Merge branch 'master' of github.com:mumuy/relationship

index.html

@@ -67,7 +67,7 @@
 							<p class="text-gray">始于2016年3月</p>
 							<div class="picture">
 								<img src="static/image/app.png" width="512" height="320" alt="亲戚称呼换算APP"/>
-								<a class="btn" href="/relationship/vue/" target="_blank">访问手机版</a>
+								<a class="btn" href="vue/" target="_blank">访问手机版</a>
 							</div>
 						</div>
 						<div class="bd">
@@ -707,5 +707,6 @@
 			    s.parentNode.insertBefore(bp, s);
 			})();
 		</script>
+		<script type="text/javascript" src="https://passer-by.com/public/script/projects.js"></script>
 	</body>
 </html>

src/module/data/branch.js

@@ -232,22 +232,30 @@ export default {
     '{G0},s,s,w':['孙妇'],
     '{G0},s,s,s':['曾孙','曾孙男'],
     '{G0},s,s,s,w':['曾孙妇'],
-    '{G0},s,s,s,s':['玄孙','玄孙男'],
+    '{G0},s,s,s,s':['玄孙','玄孙男','元孙','元孙男'],
-    '{G0},s,s,s,d':['玄孙女'],
+    '{G0},s,s,s,s,w':['玄孙妇'],
+    '{G0},s,s,s,d':['玄孙女','元孙女'],
+    '{G0},s,s,s,d,h':['玄孙婿'],
     '{G0},s,s,d':['曾孙女'],
     '{G0},s,s,d,h':['曾孙婿'],
     '{G0},s,s,d,s':['玄外孙','玄外孙男'],
+    '{G0},s,s,d,s,w':['玄外孙妇'],
     '{G0},s,s,d,d':['玄外孙女'],
+    '{G0},s,s,d,d,h':['玄外孙婿'],
     '{G0},s,d':['孙女'],
     '{G0},s,d,h':['孙婿'],
     '{G0},s,d,s':['曾外孙','曾外孙男'],
     '{G0},s,d,s,w':['曾外孙妇'],
     '{G0},s,d,s,s':['曾外曾孙','曾外曾孙男'],
+    '{G0},s,d,s,s,w':['曾外曾孙妇'],
     '{G0},s,d,s,d':['曾外曾孙女'],
+    '{G0},s,d,s,d,h':['曾外曾孙婿'],
     '{G0},s,d,d':['曾外孙女'],
     '{G0},s,d,d,h':['曾外孙婿'],
     '{G0},s,d,d,s':['曾外曾外孙','曾外曾外孙男'],
+    '{G0},s,d,d,s,w':['曾外曾外孙妇'],
     '{G0},s,d,d,d':['曾外曾外孙女'],
+    '{G0},s,d,d,d,h':['曾外曾外孙婿'],
     '{G0},d':['女','女儿'],
     '{G0},d,h':['女婿','婿'],
     '{G0},d,s':['外孙','外孙男'],

src/module/data/main.js

@@ -38,8 +38,8 @@ export default {
     'm,m,m,f':['外曾外曾外祖父','高毑父'],
     'm,m,m,m':['外曾外曾外祖母','高毑母'],
     // 曾祖辈
-    'f,f,f':['曾祖父','曾祖','外曾外毑父','太公','太爷','老太爷','太翁','太爷爷','佬嗲','祖爷','三世祖'],
+    'f,f,f':['曾祖父','曾祖','外曾外毑父','太公','太爷','老太爷','太翁','太爷爷','曾爷爷','佬嗲','祖爷','三世祖'],
-    'f,f,m':['曾祖母','外曾外毑母','太婆','太奶','老太奶','太嬷','太姆','太奶奶','老娭毑'],
+    'f,f,m':['曾祖母','外曾外毑母','太婆','太奶','老太奶','太嬷','太姆','太奶奶','曾奶奶','老娭毑'],
     'f,m,f':['曾外祖父','曾外祖','外曾毑父','太外公','太外爷','太外翁','太外爷爷'],
     'f,m,m':['曾外祖母','外曾毑母','太外婆','太外奶','太外嬷','太外姆','太外奶奶'],
     'm,f,f':['外曾祖父','外曾祖','曾外毑父','外太公','外太爷','外太翁','外太爷爷'],
@@ -54,7 +54,7 @@ export default {
     'f,f,ob':['伯公','伯祖','伯翁','大爷爷','大嗲','大爷','大公','大阿爷'],
     'f,f,ob,w':['伯婆','姆婆','大奶奶'],
     'f,f,lb':['叔公','叔祖','叔翁','小爷爷','晚公','幺爷','细嗲'],
-    'f,f,lb,w':['叔婆','婶婆','晚婆','幺奶','小奶奶'],
+    'f,f,lb,w':['叔婆','婶婆','小奶奶','晚婆','幺奶'],
     'f,f,xb':['伯叔祖父','从祖父','几爷爷','几大爷','几嗲','几爷','几公'],
     'f,f,xb,w':['伯叔祖母','从祖母','几奶奶','几大娘','几奶','几婆'],
     'f,f,xs':['姑奶奶','祖姑','恩婆'],
@@ -79,8 +79,8 @@ export default {
     'f':['爸爸','父亲','老父亲','老爸','阿爸','阿父','阿爹','老窦','爹地','依爹','老爹','老汉','老爷子','老子','牙老子','爸','父','爹','老汉儿','牙老倌','爸比','爹爹','爹啲','一世祖'],
     'f,ob':['伯父','伯伯','伯爸','伯爷','依伯','世父','大爹','大爸','大爸爸','伯儿','大伯','大爷','大大','阿伯','几伯','伯'],
     'f,ob,w':['伯母','伯妈','伯娘','依姆','世母','大娘','大妈','大妈妈','伯妇','大嬷','大姆妈','伯姐','姆'],
-    'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','叔儿','仲父','季父','叔仔','依叔','小叔','小爹','小爸','尕爸','尕爹','幺爸','幺爹','幺叔','细叔','满叔','碎叔','晚叔','几叔','叔'],
+    'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','叔儿','仲父','季父','叔仔','依叔','小叔','小爹','小爸','几叔','叔'],
-    'f,lb,w':['婶婶','婶母','婶妈','婶娘','阿婶','婶儿','仲母','季母','叔妇','依婶','小婶','小娘','小妈','尕妈','尕婶','幺妈','幺娘','幺婶','细婶','碎婶','满婶','晚婶','几婶','婶','婶子','家婶','叔母','叔妈','叔娘','婶爹'],
+    'f,lb,w':['婶婶','婶母','婶妈','婶娘','阿婶','婶儿','仲母','季母','叔妇','依婶','小婶','小娘','小妈','几婶','婶','婶子','家婶','叔母','叔妈','叔娘','婶爹','嬢嬢'],
     'f,xb':['伯叔父','叔伯','几爸爸','几爸','几爹'],
     'f,xb,w':['伯叔母','几妈妈','几妈','几娘'],
     'f,xb,s&o':['堂哥','堂阿哥','堂房哥哥','堂房阿哥','叔伯哥哥','叔伯阿哥','堂老兄'],
@@ -102,11 +102,11 @@ export default {
     'f,xb,d,s,w':['堂外甥媳妇'],
     'f,xb,d,d':['堂外甥女'],
     'f,xb,d,d,h':['堂外甥女婿'],
-    'f,os':['大姑','大姑妈','姑姊'],
+    'f,os':['大姑','大姑妈','姑姊','姑嬷'],
     'f,os,h':['大姑丈','大姑父','大姑爸','恩伯'],
-    'f,ls':['小姑','小姑妈','姑姐','姑妹','姑仔','尕娘','幺姑姐','老姑','幺姑','细姑','满姑','碎姑','晚姑'],
+    'f,ls':['小姑','小姑妈','姑姐','姑妹','姑仔','尕娘','幺姑姐','老姑'],
     'f,ls,h':['小姑丈','小姑父','小姑爹','恩叔'],
-    'f,xs':['姑妈','姑母','姑姑','恩妈','嬢嬢','娘娘','几姑','姑','阿姑'],
+    'f,xs':['姑妈','姑母','姑姑','恩妈','几姑','姑','阿姑','嬢嬢','娘娘'],
     'f,xs,h':['姑丈','姑父','姑爸','恩爸','姑伯','姑爹','姑夫','姑婿','姑郎','亘'],
     'f,f,xb,s&o':['堂伯'],
     'f,f,xb,s&o,w':['堂伯母'],
@@ -154,15 +154,15 @@ export default {
     'm':['妈妈','母亲','老母亲','老妈','阿妈','阿母','阿娘','老母','妈咪','依妈','老娘','老乸','老妈子','妈子','娘老子','妈','母','娘','阿毑','姆嬷','姆妈','娘亲'],
     'm,ob':['大舅','大舅舅','舅伯','元舅'],
     'm,ob,w':['大舅妈','大妗','舅嫲'],
-    'm,lb':['小舅','小舅舅','舅仔','舅父仔','尕阿舅','老舅','幺舅','细舅','满舅','碎舅','晚舅'],
+    'm,lb':['小舅','小舅舅','舅仔','舅父仔','尕阿舅','老舅'],
     'm,lb,w':['小舅妈','小妗','细妗'],
     'm,xb':['舅舅','舅爸','舅父','舅爹','娘舅','母舅','阿舅','妗公','几舅','舅'],
-    'm,xb,w':['舅妈','舅母','舅娘','娘妗','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','老妗','妗子','妗妗','妗妈','妗娘','妗母','阿妗','妗门','妗婆仔','妗儿妈','妗'],
+    'm,xb,w':['舅妈','舅母','舅娘','娘妗','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','老妗','妗子','妗妗','妗妈','妗娘','妗母','阿妗','妗门','妗婆仔','妗儿妈','妗','嬢嬢'],
-    'm,os':['大姨','大姨妈'],
+    'm,os':['大姨','大姨妈','姨嬷'],
     'm,os,h':['大姨丈','大姨父','大姨爸','姨伯'],
-    'm,ls':['小姨','小姨妈','姨仔','尕姨娘','老姨','幺姨','细姨','满姨','碎姑','晚姨'],
+    'm,ls':['小姨','小姨妈','姨仔','老姨'],
     'm,ls,h':['小姨丈','小姨父','小姨爹','老姨夫','姨叔'],
-    'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','几姨','姨','从母'],
+    'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','几姨','姨','从母','嬢嬢'],
     'm,xs,h':['姨丈','姨父','姨爸','姨爹','姨夫','姨婿','姨郎','尹'],
     'm,f,xb,s':['堂舅'],
     'm,f,xb,s,w':['堂舅妈'],
@@ -238,7 +238,7 @@ export default {
     'w,m,f':['外祖岳父','毑岳父','外祖丈人爹','外祖丈人','外太岳父','姥岳父','姥丈爷','姥丈人','姥丈人爹','老丈爷','姥爷丈人'],
     'w,m,m':['外祖岳母','毑岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈姥','姥丈母','姥丈母娘','老丈娘'],
     'w,f':['岳父','丈人','老丈人','外父','泰山','外舅','老亲爷','丈人爹','老干爷','丈人公','丈母爷','丈爷','丈爷爹','丈父','岳老子','老丈杆子','岳丈','岳翁','妇翁','家岳'],
-    'w,m':['岳母','丈母','老丈母','外母','泰水','外姑','老亲娘','丈人娘','老干娘','丈人婆','丈母娘','丈姥','丈姥娘','丈姆','岳母娘','丈母婆','丈姆婆'],
+    'w,m':['岳母','丈母','老丈母','外母','泰水','外姑','老亲娘','丈人娘','老干娘','丈人婆','丈母娘','丈姥','丈姥娘','丈姆','岳母娘','丈母婆','丈姆婆','丈姆娘'],
     'w':['老婆','妻子','媳妇','媳妇儿','太太','妻','女人','新娘','爱姥','妻亲','娘子','新娘子','夫人','婆娘','老太婆','内人','内子','内助','贤内助','爱妻','发妻','婆姨','婆子','老婆子','老婆儿','老婆仔','堂客','爱人','老伴','那口子','配偶','伴侣','伉俪','卿卿'],
     'w,ob':['大舅子','大舅哥','大舅佬','大阿舅','舅哥'],
     'w,ob,w':['大舅妇','大舅姆','大舅兄嫂','大舅嫂','大舅姐','大舅媳妇','大妗子','大妗儿'],
@@ -261,7 +261,7 @@ export default {
     'ob,w':['嫂子','嫂','嫂嫂','阿嫂','家嫂','兄姊','兄嫂','兄妇','兄妻','几嫂'],
     'ob,s':['侄子','兄子'],
     'ob,d':['侄女','兄女'],
-    'lb':['弟弟','弟','胞弟','亲弟','老弟','阿弟','细佬','依弟','小弟','幺弟','细弟','满弟','幼弟','几弟'],
+    'lb':['弟弟','弟','胞弟','亲弟','老弟','阿弟','细佬','依弟','小弟','几弟'],
     'lb,w':['弟妹','弟媳','弟媳妇','弟媳妇子','弟新妇','老弟嫂'],
     'lb,s':['侄子','弟子'],
     'lb,d':['侄女','弟女'],
@@ -271,7 +271,7 @@ export default {
     'xb,d,h':['侄女婿','侄婿','侄郎'],
     'os':['姐姐','姐','胞姐','亲姐','阿姐','阿姊','姊仔','家姐','依姐','长姐','几姐'],
     'os,h':['姐夫','姐丈','姐婿','姐郎','姊兄','姐夫哥','胞姐夫'],
-    'ls':['妹妹','妹','胞妹','亲妹','阿妹','妹儿','妹子','依妹','幺妹','细妹','满妹','幼妹','几妹'],
+    'ls':['妹妹','妹','胞妹','亲妹','老妹','阿妹','妹儿','妹子','依妹','小妹','几妹'],
     'ls,h':['妹夫','妹丈','妹婿','妹郎','妹弟','妹夫子','胞妹夫'],
     'xs,s':['外甥','甥子','甥男','甥儿','甥儿子','甥','甥仔'],
     'xs,s,w':['甥媳妇','甥媳','甥嫂','甥妇','甥儿息妇儿'],

src/module/data/multiple.js

@@ -18,7 +18,7 @@ export default {
     '[f|m],[f|m],m,xb,w':['舅太老姥'],
     '[f|m],[f|m],m,xs':['姨太老姥'],
     '[f|m],[f|m],m,xs,h':['姨太老爷'],
-    '[f,f|f,m|m,f],f':['太奶爷','祖奶爷'],
+    '[f,f|f,m|m,f],f':['太奶爷','祖奶爷','祖爷爷'],
     '[f,f|f,m|m,f],f,ob':['伯太奶爷','太伯奶爷'],
     '[f,f|f,m|m,f],f,ob,w':['伯太奶奶','太伯奶奶'],
     '[f,f|f,m|m,f],f,lb':['叔太奶爷','太叔奶爷'],
@@ -43,6 +43,7 @@ export default {
     '[f,m|m,f|m,m],m,xs':['姨太姥姥','太姨姥姥'],
     '[f,m|m,f|m,m],m,xs,h':['姨太姥爷','太姨姥爷'],
     '[f|m],[f|m],[f|m]':['曾祖辈','祖祖','老太'],
+    '[f|m],f,[f|m]':['阿太'],
     '[f|m],[f|m]':['祖辈'],
     '[f|m],f':['老爷'],
     '[f|m],f,ob':['伯老爷'],

src/module/rule/replace.js

@@ -39,7 +39,7 @@ export default [
         arr:['姑$1祖母']
     },
     {
-        exp:/^([曾玄来晜仍云耳])([侄甥])/,
+        exp:/^([曾玄元来晜仍云耳])([侄甥])/,
         arr:['$2$1']
     },
     {
@@ -78,6 +78,10 @@ export default [
         exp:/祖$/,
         arr:['祖父']
     },
+    {
+        exp:/(新妇|媳)$/,
+        arr:['媳妇']
+    },
     {
         exp:/嫂$/,
         arr:['兄妇']

src/module/rule/similar.js

@@ -9,8 +9,6 @@ export default {
     '婿':'壻',
     '祖父':'王父',
     '祖母':'王母',
-    '弟媳':'弟妇',
-    '嫂':'兄妇',
     '孙女婿':'孙婿',
     '甥女婿':'甥婿',
     '侄女婿':'侄婿',

src/module/selector.js

@@ -93,9 +93,6 @@ export function getSelectors(str){
     while(lists.length){
         let name = lists.shift();           //当前匹配词
         let items = [];                     //当前匹配词可能性
-        let x_items = [];
-        let r_items = [];
-        let i_items = [];
         let keywords = [name];
         let getList = function(name){
             // 词义扩展
@@ -122,47 +119,35 @@ export function getSelectors(str){
         };
         getList(name);
         // 通过关键词找关系
+        let items_map = [[],[],[]];
         keywords.forEach(function(name){
+            name = name.replace(/^[尕幺细满碎晚末尾幼]/,'小');
             let match = name.match(/^[大|小]|^[一|二|三|四|五|六|七|八|九|十]+/);
-            if(match){
+            if(match){  // 匹配排序
                 let x_name = name.replace(match[0],'几');
                 let r_name = name.replace(match[0],'');
                 let num = zh2number(match[0]);
-                let x_ids = _cache[x_name]||[];
+                [x_name,r_name,name].forEach(function(name,index){
-                let r_ids = _cache[r_name]||[];
+                    let ids = _cache[name];
-                let i_ids = _cache[name]||[];
+                    if(ids&&ids.length){
-                if(x_ids.length){
+                        ids.forEach(function(i){
-                    x_ids.forEach(function(i){
+                            let id = i.replace(/(,[hw])$/,'&'+num+'$1').replace(/([^hw]+)$/,'$1&'+num);
-                        let r_i = i.replace(/(,[hw])$/,'&'+num+'$1').replace(/([^hw]+)$/,'$1&'+num);
+                            if(!i.match(/^[mf,]+$/)&&!name.match(/^[从世]/)){  // 直系祖辈不参与排序
-                        x_items.push(r_i);
+                                items_map[index].push(id);
-                    });
+                            }
-                }else if(r_ids.length){
+                        });
-                    r_ids.forEach(function(i){
+                    }
-                        let r_i = i.replace(/(,[hw])$/,'&'+num+'$1').replace(/([^hw]+)$/,'$1&'+num);
+                });
-                        if(!i.match(/^[mf,]+$/)&&!r_name.match(/^[从世]/)){  // 直系祖辈不参与排序
-                            r_items.push(r_i);
-                        }
-                    });
-                }else{
-                    i_ids.forEach(function(i){
-                        let r_i = i.replace(/(,[hw])$/,'&'+num+'$1').replace(/([^hw]+)$/,'$1&'+num);
-                        i_items.push(r_i);
-                    });
-                }
             }
             items = items.concat(_cache[name]||[]);
         });
         // console.log('[keywords]',keywords);
         // 如找不到结果，再是否存在称呼的排行问题(不直接判断，因存在"大舅""三从父兄""三世祖"这样特俗含义的情况)
-        if(!items.length){
+        items_map.forEach(function(items_x){
-            items = x_items;
+            if(!items.length){
-        }
+                items = items_x;
-        if(!items.length){
+            }
-            items = r_items;
+        });
-        }
-        if(!items.length){
-            items = i_items;
-        }
         // 完全匹配不到结果
         if(!items.length){
             isMatch = false;

vercel.json

@@ -0,0 +1,5 @@
+{
+    "github": {
+        "silent": true
+    }
+}

zh-HK.html

@@ -67,7 +67,7 @@
 							<p class="text-gray">始於2016年3月</p>
 							<div class="picture">
 								<img src="static/image/app.png" width="512" height="320" alt="親戚稱呼換算APP"/>
-								<a class="btn" href="/relationship/vue/" target="_blank">訪問手機版</a>
+								<a class="btn" href="vue/" target="_blank">訪問手機版</a>
 							</div>
 						</div>
 						<div class="bd">
@@ -707,5 +707,6 @@
 			    s.parentNode.insertBefore(bp, s);
 			})();
 		</script>
+		<script type="text/javascript" src="https://passer-by.com/public/script/projects.js"></script>
 	</body>
 </html>