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

updated 解决冲突

Browse Source
This commit is contained in:
PASSER-BY 2021-11-15 20:28:08 +08:00
commit a5c960f1d4
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/relationship.js vendored
View File

@ -1968,15 +1968,12 @@
} }
return (function (parameter){ return (function (parameter){
var options = { var options = Object.assign({
text:'', text:'',
sex:-1, sex:-1,
type:'default', //为'chain'时,reverse无效 type:'default', //为'chain'时,reverse无效
reverse:false reverse:false
}; },parameter);
for (var p in parameter) {
options[p] = parameter[p];
}
var selectors = getSelectors(options.text); var selectors = getSelectors(options.text);
// console.log('[selectors]',selectors); // console.log('[selectors]',selectors);
var result = []; //匹配结果 var result = []; //匹配结果

2
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
script/relationship.js
View File

@ -1968,15 +1968,12 @@
} }
return (function (parameter){ return (function (parameter){
var options = { var options = Object.assign({
text:'', text:'',
sex:-1, sex:-1,
type:'default', //为'chain'时,reverse无效 type:'default', //为'chain'时,reverse无效
reverse:false reverse:false
}; },parameter);
for (var p in parameter) {
options[p] = parameter[p];
}
var selectors = getSelectors(options.text); var selectors = getSelectors(options.text);
// console.log('[selectors]',selectors); // console.log('[selectors]',selectors);
var result = []; //匹配结果 var result = []; //匹配结果