From 7daf8b8c26ac0a2780d26ec36479d20aac0a152b Mon Sep 17 00:00:00 2001 From: mumuy Date: Mon, 9 Jan 2017 13:35:38 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E7=A7=B0=E5=91=BC?= 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 63b40f6..fe5d6ec 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -316,7 +316,7 @@ 'f,m,xb,d,h':['舅表姑父','表姑爸','表姑父','表姑丈'], 'f,m,xb,d,s':['从表兄弟'], 'f,m,xb,d,d':['从表姐妹'], - 'f,m,xs':['祖姨母','姨祖母','姨婆','姨奶奶'], + 'f,m,xs':['祖姨母','姨祖母','姨婆','姨奶奶','姨奶'], 'f,m,xs,h':['祖姨父','姨祖父','姨公','姨爷爷','姨丈公','姨爷','姨老爷','姨奶爷'], 'f,m,xs,s&o':['姨表伯父','表伯','表伯父','从母伯父'], 'f,m,xs,s&o,w':['姨表伯母','表伯母','从母伯母'], @@ -472,7 +472,7 @@ 'm,m,xb,d,h':['舅表姨父','舅表姨丈','表姨父','表姨丈'], 'm,m,xb,d,s':['从表兄弟'], 'm,m,xb,d,d':['从表姐妹'], - 'm,m,xs':['姨外祖母','外姨婆','外姨祖母','姨姥姥','姨婆'], + 'm,m,xs':['姨外祖母','外姨婆','外姨祖母','姨姥姥','姨婆','姨姥'], 'm,m,xs,h':['姨外祖父','外姨丈公','外姨祖父','姨姥爷','姨公'], 'm,m,xs,s':['姨表舅父','姨表舅爸','表舅父','表舅爸','表舅','表舅舅','姨表舅舅','从母舅父'], 'm,m,xs,s,w':['姨表舅母','姨表舅妈','表舅母','表舅妈','从母舅母'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index f82e8f8..7a55d27 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1 +1 @@ -!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.split("的"),x=[],m=!0;f.length;){var b=f.shift(),d=[],l=!1;for(var h in w){var o=w[h];o.indexOf(b)>-1&&(!h&&f.length||d.push(h),l=!0)}if(l||(m=!1),x.length){for(var e=[],h=0;h-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var b=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var l in d){var h=d[l];if(s=s.replace(h.exp,h.str),s.indexOf("#")>-1){for(var o=s.split("#"),l=0;l-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var b=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");b=b.substring(0,b.lastIndexOf(","));for(var d=s.split(",").reverse(),w=b.split(",").reverse(),l=[],h=0;h-1&&(!h&&f.length||d.push(h),l=!0)}if(l||(m=!1),x.length){for(var e=[],h=0;h-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var b=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var l in d){var h=d[l];if(s=s.replace(h.exp,h.str),s.indexOf("#")>-1){for(var o=s.split("#"),l=0;l-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var b=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");b=b.substring(0,b.lastIndexOf(","));for(var d=s.split(",").reverse(),w=b.split(",").reverse(),l=[],h=0;h