updated 姻兄弟关系添加

src/module/data/branch.js

@@ -10,11 +10,11 @@ export default {
     '{G2},s,s':['兄弟'],
     '{G2},s,s&o':['兄'],
     '{G2},s,s&l':['弟'],
+    '{G2},s,s,s':['男','子'],
+    '{G2},s,s,d':['女'],
     '{G2},s,d':['姊妹'],
     '{G2},s,d&o':['姊'],
     '{G2},s,d&l':['妹'],
-    '{G2},s,s,s':['男','子'],
-    '{G2},s,s,d':['女'],
     // 高祖以上
     'f,f,f,f,f,f,f,f,[{G1M}|{G1W},h]':['鼻祖父'],
     'f,f,f,f,f,f,f,f,[{G1M},w|{G1W}]':['鼻祖母'],

src/module/data/main.js

@@ -80,7 +80,7 @@ export default {
     'f,ob':['伯父','伯伯','伯爸','伯爷','依伯','世父','大爹','大爸','大爸爸','伯儿','大伯','大爷','大大','阿伯','几伯','伯'],
     'f,ob,w':['伯母','伯妈','伯娘','依姆','世母','大娘','大妈','大妈妈','伯妇','大嬷','大姆妈','伯姐','姆'],
     'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','叔儿','仲父','季父','叔仔','依叔','小叔','小爹','小爸','几叔','叔'],
-    'f,lb,w':['婶婶','婶母','婶妈','婶娘','阿婶','婶儿','仲母','季母','叔妇','依婶','小婶','小娘','小妈','几婶','婶','婶子','家婶','叔母','叔妈','叔娘','婶爹','嬢嬢'],
+    'f,lb,w':['婶婶','叔母','叔妈','叔娘','阿婶','婶儿','仲母','季母','叔妇','依婶','小婶','小娘','小妈','几婶','婶','婶母','婶妈','婶娘','婶子','家婶','婶爹','嬢嬢'],
     'f,xb,s&o':['堂哥','堂老兄'],
     'f,xb,s&o,w':['堂嫂','堂兄嫂'],
     'f,xb,s&l':['堂弟','堂老弟'],
@@ -155,7 +155,7 @@ export default {
     'm,lb':['小舅','小舅舅','舅仔','舅父仔','尕阿舅','老舅'],
     'm,lb,w':['小舅妈','小妗','细妗'],
     'm,xb':['舅舅','舅爸','舅父','舅爹','娘舅','母舅','阿舅','妗公','舅台','几舅','舅'],
-    'm,xb,w':['舅妈','舅母','舅娘','娘妗','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','老妗','妗子','妗妗','妗妈','妗娘','妗母','阿妗','妗门','妗婆仔','妗儿妈','妗','嬢嬢'],
+    'm,xb,w':['舅妈','舅母','舅娘','娘妗','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','舅毑','老妗','妗子','妗妗','妗妗儿','妗爹','妗娘','妗爸','妗妈','妗母','阿妗','妗门','妗婆仔','妗儿妈','娘妗子','妗','嬢嬢'],
     'm,os':['大姨','大姨夫','姨嬷'],
     'm,os,h':['大姨丈','姨伯'],
     'm,ls':['小姨','姨仔','老姨'],

src/module/data/pair.js

@@ -49,5 +49,6 @@ export default {
     'lb,w#h,ob':['伯媳'],
     'ob,w#h,lb':['叔嫂'],
     'xb,w#h,xs':['姑嫂'],
+    'xs,h,xb#xb,w,xb':['姻兄弟'],
     'd,h,[f|m]#s,w,[f|m]':['儿女亲家'],
 }

src/module/id.js

@@ -167,12 +167,12 @@ export function getPairsById(id1,id2){
     let result = [];
     let result_x = [];
     let result_r = [];
-    id1 = id1.replace(/&\d+/,'');
-    id2 = id2.replace(/&\d+/,'');
-    let id1_x = id1.replace(/([ol])([bs])/,'x$2');
-    let id2_x = id2.replace(/([ol])([bs])/,'x$2');
-    let id1_r = id1.replace(/&[ol]/,'');
-    let id2_r = id2.replace(/&[ol]/,'');
+    id1 = id1.replace(/&\d+/g,'');
+    id2 = id2.replace(/&\d+/g,'');
+    let id1_x = id1.replace(/([ol])([bs])/g,'x$2');
+    let id2_x = id2.replace(/([ol])([bs])/g,'x$2');
+    let id1_r = id1.replace(/&[ol]/g,'');
+    let id2_r = id2.replace(/&[ol]/g,'');
     for(let key in _pair){
         let selectors = key.split('#');
         if(selectors.length>1){