From 020b0ff5301013fee5ac761ebacaff443de8d884 Mon Sep 17 00:00:00 2001 From: PASSER-BY Date: Thu, 18 Nov 2021 00:56:43 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=96=87=E6=A1=88=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 16 ++++++++-------- dist/relationship.min.js | 2 +- script/relationship.js | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 493919d..598be31 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -454,7 +454,7 @@ 'f,f,xb,s,d&l':['从堂妹','再从父妹','从祖妹'], 'f,f,xb,s,d&l,h':['从堂妹夫','再从父妹夫'], 'f,f,xb,s,d,s':['从堂外甥','再从父外甥'], - 'f,f,xb,s,d,s,w':['从堂父外甥媳','再从父外甥媳'], + 'f,f,xb,s,d,s,w':['从堂外甥媳','再从父外甥媳'], 'f,f,xb,s,d,d':['从堂外甥女','再从父外甥女'], 'f,f,xb,s,d,d,h':['从堂甥女婿','再从父甥女婿'], // 从父姑表 @@ -972,14 +972,14 @@ // 从父姨表 'm,f,xb,d':['堂姨','堂姨妈','堂姨母','从父姨母','叔伯姨母','叔伯姨'], 'm,f,xb,d,h':['堂姨丈','堂姨爸','堂姨父','从父姨父','叔伯姨父'], - 'm,f,xb,d,s&o':['堂父姨表兄','从父姨表兄'], - 'm,f,xb,d,s&o,w':['堂父姨表嫂','从父姨表嫂'], - 'm,f,xb,d,s&l':['堂父姨表弟','从父姨表弟'], - 'm,f,xb,d,s&l,w':['堂父姨表弟媳','从父姨表弟媳'], - 'm,f,xb,d,s,s':['堂父姨表侄男','从父姨表侄男'], - 'm,f,xb,d,s,s,w':['堂父姨表侄妇','从父姨表侄妇'], + 'm,f,xb,d,s&o':['堂姨表兄','从父姨表兄'], + 'm,f,xb,d,s&o,w':['堂姨表嫂','从父姨表嫂'], + 'm,f,xb,d,s&l':['堂姨表弟','从父姨表弟'], + 'm,f,xb,d,s&l,w':['堂姨表弟媳','从父姨表弟媳'], + 'm,f,xb,d,s,s':['堂姨表侄男','从父姨表侄男'], + 'm,f,xb,d,s,s,w':['堂姨表侄妇','从父姨表侄妇'], 'm,f,xb,d,s,d':['堂姨表侄女','从父姨表侄女'], - 'm,f,xb,d,s,d,h':['堂父姨表侄婿','从父姨表侄婿'], + 'm,f,xb,d,s,d,h':['堂姨表侄婿','从父姨表侄婿'], 'm,f,xb,d,d&o':['堂姨表姊','从父姨表姊'], 'm,f,xb,d,d&o,h':['堂姨表姊夫','从父姨表姊夫'], 'm,f,xb,d,d&l':['堂姨表妹','从父姨表妹'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 259b286..d317508 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=[],w=!1;for(var l in h){var o=h[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(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 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?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-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(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 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?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-1?l.sex:h.sex;for(var e=f(l.selector,o),r=0;r