From 71794a5a8c3e35f24b5880b12621fd676d6f68f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=B5=A9=E4=B9=90?= <89932980@qq.com> Date: Tue, 22 Mar 2016 15:16:40 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E5=BD=93=E5=87=BA=E7=8E=B0=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E8=A7=A3=E6=9E=90=E8=AF=8D=E6=B1=87=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E9=80=89=E6=8B=A9=E5=BF=BD=E7=95=A5=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=8D=E5=8C=B9=E9=85=8D=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/script/relationship.js b/script/relationship.js index 5bbb949..6b26fc5 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -166,7 +166,7 @@ ]; var _data = { - '':['自己'], + '':['自己','我'], //外家 'm,m':['外婆','姥姥'], 'm,f':['外公','姥爷'], @@ -447,6 +447,7 @@ function getSelectors(str){ var lists = str.split('的'); var result = []; //所有可能性 + var match = true; while(lists.length){ var name = lists.shift(); //当前匹配词 var arr = []; //当前匹配词可能性 @@ -454,9 +455,12 @@ var value = _data[i]; if(value.indexOf(name)>-1){ //是否存在该关系 arr.push(i); + }else{ + match = false; //是否存在不可解析的内容 + break; } } - if(result.length){ //当前匹配词与之前可能性组合 + if(result.length){ //当前匹配词与之前可能性组合 var res = []; for(var i=0;i