diff --git a/dist/relationship.js b/dist/relationship.js index b628287..b30eedf 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -277,8 +277,8 @@ 'f,f,ob,w':['伯祖母','伯奶奶','伯婆','大奶奶','堂祖母'], 'f,f,lb':['叔祖父','叔老爷','叔公','小爷爷','堂祖父','叔爷爷','叔奶爷'], 'f,f,lb,w':['叔祖母','叔奶奶','叔婆','小奶奶','堂祖母'], - 'f,f,xs':['祖姑母','姑祖母','姑奶奶','姑婆'], - 'f,f,xs,h':['祖姑父','姑祖父','姑爷爷','姑老爷','姑公','姑奶爷','姑丈公'], + 'f,f,xs':['姑奶奶','姑内祖母','祖姑母','姑祖母','姑婆'], + 'f,f,xs,h':['姑爷爷','姑内祖父','祖姑父','姑祖父','姑老爷','姑公','姑奶爷','姑丈公'], 'f,f,xs,s&o':['姑表伯父','表伯父','表伯'], 'f,f,xs,s&o,w':['姑表伯母','表伯母'], 'f,f,xs,s&l':['姑表叔父','表叔父','表叔爸','表叔'], @@ -330,8 +330,8 @@ 'f,m,xb,d,h':['舅表姑父','表姑爸','表姑父','表姑丈'], 'f,m,xb,d,s':['从表兄弟'], 'f,m,xb,d,d':['从表姐妹'], - 'f,m,xs':['祖姨母','姨祖母','姨婆','姨奶奶','姨奶'], - 'f,m,xs,h':['祖姨父','姨祖父','姨公','姨爷爷','姨丈公','姨爷','姨老爷','姨奶爷'], + 'f,m,xs':['姨奶奶','祖姨母','姨祖母','姨婆','姨奶'], + 'f,m,xs,h':['姨爷爷','祖姨父','姨祖父','姨公','姨丈公','姨爷','姨老爷','姨奶爷'], 'f,m,xs,s&o':['姨表伯父','表伯','表伯父','从母伯父'], 'f,m,xs,s&o,w':['姨表伯母','表伯母','从母伯母'], 'f,m,xs,s&l':['姨表叔父','表叔父','表叔爸','表叔','从母叔父'], @@ -453,8 +453,8 @@ 'm,f,ob,w':['伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','伯婆'], 'm,f,lb':['叔外祖父','外叔祖父','叔姥爷','叔公','小姥爷','外叔祖','叔外祖','叔爷爷'], 'm,f,lb,w':['叔外祖母','外叔祖母','叔姥姥','叔婆','小姥姥','外姆婆'], - 'm,f,xs':['姑外祖母','外姑祖母','姑姥姥','外太姑母','姑婆'], - 'm,f,xs,h':['姑外祖父','外姑祖父','姑姥爷','外太姑父','姑公'], + 'm,f,xs':['姑姥姥','姑外祖母','外姑祖母','外太姑母','姑婆'], + 'm,f,xs,h':['姑姥爷','姑外祖父','外姑祖父','外太姑父','姑公'], 'm,f,xs,s':['姑表舅父','姑表舅爸','表舅父','表舅爸','表舅','表舅舅','姑表舅舅'], 'm,f,xs,s,w':['姑表舅母','姑表舅妈','表舅母','表舅妈'], 'm,f,xs,s,s':['从表兄弟'], @@ -506,8 +506,8 @@ 'm,m,xb,d,h':['舅表姨父','舅表姨丈','表姨父','表姨丈'], 'm,m,xb,d,s':['从表兄弟'], 'm,m,xb,d,d':['从表姐妹'], - 'm,m,xs':['姨外祖母','外姨婆','外姨祖母','姨姥姥','姨婆','姨姥'], - 'm,m,xs,h':['姨外祖父','外姨丈公','外姨祖父','姨姥爷','姨公'], + 'm,m,xs':['姨姥姥','姨外祖母','外姨婆','外姨祖母','姨婆','姨姥'], + 'm,m,xs,h':['姨姥爷','姨外祖父','外姨丈公','外姨祖父','姨公'], 'm,m,xs,s':['姨表舅父','姨表舅爸','表舅父','表舅爸','表舅','表舅舅','姨表舅舅','从母舅父'], 'm,m,xs,s,w':['姨表舅母','姨表舅妈','表舅母','表舅妈','从母舅母'], 'm,m,xs,s,s':['从表兄弟'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index fa3aafd..0d386a1 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1 +1 @@ -!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function s(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x");for(var f=s.split("的"),x=[],m=!0;f.length;){var b=f.shift(),d=[],h=!1;for(var l in w){var o=w[l];o.indexOf(b)>-1&&(!l&&f.length||d.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var b=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in d){var l=d[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),h=0;h-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var b=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");b=b.substring(0,b.lastIndexOf(","));for(var d=s.split(",").reverse(),w=b.split(",").reverse(),h=[],l=0;l-1&&(!l&&f.length||d.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var b=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in d){var l=d[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),h=0;h-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var b=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");b=b.substring(0,b.lastIndexOf(","));for(var d=s.split(",").reverse(),w=b.split(",").reverse(),h=[],l=0;l