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-03-16 09:43:17 +08:00
parent 9086979e12
commit 70175de89f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
script/relationship.js
View File

@ -1575,6 +1575,10 @@
'w':['内','妻','岳','岳家','丈人'], 'w':['内','妻','岳','岳家','丈人'],
'h':['外','夫','婆家'], 'h':['外','夫','婆家'],
}; };
var nameList = [];
for(var key in _map){
nameList = [].concat(_map[key]);
}
for(var key in _map){ for(var key in _map){
if(key.match(/^[fm]/)||key.match(/^[olx][bs]$|^[olx][bs],[^mf]/)){ if(key.match(/^[fm]/)||key.match(/^[olx][bs]$|^[olx][bs],[^mf]/)){
for(var k in branch){ for(var k in branch){
@ -1586,7 +1590,10 @@
var nameList = _map[key]; var nameList = _map[key];
prefixList.forEach(function(prefix){ prefixList.forEach(function(prefix){
nameList.forEach(function(name){ nameList.forEach(function(name){
_map[newKey].push(prefix+name); var newName = prefix+name;
if(nameList.indexOf(name)==-1){ // 配偶组合的称呼不得已原有称呼冲突(如：妻舅!=妻子的舅舅;外舅公!=老公的舅公)
_map[newKey].push();
}
}); });
}); });
} }