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:
mumuy 2022-02-17 12:06:58 +08:00
parent 53aa8886ab
commit 959e465828
2 changed files with 9 additions and 3 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

10
script/relationship.js
View File

@ -2359,7 +2359,7 @@
function getSelectors(str){ function getSelectors(str){
str = str.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,'x'); str = str.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,'x');
var lists = str.replace(/我的?(.+)/,'$1').replace(/家的?/,'的').split('的'); var lists = str.replace(/我的?(.+)/,'$1').replace(/家的?/,'的').split('的');
var result = ['']; var result = [];
var isMatch = true; var isMatch = true;
var replaceMap = { var replaceMap = {
'哥':'兄', '哥':'兄',
@ -2408,6 +2408,9 @@
isMatch = false; isMatch = false;
} }
var res = []; var res = [];
if(!result.length){
result = [''];
}
result.forEach(function(a){ result.forEach(function(a){
items.forEach(function(b){ items.forEach(function(b){
res.push(a+(b?','+b:'')); res.push(a+(b?','+b:''));
@ -2415,7 +2418,7 @@
}); });
result = res; result = res;
} }
return isMatch?result:['']; return isMatch?result:[];
} }
// 选择器转ID // 选择器转ID
@ -2655,6 +2658,9 @@
} }
var from_selectors = getSelectors(options.text); var from_selectors = getSelectors(options.text);
var to_selectors = getSelectors(options.target); var to_selectors = getSelectors(options.target);
if(!to_selectors.length){
to_selectors = [''];
}
// console.log('[selectors]',from_selectors,to_selectors); // console.log('[selectors]',from_selectors,to_selectors);
var result = []; //匹配结果 var result = []; //匹配结果
from_selectors.forEach(function(from){ from_selectors.forEach(function(from){