docker/relationship
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated 修复排序算法中“三爷爷”排队为"爷爷"的问题

Browse Source
This commit is contained in:
PASSER-BY 2022-03-27 21:02:14 +08:00
parent 0d2702e6ab
commit aa4878b35c
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/relationship.zh-HK.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
script/relationship.js
View File

@ -381,6 +381,8 @@
'f,f,ob,w':['伯婆','大奶奶','姆婆'], 'f,f,ob,w':['伯婆','大奶奶','姆婆'],
'f,f,lb':['叔公','叔祖','叔翁','小爷爷','晚公'], 'f,f,lb':['叔公','叔祖','叔翁','小爷爷','晚公'],
'f,f,lb,w':['叔婆','小奶奶','婶婆','晚婆'], 'f,f,lb,w':['叔婆','小奶奶','婶婆','晚婆'],
'f,f,xb':['堂祖父','x爷爷','x大爷','x爷','x公'],
'f,f,xb,w':['堂祖母','x奶奶','x大娘','x奶','x婆'],
'f,f,xs':['姑奶奶','祖姑'], 'f,f,xs':['姑奶奶','祖姑'],
'f,f,xs,h':['姑爷爷','姑公公','祖姑丈','姑丈公','丈公'], 'f,f,xs,h':['姑爷爷','姑公公','祖姑丈','姑丈公','丈公'],
'f,m,xb':['舅爷爷','舅祖','舅爹','太舅父'], 'f,m,xb':['舅爷爷','舅祖','舅爹','太舅父'],
@ -391,6 +393,8 @@
'm,f,ob,w':['伯外婆','外姆婆','大外婆','大姥姥','大姥奶'], 'm,f,ob,w':['伯外婆','外姆婆','大外婆','大姥姥','大姥奶'],
'm,f,lb':['叔外公','外叔祖','叔外祖','小外公','小姥爷','小外爷'], 'm,f,lb':['叔外公','外叔祖','叔外祖','小外公','小姥爷','小外爷'],
'm,f,lb,w':['叔外婆','外婶婆','小外婆','小姥姥','小姥奶'], 'm,f,lb,w':['叔外婆','外婶婆','小外婆','小姥姥','小姥奶'],
'm,f,xb':['堂外祖父','x外公','x姥爷','x外爷'],
'm,f,xb,w':['堂外祖母','x外婆','x姥姥','x姥奶','x外奶','x姥'],
'm,f,xs':['姑外婆','姑婆'], 'm,f,xs':['姑外婆','姑婆'],
'm,f,xs,h':['姑外公','姑公','外姑丈公','外丈公'], 'm,f,xs,h':['姑外公','姑公','外姑丈公','外丈公'],
'm,m,xb':['舅外公','舅公'], 'm,m,xb':['舅外公','舅公'],
@ -1338,11 +1342,15 @@
getList(name); getList(name);
// 通过关键词找关系 // 通过关键词找关系
keywords.forEach(function(name){ keywords.forEach(function(name){
var x_name = name.replace(/^[大|小|二|三|四|五|六|七|八|九|十]/,'x');
var r_name = name.replace(/^[大|小|二|三|四|五|六|七|八|九|十]/,''); var r_name = name.replace(/^[大|小|二|三|四|五|六|七|八|九|十]/,'');
for(var i in _data){ for(var i in _data){
if(_data[i].indexOf(name)>-1){ if(_data[i].indexOf(name)>-1){
items.push(i); items.push(i);
} }
if(name!=x_name&&_data[i].indexOf(x_name)>-1){
items.push(i);
}
if(name!=r_name&&_data[i].indexOf(r_name)>-1){ if(name!=r_name&&_data[i].indexOf(r_name)>-1){
r_items.push(i); r_items.push(i);
} }