From e221fe387dd7ae6aadb5307cb1bb10ff7247c238 Mon Sep 17 00:00:00 2001 From: PASSER-BY Date: Wed, 10 Nov 2021 22:59:25 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=A5=96=E5=AE=97=E5=8D=81=E5=85=AB?= =?UTF-8?q?=E4=BB=A3=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 165 ++++++++++++++++++++++++++++++--------- dist/relationship.min.js | 4 +- script/relationship.js | 165 ++++++++++++++++++++++++++++++--------- 3 files changed, 254 insertions(+), 80 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 73784c5..599f705 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -187,24 +187,78 @@ '[h,f|h,m]':['公婆'], '[w,f|w,m]':['岳父母'], '[xb|xs]':['兄弟姐妹','同胞','手足'], - '[s|d]':['子女','儿女','小孩','孩子'], + '[f,xb,s&o|f,xb,s&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]':['表姐妹'], + '[s|d]':['子女','儿女','小孩','孩子','孩儿'], '[s,s|s,d|d,s|d,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,f,f,f,m':['烈祖母'], - 'f,f,f,f,f,f,f':['太祖父'], - 'f,f,f,f,f,f,m':['太祖母'], - 'f,f,f,f,f,f,f,f':['远祖父'], - 'f,f,f,f,f,f,f,m':['远祖母'], - '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,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,f,ob':['伯鼻祖父'], + 'f,f,f,f,f,f,f,f,f,ob,w':['伯鼻祖母'], + 'f,f,f,f,f,f,f,f,f,lb':['叔鼻祖父'], + 'f,f,f,f,f,f,f,f,f,lb,w':['叔鼻祖母'], + 'f,f,f,f,f,f,f,f,f,xs':['姑鼻祖母'], + 'f,f,f,f,f,f,f,f,f,xs,h':['姑鼻祖父'], 'f,f,f,f,f,f,f,f,m':['鼻祖母'], + 'f,f,f,f,f,f,f,f,m,xs':['姨鼻祖母'], + 'f,f,f,f,f,f,f,f,m,xs,h':['姨鼻祖父'], + 'f,f,f,f,f,f,f,f,m,xb':['舅鼻祖父'], + 'f,f,f,f,f,f,f,f,m,xb,w':['舅鼻祖母'], + 'f,f,f,f,f,f,f,f,ob':['伯远祖父'], + 'f,f,f,f,f,f,f,f,ob,w':['伯远祖母'], + 'f,f,f,f,f,f,f,f,lb':['叔远祖父'], + 'f,f,f,f,f,f,f,f,lb,w':['叔远祖母'], + 'f,f,f,f,f,f,f,f,xs':['姑远祖母'], + 'f,f,f,f,f,f,f,f,xs,h':['姑远祖父'], + 'f,f,f,f,f,f,f,m':['远祖母'], + 'f,f,f,f,f,f,f,m,xs':['姨远祖母'], + 'f,f,f,f,f,f,f,m,xs,h':['姨远祖父'], + 'f,f,f,f,f,f,f,m,xb':['舅远祖父'], + 'f,f,f,f,f,f,f,m,xb,w':['舅远祖母'], + 'f,f,f,f,f,f,f,ob':['伯太祖父'], + 'f,f,f,f,f,f,f,ob,w':['伯太祖母'], + 'f,f,f,f,f,f,f,lb':['叔太祖父'], + 'f,f,f,f,f,f,f,lb,w':['叔太祖母'], + 'f,f,f,f,f,f,f,xs':['姑太祖母'], + 'f,f,f,f,f,f,f,xs,h':['姑太祖父'], + 'f,f,f,f,f,f,m':['太祖母'], + 'f,f,f,f,f,f,m,xs':['姨太祖母'], + 'f,f,f,f,f,f,m,xs,h':['姨太祖父'], + 'f,f,f,f,f,f,m,xb':['舅太祖父'], + 'f,f,f,f,f,f,m,xb,w':['舅太祖母'], + 'f,f,f,f,f,f,ob':['伯烈祖父'], + 'f,f,f,f,f,f,ob,w':['伯烈祖母'], + 'f,f,f,f,f,f,lb':['叔烈祖父'], + 'f,f,f,f,f,f,lb,w':['叔烈祖母'], + 'f,f,f,f,f,f,xs':['姑烈祖母'], + 'f,f,f,f,f,f,xs,h':['姑烈祖父'], + 'f,f,f,f,f,m':['烈祖母'], + 'f,f,f,f,f,m,xs':['姨烈祖母'], + 'f,f,f,f,f,m,xs,h':['姨烈祖父'], + 'f,f,f,f,f,m,xb':['舅烈祖父'], + 'f,f,f,f,f,m,xb,w':['舅烈祖母'], + 'f,f,f,f,f,ob':['伯天祖父'], + 'f,f,f,f,f,ob,w':['伯天祖母'], + 'f,f,f,f,f,lb':['叔天祖父'], + 'f,f,f,f,f,lb,w':['叔天祖母'], + 'f,f,f,f,f,xs':['姑天祖母'], + 'f,f,f,f,f,xs,h':['姑天祖父'], 'f,f,f,f,m':['天祖母'], + 'f,f,f,f,m,xs':['姨天祖母'], + 'f,f,f,f,m,xs,h':['姨天祖父'], + 'f,f,f,f,m,xb':['舅天祖父'], + 'f,f,f,f,m,xb,w':['舅天祖母'], 'f,f,f,f,ob':['伯高祖父'], 'f,f,f,f,ob,w':['伯高祖母'], 'f,f,f,f,lb':['叔高祖父'], @@ -648,12 +702,12 @@ 'm,f,f,lb':['叔外曾祖父','外太叔公','叔太姥爷','叔太奶爷','叔太爷爷'], 'm,f,f,lb,w':['叔外曾祖母','外太叔母','叔太姥姥','叔太奶奶'], // 再从父 - 'm,f,f,xb,s':['从父外祖父','从父姥爷'], - 'm,f,f,xb,s,w':['从父外祖母','从父姥姥'], - 'm,f,f,xb,s&o':['从父伯外祖父','从父伯姥爷'], - 'm,f,f,xb,s&o,w':['从父伯外祖母','从父伯姥姥'], - 'm,f,f,xb,s&l':['从父叔外祖父','从父叔姥爷'], - 'm,f,f,xb,s&l,w':['从父叔外祖母','从父叔姥姥'], + 'm,f,f,xb,s':['堂外祖父','从父外祖父','从父姥爷'], + 'm,f,f,xb,s,w':['堂外祖母','从父外祖母','从父姥姥'], + 'm,f,f,xb,s&o':['堂伯外祖父','从父伯外祖父','从父伯姥爷'], + 'm,f,f,xb,s&o,w':['堂伯外祖母','从父伯外祖母','从父伯姥姥'], + 'm,f,f,xb,s&l':['堂叔外祖父','从父叔外祖父','从父叔姥爷'], + 'm,f,f,xb,s&l,w':['堂叔外祖母','从父叔外祖母','从父叔姥姥'], 'm,f,f,xb,s,s':['再从父舅父'], 'm,f,f,xb,s,s,w':['再从父舅母'], 'm,f,f,xb,s,d':['再从父姨母'], @@ -1116,8 +1170,8 @@ 'h,lb':['小叔子','小叔弟'], 'h,lb,w':['小婶子','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'], 'h,xb':['伯叔'], - 'h,xb,s':['叔侄男','叔伯男','从男','婆家侄男'], - 'h,xb,s,w':['叔侄妇'], + 'h,xb,s':['婆家侄','叔侄男','叔伯男','从男','婆家侄男'], + 'h,xb,s,w':['叔侄媳妇','叔侄妇'], 'h,xb,s,s':['叔侄孙男'], 'h,xb,s,s,w':['叔侄孙妇'], 'h,xb,s,d':['叔侄孙女'], @@ -1399,8 +1453,8 @@ '0,xs,h,xs,d':['姨姻姑女'], '1,xs,h,xs,d':['姑姻姑女'], 'xs,s':['外甥','外甥男','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], - 'xs,s,w':['甥媳妇','外甥媳妇','甥妇'], - 'xs,s,s':['甥孙男'], + 'xs,s,w':['外甥媳妇','甥媳妇','甥妇'], + 'xs,s,s':['甥孙'], 'xs,s,s,w':['甥孙妇'], 'xs,s,s,s':['甥曾孙'], 'xs,s,s,s,w':['甥曾孙妇'], @@ -1421,7 +1475,7 @@ 'xs,s,d,d,s':['甥曾外曾外孙'], 'xs,s,d,d,d':['甥曾外曾外孙女'], 'xs,d':['外甥女','甥女','外甥囡'], - 'xs,d,h':['甥女婿','外甥女婿','甥婿'], + 'xs,d,h':['外甥女婿','甥女婿','甥婿'], 'xs,d,s':['甥外孙'], 'xs,d,s,w':['甥外孙妇'], 'xs,d,s,s':['甥外曾孙'], @@ -1443,56 +1497,89 @@ 'xs,d,d,d,s':['甥外曾外曾外孙'], 'xs,d,d,d,d':['甥外曾外曾外孙女'], //自家 - 's':['儿子','男儿','仔','阿仔','仔仔','x儿子','孩子','孩儿'], + 's':['儿子','男儿','儿','仔','阿仔','仔仔','x儿子'], 's,w':['儿媳','儿媳妇','新妇'], 's,s':['孙子','孙男','孙儿','x孙子','孙'], - 's,s,w':['孙媳','孙媳妇','孙妇'], + 's,s,w':['孙媳妇','孙媳','孙妇'], 's,s,w,xb':['姻家再侄'], 's,s,w,xs':['姻家再侄'], - 's,s,s':['曾孙','曾孙男'], + 's,s,s':['曾孙','曾孙男','重孙'], 's,s,s,w':['曾孙妇'], 's,s,s,s':['玄孙','元孙','膀孙'], - 's,s,s,d':['玄孙女'], + 's,s,s,s,w':['玄孙媳妇'], 's,s,s,s,s':['来孙'], - 's,s,s,s,d':['来孙女'], + 's,s,s,s,s,w':['来孙媳妇'], 's,s,s,s,s,s':['晜孙'], - 's,s,s,s,s,d':['晜孙女'], + 's,s,s,s,s,s,w':['晜孙媳妇'], 's,s,s,s,s,s,s':['仍孙'], - 's,s,s,s,s,s,d':['仍孙女'], + 's,s,s,s,s,s,s,w':['仍孙媳妇'], 's,s,s,s,s,s,s,s':['云孙'], - 's,s,s,s,s,s,s,d':['云孙女'], 's,s,s,s,s,s,s,s,s':['耳孙'], + 's,s,s,s,s,s,s,s,s,w':['耳孙媳妇'], 's,s,s,s,s,s,s,s,d':['耳孙女'], - 's,s,d':['曾孙女','曾孙'], + 's,s,s,s,s,s,s,s,d,h':['耳孙女婿'], + 's,s,s,s,s,s,s,d':['云孙女'], + 's,s,s,s,s,s,s,d,h':['云孙女婿'], + 's,s,s,s,s,s,s,d,s':['耳外孙'], + 's,s,s,s,s,s,s,d,s,w':['耳外孙媳妇'], + 's,s,s,s,s,s,s,d,d':['耳外孙女'], + 's,s,s,s,s,s,s,d,d,h':['耳外孙女婿'], + 's,s,s,s,s,s,d':['仍孙女'], + 's,s,s,s,s,s,d,h':['仍孙女婿'], + 's,s,s,s,s,s,d,s':['云外孙'], + 's,s,s,s,s,s,d,s,w':['云外孙媳妇'], + 's,s,s,s,s,s,d,d':['云外孙女'], + 's,s,s,s,s,s,d,d,h':['云外孙女婿'], + 's,s,s,s,s,d':['晜孙女'], + 's,s,s,s,s,d,h':['晜孙女婿'], + 's,s,s,s,s,d,s':['仍外孙'], + 's,s,s,s,s,d,s,w':['仍外孙媳妇'], + 's,s,s,s,s,d,d':['仍外孙女'], + 's,s,s,s,s,d,d,h':['仍外孙女婿'], + 's,s,s,s,d':['来孙女'], + 's,s,s,s,d,h':['来孙女婿'], + 's,s,s,s,d,s':['晜外孙'], + 's,s,s,s,d,s,w':['晜外孙媳妇'], + 's,s,s,s,d,d':['晜外孙女'], + 's,s,s,s,d,d,h':['晜外孙女婿'], + 's,s,s,d':['玄孙女'], + 's,s,s,d,h':['玄孙女婿'], + 's,s,s,d,s':['来外孙'], + 's,s,s,d,s,w':['来外孙媳妇'], + 's,s,s,d,d':['来外孙女'], + 's,s,s,d,d,h':['来外孙女婿'], + 's,s,d':['曾孙女'], 's,s,d,h':['曾孙婿'], - 's,s,d,s':['玄外孙',], + 's,s,d,s':['玄外孙'], + 's,s,d,s,w':['玄外孙媳妇'], 's,s,d,d':['玄外孙女'], + 's,s,d,d,h':['玄外孙女婿'], 's,d':['孙女','孙囡'], - 's,d,h':['孙婿','孙女婿'], + 's,d,h':['孙女婿','孙婿'], 's,d,h,xb':['姻家再侄男','姻家再侄'], 's,d,h,xs':['姻家再侄女','姻家再侄'], 's,d,s':['曾外孙'], - 's,d,s,w':['曾外孙妇'], + 's,d,s,w':['曾外孙媳妇','曾外孙妇'], 's,d,s,s':['曾外曾孙'], 's,d,s,d':['曾外曾孙女'], 's,d,d':['曾外孙女'], - 's,d,d,h':['曾外孙婿'], + 's,d,d,h':['曾外孙女婿','曾外孙婿'], 's,d,d,s':['曾外曾外孙'], 's,d,d,d':['曾外曾外孙女'], - 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿','孩子','孩儿'], + 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿'], 'd,h':['女婿','姑爷','女婿子','女婿儿','儿婿'], 'd,s':['外孙'], - 'd,s,w':['外孙妇','外孙媳妇'], + 'd,s,w':['外孙媳妇','外孙妇'], 'd,s,s':['外曾孙','重外孙'], - 'd,s,s,w':['外曾孙妇'], + 'd,s,s,w':['外曾孙媳妇','外曾孙妇'], 'd,s,s,s':['外玄孙'], 'd,s,s,d':['外玄孙女'], 'd,s,d':['外曾孙女','重外孙女'], - 'd,s,d,h':['外曾孙婿','重外孙婿'], + 'd,s,d,h':['外曾孙女婿','外曾孙婿','重外孙婿'], 'd,s,d,s':['外玄外孙'], 'd,s,d,d':['外玄外孙女'], 'd,d':['外孙女','外孙囡'], - 'd,d,h':['外孙婿','外孙女婿'], + 'd,d,h':['外孙女婿','外孙婿'], 'd,d,s':['外曾外孙'], 'd,d,s,w':['外曾外孙妇'], 'd,d,s,s':['外曾外曾孙'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index d09d4c3..72ca60c 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 Date: Wed, 10 Nov 2021 23:31:57 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=AD=A3=E5=88=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 2 +- dist/relationship.min.js | 2 +- script/relationship.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 599f705..5322639 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -170,7 +170,7 @@ str:'$1$2$4#$1[$3]$4' }, {//并列关系处理2 - exp:/(.+)?\[([^\[\]]+)\|([^\[\]]+)?\](.+)?/g, + exp:/(.+)?\[([^\[\]\|]+)\|([^\[\]\|]+)?\](.+)?/g, str:'$1$2$4#$1$3$4' } ]; diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 72ca60c..057b75b 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 Date: Wed, 10 Nov 2021 23:41:22 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=AD=A3=E5=88=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 4 ++-- dist/relationship.min.js | 2 +- script/relationship.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 5322639..ba691fa 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -166,11 +166,11 @@ str:'' }, {//并列关系处理1 - exp:/(.+)?\[([^\|]+)\|(.+\|.+)?\](.+)?/g, + exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g, str:'$1$2$4#$1[$3]$4' }, {//并列关系处理2 - exp:/(.+)?\[([^\[\]\|]+)\|([^\[\]\|]+)?\](.+)?/g, + exp:/(.+)?\[([^\[\]\|]+?)\|([^\[\]\|]+?)?\](.+)?/g, str:'$1$2$4#$1$3$4' } ]; diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 057b75b..2ef9467 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 Date: Thu, 11 Nov 2021 00:26:23 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E5=8C=B9=E9=85=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 8 ++++---- dist/relationship.min.js | 4 ++-- script/relationship.js | 8 ++++---- tests/test.js | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index ba691fa..8699571 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -166,7 +166,7 @@ str:'' }, {//并列关系处理1 - exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g, + exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g, str:'$1$2$4#$1[$3]$4' }, {//并列关系处理2 @@ -634,14 +634,14 @@ 'f,xb,s&o,w':['堂嫂'], 'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'], 'f,xb,s&l,w':['堂弟媳','堂弟妹'], - 'f,xb,s,s':['堂侄男','堂侄子','从父侄男','叔伯侄男','堂侄'], - 'f,xb,s,s,w':['堂侄妇','从父侄妇','叔伯侄父'], + 'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'], + 'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'], 'f,xb,s,s,s':['堂侄孙男'], 'f,xb,s,s,s,w':['堂侄孙妇'], 'f,xb,s,s,d':['堂侄孙女'], 'f,xb,s,s,d,h':['堂侄孙婿'], 'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'], - 'f,xb,s,d,h':['堂侄婿','从父侄婿','叔伯侄婿'], + 'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'], 'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'], 'f,xb,d&o,h':['堂姐夫'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 2ef9467..f691a67 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 Date: Thu, 11 Nov 2021 00:44:03 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=A7=B0=E5=91=BC=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 8 ++++---- dist/relationship.min.js | 4 ++-- script/relationship.js | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 8699571..b91c58d 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -1076,10 +1076,10 @@ 'h,f,f,lb':['叔祖公','叔祖翁'], 'h,f,f,lb,w':['叔祖婆'], 'h,f,f,f':['曾祖公','太公翁'], - 'h,f,f,f,ob':['太伯翁'], - 'h,f,f,f,ob,w':['太姆婆'], - 'h,f,f,f,lb':['太叔翁'], - 'h,f,f,f,lb,w':['太婶婆'], + 'h,f,f,f,ob':['伯曾祖公','太伯翁'], + 'h,f,f,f,ob,w':['伯曾祖婆','太姆婆'], + 'h,f,f,f,lb':['叔曾祖公','太叔翁'], + 'h,f,f,f,lb,w':['叔曾祖婆','太婶婆'], 'h,f,f,m':['曾祖婆','太奶亲'], 'h,f,f,xs':['姑祖婆'], 'h,f,f,xs,h':['姑祖公'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index f691a67..b2947e4 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 Date: Thu, 11 Nov 2021 22:20:41 +0800 Subject: [PATCH 06/11] =?UTF-8?q?updated=20=E6=96=87=E6=A1=88SEO=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 36 ++++++++++++++++++++---------------- dist/relationship.min.js | 4 ++-- index.html | 6 +++++- script/relationship.js | 36 ++++++++++++++++++++---------------- 4 files changed, 47 insertions(+), 35 deletions(-) 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 中国亲戚关系计算器 - +