update 支持"表表""从表"查询

script/relationship.js

@@ -348,8 +348,6 @@
         'm,f,m':['外曾祖母','曾外毑母','外太婆','外太奶','外太姆','外太奶奶'],
         'm,m,f':['外曾外祖父','外曾外祖','曾毑父','外太外公','外太外爷','外太外翁','外太外爷爷','外太姥爷'],
         'm,m,m':['外曾外祖母','曾毑母','外太外婆','外太外奶','外太外姆','外太外奶奶','老外婆','老外奶','老姥姥','老姥娘'],
-        'f,f,f,xb':['族曾祖父'],
-        'f,f,f,xb,w':['族曾祖母'],
         // 祖父辈
         'f,f':['爷爷','祖父','奶爷','阿爷','阿公','嗲嗲','二世祖'],
         'f,m':['奶奶','祖母','阿奶','阿嬷','阿嫲','嫲嫲','婻婻','娭毑','嗯奶'],
@@ -518,9 +516,9 @@
         '0,xb,w,xs,d':['舅眷姨女'],
         '1,xb,w,xs,d':['叔眷姨女'],
         '0,xb,s':['娘家侄子','娘家侄'],
-        'xb,s':['侄子','侄男','侄儿','阿侄','侄','从子'],
-        'xb,s,s':['侄孙','从孙'],
-        'xb,d':['侄女','侄囡','从女'],
+        'xb,s':['侄子','侄男','侄儿','阿侄','侄'],
+        'xb,s,s':['侄孙'],
+        'xb,d':['侄女','侄囡'],
         // 姐妹
         'os':['姐姐','姐','阿姊','胞姐','大姐','阿姐','家姐','x姐'],
         'os,h':['姐夫','姐丈','姐婿','姊兄','姐夫哥','胞姐夫','大姐夫','x姐夫'],
@@ -658,12 +656,19 @@
     */
     // 分支前缀
     var _prefix = {
+        'G3':{
+            'f,f,f,xb':['族'],
+        },
+        '{G2}':{
+            'f,f,xb':['从祖'],
+            'm,f,xb':['外从祖'],
+        },
     	'{G1}':{
             'f,xb':['堂','同堂','从父','叔伯','从'],
     		'f,xs':['姑表','姑家'],
     		'm,xb':['舅表','舅家'],
-    		'm,xs':['姨','从母','从','姨家'],
-    		'f,f,xb,s':['从堂','再从父','再从','从祖'],
+    		'm,xs':['姨','从母','姨家','从'],
+    		'f,f,xb,s':['从堂','再从父','叔伯叔伯','再从'],
     		'f,f,xb,d':['堂姑表','从父姑表'],
     		'f,f,xs,s':['姑表叔表'],
     		'f,f,xs,d':['姑表姑表'],
@@ -678,8 +683,8 @@
     		'm,m,xb,s':['舅表舅表'],
     		'm,m,xb,d':['舅表姨表'],
     		'm,m,xs,s':['从母舅表'],
-    		'm,m,xs,d':['再从母','姨姨'],
-    		'f,f,f,xb,s,s':['再从堂','三从父','族'],
+    		'm,m,xs,d':['再从母','姨姨','再从'],
+    		'f,f,f,xb,s,s':['再从堂','三从父'],
     		'm,m,m,xs,d,d':['三从母'],
     		'f,f,f,f,xb,s,s,s':['三从堂','四从父'],
     		'm,m,m,m,xs,d,d,d':['四从母'],
@@ -717,7 +722,7 @@
             'm,m,xs,d':['姨姨','从母姨'],
         },
     	'{G0}':{
-    		'xb':['侄'],
+    		'xb':['侄','从'],
     		'h,xb':['叔侄'],
     		'w,xb':['舅侄'],
     		'xs':['甥'],
@@ -897,6 +902,28 @@
         '{G1},d,d,s,w':['甥外孙妇'],
         '{G1},d,d,d':['甥外孙女'],
         '{G1},d,d,d,h':['甥外孙婿'],
+        '{G3}':['曾祖父'],
+        '{G3},w':['曾祖母'],
+        '{G3},s':['祖父'],
+        '{G3},s,w':['祖母'],
+        '{G3},s,s':['父'],
+        '{G3},s,s,w':['母'],
+        '{G3},s,s,s&o':['兄'],
+        '{G3},s,s,s&l':['弟'],
+        '{G3},s,s,d&o':['姊'],
+        '{G3},s,s,d&l':['妹'],
+        '{G3},s,s,s,s':['子'],
+        '{G3},s,s,s,d':['女'],
+        '{G2}':['祖父'],
+        '{G2},w':['祖母'],
+        '{G2},s':['父'],
+        '{G2},s,w':['母'],
+        '{G2},s,s&o':['兄'],
+        '{G2},s,s&l':['弟'],
+        '{G2},s,d&o':['姊'],
+        '{G2},s,d&l':['妹'],
+        '{G2},s,s,s':['子'],
+        '{G2},s,s,d':['女'],
         'h,f,{G1M}':['祖公父','祖公','祖翁'],
         'h,f,{G1M},w':['祖婆母','祖婆','祖姆'],
         'h,{G1M}':['公父','公公'],
@@ -1238,8 +1265,8 @@
         };
         // 含义扩展
         var replaceFilter = {
-            '^从祖':['伯','叔'],
-            '^外从祖':['伯外','叔外'],
+            '^从表':['从父姑表','从父舅表','从父姨表','从母姑表','从母舅表','从母叔表'],
+            '^表表':['姑表叔表','姑表姑表','姑表舅表','姑表姨表','舅表叔表','舅表姑表','舅表舅表','舅表姨表'],
             '^表':['姑表','舅表'],
             '^姻':['姑姻','姨姻','姊妹姻','女姻'],
             '^眷':['叔眷','舅眷','兄弟眷','男眷'],