diff --git a/dist/relationship.js b/dist/relationship.js index d828561..7875328 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -204,6 +204,8 @@ 'f,f,f,m':['高祖母','老太太','祖太太','祖太奶','祖太奶奶','祖太婆'], 'f,f,f,m,xs':['姨高祖母'], 'f,f,f,m,xs,h':['姨高祖父'], + 'f,f,f,m,xb':['舅高祖父'], + 'f,f,f,m,xb,w':['舅高祖母'], 'f,f,f,ob':['曾伯祖父','曾伯父','伯曾祖父','伯公太','伯太爷'], 'f,f,f,ob,w':['曾伯祖母','曾伯母','伯曾祖母','伯婆太','伯太太'], 'f,f,f,lb':['曾叔祖父','曾叔父','叔曾祖父','叔公太','叔太爷'], @@ -434,10 +436,18 @@ 'm,f,m,m':['外高外祖母','祖太姥姥','祖太姥娘','祖太婆'], 'm,f,m,xb':['舅外曾祖父','外太舅公','舅太姥爷','舅太奶爷'], 'm,f,m,xb,w':['舅外曾祖母','外太舅母','舅太姥姥','舅太奶奶','外太舅婆'], + 'm,f,m,xb,s&o':['表伯外祖父','外表伯祖父'], + 'm,f,m,xb,s&o,w':['表伯外祖母','外表伯祖母'], + 'm,f,m,xb,s&l':['表叔外祖父','外表叔祖父'], + 'm,f,m,xb,s&l,w':['表叔外祖母','外表叔祖母'], 'm,f,m,xb,d':['表姑外祖母'], 'm,f,m,xb,d,h':['表姑外祖父'], 'm,f,m,xs':['姨外曾祖母','外太姨婆','姨太姥姥','姨太奶奶'], 'm,f,m,xs,h':['姨外曾祖父','外太姑姨公','姨太姥爷','姨太奶爷','姨太爷爷'], + 'm,f,m,xs,s&o':['表伯外祖父','外表伯祖父'], + 'm,f,m,xs,s&o,w':['表伯外祖母','外表伯祖母'], + 'm,f,m,xs,s&l':['表叔外祖父','外表叔祖父'], + 'm,f,m,xs,s&l,w':['表叔外祖母','外表叔祖母'], 'm,f,m,xs,d':['表姑外祖母'], 'm,f,m,xs,d,h':['表姑外祖父'], 'm,f,xb':['大姥爷/小姥爷','x姥爷'], @@ -867,12 +877,16 @@ 's,w,f,m':['太姻姆'], 's,w,f,ob':['姻兄','姻亲'], 's,w,f,lb':['姻弟','姻亲'], + 's,w,f,os':['姻姐','姻亲'], + 's,w,f,ls':['姻妹','姻亲'], 'd,h,m':['亲家母','亲家'], 'd,h,f':['亲家公','亲家翁','亲家'], 'd,h,f,f':['太姻翁'], 'd,h,f,m':['太姻姆'], 'd,h,f,ob':['姻兄','姻亲'], - 'd,h,f,lb':['姻弟','姻亲'] + 'd,h,f,lb':['姻弟','姻亲'], + 's,w,f,os':['姻姐','姻亲'], + 's,w,f,ls':['姻妹','姻亲'] }; //数组去重 diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 718106d..41ce294 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("#"),e=0;e-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("#"),e=0;e-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