From 75ff909fb5504bbf01905e3e6e89cbc36e5969fc Mon Sep 17 00:00:00 2001 From: PASSER-BY Date: Mon, 15 Nov 2021 20:23:30 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E5=88=AB=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 32 ++++++++++++++++---------------- dist/relationship.min.js | 2 +- script/relationship.js | 32 ++++++++++++++++---------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 63595fe..baa8e3c 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -1137,32 +1137,32 @@ 'm,xs,s&l,w':['姨弟妇','从母弟妇'], 'm,xs,s,s':['姨侄男','从母侄男','姨侄'], 'm,xs,s,s,w':['姨侄妇','从母侄妇'], - 'm,xs,s,s,s':['姨侄孙男','姨侄孙'], - 'm,xs,s,s,s,w':['姨侄孙妇'], - 'm,xs,s,s,d':['姨侄孙女'], - 'm,xs,s,s,d,h':['姨侄孙婿'], + 'm,xs,s,s,s':['姨侄孙男','姨侄孙','从母侄孙'], + 'm,xs,s,s,s,w':['姨侄孙妇','从母侄孙妇'], + 'm,xs,s,s,d':['姨侄孙女','从母侄孙女'], + 'm,xs,s,s,d,h':['姨侄孙婿','从母侄孙婿'], 'm,xs,s,d':['姨侄女','从母侄女','姨侄'], 'm,xs,s,d,h':['姨侄婿','从母侄婿'], - 'm,xs,s,d,s':['姨侄外孙男','姨侄外孙'], - 'm,xs,s,d,s,w':['姨侄外孙妇'], - 'm,xs,s,d,d':['姨侄外孙女'], - 'm,xs,s,d,d,h':['姨侄外孙婿'], + 'm,xs,s,d,s':['姨侄外孙男','姨侄外孙','从母侄外孙'], + 'm,xs,s,d,s,w':['姨侄外孙妇','从母侄外孙妇'], + 'm,xs,s,d,d':['姨侄外孙女','从母侄外孙女'], + 'm,xs,s,d,d,h':['姨侄外孙婿','从母侄外孙婿'], 'm,xs,d&o':['姨姐','姨姊','从母姐','从母姊'], 'm,xs,d&o,h':['姨姐夫','姨姊夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'], 'm,xs,d&l':['姨妹','从母妹'], 'm,xs,d&l,h':['姨妹夫','从母妹夫','从母妹丈','从母妹婿','从母妹郎'], 'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'], 'm,xs,d,s,w':['姨甥妇','从母甥妇'], - 'm,xs,d,s,s':['姨甥孙男','姨甥孙'], - 'm,xs,d,s,s,w':['姨甥孙妇'], - 'm,xs,d,s,d':['姨甥孙女'], - 'm,xs,d,s,d,h':['姨甥孙婿'], + 'm,xs,d,s,s':['姨甥孙男','姨甥孙','从母甥孙'], + 'm,xs,d,s,s,w':['姨甥孙妇','从母甥孙妇'], + 'm,xs,d,s,d':['姨甥孙女','从母甥孙女'], + 'm,xs,d,s,d,h':['姨甥孙婿','从母甥孙婿'], 'm,xs,d,d':['姨甥女','从母甥女','姨外甥女','姨甥'], 'm,xs,d,d,h':['姨甥婿','从母甥婿'], - 'm,xs,d,d,s':['姨甥外孙男','姨甥外孙'], - 'm,xs,d,d,s,w':['姨甥外孙妇'], - 'm,xs,d,d,d':['姨甥外孙女'], - 'm,xs,d,d,d,h':['姨甥外孙婿'], + 'm,xs,d,d,s':['姨甥外孙男','姨甥外孙','从母甥外孙'], + 'm,xs,d,d,s,w':['姨甥外孙妇','从母甥外孙妇'], + 'm,xs,d,d,d':['姨甥外孙女','从母甥外孙女'], + 'm,xs,d,d,d,h':['姨甥外孙婿','从母甥外孙婿'], // 婆家 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','良人','爱人','老伴','老头子'], 'h,f':['公公','翁亲','老公公'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 6fc0fe5..39e78ae 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 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?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(),w=m.split(",").reverse(),h=[],l=0;l