updated 从男从女数据添加

script/relationship.js

@@ -285,7 +285,7 @@
         '[lb|ls]':['弟弟妹妹'],
         '[ob|ob,w]':['哥哥嫂嫂'],
         '[f,xb|m,xs],[s|d]':['从兄弟姐妹','从姐妹兄弟'],
-        '[f,xs|m,xb],[s|d]':['表兄弟姐妹','表姐妹兄弟','老表'],
+        '[f,xs|m,xb],[s|d]':['表兄弟姐妹','表姐妹兄弟','老表','阿表'],
         'f,xb,[s|d]':['堂兄弟姐妹','堂姐妹兄弟','从父兄弟姐妹'],
         'm,xs,[s|d]':['姨兄弟姐妹','姨姐妹兄弟','从母兄弟姐妹'],
         'f,xs,[s|d]':['姑表兄弟姐妹'],
@@ -369,8 +369,8 @@
         'm,f,ob,w':['伯外婆','外姆婆','大外婆','大姥姥','大姥奶'],
         'm,f,lb':['叔外公','外叔祖','叔外祖','小外公','小姥爷','小外爷'],
         'm,f,lb,w':['叔外婆','外婶婆','小外婆','小姥姥','小姥奶'],
-        'm,f,xb':['x外公','x姥爷','x外爷'],
-        'm,f,xb,w':['x外婆','x姥姥','x姥奶','x外奶','x姥'],
+        'm,f,xb':['堂外祖父','x外公','x姥爷','x外爷'],
+        'm,f,xb,w':['堂外祖母','x外婆','x姥姥','x姥奶','x外奶','x姥'],
         'm,f,xs':['姑外婆','姑婆','x姑姥姥'],
         'm,f,xs,h':['姑外公','姑公','外姑丈公','外丈公','x姑姥爷'],
         'm,m,xb':['舅外公','舅公','x舅姥爷'],
@@ -532,10 +532,10 @@
         '1,xs,h,xs,s':['姑姻姑男'],
         '0,xs,h,xs,d':['姨姻姑女'],
         '1,xs,h,xs,d':['姑姻姑女'],
-        '0,xs,s':['姨甥'],
+        '0,xs,s':['姨甥男'],
         '0,xs,s,w':['姨甥媳妇'],
-        '0,xs,d':['姨甥女','姨甥'],
-        '0,xs,d,h':['姨甥婿'],
+        '0,xs,d':['姨甥女'],
+        '0,xs,d,h':['姨甥女婿'],
         'xs,s':['外甥','外甥男','外甥儿','外甥子','外甥儿子'],
         'xs,d':['外甥女','外甥囡','外甥女儿','外甥闺女'],
         // 堂表亲
@@ -722,10 +722,16 @@
             'm,m,xs,d':['姨姨','从母姨'],
         },
     	'{G0}':{
-    		'xb':['侄','从'],
+    		'xb':['侄'],
+            '1,xb':['从'],
+            '1,f,xb,s':['再从'],
+            '1,f,f,xb,s,s':['三从'],
     		'h,xb':['叔侄'],
     		'w,xb':['舅侄'],
     		'xs':['甥'],
+            '0,xs':['从'],
+            '0,m,xs,d':['再从'],
+            '0,m,m,xs,d,d':['三从'],
     		'h,xs':['姑甥'],
     		'w,xs':['姨甥'],
     	},
@@ -910,9 +916,11 @@
         '{G3},s,s,w':['母'],
         '{G3},s,s,s&o':['兄'],
         '{G3},s,s,s&l':['弟'],
+        '{G3},s,s,[s&o|s&l]':['兄弟'],
         '{G3},s,s,d&o':['姊'],
         '{G3},s,s,d&l':['妹'],
-        '{G3},s,s,s,s':['子'],
+        '{G3},s,s,[d&o|d&l]':['姊妹'],
+        '{G3},s,s,s,s':['男','子'],
         '{G3},s,s,s,d':['女'],
         '{G2}':['祖父'],
         '{G2},w':['祖母'],
@@ -920,9 +928,11 @@
         '{G2},s,w':['母'],
         '{G2},s,s&o':['兄'],
         '{G2},s,s&l':['弟'],
+        '{G2},s,[s&o|s&l]':['兄弟'],
         '{G2},s,d&o':['姊'],
         '{G2},s,d&l':['妹'],
-        '{G2},s,s,s':['子'],
+        '{G2},s,[d&o|d&l]':['姊妹'],
+        '{G2},s,s,s':['男','子'],
         '{G2},s,s,d':['女'],
         'h,f,{G1M}':['祖公父','祖公','祖翁'],
         'h,f,{G1M},w':['祖婆母','祖婆','祖姆'],
@@ -1235,7 +1245,9 @@
 
     // 中文获取选择器
     function getSelectors(str){
-        str = str.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,'x');
+        if(!str.match(/^[三|四|五]从/)){
+            str = str.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,'x');
+        }
         str = str.replace(/之/,'的').replace(/我的?(.+)/,'$1');
         if(str.match(/[^娘婆岳亲]家的?/)){
             str = str.replace(/家的?/,'的');
@@ -1347,6 +1359,10 @@
             }else if(selector.match(/^,h/)){
                 sex = 0;
             }
+        }else if(sex==1&&selector.match(/^,[h0]/)){
+            return false;
+        }else if(sex==0&&selector.match(/^,[w1]/)){
+            return false;
         }
         // console.log('[selector]',selector);
         var getId = function(selector,sex){
@@ -1679,9 +1695,9 @@
                                 temps = reverseId(id,data['sex']);
                             }
                             temps.forEach(function(id){
-                                var items = getDataById(data['sex']+','+id);
+                                var items = getDataById(id);
                                 if(!items.length){
-                                    items = getDataById(id);
+                                    items = getDataById(data['sex']+','+id);
                                 }
                                 if(items.length){
                                     result = result.concat(items);