From d946d9b57be019290140dab05f3833887086af91 Mon Sep 17 00:00:00 2001 From: PASSER-BY Date: Wed, 17 Nov 2021 07:34:31 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E7=94=A5=E5=A5=B3?= =?UTF-8?q?=E6=97=8F=E4=BE=84=E5=A5=B3=E6=97=8F=E7=94=A5=E7=94=B7=E6=97=8F?= =?UTF-8?q?=E4=BE=84=E7=94=B7=E6=97=8F=E5=AD=99=E5=A5=B3=E6=97=8F=E5=AD=99?= =?UTF-8?q?=E7=94=B7=E6=97=8F=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 72 +++++++++++++++++++++++++++++++++++++--- dist/relationship.min.js | 4 +-- index.html | 2 +- script/relationship.js | 72 +++++++++++++++++++++++++++++++++++++--- 4 files changed, 139 insertions(+), 11 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index e963535..423e32a 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -704,6 +704,12 @@ 'f,xb,s&o,w':['堂嫂','从父兄妇','叔伯兄妇'], 'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'], 'f,xb,s&l,w':['堂弟媳','堂弟妹','从父弟妇','叔伯弟妇'], + 'f,xb,s,w,f':['从父兄弟眷父'], + 'f,xb,s,w,m':['从父兄弟眷母'], + 'f,xb,s,w,xb&o':['从父兄弟眷兄'], + 'f,xb,s,w,xb&l':['从父兄弟眷弟'], + 'f,xb,s,w,xs&o':['从父兄弟眷姊'], + 'f,xb,s,w,xs&l':['从父兄弟眷妹'], 'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'], 'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'], 'f,xb,s,s,s':['堂侄孙'], @@ -720,6 +726,12 @@ 'f,xb,d&o,h':['堂姐夫','从父姊夫','从父姊婿','叔伯姊夫'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], 'f,xb,d&l,h':['堂妹夫','从父妹夫','从父妹婿','叔伯妹夫'], + 'f,xb,d,h,f':['从父姊妹姻父'], + 'f,xb,d,h,m':['从父姊妹姻母'], + 'f,xb,d,h,xb&o':['从父姊妹姻兄'], + 'f,xb,d,h,xb&l':['从父姊妹姻弟'], + 'f,xb,d,h,xs&o':['从父姊妹姻姊'], + 'f,xb,d,h,xs&l':['从父姊妹姻妹'], 'f,xb,d,s':['堂外甥','堂甥'], 'f,xb,d,s,w':['堂甥媳'], 'f,xb,d,s,s':['堂甥孙'], @@ -1167,6 +1179,12 @@ 'm,xs,s&o,w':['姨嫂','姨兄妇','从母嫂','从母兄妇'], 'm,xs,s&l':['姨弟','从母弟'], 'm,xs,s&l,w':['姨弟妇','从母弟妇'], + 'm,xs,s,w,f':['从母兄弟眷父'], + 'm,xs,s,w,m':['从母兄弟眷母'], + 'm,xs,s,w,xb&o':['从母兄弟眷兄'], + 'm,xs,s,w,xb&l':['从母兄弟眷弟'], + 'm,xs,s,w,xs&o':['从母兄弟眷姊'], + 'm,xs,s,w,xs&l':['从母兄弟眷妹'], 'm,xs,s,s':['姨侄男','从母侄男','姨侄'], 'm,xs,s,s,w':['姨侄妇','从母侄妇'], 'm,xs,s,s,s':['姨侄孙男','姨侄孙','从母侄孙'], @@ -1183,6 +1201,12 @@ 'm,xs,d&o,h':['姨姐夫','姨姊夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'], 'm,xs,d&l':['姨妹','从母妹'], 'm,xs,d&l,h':['姨妹夫','从母妹夫','从母妹丈','从母妹婿','从母妹郎'], + 'm,xs,d,h,f':['从母姊妹姻父'], + 'm,xs,d,h,m':['从母姊妹姻母'], + 'm,xs,d,h,xb&o':['从母姊妹姻兄'], + 'm,xs,d,h,xb&l':['从母姊妹姻弟'], + 'm,xs,d,h,xs&o':['从母姊妹姻姊'], + 'm,xs,d,h,xs&l':['从母姊妹姻妹'], 'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'], 'm,xs,d,s,w':['姨甥妇','从母甥妇'], 'm,xs,d,s,s':['姨甥孙男','姨甥孙','从母甥孙'], @@ -1566,6 +1590,14 @@ '1,xb,w,xs,d':['叔眷姨女'], 'xb,s':['侄子','侄男','侄男儿','侄儿','阿侄'], 'xb,s,w':['侄媳妇','侄妇'], + 'xb,s,w,f&o':['侄眷兄'], + 'xb,s,w,f&l':['侄眷弟'], + 'xb,s,w,m&o':['侄眷姊'], + 'xb,s,w,m&l':['侄眷妹'], + 'xb,s,w,xb':['侄眷男'], + 'xb,s,w,xb,w':['侄眷妇'], + 'xb,s,w,xs':['侄眷女'], + 'xb,s,w,xs,h':['侄眷婿'], 'xb,s,s':['侄孙男','侄孙子'], 'xb,s,s,w':['侄孙妇'], 'xb,s,s,s':['侄曾孙'], @@ -1588,6 +1620,14 @@ 'xb,s,d,d,d':['侄曾外曾外孙女'], 'xb,d':['侄女','侄女儿','侄囡'], 'xb,d,h':['侄女婿','侄婿'], + 'xb,d,h,f&o':['侄姻兄'], + 'xb,d,h,f&l':['侄姻弟'], + 'xb,d,h,m&o':['侄姻姊'], + 'xb,d,h,m&l':['侄姻妹'], + 'xb,d,h,xb':['侄姻男'], + 'xb,d,h,xb,w':['侄姻妇'], + 'xb,d,h,xs':['侄姻女'], + 'xb,d,h,xs,h':['侄姻婿'], 'xb,d,s':['侄外孙','外侄孙'], 'xb,d,s,w':['侄外孙妇','外侄孙妇'], 'xb,d,s,s':['侄外曾孙'], @@ -1708,6 +1748,14 @@ '1,xs,h,xs,d':['姑姻姑女'], 'xs,s':['外甥','外甥男','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], 'xs,s,w':['外甥媳妇','甥媳妇','甥妇'], + 'xs,s,w,f&o':['甥眷兄'], + 'xs,s,w,f&l':['甥眷弟'], + 'xs,s,w,m&o':['甥眷姊'], + 'xs,s,w,m&l':['甥眷妹'], + 'xs,s,w,xb':['甥眷男'], + 'xs,s,w,xb,w':['甥眷妇'], + 'xs,s,w,xs':['甥眷女'], + 'xs,s,w,xs,h':['甥眷婿'], 'xs,s,s':['甥孙'], 'xs,s,s,w':['甥孙妇'], 'xs,s,s,s':['甥曾孙'], @@ -1730,6 +1778,14 @@ 'xs,s,d,d,d':['甥曾外曾外孙女'], 'xs,d':['外甥女','甥女','外甥囡'], 'xs,d,h':['外甥女婿','甥女婿','甥婿'], + 'xs,d,h,f&o':['甥姻兄'], + 'xs,d,h,f&l':['甥姻弟'], + 'xs,d,h,m&o':['甥姻姊'], + 'xs,d,h,m&l':['甥姻妹'], + 'xs,d,h,xb':['甥姻男'], + 'xs,d,h,xb,w':['甥姻妇'], + 'xs,d,h,xs':['甥姻女'], + 'xs,d,h,xs,h':['甥姻婿'], 'xs,d,s':['甥外孙'], 'xs,d,s,w':['甥外孙妇'], 'xs,d,s,s':['甥外曾孙'], @@ -1755,8 +1811,12 @@ 's,w':['儿媳','儿媳妇','新妇'], 's,s':['孙子','孙男','孙儿','x孙子','孙'], 's,s,w':['孙媳妇','孙媳','孙妇'], - 's,s,w,xb':['姻家再侄'], - 's,s,w,xs':['姻家再侄'], + 's,s,w,f':['孙眷男'], + 's,s,w,m':['孙眷女'], + 's,s,w,xb':['孙眷孙男','姻家再侄男','姻家再侄'], + 's,s,w,xb,w':['孙眷孙妇'], + 's,s,w,xs':['孙眷孙女','姻家再侄女','姻家再侄'], + 's,s,w,xs,h':['孙眷孙婿'], 's,s,s':['曾孙','曾孙男','重孙'], 's,s,s,w':['曾孙妇'], 's,s,s,s':['玄孙','元孙','膀孙'], @@ -1810,8 +1870,12 @@ 's,s,d,d,h':['玄外孙女婿'], 's,d':['孙女','孙囡'], 's,d,h':['孙女婿','孙婿'], - 's,d,h,xb':['姻家再侄男','姻家再侄'], - 's,d,h,xs':['姻家再侄女','姻家再侄'], + 's,d,h,f':['孙姻男'], + 's,d,h,m':['孙姻女'], + 's,d,h,xb':['孙姻孙男','姻家再侄男','姻家再侄'], + 's,d,h,xb,w':['孙姻孙妇'], + 's,d,h,xs':['孙姻孙女','姻家再侄女','姻家再侄'], + 's,d,h,xs,h':['孙姻孙婿'], 's,d,s':['曾外孙'], 's,d,s,w':['曾外孙媳妇','曾外孙妇'], 's,d,s,s':['曾外曾孙'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index a79163a..24d2513 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=[],d=!0;f.length;){var m=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(d=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var b=!0;do{f=s;for(var w in h){var l=h[w];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),h=m.split(",").reverse(),w=[],l=0;l-1?l.sex:w.sex;for(var e=f(l.selector,o),r=0;r-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(d=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var b=!0;do{f=s;for(var w in h){var l=h[w];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),h=m.split(",").reverse(),w=[],l=0;l-1?l.sex:w.sex;for(var e=f(l.selector,o),r=0;r

中国亲戚关系计算器

逢年过节遇到三姑六婆,拒绝叫不出口的尴尬!轻松搞定亲戚关系~

-

当前已收录约1650条亲戚关系

+

当前已收录约1700条亲戚关系

diff --git a/script/relationship.js b/script/relationship.js index e963535..423e32a 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -704,6 +704,12 @@ 'f,xb,s&o,w':['堂嫂','从父兄妇','叔伯兄妇'], 'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'], 'f,xb,s&l,w':['堂弟媳','堂弟妹','从父弟妇','叔伯弟妇'], + 'f,xb,s,w,f':['从父兄弟眷父'], + 'f,xb,s,w,m':['从父兄弟眷母'], + 'f,xb,s,w,xb&o':['从父兄弟眷兄'], + 'f,xb,s,w,xb&l':['从父兄弟眷弟'], + 'f,xb,s,w,xs&o':['从父兄弟眷姊'], + 'f,xb,s,w,xs&l':['从父兄弟眷妹'], 'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'], 'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'], 'f,xb,s,s,s':['堂侄孙'], @@ -720,6 +726,12 @@ 'f,xb,d&o,h':['堂姐夫','从父姊夫','从父姊婿','叔伯姊夫'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], 'f,xb,d&l,h':['堂妹夫','从父妹夫','从父妹婿','叔伯妹夫'], + 'f,xb,d,h,f':['从父姊妹姻父'], + 'f,xb,d,h,m':['从父姊妹姻母'], + 'f,xb,d,h,xb&o':['从父姊妹姻兄'], + 'f,xb,d,h,xb&l':['从父姊妹姻弟'], + 'f,xb,d,h,xs&o':['从父姊妹姻姊'], + 'f,xb,d,h,xs&l':['从父姊妹姻妹'], 'f,xb,d,s':['堂外甥','堂甥'], 'f,xb,d,s,w':['堂甥媳'], 'f,xb,d,s,s':['堂甥孙'], @@ -1167,6 +1179,12 @@ 'm,xs,s&o,w':['姨嫂','姨兄妇','从母嫂','从母兄妇'], 'm,xs,s&l':['姨弟','从母弟'], 'm,xs,s&l,w':['姨弟妇','从母弟妇'], + 'm,xs,s,w,f':['从母兄弟眷父'], + 'm,xs,s,w,m':['从母兄弟眷母'], + 'm,xs,s,w,xb&o':['从母兄弟眷兄'], + 'm,xs,s,w,xb&l':['从母兄弟眷弟'], + 'm,xs,s,w,xs&o':['从母兄弟眷姊'], + 'm,xs,s,w,xs&l':['从母兄弟眷妹'], 'm,xs,s,s':['姨侄男','从母侄男','姨侄'], 'm,xs,s,s,w':['姨侄妇','从母侄妇'], 'm,xs,s,s,s':['姨侄孙男','姨侄孙','从母侄孙'], @@ -1183,6 +1201,12 @@ 'm,xs,d&o,h':['姨姐夫','姨姊夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'], 'm,xs,d&l':['姨妹','从母妹'], 'm,xs,d&l,h':['姨妹夫','从母妹夫','从母妹丈','从母妹婿','从母妹郎'], + 'm,xs,d,h,f':['从母姊妹姻父'], + 'm,xs,d,h,m':['从母姊妹姻母'], + 'm,xs,d,h,xb&o':['从母姊妹姻兄'], + 'm,xs,d,h,xb&l':['从母姊妹姻弟'], + 'm,xs,d,h,xs&o':['从母姊妹姻姊'], + 'm,xs,d,h,xs&l':['从母姊妹姻妹'], 'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'], 'm,xs,d,s,w':['姨甥妇','从母甥妇'], 'm,xs,d,s,s':['姨甥孙男','姨甥孙','从母甥孙'], @@ -1566,6 +1590,14 @@ '1,xb,w,xs,d':['叔眷姨女'], 'xb,s':['侄子','侄男','侄男儿','侄儿','阿侄'], 'xb,s,w':['侄媳妇','侄妇'], + 'xb,s,w,f&o':['侄眷兄'], + 'xb,s,w,f&l':['侄眷弟'], + 'xb,s,w,m&o':['侄眷姊'], + 'xb,s,w,m&l':['侄眷妹'], + 'xb,s,w,xb':['侄眷男'], + 'xb,s,w,xb,w':['侄眷妇'], + 'xb,s,w,xs':['侄眷女'], + 'xb,s,w,xs,h':['侄眷婿'], 'xb,s,s':['侄孙男','侄孙子'], 'xb,s,s,w':['侄孙妇'], 'xb,s,s,s':['侄曾孙'], @@ -1588,6 +1620,14 @@ 'xb,s,d,d,d':['侄曾外曾外孙女'], 'xb,d':['侄女','侄女儿','侄囡'], 'xb,d,h':['侄女婿','侄婿'], + 'xb,d,h,f&o':['侄姻兄'], + 'xb,d,h,f&l':['侄姻弟'], + 'xb,d,h,m&o':['侄姻姊'], + 'xb,d,h,m&l':['侄姻妹'], + 'xb,d,h,xb':['侄姻男'], + 'xb,d,h,xb,w':['侄姻妇'], + 'xb,d,h,xs':['侄姻女'], + 'xb,d,h,xs,h':['侄姻婿'], 'xb,d,s':['侄外孙','外侄孙'], 'xb,d,s,w':['侄外孙妇','外侄孙妇'], 'xb,d,s,s':['侄外曾孙'], @@ -1708,6 +1748,14 @@ '1,xs,h,xs,d':['姑姻姑女'], 'xs,s':['外甥','外甥男','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], 'xs,s,w':['外甥媳妇','甥媳妇','甥妇'], + 'xs,s,w,f&o':['甥眷兄'], + 'xs,s,w,f&l':['甥眷弟'], + 'xs,s,w,m&o':['甥眷姊'], + 'xs,s,w,m&l':['甥眷妹'], + 'xs,s,w,xb':['甥眷男'], + 'xs,s,w,xb,w':['甥眷妇'], + 'xs,s,w,xs':['甥眷女'], + 'xs,s,w,xs,h':['甥眷婿'], 'xs,s,s':['甥孙'], 'xs,s,s,w':['甥孙妇'], 'xs,s,s,s':['甥曾孙'], @@ -1730,6 +1778,14 @@ 'xs,s,d,d,d':['甥曾外曾外孙女'], 'xs,d':['外甥女','甥女','外甥囡'], 'xs,d,h':['外甥女婿','甥女婿','甥婿'], + 'xs,d,h,f&o':['甥姻兄'], + 'xs,d,h,f&l':['甥姻弟'], + 'xs,d,h,m&o':['甥姻姊'], + 'xs,d,h,m&l':['甥姻妹'], + 'xs,d,h,xb':['甥姻男'], + 'xs,d,h,xb,w':['甥姻妇'], + 'xs,d,h,xs':['甥姻女'], + 'xs,d,h,xs,h':['甥姻婿'], 'xs,d,s':['甥外孙'], 'xs,d,s,w':['甥外孙妇'], 'xs,d,s,s':['甥外曾孙'], @@ -1755,8 +1811,12 @@ 's,w':['儿媳','儿媳妇','新妇'], 's,s':['孙子','孙男','孙儿','x孙子','孙'], 's,s,w':['孙媳妇','孙媳','孙妇'], - 's,s,w,xb':['姻家再侄'], - 's,s,w,xs':['姻家再侄'], + 's,s,w,f':['孙眷男'], + 's,s,w,m':['孙眷女'], + 's,s,w,xb':['孙眷孙男','姻家再侄男','姻家再侄'], + 's,s,w,xb,w':['孙眷孙妇'], + 's,s,w,xs':['孙眷孙女','姻家再侄女','姻家再侄'], + 's,s,w,xs,h':['孙眷孙婿'], 's,s,s':['曾孙','曾孙男','重孙'], 's,s,s,w':['曾孙妇'], 's,s,s,s':['玄孙','元孙','膀孙'], @@ -1810,8 +1870,12 @@ 's,s,d,d,h':['玄外孙女婿'], 's,d':['孙女','孙囡'], 's,d,h':['孙女婿','孙婿'], - 's,d,h,xb':['姻家再侄男','姻家再侄'], - 's,d,h,xs':['姻家再侄女','姻家再侄'], + 's,d,h,f':['孙姻男'], + 's,d,h,m':['孙姻女'], + 's,d,h,xb':['孙姻孙男','姻家再侄男','姻家再侄'], + 's,d,h,xb,w':['孙姻孙妇'], + 's,d,h,xs':['孙姻孙女','姻家再侄女','姻家再侄'], + 's,d,h,xs,h':['孙姻孙婿'], 's,d,s':['曾外孙'], 's,d,s,w':['曾外孙媳妇','曾外孙妇'], 's,d,s,s':['曾外曾孙'],