From 8e3b485b0a1b9c14d9c2ed43794974419e3ce4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=B5=A9=E4=B9=90?= <89932980@qq.com> Date: Thu, 17 Mar 2016 11:02:23 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=A1=A8?= =?UTF-8?q?=E5=A7=91=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/relationship.js b/script/relationship.js index 65b1daf..50d3b84 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -487,6 +487,10 @@ result.push(_data[id][0]); }else{ //高级查找 var data = getDataById(id); //忽略属性查找 + if(!data.length){ //当无精确数据时,忽略年龄条件查找 + id = id.replace(/&[ol]/g,''); + data = getDataById(id); + } if(!data.length){ id = id.replace(/[ol]/g,'x'); data = getDataById(id); @@ -515,4 +519,5 @@ //表哥的表妹 //大舅的女儿 //表哥的姐姐 -console.log(relationship('老婆的爸爸的女儿')); \ No newline at end of file +//爸爸的表姐 +console.log(relationship('爸爸的表姐')); \ No newline at end of file