Merge branch 'master' of github.com:mumuy/relationship
# Conflicts: # dist/relationship.min.js # dist/relationship.zh-HK.min.js
This commit is contained in:
mumuy
commit
6f8414bbe4
2
dist/relationship.min.js
vendored
2
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
2
dist/relationship.zh-HK.min.js
vendored
2
dist/relationship.zh-HK.min.js
vendored
File diff suppressed because one or more lines are too long
674
package-lock.json
generated
674
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
60
src/main.js
60
src/main.js
@ -114,11 +114,9 @@ export default {
|
||||
'[xb|xs],[s|d]':['侄甥'],
|
||||
'xb,[s|d]':['侄子女','侄子侄女'],
|
||||
'xs,[s|d]':['甥子女','外甥子女'],
|
||||
'0,xb,[s|d],[s|d]':['归孙'],
|
||||
'h,xs,[s|d],[s|d]':['离孙'],
|
||||
'[w|s|d]':['妻儿'],
|
||||
'[s|d]':['子女','儿女','小孩','孩子','孩子们','孩儿','小孩儿','宝宝','宝贝','娃','儿辈','子辈','子息','子嗣','崽','幺儿'],
|
||||
'[s|d],[s|d]':['孙辈'],
|
||||
'[s|d],[s|d]':['孙辈','孙息','孙枝'],
|
||||
's,[s|d]':['孙子女'],
|
||||
'd,[s|d]':['外孙子女'],
|
||||
'[s|d]#[s|d],[s|d]':['儿孙','子孙','孙息'],
|
||||
@ -203,8 +201,8 @@ export default {
|
||||
'f,f,ob,w':['伯婆','姆婆','大奶奶'],
|
||||
'f,f,lb':['叔公','叔祖','叔翁','晚公','细嗲','小爷爷'],
|
||||
'f,f,lb,w':['叔婆','婶婆','晚婆','小奶奶'],
|
||||
'f,f,xb':['堂祖父','x爷爷','x大爷','x嗲','x爷','x公'],
|
||||
'f,f,xb,w':['堂祖母','x奶奶','x大娘','x奶','x婆'],
|
||||
'f,f,xb':['堂祖父','几爷爷','几大爷','几嗲','几爷','几公'],
|
||||
'f,f,xb,w':['堂祖母','几奶奶','几大娘','几奶','几婆'],
|
||||
'f,f,xs':['姑奶奶','祖姑'],
|
||||
'f,f,xs,h':['姑爷爷','姑公公','祖姑丈','姑丈公','丈公'],
|
||||
'f,m,xb':['舅爷爷','舅祖','舅爹','太舅父'],
|
||||
@ -215,8 +213,8 @@ export default {
|
||||
'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':['堂外祖父','几外公','几姥爷','几外爷'],
|
||||
'm,f,xb,w':['堂外祖母','几外婆','几姥姥','几姥奶','几外奶','几姥'],
|
||||
'm,f,xs':['姑外婆','姑婆'],
|
||||
'm,f,xs,h':['姑外公','姑公','外姑丈公','外丈公'],
|
||||
'm,m,xb':['舅外公','舅公','舅爹'],
|
||||
@ -226,11 +224,11 @@ export default {
|
||||
// 父辈
|
||||
'f':['爸爸','父亲','老爸','阿爸','阿父','阿爹','老窦','爹地','依爹','老爹','老汉','老爷子','老子','牙老子','爸','父','爹','老汉儿','牙老倌','爸比','爹爹','爹啲','一世祖'],
|
||||
'm':['妈妈','母亲','老妈','阿妈','阿母','阿娘','老母','妈咪','依妈','老娘','老乸','老妈子','妈子','娘老子','妈','母','娘','阿毑','姆嬷','姆妈','娘亲'],
|
||||
'f,ob':['伯父','伯伯','阿伯','大伯','大伯爷','大伯伯','伯儿','大大','世父','大伯爸','伯爸','大爸爸','大爸','大爹','大爷'],
|
||||
'f,ob,w':['伯母','伯妈','伯娘','伯妇','阿娘','依姆','姆姆','姆','世母','大娘','大妈','大妈妈','大姆妈','大嬷'],
|
||||
'f,ob':['伯父','伯伯','伯爸','伯爷','阿伯','依伯','世父','大爷','大爸','大爸爸','大爹','伯儿','大伯','大大','伯'],
|
||||
'f,ob,w':['伯母','伯妈','伯娘','阿娘','依姆','世母','大娘','大妈','大妈妈','大嬷','伯妇','大嬷','大姆妈','伯姐','姆姆','姆'],
|
||||
'f,lb':['叔叔','叔父','叔爸','叔爹','阿叔','叔儿','仲父','季父','叔仔','小叔','小爹','小爸','尕爸','幺爸','幺爹','幺叔','细叔','满叔','晚叔','叔'],
|
||||
'f,lb,w':['婶婶','婶母','婶娘','婶妈','婶爹','叔妇','阿婶','依婶','仲母','季母','小婶','小娘','小妈','尕婶','幺婶','细婶','满婶','晚婆','婶子','婶儿','家婶','叔母','叔妈','叔娘','婶'],
|
||||
'f,[ob|lb]':['叔伯','从父','x爸爸','x爸','x爹'],
|
||||
'f,[ob|lb]':['叔伯','从父','几爸爸','几爸','几爹'],
|
||||
'f,os':['大姑','大姑妈','姑姊'],
|
||||
'f,os,h':['大姑丈','大姑父','大姑爸'],
|
||||
'f,ls':['小姑','小姑妈','姑姐','姑妹','姑仔','尕娘','幺姑','幺姑姐','老姑','细姑','满姑'],
|
||||
@ -241,8 +239,8 @@ export default {
|
||||
'm,ob,w':['大舅妈','大妗'],
|
||||
'm,lb':['小舅','小舅舅','舅仔','舅父仔','幺舅','老舅','细舅','满舅','尕阿舅'],
|
||||
'm,lb,w':['小舅妈','小妗','细妗'],
|
||||
'm,xb':['舅舅','舅父','舅爸','舅爹','娘舅','母舅','舅','阿舅','妗公'],
|
||||
'm,xb,w':['舅妈','舅母','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','妗','妗子','妗妗','妗妈','妗娘','妗母','阿妗','妗门','妗婆仔','妗儿妈'],
|
||||
'm,xb':['舅舅','舅爸','舅父','舅爹','娘舅','母舅','阿舅','妗公','舅'],
|
||||
'm,xb,w':['舅妈','舅母','舅娘','舅妻','舅姆','舅姆妈','舅媳妇','舅妇','舅姥','妗子','妗妗','妗妈','妗娘','妗母','阿妗','妗门','妗婆仔','妗儿妈','妗'],
|
||||
'm,os':['大姨','大姨妈'],
|
||||
'm,os,h':['大姨丈','大姨父','大姨爸'],
|
||||
'm,ls':['小姨','小姨妈','姨仔','幺姨','老姨','满姨','细姨','尕姨娘'],
|
||||
@ -290,7 +288,7 @@ export default {
|
||||
'h,m,m':['外祖婆母','毑婆母','外祖婆','外祖婆婆','姥婆母','姥婆'],
|
||||
'h,f':['公公','公父','家公','家官','家翁','家爷','翁亲','老官','大官','老公公','老人公','大人公','公爹','老公爹','婆父','婆爹'],
|
||||
'h,m':['婆婆','婆母','家婆','家娘','姑亲','大家','老婆婆','老人婆','大人婆','婆妈','婆母娘','婆子妈'],
|
||||
'h,f,ob':['伯公父','伯公','伯翁','伯公公','婆婆伯'],
|
||||
'h,f,ob':['伯公父','伯公','伯翁','伯公公','伯祖','婆婆伯'],
|
||||
'h,f,ob,w':['伯婆母','伯婆','姆婆','伯婆婆','伯姆','婆婆伯姆'],
|
||||
'h,f,lb':['叔公父','叔公','叔翁','叔公公','叔祖','婆婆叔'],
|
||||
'h,f,lb,w':['叔婆母','叔婆','婶婆','婶婆婆','婶亲','婆婆婶子'],
|
||||
@ -336,10 +334,14 @@ export default {
|
||||
'w,m,m,m':['外曾外祖岳母','外曾外祖丈母','外曾外祖丈母娘','祖姥丈母娘','太姥丈母娘'],
|
||||
'w,f,f':['祖岳父','太岳父','奶岳父','祖丈人','爷丈人','奶爷丈人','奶丈爷','奶丈人','老丈爷'],
|
||||
'w,f,m':['祖岳母','太岳母','奶岳母','祖丈母','祖丈母娘','奶丈母娘','奶丈姥','奶丈母','老丈姥'],
|
||||
'w,f,ob':['伯岳父','姻伯','姻伯丈'],
|
||||
'w,f,ob,w':['伯岳母','姻姆'],
|
||||
'w,f,lb':['叔岳父','姻叔','姻叔丈'],
|
||||
'w,f,lb,w':['叔岳母','姻婶'],
|
||||
'w,f,ob':['伯岳父'],
|
||||
'w,f,ob,w':['伯岳母'],
|
||||
'w,f,lb':['叔岳父'],
|
||||
'w,f,lb,w':['叔岳母'],
|
||||
'w,f,f,xb,s&o':['姻伯丈'],
|
||||
'w,f,f,xb,s&o,w':['姻姆'],
|
||||
'w,f,f,xb,s&l':['姻叔丈'],
|
||||
'w,f,f,xb,s&l,w':['姻婶'],
|
||||
'w,m,f':['外祖岳父','毑岳父','外祖丈人','外太岳父','姥岳父','姥丈爷','姥丈人','姥爷丈人','老丈爷'],
|
||||
'w,m,m':['外祖岳母','毑岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈姥','姥丈母','姥丈母娘'],
|
||||
'w,f':['岳父','岳丈','岳老子','老干爷','老丈人','丈母爷','老丈杆子','丈人爹','丈爷爹','岳翁','丈人','丈人公','丈父','丈爷','外父','妻父','泰山','外舅','老亲爷'],
|
||||
@ -391,6 +393,7 @@ export default {
|
||||
'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
|
||||
'xb,d,h':['侄女婿','侄婿'],
|
||||
'0,xb,s':['娘家侄子','娘家侄'],
|
||||
'0,xb,s,s':['归孙'],
|
||||
'0,xb,d':['娘家侄女'],
|
||||
'1,xb,s':['从男','从子'],
|
||||
'1,xb,s,w':['从妇'],
|
||||
@ -427,6 +430,7 @@ export default {
|
||||
'0,xs,s,d':['姨甥孙女','姨孙女'],
|
||||
'0,xs,d,s':['姨甥外孙','姨外孙','姨甥外孙男','姨外孙男'],
|
||||
'0,xs,d,d':['姨甥外孙女','姨外孙女'],
|
||||
'1,xs,s,s':['离孙'],
|
||||
// 堂表亲
|
||||
'f,xb,s,s':['堂侄'],
|
||||
'f,xb,s,s,w':['堂侄媳妇'],
|
||||
@ -440,7 +444,17 @@ export default {
|
||||
's':['儿子','男儿','息男','闺男','囝囝','囝男','小子','娃子','男亲','长子','次子','幼子','儿','仔','子','阿仔','仔仔','后生','一世孙'],
|
||||
's,w':['儿媳','儿媳妇','儿媳妇儿','新妇','新妇囝','心抱','息妇','儿妇','子妇','小妇','息妇儿'],
|
||||
's,w,f':['亲家公'],
|
||||
's,w,f,f&o':['姻伯'],
|
||||
's,w,f,f&l':['姻叔'],
|
||||
's,w,m':['亲家母'],
|
||||
's,w,xb':['姻侄','世侄'],
|
||||
's,w,xb,w':['姻侄媳'],
|
||||
's,w,xb,s':['姻侄孙'],
|
||||
's,w,xb,d':['姻侄孙女'],
|
||||
's,w,xs':['姻侄女'],
|
||||
's,w,xs,h':['姻侄婿'],
|
||||
's,w,xs,s':['姻侄外孙'],
|
||||
's,w,xs,d':['姻侄外孙女'],
|
||||
's,s':['孙子','孙男','孙男儿','孙儿','长孙','孙娃子','孙伢子','二世孙'],
|
||||
's,s,w':['孙媳妇','孙媳','孙妇','孙息妇','孙新妇'],
|
||||
's,s,s':['曾孙','曾孙男','重孙','重孙子','息仔','三世孙'],
|
||||
@ -536,7 +550,17 @@ export default {
|
||||
'd':['女儿','千金','掌上明珠','息女','闺女','囡女','乖囡','囡囡','囡嗯','囡儿','丫头','姑娘','妮子','女亲','长女','次女','幼女','女','阿女','女女'],
|
||||
'd,h':['女婿','姑爷','姑爷儿','女婿子','女婿儿','儿婿','子婿','息婿','小婿','郎婿','郎婿子','息婿儿','囝婿','囡婿','东床','半子'],
|
||||
'd,h,f':['亲家公'],
|
||||
'd,h,f,f&o':['姻伯'],
|
||||
'd,h,f,f&l':['姻叔'],
|
||||
'd,h,m':['亲家母'],
|
||||
'd,h,xb':['姻侄','世侄'],
|
||||
'd,h,xb,w':['姻侄媳'],
|
||||
'd,h,xb,s':['姻侄孙'],
|
||||
'd,h,xb,d':['姻侄孙女'],
|
||||
'd,h,xs':['姻侄女'],
|
||||
'd,h,xs,h':['姻侄婿'],
|
||||
'd,h,xs,s':['姻侄外孙'],
|
||||
'd,h,xs,d':['姻侄外孙女'],
|
||||
'd,s':['外孙','外孙子','外孙儿'],
|
||||
'd,s,w':['外孙媳妇','外孙妇','外孙新妇'],
|
||||
'd,s,s':['外曾孙','重外孙','外息仔'],
|
||||
@ -565,4 +589,4 @@ export default {
|
||||
'd,d,d,s,w':['外曾外曾外孙媳妇'],
|
||||
'd,d,d,d':['外曾外曾外孙女'],
|
||||
'd,d,d,d,h':['外曾外曾外孙女婿'],
|
||||
};
|
||||
};
|
||||
|
||||
@ -58,7 +58,7 @@ export function getSelectors(str){
|
||||
'^([姨姑])([曾玄外]*)孙':['$1甥$2孙'],
|
||||
'([孙甥侄])$':['$1男','$1女'],
|
||||
'([姑舅姨叔])([孙外]*)([男女])$':['$1表侄$2$3','$1表甥$2$3'],
|
||||
'祖$':['祖父','祖母'],
|
||||
'祖$':['祖父'],
|
||||
'嫂$':['兄妇'],
|
||||
'女儿$':['女'],
|
||||
'外甥$':['甥'],
|
||||
@ -94,7 +94,7 @@ export function getSelectors(str){
|
||||
getList(name);
|
||||
// 通过关键词找关系
|
||||
keywords.forEach(function(name){
|
||||
var x_name = name.replace(/^[大|小|老]|^[一|二|三|四|五|六|七|八|九|十]{1,2}/,'x');
|
||||
var x_name = name.replace(/^[大|小|老]|^[一|二|三|四|五|六|七|八|九|十]{1,2}/,'几');
|
||||
var r_name = name.replace(/^[大|小|老]|^[一|二|三|四|五|六|七|八|九|十]{1,2}/,'');
|
||||
for(var i in _data){
|
||||
if(_data[i].indexOf(name)>-1){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user