From 27dbf8c555db4a6f8714b3b29667e650d688a25e Mon Sep 17 00:00:00 2001 From: mumuy Date: Mon, 12 Feb 2018 08:10:40 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= 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 11ba5a8..16f5440 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -281,7 +281,7 @@ 'f,f,ob,w':['伯祖母','伯奶奶','伯婆','大奶奶','堂祖母','姆婆'], 'f,f,lb':['叔祖父','叔老爷','叔公','小爷爷','堂祖父','叔爷爷','叔奶爷'], 'f,f,lb,w':['叔祖母','叔奶奶','叔婆','小奶奶','堂祖母','婶婆'], - 'f,f,xs':['姑奶奶','姑内祖母','祖姑母','姑祖母','姑婆','祖姑'], + 'f,f,xs':['姑奶奶','姑内祖母','祖姑母','姑祖母','姑奶','姑婆','祖姑'], 'f,f,xs,h':['姑爷爷','姑内祖父','祖姑父','姑祖父','姑老爷','姑公','姑奶爷','姑丈公'], 'f,f,xs,s&o':['姑表伯父','表伯父','表伯'], 'f,f,xs,s&o,w':['姑表伯母','表伯母'], @@ -327,7 +327,7 @@ 'f,m,m,xs,d':['表姨祖母'], 'f,m,m,xs,d,h':['表姨祖父'], 'f,m,xb':['舅公','舅祖父','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','太舅父'], - 'f,m,xb,w':['舅婆','舅祖母','舅奶奶','妗婆','太舅母'], + 'f,m,xb,w':['舅婆','舅祖母','舅奶奶','舅奶','妗婆','太舅母'], 'f,m,xb,s&o':['舅表伯父','表伯父','表伯'], 'f,m,xb,s&o,w':['舅表伯母','表伯母'], 'f,m,xb,s&l':['舅表叔父','表叔父','表叔爸','表叔'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 66c44b5..e20d194 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=[],h=!1;for(var l in w){var o=w[l];o.indexOf(b)>-1&&(!l&&f.length||d.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l-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 h in d){var l=d[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-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(),h=[],l=0;l-1&&(!l&&f.length||d.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l-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 h in d){var l=d[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-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(),h=[],l=0;l