diff --git a/dist/relationship.js b/dist/relationship.js index 15cfb0c..47e87a9 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -165,7 +165,11 @@ exp:/,w,h|,h,w/g, str:'' }, - {//并列关系处理 + {//并列关系处理1 + exp:/(.+)?\[([^\|]+)\|(.+\|.+)?\](.+)?/g, + str:'$1$2$4#$1[$3]$4' + }, + {//并列关系处理2 exp:/(.+)?\[([^\[\]]+)\|([^\[\]]+)?\](.+)?/g, str:'$1$2$4#$1$3$4' } @@ -178,12 +182,12 @@ var _data = { '':['自己','我','本人'], //并称 - '[[f,f|f,m]|[m,f|m,m]]':['祖父母'], + '[f,f|f,m|m,f|m,m]':['祖父母'], '[f|m]':['父母','爹娘','爹妈','爸妈','双亲','二老','高堂'], '[h,f|h,m]':['公婆'], '[xb|xs]':['兄弟姐妹'], '[s|d]':['子女','儿女','小孩','孩子'], - '[[s,s|s,d]|[d,s|d,d]]':['孙辈'], + '[s,s|s,d|d,s|d,d]':['孙辈'], // 本家 'f':['爸爸','父亲','阿爸','老爸','老窦','爸','父','爹','爹爹','爹地','爹啲','老爹','大大','老爷子','老头子'], // 爷爷 diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 40d7868..5bc84b1 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