From c509802710a260c27a0eabca13b710e91d0e4bb7 Mon Sep 17 00:00:00 2001 From: PASSER-BY Date: Tue, 23 Nov 2021 00:55:45 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 4 ++-- dist/relationship.min.js | 2 +- index.html | 4 ++-- script/relationship.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index cce9659..4317b25 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -1597,7 +1597,7 @@ 'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅','舅弟'], 'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'], 'w,xb,s':['内侄','内侄男','妻侄男','舅侄男','岳侄男','丈人侄男','舅男'], - 'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇','舅妇'], + 'w,xb,s,w':['内侄媳妇','内侄妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇','舅妇'], 'w,xb,s,s':['内侄孙','内侄孙男','妻侄孙男'], 'w,xb,s,s,w':['内侄孙妇','妻侄孙妇'], 'w,xb,s,s,s':['内曾侄孙','内曾侄孙男'], @@ -1607,7 +1607,7 @@ 'w,xb,s,d':['内侄孙女','妻侄孙女'], 'w,xb,s,d,h':['内侄孙婿','妻侄孙婿'], 'w,xb,d':['内侄女','内侄','妻侄女','舅侄女','岳侄女','丈人侄女','舅女'], - 'w,xb,d,h':['内侄婿','妻侄婿','舅侄婿','岳侄婿','丈人侄婿'], + 'w,xb,d,h':['内侄女婿','妻侄婿','舅侄婿','岳侄婿','丈人侄婿'], 'w,xb,d,s':['内侄外孙','内侄外孙男','姨侄外孙男'], 'w,xb,d,s,w':['内侄外孙妇','姨侄外孙妇'], 'w,xb,d,d':['内侄外孙女','姨侄外孙女'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index b212a63..4a99d4a 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,m={"哥":"兄","姐":"姊","媳妇":"妇","女婿":"婿","媳":"妇","夫":"婿","姊妹姻":"姻","女姻":"姻","兄弟眷":"眷","男眷":"眷"};f.length;){var b=f.shift(),w=[];for(var l in h){var o=h[l];if(o.indexOf(b)>-1)w.push(l);else{var e=b;for(var r in m)e=e.replace(r,m[r]);var t=o.map(function(s){for(var f in m)s=s.replace(f,m[f]);return s});t.indexOf(e)>-1&&w.push(l)}}w.length||(d=!1);var n=[];x.forEach(function(s){w.forEach(function(f){n.push(s+","+f)})}),x=n}return d?x:[]}function f(s,f){var x=[],d={};if(f<0?0==s.indexOf(",w")?s=",1"+s:0==s.indexOf(",h")&&(s=",0"+s):0==s.indexOf(",1")||0==s.indexOf(",0")||f>-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 h in w){var l=w[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?o++:["s","d"].indexOf(s)>-1&&o--}),h.join(",")+(o?"":d)}return""}function m(s){for(var f=s.split(","),x=[],d=0;d-1?l.sex:h.sex;for(var e=f(l.selector,o),r=0;r-1?l.sex:h.sex;for(var e=f(l.selector,o),r=0;r