Merge branch 'master' into master

This commit is contained in:
Xwite
2022-01-23 16:54:45 +08:00
committed by GitHub
4 changed files with 15 additions and 12 deletions
+6 -1
View File
@@ -107,7 +107,7 @@
placeholder="是否加载url (启用: true 关闭: false (可选,默认true))"></textarea>
</div>
<div>
<div>启用JS :</div>
<div>启用JS :</div>
<textarea rows="1" id="enableJs" class="base" title="enableJs"
placeholder="是否启用Js (启用: true 关闭: false (可选,默认true))"></textarea>
</div>
@@ -148,6 +148,11 @@
<textarea rows="1" id="customOrder" class="base" title="customOrder"
placeholder="整数: 0~N (可选,默认0) | 数字越小越靠前"></textarea>
</div>
<div>
<div>单URL :</div>
<textarea rows="1" id="singleUrl" class="base" title="singleUrl"
placeholder="启用: true 关闭: false (可选,false)"></textarea>
</div>
</div>
</div>
<div class="menu">
+3 -2
View File
@@ -76,15 +76,16 @@ function rule2json() {
let RuleJSON = Container();
// 转换base
Object.keys(RuleJSON).forEach(key => {
RuleJSON[key] = $('#' + key).value;
RuleJSON[key] = $('#' + key).value;
});
//类型转换
RuleJSON.lastUpdateTime = new Date().getTime();
RuleJSON.customOrder = RuleJSON.customOrder == '' ? 0 : parseInt(RuleJSON.customOrder);
RuleJSON.articleStyle = RuleJSON.articleStyle == '' ? 0 : parseInt(RuleJSON.articleStyle);
RuleJSON.enabled = RuleJSON.enabled == '' || String(RuleJSON.enabled).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.loadWithBaseUrl = RuleJSON.loadWithBaseUrl == '' || String(RuleJSON.loadWithBaseUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.enableJs = RuleJSON.enableJs == '' || String(RuleJSON.enableJs).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.loadWithBaseUrl = RuleJSON.loadWithBaseUrl == '' || String(RuleJSON.loadWithBaseUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.singleUrl = RuleJSON.singleUrl == '' || String(RuleJSON.singleUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
return RuleJSON;
}
// 将源对象填充到源表单