updated 一处去重逻辑恢复,修复bug
This commit is contained in:
parent
794324bf7e
commit
53d5c10682
4
dist/relationship.min.js
vendored
4
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
@ -807,7 +807,7 @@
|
||||
'm,m,{G1M},w':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'],
|
||||
'm,m,{G1W}':['?外曾外祖母','外曾外?祖母','?外太外婆','外太外?婆','外太外?奶','?外太外奶','?外太外奶奶','外太外?奶奶'],
|
||||
'm,m,{G1W},h':['?外曾外祖父','外曾外?祖父','?外太外公','外太外?公','外太外?爷','?外太外爷','?外太外爷爷','外太?外爷爷'],
|
||||
'f,{G1M}':['公','祖父','奶爷','爷'],
|
||||
'f,{G1M}':['公','祖父','奶爷','爷爷','老爷','爷'],
|
||||
'f,{G1M},w':['婆','祖母','奶奶','奶'],
|
||||
'f,{G1W}':['婆','祖母','奶奶','奶'],
|
||||
'f,{G1W},h':['公','祖父','奶爷','爷'],
|
||||
@ -1365,6 +1365,9 @@
|
||||
var items = [];
|
||||
var getData = function(d){
|
||||
var res = [];
|
||||
if(_data[d]){
|
||||
res.push(_data[d][0]);
|
||||
}else{
|
||||
for(var i in _data){
|
||||
if(i.replace(/&[ol]/g,'')==d){
|
||||
res.push(_data[i][0]);
|
||||
@ -1379,6 +1382,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return res;
|
||||
};
|
||||
if(_data[id]){ // 直接匹配称呼
|
||||
|
Loading…
x
Reference in New Issue
Block a user