From bf7d6bdb0deabd0c8a33db80662f57dfa6269bf1 Mon Sep 17 00:00:00 2001 From: mumuy Date: Thu, 25 Oct 2018 16:27:57 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E7=AE=80=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B8=88=E7=88=B6=E5=B8=88=E7=A5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 9 +++++++-- dist/relationship.min.js | 2 +- script/relationship.js | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 4369726..975b1ad 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -902,7 +902,12 @@ 'd,h,f,ob':['姻兄','姻亲'], 'd,h,f,lb':['姻弟','姻亲'], 's,w,f,os':['姻姐','姻亲'], - 's,w,f,ls':['姻妹','姻亲'] + 's,w,f,ls':['姻妹','姻亲'], + //其他 + 't':['老师','师父','师'], + 't,w':['师娘','师母'], + 't,t':['师祖','师公','师爷','太师父'], + 't,t,t':['太师祖'] }; //数组去重 @@ -922,7 +927,7 @@ //分词解析 function getSelectors(str){ str = str.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,'x'); - var lists = str.replace('家','的').split('的'); + var lists = str.replace('我','').replace('家的','的').replace('家','的').split('的'); var result = []; //所有可能性 var match = true; while(lists.length){ diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 16c885c..7090515 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.replace("家","的").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