diff --git a/dist/relationship.js b/dist/relationship.js index b91c58d..ff3e78d 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -188,9 +188,9 @@ '[w,f|w,m]':['岳父母'], '[xb|xs]':['兄弟姐妹','同胞','手足'], '[f,xb,s&o|f,xb,s&l]':['堂兄弟'], - '[f,xb,d&o|f,xb,d&l]':['堂姐妹'], + '[f,xb,d&o|f,xb,d&l]':['堂姐妹','堂姊妹'], '[f,xs,s&o|f,xs,s&l|m,xb,s&o|m,xb,s&l]':['表兄弟'], - '[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]':['表姐妹'], + '[f,xs,d&o|f,xs,d&l|m,xb,d&o|m,xb,d&l]':['表姐妹','表姊妹'], '[s|d]':['子女','儿女','小孩','孩子','孩儿'], '[s,s|s,d|d,s|d,d]':['孙辈'], // 本家 @@ -622,8 +622,8 @@ // 从父 'f,ob':['伯父','伯伯','阿伯','大伯','大爹','大爸','x伯'], 'f,ob,w':['伯母','伯妈','伯娘','大娘','大妈','x妈'], - 'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','x叔','叔'], - 'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','婶子','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','x婶','婶'], + 'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小爹','小爸','幺爸','x叔','叔'], + 'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','婶子','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','幺婶','x婶','婶'], 'f,xb,w,f':['叔姻外祖父','姻伯公'], 'f,xb,w,m':['叔姻外祖母','姻伯婆'], 'f,xb,w,xb':['叔姻舅父','姻舅父'], @@ -780,8 +780,10 @@ 'm,f,m,xs,d,d':['从母姑表姨母'], 'm,f,m,xs,d,d,h':['从母姑表姨父'], // 从父* - 'm,f,ob':['大外公','大姥爷','x外公','x姥爷'], - 'm,f,lb':['小外公','小姥爷','x外公','x姥爷'], + 'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','外伯祖','大外公','大姥爷','x外公','x姥爷'], + 'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','小外公','小姥爷','x外公','x姥爷'], + 'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','外叔祖','叔外祖'], + 'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆'], // 从父舅表 'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父','叔伯舅父','叔伯舅'], 'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母','叔伯舅母'], @@ -812,10 +814,6 @@ 'm,f,xb,d,d,s,w':['从父舅表甥妇'], 'm,f,xb,d,d,d':['从父舅表甥女'], 'm,f,xb,d,d,d,h':['从父舅表甥婿'], - 'm,f,ob':['外伯公','伯外祖父','外伯祖父','伯姥爷','大姥爷','外伯祖'], - 'm,f,ob,w':['外伯婆','伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆'], - 'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','小姥爷','外叔祖','叔外祖'], - 'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆'], // 姑表* 'm,f,xs':['外姑婆','姑姥姥','姑外祖母','外姑祖母','外太姑母','外姑母'], 'm,f,xs,h':['外姑公','姑姥爷','姑外祖父','外姑祖父','外太姑父','外姑丈'], @@ -1063,9 +1061,11 @@ 'm,xs,d&o,h':['姨姐夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'], 'm,xs,d&l':['姨妹','从母妹'], 'm,xs,d&l,h':['姨妹夫','从母妹夫','从母妹丈','从母妹婿','从母妹郎'], - 'm,xs,d,s':['姨甥男','从母甥男','姨甥'], + 'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'], 'm,xs,d,s,w':['姨甥妇','从母甥妇'], - 'm,xs,d,d':['姨甥女','从母甥女','姨甥'], + 'm,xs,d,s,s':['姨甥孙男','姨甥孙'], + 'm,xs,d,s,d':['姨甥孙女'], + 'm,xs,d,d':['姨甥女','从母甥女','姨外甥女','姨甥'], 'm,xs,d,d,h':['姨甥婿','从母甥婿'], // 婆家 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','良人','爱人','老伴','老头子'], @@ -1247,7 +1247,7 @@ 'w,f,xs,d&o,h':['姑表襟兄','表襟兄'], 'w,f,xs,d&l':['姑表小姨妹','表姨仔','表内妹'], 'w,f,xs,d&l,h':['姑表襟弟','表襟弟'], - 'w,m':['岳母','丈母娘','丈母','泰水'], + 'w,m':['岳母','丈母娘','老丈母','丈母','泰水'], 'w,m,f':['外祖岳父','外太岳父','姥岳父'], 'w,m,f,f':['外曾祖丈人'], 'w,m,f,m':['外曾祖丈母'], @@ -1288,15 +1288,19 @@ 'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'], 'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅','舅弟'], 'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'], - 'w,xb,s':['内侄男','内侄','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'], + 'w,xb,s':['内侄','内侄男','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'], 'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇'], - 'w,xb,s,s':['内侄孙男','妻侄孙男'], + 'w,xb,s,s':['内侄孙','内侄孙男','妻侄孙男'], 'w,xb,s,s,w':['内侄孙妇','妻侄孙妇'], + 'w,xb,s,s,s':['内曾侄孙','内曾侄孙男'], + 'w,xb,s,s,s,w':['内曾侄孙妇'], + 'w,xb,s,s,d':['内曾侄孙女'], + 'w,xb,s,s,d,h':['内曾侄孙婿'], 'w,xb,s,d':['内侄孙女','妻侄孙女'], 'w,xb,s,d,h':['内侄孙婿','妻侄孙婿'], 'w,xb,d':['内侄女','内侄','妻侄女','舅侄女','岳侄女','丈人侄女','舅女'], 'w,xb,d,h':['内侄婿','妻侄婿','舅侄婿','岳侄婿','丈人侄婿'], - 'w,xb,d,s':['内侄外孙男','姨侄外孙男'], + 'w,xb,d,s':['内侄外孙','内侄外孙男','姨侄外孙男'], 'w,xb,d,s,w':['内侄外孙妇','姨侄外孙妇'], 'w,xb,d,d':['内侄外孙女','姨侄外孙女'], 'w,xb,d,d,h':['内侄外孙婿','姨侄外孙婿'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index b2947e4..ad739e1 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1,2 +1,2 @@ -!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.replace(/我的?/,"").replace(/家的?/,"的").split("的"),x=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-1&&(!l&&f.length||b.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 d=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[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 d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l-1&&(!l&&f.length||b.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 d=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[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 d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l 中国亲戚关系计算器 - +