diff --git a/dist/relationship.js b/dist/relationship.js index 47e87a9..773eb5e 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -268,7 +268,7 @@ 'f,f,ob,w':['伯婆','伯祖母','伯奶奶','大奶奶','堂祖母','姆婆'], 'f,f,lb':['叔公','叔祖父','叔老爷','小爷爷','堂祖父','叔爷爷','叔奶爷'], 'f,f,lb,w':['叔婆','叔祖母','叔奶奶','小奶奶','堂祖母','婶婆'], - 'f,f,xb':['堂祖父','x爷爷'], + 'f,f,xb':['堂祖父','x爷爷','x大爷'], 'f,f,xb,w':['堂祖母'], // 再从父 'f,f,xb,s&o':['堂伯','堂伯父','从父伯父'], @@ -378,7 +378,7 @@ 'f,m,m,xs,d':['表姨祖母'], 'f,m,m,xs,d,h':['表姨祖父'], // 舅表* - 'f,m,xb':['舅公','舅祖父','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','太舅父'], + 'f,m,xb':['舅公','舅祖父','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','太舅父','x舅公'], 'f,m,xb,w':['舅婆','舅祖母','舅奶奶','舅奶','妗婆','太舅母'], // 舅表叔表 'f,m,xb,s&o':['舅表伯父','表伯父','表伯'], @@ -415,7 +415,7 @@ 'f,m,xb,d,d,d':['舅表姑表甥女'], 'f,m,xb,d,d,d,h':['舅表姑表甥婿'], // 从母* - 'f,m,xs':['姨奶奶','祖姨母','姨祖母','姨婆','姨奶'], + 'f,m,xs':['姨奶奶','祖姨母','姨祖母','姨婆','姨奶','x姨奶'], 'f,m,xs,h':['姨爷爷','祖姨父','姨祖父','姨公','姨丈公','姨爷','姨老爷','姨奶爷'], // 从母叔表 'f,m,xs,s&o':['姨伯父','从母伯父'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 5bc84b1..e70ad58 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-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