提交 e6f4a9eb 编写于 作者: H hjdhnx

修复本地js继承模板逻辑

上级 1b997493
无法预览此类型文件
3.9.10beta1 3.9.10beta2
\ No newline at end of file \ No newline at end of file
...@@ -1709,9 +1709,6 @@ function playParse(playObj){ ...@@ -1709,9 +1709,6 @@ function playParse(playObj){
let muban = eval(globalThis.mubanJs); let muban = eval(globalThis.mubanJs);
if (typeof ext == 'object'){ if (typeof ext == 'object'){
rule = ext; rule = ext;
if (rule.模板 && muban.hasOwnProperty(rule.模板)) {
rule = Object.assign(muban[rule.模板], rule);
}
} else if (typeof ext == 'string') { } else if (typeof ext == 'string') {
if (ext.startsWith('http')) { if (ext.startsWith('http')) {
let js = request(ext,{'method':'GET'}); let js = request(ext,{'method':'GET'});
...@@ -1719,9 +1716,13 @@ function playParse(playObj){ ...@@ -1719,9 +1716,13 @@ function playParse(playObj){
eval(js.replace('var rule', 'rule')); eval(js.replace('var rule', 'rule'));
} }
} }
} else { } else {
eval(ext.replace('var rule', 'rule')); eval(ext.replace('var rule', 'rule'));
} }
if (rule.模板 && muban.hasOwnProperty(rule.模板)) {
print('继承模板:'+rule.模板);
rule = Object.assign(muban[rule.模板], rule);
}
/** 处理一下 rule规则关键字段没传递的情况 **/ /** 处理一下 rule规则关键字段没传递的情况 **/
let rule_cate_excludes = (rule.cate_exclude||'').split('|').filter(it=>it.trim()); let rule_cate_excludes = (rule.cate_exclude||'').split('|').filter(it=>it.trim());
let rule_tab_excludes = (rule.tab_exclude||'').split('|').filter(it=>it.trim()); let rule_tab_excludes = (rule.tab_exclude||'').split('|').filter(it=>it.trim());
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册