From 7f4644cab54f5c9a7219095e29f21c78236e05f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=B5=A9=E4=B9=90?= <89932980@qq.com> Date: Wed, 16 Mar 2016 15:26:30 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E4=BF=AE=E5=A4=8D=E2=80=9C=E5=A4=A7?= =?UTF-8?q?=E7=88=B7=E7=9A=84=E5=BC=9F=E5=BC=9F=E2=80=9D=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/script/relationship.js b/script/relationship.js index 6c3d33e..4f34d76 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -48,7 +48,7 @@ {//如果自己是男性,兄弟姐妹的兄弟就是自己的兄弟或自己 con:/(,[fhs]|([olx]b)),[olx][sb],[olx]b/, - exp:/^(.+),[olx][sb],[olx]b(.+)$/, + exp:/^(.+)?,[olx][sb],[olx]b(.+)?$/, str:'$1,xb$2#$1$2', }, {//如果自己是女性,兄弟姐妹的兄弟就是自己的兄弟 @@ -63,7 +63,7 @@ }, {//如果自己是女性,兄弟姐妹的姐妹就是自己的姐妹或自己 con:/(,[mwd]|([olx]s)),[olx][sb],[olx]s/, - exp:/^(.+),[olx][sb],[olx]s(.+)$/, + exp:/^(.+)?,[olx][sb],[olx]s(.+)?$/, str:'$1,xs$2#$1$2', }, @@ -227,6 +227,7 @@ 'f,f':['爷爷','祖父'], 'f,f,f':['太爷爷'], 'f,f,m':['太奶奶'], + 'f,f,xb':['xx爷爷'], 'f,f,ob':['大爷爷','大爷'], 'f,f,ob,w':['大奶奶'], 'f,f,lb':['小爷爷'], @@ -398,12 +399,13 @@ function relationship(str){ var selectors = getSelectors(str); - console.log(selectors); + // console.log(selectors); var result = []; //匹配结果 for(var i = 0;i