diff --git a/dist/relationship.js b/dist/relationship.js index ba691fa..8699571 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -166,7 +166,7 @@ str:'' }, {//并列关系处理1 - exp:/(.+)?\[([^\|]+?)\|(.+?\|.+?)?\](.+)?/g, + exp:/(.+)?\[([^\|]+?)\|([^\[\]]+?\|[^\[\]]+?)?\](.+)?/g, str:'$1$2$4#$1[$3]$4' }, {//并列关系处理2 @@ -634,14 +634,14 @@ 'f,xb,s&o,w':['堂嫂'], 'f,xb,s&l':['堂弟','堂阿弟','从父弟','叔伯弟','从弟'], 'f,xb,s&l,w':['堂弟媳','堂弟妹'], - 'f,xb,s,s':['堂侄男','堂侄子','从父侄男','叔伯侄男','堂侄'], - 'f,xb,s,s,w':['堂侄妇','从父侄妇','叔伯侄父'], + 'f,xb,s,s':['堂侄','堂侄男','堂侄子','从父侄男','叔伯侄男'], + 'f,xb,s,s,w':['堂侄媳妇','堂侄妇','从父侄妇','叔伯侄父'], 'f,xb,s,s,s':['堂侄孙男'], 'f,xb,s,s,s,w':['堂侄孙妇'], 'f,xb,s,s,d':['堂侄孙女'], 'f,xb,s,s,d,h':['堂侄孙婿'], 'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'], - 'f,xb,s,d,h':['堂侄婿','从父侄婿','叔伯侄婿'], + 'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'], 'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'], 'f,xb,d&o,h':['堂姐夫'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 2ef9467..f691a67 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=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-1&&(!l&&f.length||b.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 d=function(s){var f="";if(!m[s]){m[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?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l-1&&(!l&&f.length||b.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 d=function(s){var f="";if(!m[s]){m[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?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l