|
|
@ -737,6 +737,7 @@ function search(keyword, mode, sdata, group) { |
|
|
|
let task = function (obj) { |
|
|
|
let task = function (obj) { |
|
|
|
let objdata = obj.data; |
|
|
|
let objdata = obj.data; |
|
|
|
let objmode = obj.mode; |
|
|
|
let objmode = obj.mode; |
|
|
|
|
|
|
|
let objname = obj.name; |
|
|
|
try { |
|
|
|
try { |
|
|
|
let parse; |
|
|
|
let parse; |
|
|
|
let 公共; |
|
|
|
let 公共; |
|
|
@ -761,17 +762,15 @@ function search(keyword, mode, sdata, group) { |
|
|
|
//log("√缓存临时文件失败>"+e.message);
|
|
|
|
//log("√缓存临时文件失败>"+e.message);
|
|
|
|
} |
|
|
|
} |
|
|
|
let 参数 = {"规则名": MY_RULE.title, "标识": 标识} |
|
|
|
let 参数 = {"规则名": MY_RULE.title, "标识": 标识} |
|
|
|
log("搜索:"+name) |
|
|
|
log("搜索:"+objname) |
|
|
|
ssdata = 搜索(name,page,公共,参数) || []; |
|
|
|
ssdata = 搜索(objname,page,公共,参数) || []; |
|
|
|
//log('√'+objdata.name+">搜索结果>"+ssdata.length);
|
|
|
|
//log('√'+objdata.name+">搜索结果>"+ssdata.length);
|
|
|
|
let resultdata = []; |
|
|
|
let resultdata = []; |
|
|
|
let ssname = name; |
|
|
|
|
|
|
|
ssdata.forEach(item => { |
|
|
|
ssdata.forEach(item => { |
|
|
|
let extra = item.extra || {}; |
|
|
|
let extra = item.extra || {}; |
|
|
|
extra.name = extra.name || item.title; |
|
|
|
extra.name = extra.name || item.title; |
|
|
|
log(ssname) |
|
|
|
log(extra.name+"=="+objname) |
|
|
|
log(name) |
|
|
|
if((objmode=="erji" && extra.name==objname) || objmode!="erji"){ |
|
|
|
if((objmode=="erji" && extra.name==name) || objmode!="erji"){ |
|
|
|
|
|
|
|
extra.img = extra.img || item.img || item.pic_url; |
|
|
|
extra.img = extra.img || item.img || item.pic_url; |
|
|
|
extra.stype = objdata.type; |
|
|
|
extra.stype = objdata.type; |
|
|
|
extra.sname = objdata.name; |
|
|
|
extra.sname = objdata.name; |
|
|
@ -810,7 +809,7 @@ function search(keyword, mode, sdata, group) { |
|
|
|
let list = ssdatalist.map((item) => { |
|
|
|
let list = ssdatalist.map((item) => { |
|
|
|
return { |
|
|
|
return { |
|
|
|
func: task, |
|
|
|
func: task, |
|
|
|
param: {"data":item,"mode":mode}, |
|
|
|
param: {"data":item,"mode":mode,"name":name}, |
|
|
|
id: item.name |
|
|
|
id: item.name |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|