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

updated 一处去重逻辑恢复，修复bug

Browse Source
This commit is contained in:
PASSER-BY 2022-03-16 07:40:34 +08:00
parent 794324bf7e
commit 53d5c10682
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

26
script/relationship.js
View File

@ -807,7 +807,7 @@
'm,m,{G1M},w':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'], 'm,m,{G1M},w':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'],
'm,m,{G1W}':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'], 'm,m,{G1W}':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'],
'm,m,{G1W},h':['?外曾外祖父','外曾外?祖父','?外太外公','外太外?公','外太外?爷','?外太外爷','?外太外爷爷','外太?外爷爷'], 'm,m,{G1W},h':['?外曾外祖父','外曾外?祖父','?外太外公','外太外?公','外太外?爷','?外太外爷','?外太外爷爷','外太?外爷爷'],
'f,{G1M}':['公','祖父','奶爷','爷'], 'f,{G1M}':['公','祖父','奶爷','爷爷','老爷','爷'],
'f,{G1M},w':['婆','祖母','奶奶','奶'], 'f,{G1M},w':['婆','祖母','奶奶','奶'],
'f,{G1W}':['婆','祖母','奶奶','奶'], 'f,{G1W}':['婆','祖母','奶奶','奶'],
'f,{G1W},h':['公','祖父','奶爷','爷'], 'f,{G1W},h':['公','祖父','奶爷','爷'],
@ -1365,16 +1365,20 @@
var items = []; var items = [];
var getData = function(d){ var getData = function(d){
var res = []; var res = [];
for(var i in _data){ if(_data[d]){
if(i.replace(/&[ol]/g,'')==d){ res.push(_data[d][0]);
res.push(_data[i][0]); }else{
}else{ for(var i in _data){
var expr = d; if(i.replace(/&[ol]/g,'')==d){
while (expr.match(/[ol](b|s)/)){ res.push(_data[i][0]);
expr = expr.replace(/[ol](b|s)/,'x$1'); }else{
if(expr==i){ var expr = d;
res.push(_data[i][0]); while (expr.match(/[ol](b|s)/)){
break; expr = expr.replace(/[ol](b|s)/,'x$1');
if(expr==i){
res.push(_data[i][0]);
break;
}
} }
} }
} }