updated 添加重表数据等

src/branch.js

@@ -1,5 +1,37 @@
 // 分支关系链
 export default {
+    // 其他旁系
+    '{G2}':['祖父'],
+    '{G2},w':['祖母'],
+    '{G2},s':['父'],
+    '{G2},s,w':['母'],
+    '{G2},s,s&o':['兄'],
+    '{G2},s,s&l':['弟'],
+    '{G2},s,s':['兄弟'],
+    '{G2},s,d&o':['姊'],
+    '{G2},s,d&l':['妹'],
+    '{G2},s,d':['姊妹'],
+    '{G2},s,s,s':['男','子'],
+    '{G2},s,s,d':['女'],
+    '{G2C},s&o':['伯父'],
+    '{G2C},s&o,w':['伯母'],
+    '{G2C},s&l':['叔父'],
+    '{G2C},s&l,w':['叔母'],
+    '{G2C},s,s&o':['兄'],
+    '{G2C},s,s&l':['弟'],
+    '{G2C},s,s,s':['侄男'],
+    '{G2C},s,s,d':['侄女'],
+    '{G2C},s,d&o':['姐'],
+    '{G2C},s,d&l':['妹'],
+    '{G2C},d':['姑母'],
+    '{G2C},d,h':['姑父'],
+    '{G2C},d,s&o':['兄'],
+    '{G2C},d,s&l':['弟'],
+    '{G2C},d,s,s':['侄男'],
+    '{G2C},d,s,d':['侄女'],
+    '{G2C},d,d&o':['姐'],
+    '{G2C},d,d&l':['妹'],
+    // 高祖以上
     'f,f,f,f,f,f,f,f,{G1M}':['鼻祖父'],
     'f,f,f,f,f,f,f,f,{G1M},w':['鼻祖母'],
     'f,f,f,f,f,f,f,f,{G1W}':['鼻祖母'],
@@ -151,19 +183,6 @@ export default {
     '{G1},d,d,s,w':['甥外孙妇'],
     '{G1},d,d,d':['甥外孙女','外孙女'],
     '{G1},d,d,d,h':['甥外孙婿'],
-    // 其他旁系
-    '{G2}':['祖父'],
-    '{G2},w':['祖母'],
-    '{G2},[s&o|s&l]':['父'],
-    '{G2},[s&o|s&l],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,[d&o|d&l]':['姊妹'],
-    '{G2},s,s,s':['男','子'],
-    '{G2},s,s,d':['女'],
     // 夫族
     'h,f,{G1M}':['祖公父','祖公','祖翁','奶公'],
     'h,f,{G1M},w':['祖婆母','祖婆','祖姆','奶婆'],
@@ -640,4 +659,4 @@ export default {
     '{M-2},xb,w':['孙妇'],
     '{M-2},xs':['孙女'],
     '{M-2},xs,h':['孙婿'],
-};
+};