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-09-05 23:34:50 +08:00
parent 9afde9692d
commit 3e4ae436fe
8 changed files with 201 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/branch.js
View File

@@ -571,22 +571,22 @@ export default {
'{M0},m,xs,d&o,h':['姨姊壻'],
'{M0},m,xs,d&l':['姨妹'],
'{M0},m,xs,d&l,h':['姨妹壻'],
'{M0},[ob|lb]':['兄弟'],
'{M0},[ob|lb],w':['兄弟妇'],
'{M0},ob':['兄'],
'{M0},ob,w':['兄妇','兄嫂','嫂子'],
'{M0},lb':['弟'],
'{M0},lb,w':['弟妇','弟妹'],
'{M0},xb':['兄弟'],
'{M0},xb,w':['兄弟妇'],
'{M0},xb&o':['兄'],
'{M0},xb&o,w':['兄妇','兄嫂','嫂子'],
'{M0},xb&l':['弟'],
'{M0},xb&l,w':['弟妇','弟妹'],
'{M0},xb,s':['侄男','侄子','侄儿'],
'{M0},xb,s,w':['侄妇'],
'{M0},xb,d':['侄女'],
'{M0},xb,d,h':['侄婿'],
'{M0},[os|ls]':['姊妹'],
'{M0},[os|ls],h':['姊妹壻'],
'{M0},os':['姊'],
'{M0},os,h':['姊壻','姐夫'],
'{M0},ls':['妹'],
'{M0},ls,h':['妹壻','妹夫'],
'{M0},xs':['姊妹'],
'{M0},xs,h':['姊妹壻'],
'{M0},xs&o':['姊'],
'{M0},xs&o,h':['姊壻','姐夫'],
'{M0},xs&l':['妹'],
'{M0},xs&l,h':['妹壻','妹夫'],
'{M0},xs,s':['甥男'],
'{M0},xs,s,w':['甥妇'],
'{M0},xs,d':['甥女'],

2
src/main.js
View File

@@ -425,7 +425,7 @@ export default {
'w,xs,d,d':['姨甥外孙女','姨外孙女'],
// 兄弟姐妹系
'ob':['哥哥','哥','胞兄','亲哥','老哥','依哥','阿哥','家兄','兄长','大佬','元兄','长兄','几哥'],
'ob,w':['大嫂','嫂子','嫂','嫂嫂','阿嫂','家嫂','兄姊','兄嫂','兄妇','兄妻','几嫂'],
'ob,w':['嫂子','嫂','嫂嫂','阿嫂','家嫂','兄姊','兄嫂','兄妇','兄妻','几嫂'],
'ob,s':['兄子'],
'ob,d':['兄女'],
'lb':['弟弟','弟','胞弟','亲弟','老弟','阿弟','细佬','依弟','小弟','幺弟','细弟','满弟','幼弟','几弟'],

26
src/method.js
View File

@@ -209,24 +209,26 @@ export function getSelectors(str){
var x_name = name.replace(/^[大|小]|^[一|二|三|四|五|六|七|八|九|十]+/,'几');
var r_name = name.replace(/^[大|小]|^[一|二|三|四|五|六|七|八|九|十]+/,'');
var match = name.match(/^[大|小]|^[一|二|三|四|五|六|七|八|九|十]+/);
for(var i in _data){
var isInclude = false;
if(_data[i].indexOf(name)>-1){
items.push(i);
}
if(match){
if(match){
var num = zh2number(match[0]);
for(var i in _data){
var r_i = i.replace(/(,[hw])$/,'&'+num+'$1').replace(/([^hw]+)$/,'$1&'+num);
if(_data[i].indexOf(x_name)>-1){
var num = zh2number(match[0]);
var r_i = i.replace(/(,[hw])$/,'&'+num+'$1').replace(/([^hw]+)$/,'$1&'+num);
x_items.push(r_i);
}
if(_data[i].indexOf(r_name)>-1){
}else if(_data[i].indexOf(r_name)>-1){
if(!i.match(/^[mf,]+$/)&&!r_name.match(/^[从世]/)){ // 直系祖辈不参与排序
var num = zh2number(match[0]);
var r_i = i.replace(/(,[hw])$/,'&'+num+'$1').replace(/([^hw]+)$/,'$1&'+num);
r_items.push(r_i);
}
}
if(_data[i].indexOf(name)>-1){
items.push(r_i);
}
}
}else{
for(var i in _data){
if(_data[i].indexOf(name)>-1){
items.push(i);
}
}
}
});