diff --git a/dist/relationship.js b/dist/relationship.js index c1e752b..b0d6257 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -3,12 +3,12 @@ * http://passer-by.com */ !function (root, factory) { - if (typeof module === 'object' && module.exports) - module.exports = factory(); - else - root.relationship = factory(); -}(typeof window !== 'undefined' ? window : this, -function () { + if (typeof module === 'object' && module.exports){ + module.exports = factory(); + }else{ + root.relationship = factory(); + } +}(typeof window !== 'undefined' ? window : this,function (){ //简写 var _filter = [ /* 表亲 */ @@ -236,14 +236,14 @@ function () { 'f,f,ob,w':['伯祖母','伯婆','大奶奶','堂祖母'], 'f,f,lb':['叔祖父','叔公','小爷爷','堂祖父','叔爷爷','叔老爷'], 'f,f,lb,w':['叔祖母','叔婆','小奶奶','堂祖母','叔奶奶'], - 'f,f,xs':['姑婆','姑祖母','祖姑母','姑奶奶'], - 'f,f,xs,h':['姑丈公','姑祖父','祖姑丈','姑爷爷','姑奶爷','姑老爷'], - 'f,f,xs,s&o':['表伯','表伯父'], - 'f,f,xs,s&o,w':['表伯母'], - 'f,f,xs,s&l':['表叔','表叔父'], - 'f,f,xs,s&l,w':['表婶','表叔母'], - 'f,f,xs,d':['表姑'], - 'f,f,xs,d,h':['表姑丈'], + 'f,f,xs':['姑祖母','祖姑母','姑奶奶','姑婆'], + 'f,f,xs,h':['姑祖父','祖姑丈','姑爷爷','姑奶爷','姑丈公','姑老爷','姑公'], + 'f,f,xs,s&o':['姑表伯父','表伯','表伯父'], + 'f,f,xs,s&o,w':['姑表伯母','表伯母'], + 'f,f,xs,s&l':['姑表叔父','表叔','表叔父'], + 'f,f,xs,s&l,w':['姑表叔母','表婶','表叔母'], + 'f,f,xs,d':['姑表姑母','表姑'], + 'f,f,xs,d,h':['姑表姑父','表姑丈'], 'f,m':['奶奶','祖母','阿嫲','嫲嫲'], 'f,m,f':['曾外祖父','外太公'], 'f,m,m':['曾外祖母','外太婆'], @@ -288,10 +288,10 @@ function () { //姑家 'f,xs':['姑妈','姑母','姑姑','姑'], 'f,xs,h':['姑丈','姑父','姑夫'], - 'f,xs,s&o':['表哥(姑家)','表哥'], - 'f,xs,s&o,w':['表嫂(姑家)','表嫂'], - 'f,xs,s&l':['表弟(姑家)','表弟'], - 'f,xs,s&l,w':['表弟媳(姑家)','表弟媳'], + 'f,xs,s&o':['姑表哥','表哥'], + 'f,xs,s&o,w':['姑表嫂','表嫂'], + 'f,xs,s&l':['姑表弟','表弟'], + 'f,xs,s&l,w':['姑表弟媳','表弟媳'], 'f,xs,s,s':['表侄子'], 'f,xs,s,s,s':['表侄孙'], 'f,xs,s,s,s,w':['表侄孙媳妇'], @@ -302,10 +302,10 @@ function () { 'f,xs,s,d,s,w':['外表侄孙媳妇'], 'f,xs,s,d,d':['外表侄孙女'], 'f,xs,s,d,d,h':['外表侄孙女婿'], - 'f,xs,d&o':['表姐(姑家)','表姐'], - 'f,xs,d&o,h':['表姐夫(姑家)','表姐夫','表姐丈'], - 'f,xs,d&l':['表妹(姑家)','表妹'], - 'f,xs,d&l,h':['表妹夫(姑家)','表妹夫'], + 'f,xs,d&o':['姑表姐','表姐'], + 'f,xs,d&o,h':['姑表姐夫','表姐夫','表姐丈'], + 'f,xs,d&l':['姑表妹','表妹'], + 'f,xs,d&l,h':['姑表妹夫','表妹夫'], 'f,xs,d,s':['表外甥'], 'f,xs,d,d':['表外甥女'], 'f,os':['姑母'], @@ -336,12 +336,12 @@ function () { 'm,f,ob,w':['外伯祖母','伯姥姥','大姥姥','外姆婆'], 'm,f,lb':['外叔祖父','叔姥爷','小姥爷','外叔祖'], 'm,f,lb,w':['外叔祖母','叔姥姥','小姥姥','外姆婆'], - 'm,f,xs':['外姑祖母','姑姥姥','外太姑母'], - 'm,f,xs,h':['外姑祖父','姑姥爷','外太姑父'], - 'm,f,xs,s':['表舅','表舅父'], - 'm,f,xs,s,w':['表舅妈','表舅母'], - 'm,f,xs,d':['表姨','表姨母','表姨妈','表阿姨'], - 'm,f,xs,d,h':['表姨丈','表姨父'], + 'm,f,xs':['外姑祖母','姑姥姥','外太姑母','姑婆'], + 'm,f,xs,h':['外姑祖父','姑姥爷','外太姑父','姑公'], + 'm,f,xs,s':['姑表舅父','表舅','表舅父'], + 'm,f,xs,s,w':['姑表舅母','表舅妈','表舅母'], + 'm,f,xs,d':['姑表姨母','表姨','表姨母','表姨妈','表阿姨'], + 'm,f,xs,d,h':['姑表姨父','表姨丈','表姨父'], 'm,m':['外婆','姥姥','阿婆'], 'm,m,f':['外曾外祖父','外太外公','太姥爷'], 'm,m,m':['外曾外祖母','外太外婆','太姥姥'], @@ -360,10 +360,10 @@ function () { //舅家 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','x舅'], 'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','x舅妈'], - 'm,xb,s&o':['表哥(舅家)','表哥'], - 'm,xb,s&o,w':['表嫂(舅家)','表嫂'], - 'm,xb,s&l':['表弟(舅家)','表弟'], - 'm,xb,s&l,w':['表弟媳(舅家)','表弟媳'], + 'm,xb,s&o':['舅表哥','表哥'], + 'm,xb,s&o,w':['舅表嫂','表嫂'], + 'm,xb,s&l':['舅表弟',,'表弟'], + 'm,xb,s&l,w':['舅表弟媳','表弟媳'], 'm,xb,s,s':['表侄子'], 'm,xb,s,s,s':['表侄孙'], 'm,xb,s,s,s,w':['表侄孙媳妇'], @@ -374,10 +374,10 @@ function () { 'm,xb,s,d,s,w':['外表侄孙媳妇'], 'm,xb,s,d,d':['外表侄孙女'], 'm,xb,s,d,d,h':['外表侄孙女婿'], - 'm,xb,d&o':['表姐(舅家)','表姐'], - 'm,xb,d&o,h':['表姐夫(舅家)','表姐夫','表姐丈'], - 'm,xb,d&l':['表妹(舅家)','表妹'], - 'm,xb,d&l,h':['表妹夫(舅家)','表妹夫'], + 'm,xb,d&o':['舅表姐','表姐'], + 'm,xb,d&o,h':['舅表姐夫','表姐夫','表姐丈'], + 'm,xb,d&l':['舅表妹','表妹'], + 'm,xb,d&l,h':['舅表妹夫','表妹夫'], 'm,xb,d,s':['表外甥'], 'm,xb,d,d':['表外甥女'], 'm,ob':['大舅'], @@ -387,10 +387,10 @@ function () { //姨家 'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','x姨','x姨妈'], 'm,xs,h':['姨丈','姨夫','姨父','x姨父'], - 'm,xs,s&o':['表哥(姨家)','表哥'], - 'm,xs,s&o,w':['表嫂(姨家)','表嫂'], - 'm,xs,s&l':['表弟(姨家)','表弟'], - 'm,xs,s&l,w':['表弟媳(姨家)','表弟媳'], + 'm,xs,s&o':['姨表哥','表哥'], + 'm,xs,s&o,w':['姨表嫂','表嫂'], + 'm,xs,s&l':['姨表弟','表弟'], + 'm,xs,s&l,w':['姨表弟媳','表弟媳'], 'm,xs,s,s':['表侄子'], 'm,xs,s,s,s':['表侄孙'], 'm,xs,s,s,s,w':['表侄孙媳妇'], @@ -401,10 +401,10 @@ function () { 'm,xs,s,d,s,w':['外表侄孙媳妇'], 'm,xs,s,d,d':['外表侄孙女'], 'm,xs,s,d,d,h':['外表侄孙女婿'], - 'm,xs,d&o':['表姐(姨家)','表姐'], - 'm,xs,d&o,h':['表姐夫(姨家)','表姐夫','表姐丈'], - 'm,xs,d&l':['表妹(姨家)','表妹'], - 'm,xs,d&l,h':['表妹夫(姨家)','表妹夫'], + 'm,xs,d&o':['姨表姐','表姐'], + 'm,xs,d&o,h':['姨表姐夫','表姐夫','表姐丈'], + 'm,xs,d&l':['姨表妹','表妹'], + 'm,xs,d&l,h':['姨表妹夫','表妹夫'], 'm,xs,d,s':['表外甥'], 'm,xs,d,d':['表外甥女'], 'm,os':['大姨','大姨妈'], @@ -426,6 +426,16 @@ function () { 'h,f,xb,s&o,w':['堂嫂'], 'h,f,xb,s&l':['堂叔仔','堂弟'], 'h,f,xb,s&l,w':['堂小弟'], + 'h,f,xs':['姑婆'], + 'h,f,xs,s&o':['姑表大伯子'], + 'h,f,xs,s&o,w':['姑表大伯嫂'], + 'h,f,xs,s&l':['姑表小叔弟'], + 'h,f,xs,s&l,w':['姑表小叔弟妇'], + 'h,f,xs,d&o':['姑表大姑姐'], + 'h,f,xs,d&o,h':['姑表大姑姐夫'], + 'h,f,xs,d&l':['姑表小姑妹'], + 'h,f,xs,d&l,h':['姑表小姑妹夫'], + 'h,f,xs,h':['姑公'], 'h,m':['婆婆'], 'h,m,xb':['舅公'], 'h,m,xb,w':['舅婆'], @@ -864,12 +874,3 @@ function () { return relationship; }); - -// console.log(relationship({text:'儿子的爸爸的妈妈',sex:1})); -//爸爸的妈妈的老公的儿子的女儿 -//老婆的老公 -//老公的老婆的儿子的爸爸的老婆的儿子的爸爸 -//我的三舅的儿子的爸爸的妹妹的儿子的叔叔的哥哥 -//老婆的外孙的姥姥 -//大姨的女儿的表哥 -//爸爸的女儿的儿子 diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 6df1511..966a37e 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1 +1 @@ -!function(s,x){"object"==typeof module&&module.exports?module.exports=x():s.relationship=x()}("undefined"!=typeof window?window:this,function(){function s(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x");for(var x=s.split("的"),f=[],b=!0;x.length;){var d=x.shift(),m=[],w=!1;for(var o in l){var h=l[o];h.indexOf(d)>-1&&(!o&&x.length||m.push(o),w=!0)}if(w||(b=!1),f.length){for(var e=[],o=0;o-1&&(s=","+x+s);var d=function(s){var x="";if(!b[s]){b[s]=!0;var m=!0;do{x=s;for(var l in w){var o=w[l];if(s=s.replace(o.exp,o.str),s.indexOf("#")>-1){for(var h=s.split("#"),l=0;l-1?b="&l":s.indexOf("&l")>-1&&(b="&o"),s){s=s.replace(/&[ol]/g,""),x=x?1:0;var d=(","+x+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var m=s.split(",").reverse(),w=d.split(",").reverse(),l=[],o=0;o-1&&(!l&&x.length||m.push(l),w=!0)}if(w||(b=!1),f.length){for(var e=[],l=0;l-1&&(s=","+x+s);var d=function(s){var x="";if(!b[s]){b[s]=!0;var m=!0;do{x=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("#"),h=0;h-1?b="&l":s.indexOf("&l")>-1&&(b="&o"),s){s=s.replace(/&[ol]/g,""),x=x?1:0;var d=(","+x+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var m=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l