From 4b0bcfc9cbe9315715dcc8178489a8b376991de7 Mon Sep 17 00:00:00 2001 From: mumuy Date: Tue, 20 Jun 2017 15:33:52 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E9=83=A8=E5=88=86=E5=88=AB=E7=A7=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + dist/relationship.js | 38 +++++++++++++++++++------------------- dist/relationship.min.js | 2 +- script/relationship.js | 38 +++++++++++++++++++------------------- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 3f875d7..8a1514a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules/* +/node_modules diff --git a/dist/relationship.js b/dist/relationship.js index 79ecfdb..0b22e41 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -184,8 +184,8 @@ '[s|d]':['子女','儿女','小孩','孩子'], //本家 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子','老头子'], - 'f,f':['爷爷','祖父','阿爷','奶爷','阿公'], - 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'], + 'f,f':['爷爷','祖父','阿爷','奶爷','阿公','老爷'], + 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷','太老爷'], 'f,f,f,f':['高祖父','老太爷','祖太爷','祖太爷爷','祖太公'], 'f,f,f,f,f':['天祖父'], 'f,f,f,f,f,f':['烈祖父'], @@ -208,10 +208,10 @@ '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':['曾叔祖父','曾叔父','叔曾祖父','叔公太','叔太爷'], - 'f,f,f,lb,w':['曾叔祖母','曾叔母','叔曾祖母','叔婆太','叔太太'], + 'f,f,f,ob':['曾伯祖父','曾伯父','伯曾祖父','伯公太','伯太爷','伯公老爷'], + 'f,f,f,ob,w':['曾伯祖母','曾伯母','伯曾祖母','伯婆太','伯太太','伯婆奶奶'], + 'f,f,f,lb':['曾叔祖父','曾叔父','叔曾祖父','叔公太','叔太爷','叔公老爷'], + 'f,f,f,lb,w':['曾叔祖母','曾叔母','叔曾祖母','叔婆太','叔太太','叔婆奶奶'], 'f,f,f,xb,s&o':['堂伯祖父','族伯祖父'], 'f,f,f,xb,s&o,w':['堂伯祖母','族伯祖母'], 'f,f,f,xb,s&l':['堂叔祖父','族叔祖父'], @@ -224,8 +224,8 @@ 'f,f,f,xb,s,s,s&l':['族弟'], 'f,f,f,xb,d':['堂姑祖母'], 'f,f,f,xb,d,h':['堂姑祖父'], - 'f,f,f,xs':['曾祖姑母','姑曾祖母','太姑婆','姑婆太','姑太太','曾祖姑'], - 'f,f,f,xs,h':['曾祖姑丈','姑曾祖父','太姑丈公','姑丈公太','姑太爷'], + 'f,f,f,xs':['曾祖姑母','姑曾祖母','太姑婆','姑婆太','姑太太','曾祖姑','姑婆奶奶'], + 'f,f,f,xs,h':['曾祖姑丈','姑曾祖父','太姑丈公','姑丈公太','姑太爷','姑公老爷'], 'f,f,f,xs,s&o':['表伯祖父'], 'f,f,f,xs,s&o,w':['表伯祖母'], 'f,f,f,xs,s&l':['表叔祖父'], @@ -235,8 +235,8 @@ 'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'], 'f,f,m,f':['高外祖父','祖太姥爷','祖太公'], 'f,f,m,m':['高外祖母','祖太姥姥','祖太姥娘','祖太婆'], - 'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷','舅太爷爷'], - 'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太','舅太奶奶'], + 'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷','舅太爷爷','舅公老爷'], + 'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太','舅太奶奶','舅婆奶奶'], 'f,f,m,xb,s&o':['表伯祖父'], 'f,f,m,xb,s&o,w':['表伯祖母'], 'f,f,m,xb,s&l':['表叔祖父'], @@ -465,12 +465,12 @@ 'm,f,xb,d,s&l':['堂姨表弟'], 'm,f,xb,d,d&o':['堂姨表姐'], 'm,f,xb,d,d&l':['堂姨表妹'], - 'm,f,ob':['伯外祖父','外伯祖父','伯姥爷','大姥爷','外伯祖','伯公'], - 'm,f,ob,w':['伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','伯婆'], - 'm,f,lb':['叔外祖父','外叔祖父','叔姥爷','叔公','小姥爷','外叔祖','叔外祖','叔爷爷'], - 'm,f,lb,w':['叔外祖母','外叔祖母','叔姥姥','叔婆','小姥姥','外姆婆'], - 'm,f,xs':['姑姥姥','姑外祖母','外姑祖母','外太姑母','姑婆'], - 'm,f,xs,h':['姑姥爷','姑外祖父','外姑祖父','外太姑父','姑公'], + 'm,f,ob':['伯外祖父','外伯祖父','伯姥爷','大姥爷','外伯祖','外伯公'], + 'm,f,ob,w':['伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','外伯婆'], + 'm,f,lb':['叔外祖父','外叔祖父','叔姥爷','小姥爷','外叔祖','叔外祖','外叔公'], + 'm,f,lb,w':['叔外祖母','外叔祖母','叔姥姥','小姥姥','外姆婆','外叔婆'], + 'm,f,xs':['姑姥姥','姑外祖母','外姑祖母','外太姑母','外姑婆','外姑母'], + 'm,f,xs,h':['姑姥爷','姑外祖父','外姑祖父','外太姑父','外姑公','外姑丈'], 'm,f,xs,s':['姑表舅父','姑表舅爸','表舅父','表舅爸','表舅','表舅舅','姑表舅舅'], 'm,f,xs,s,w':['姑表舅母','姑表舅妈','表舅母','表舅妈'], 'm,f,xs,s,s':['从表兄弟'], @@ -513,7 +513,7 @@ 'm,m,m,xs,d':['表姨外祖母'], 'm,m,m,xs,d,h':['表姨外祖父'], 'm,m,xb':['外舅公','外舅祖父','外太舅父','舅外祖父','舅姥爷','舅外公','舅公','x舅姥爷'], - 'm,m,xb,w':['外舅婆','外舅祖母','外太舅母','舅外祖母','舅姥姥','舅婆'], + 'm,m,xb,w':['外舅婆','外舅祖母','外太舅母','舅外祖母','舅姥姥','舅婆','外妗婆'], 'm,m,xb,s':['舅表舅父','舅表舅爸','表舅父','表舅爸','表舅','表舅舅','舅表舅舅'], 'm,m,xb,s,w':['舅表舅母','舅表舅妈','表舅母','表舅妈'], 'm,m,xb,s,s':['从表兄弟'], @@ -819,11 +819,11 @@ 'xs,s,d,d':['外曾甥孙女'], 'xs,d':['外甥女','外甥囡'], 'xs,d,h':['外甥女婿'], - 'xs,d,s':['外甥孙','甥孙男','甥孙','甥外孙男'], + 'xs,d,s':['外甥孙','甥孙男','甥孙','甥外孙男','外弥甥'], 'xs,d,s,w':['外甥孙媳妇'], 'xs,d,s,s':['外曾甥孙'], 'xs,d,s,d':['外曾甥孙女'], - 'xs,d,d':['外甥孙女','甥孙女','甥孙','甥外孙女'], + 'xs,d,d':['外甥孙女','甥孙女','甥孙','甥外孙女','外弥甥女'], 'xs,d,d,h':['外甥孙女婿'], 'xs,d,d,s':['外曾甥孙'], 'xs,d,d,d':['外曾甥孙女'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index dc36041..95cdabd 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