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

updated 排序和无排序优先问题调整及部分别称添加

Browse Source
This commit is contained in:
mumuy
2022-10-08 08:42:27 +08:00
parent 96b1f3d07b
commit e2b9a4e139
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.js
View File

@@ -198,9 +198,9 @@ export default {
'm,m,f':['外曾外祖父','外曾外祖','曾毑父','外太外公','外太外爷','外太外翁','外太外爷爷','外太姥爷'],
'm,m,m':['外曾外祖母','曾毑母','外太外婆','外太外奶','外太外嬷','外太外姆','外太外奶奶','外太姥姥'],
// 祖父辈
'f,f':['爷爷','祖父','奶爷','阿爷','阿公','依爷','嗲嗲','爷儿','大父','爷','爷老','爷老子','爷老倌','二世祖'],
'f,m':['奶奶','祖母','阿奶','阿姆','阿婆','依奶','阿嬷','阿嫲','大母','奶','嫲嫲','婻婻','娭毑','嗯奶','娘姆','媪婆','亲婆'],
'm,f':['外公','外祖父','姥爷','阿公','外爷','客公','毑父','毑公','姥公','舅家爷','嘎公','嘎嘎爹','尕公','毑爹','外大父','毑爷'],
'f,f':['爷爷','祖父','奶爷','奶爹','阿爷','阿公','依爷','嗲嗲','爷儿','大父','爷','爷老','爷老子','爷老倌','二世祖'],
'f,m':['奶奶','祖母','阿奶','奶娘','阿姆','阿婆','依奶','阿嬷','阿嫲','大母','奶','嫲嫲','婻婻','娭毑','嗯奶','娘姆','媪婆','亲婆'],
'm,f':['外公','外祖父','姥爷','阿公','外爷','客公','毑父','毑公','姥公','舅家爷','嘎公','嘎嘎爹','尕公','毑爹','外大父','姥爹','毑爷'],
'm,m':['外婆','外祖母','姥姥','阿婆','外奶','客婆','毑母','毑婆','姥婆','舅家婆','嘎嘎','嘎嘎婆','尕婆','毑毑','外大母','姥娘','阿嬷','阿嫲','嫲嫲','好婆','嫏嫏','嫏娘'],
'f,f,ob':['伯公','伯祖','伯翁','大爷爷','大嗲','大爷','大公','大阿爷'],
'f,f,ob,w':['伯婆','姆婆','大奶奶'],

18
src/method.js
View File

@@ -179,6 +179,7 @@ export function getSelectors(str){
var items = []; //当前匹配词可能性
var x_items = [];
var r_items = [];
var i_items = [];
var keywords = [name];
var getList = function(name){
for(var filter in replaceFilter){
@@ -218,16 +219,14 @@ export function getSelectors(str){
if(!i.match(/^[mf,]+$/)&&!r_name.match(/^[从世]/)){ // 直系祖辈不参与排序
r_items.push(r_i);
}
}
if(_data[i].includes(name)){
items.push(r_i);
}else if(_data[i].includes(name)){
i_items.push(r_i);
}
}
}else{
for(var i in _data){
if(_data[i].includes(name)){
items.push(i);
}
}
for(var i in _data){
if(_data[i].includes(name)){
items.push(i);
}
}
});
@@ -239,6 +238,9 @@ export function getSelectors(str){
if(!items.length){
items = r_items;
}
if(!items.length){
items = i_items;
}
// 完全匹配不到结果
if(!items.length){
isMatch = false;