From 581befbab513fdae0c0afaa6f6454809bc26d1b3 Mon Sep 17 00:00:00 2001
From: Celeter <alansky114@gmail.com>
Date: Sat, 12 Sep 2020 14:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BA=90=E8=B0=83=E8=AF=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=A0=B7=E5=BC=8F=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/web/index.html | 22 ++++++++++++++++------
 app/src/main/assets/web/index.js   |  2 --
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/assets/web/index.html b/app/src/main/assets/web/index.html
index f4de68c81..2af52d9a4 100644
--- a/app/src/main/assets/web/index.html
+++ b/app/src/main/assets/web/index.html
@@ -14,7 +14,7 @@
             <div class="rules">
                 <div><b>基本</b></div>
                 <div>
-                    <div>源URL　:</div>
+                    <div>源域名　:</div>
                     <textarea rows="1" id="bookSourceUrl" class="base" title="bookSourceUrl"
                         placeholder="<必填>通常填写网站主页,例: https://www.qidian.com"></textarea>
                 </div>
@@ -33,16 +33,16 @@
                     <textarea rows="1" id="bookSourceGroup" class="base" title="bookSourceGroup"
                         placeholder="&lt;选填&gt;描述书源的特征信息"></textarea>
                 </div>
+                <div>
+                    <div>源注释　:</div>
+                    <textarea rows="1" id="bookSourceComment" class="base" title="bookSourceComment"
+                              placeholder="&lt;选填&gt;描述书源作者和状态"></textarea>
+                </div>
                 <div>
                     <div>登录地址:</div>
                     <textarea rows="1" id="loginUrl" class="base" title="loginUrl"
                         placeholder="&lt;选填&gt;填写网站登录网址,仅在需要登录的书源有用"></textarea>
                 </div>
-                <div>
-                    <div>注释:</div>
-                    <textarea rows="1" id="bookSourceComment" class="base" title="bookSourceComment"
-                              placeholder="&lt;选填&gt;描述书源作者和状态"></textarea>
-                </div>
                 <div>
                     <div>链接验证:</div>
                     <textarea rows="1" id="bookUrlPattern" class="base" title="bookUrlPattern"
@@ -257,6 +257,16 @@
                     <textarea rows="1" id="ruleContent_sourceRegex" class="ruleContent" title="sourceRegex"
                         placeholder="匹配资源的url特征，用于嗅探"></textarea>
                 </div>
+                <div>
+                    <div>替换规则:</div>
+                    <textarea rows="1" id="ruleContent_replaceRegex" class="ruleContent" title="replaceRegex"
+                        placeholder="多页内容合并后替换，用于正文净化"></textarea>
+                </div>
+                <div>
+                    <div>图片样式:</div>
+                    <textarea rows="1" id="ruleContent_imageStyle" class="ruleContent" title="imageStyle"
+                        placeholder="FULL:铺满 不填:默认样式"></textarea>
+                </div>
                 <p></p>
                 <div><b>其它规则</b></div>
                 <div>
diff --git a/app/src/main/assets/web/index.js b/app/src/main/assets/web/index.js
index 13e79007a..7b0ec52a3 100644
--- a/app/src/main/assets/web/index.js
+++ b/app/src/main/assets/web/index.js
@@ -33,7 +33,6 @@ const RuleJSON = (() => {
 	ruleJson.weight = 0;
 	ruleJson.enabled = true;
 	ruleJson.enabledExplore = true;
-    ruleJson.bookSourceComment = ""
 
 	// 搜索规则
 	$$('.rules .ruleSearch').forEach(item => searchJson[item.title] = '');
@@ -160,7 +159,6 @@ function rule2json() {
 	RuleJSON.ruleContent = contentJson;
 
 	RuleJSON.lastUpdateTime = RuleJSON.lastUpdateTime == '' ? 0 : parseInt(RuleJSON.lastUpdateTime);
-	RuleJSON.bookSourceComment = RuleJSON.bookSourceComment == '' ? "" : String(RuleJSON.bookSourceComment);
 	RuleJSON.customOrder = RuleJSON.customOrder == '' ? 0 : parseInt(RuleJSON.customOrder);
 	RuleJSON.weight = RuleJSON.weight == '' ? 0 : parseInt(RuleJSON.weight);
 	RuleJSON.bookSourceType == RuleJSON.bookSourceType == '' ? 0 : parseInt(RuleJSON.weight);