diff --git a/script/relationship.js b/script/relationship.js index b8b7a93..3a1a6c6 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -6,14 +6,6 @@ //简写 var _filter = [ /* 表亲 */ - {//表亲的关系 - exp:/^(.+)&o([^#]+)&o/g, - str:'$1$2&o' - }, - {//表亲的关系 - exp:/^(.+)&l([^#]+)&l/g, - str:'$1$2&l' - }, {//表亲的关系 exp:/^(.+)&o([^#]+)&l/g, str:'$1$2' @@ -22,6 +14,10 @@ exp:/^(.+)&l([^#]+)&o/g, str:'$1$2' }, + {//表亲的关系 + exp:/(,[ds],(.+),[ds])&[ol]/g, + str:'$1' + }, /* 父母 */ {//母亲的丈夫是自己的父亲 exp:/m,h/g, @@ -713,8 +709,9 @@ window.relationship = relationship; })(window); -// console.log(relationship({text:'爸爸的儿子的儿子的爸爸'})); +// console.log(relationship({text:'表姐的表哥'})); //老婆的老公 //老公的老婆的儿子的爸爸的老婆的儿子的爸爸 //我的三舅的儿子的爸爸的妹妹的儿子的叔叔的哥哥 //老婆的外孙的姥姥 +//大姨的女儿的表哥