updated bug修复
This commit is contained in:
parent
bfafe7c272
commit
2cdbb18ca4
2
dist/relationship.min.js
vendored
2
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
2
dist/relationship.zh-HK.min.js
vendored
2
dist/relationship.zh-HK.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1653,7 +1653,6 @@
|
|||||||
'sex':sex
|
'sex':sex
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 数据初始化
|
// 数据初始化
|
||||||
// 分支关系
|
// 分支关系
|
||||||
for(var key in _branch){
|
for(var key in _branch){
|
||||||
@ -1705,8 +1704,9 @@
|
|||||||
var nameList = _map[key];
|
var nameList = _map[key];
|
||||||
prefixList.forEach(function(prefix){
|
prefixList.forEach(function(prefix){
|
||||||
nameList.forEach(function(name){
|
nameList.forEach(function(name){
|
||||||
if(!allName[name]){ // 配偶组合的称呼不得已原有称呼冲突(如:妻舅!=妻子的舅舅;外舅公!=老公的舅公)
|
var newName = prefix+name;
|
||||||
_map[newKey].push(prefix+name);
|
if(!allName[newName]){ // 配偶组合的称呼不得已原有称呼冲突(如:妻舅!=妻子的舅舅;外舅公!=老公的舅公)
|
||||||
|
_map[newKey].push(newName);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user