From b2af8e196b1a0e8d6fd6b08ae4cf8c669e1aae51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Fri, 25 Mar 2022 14:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components.js                        |  4 ++--
 web/public/js/components/common/source-code-box.js | 11 ++++++++++-
 web/views/@default/clusters/tasks/listPopup.html   |  3 ++-
 web/views/@default/dns/tasks/listPopup.html        |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/web/public/js/components.js b/web/public/js/components.js
index 1762b797..e75ff901 100755
--- a/web/public/js/components.js
+++ b/web/public/js/components.js
@@ -6862,14 +6862,14 @@ Vue.component("http-compression-config-box", {
 						</div>
 					</div>
 					
-					<p class="comment">选择支持的压缩算法和优先顺序，拖动<i class="icon list small grey"></i>图表排序。</p>
+					<p class="comment" v-show="!config.useDefaultTypes">选择支持的压缩算法和优先顺序，拖动<i class="icon list small grey"></i>图表排序。</p>
 				</td>
 			</tr>
 			<tr>
 				<td>支持已压缩内容</td>
 				<td>
 					<checkbox v-model="config.decompressData"></checkbox>
-					<p class="comment">支持对已压缩内容尝试重新使用新的算法压缩。</p>
+					<p class="comment">支持对已压缩内容尝试重新使用新的算法压缩；不选中表示保留当前的压缩格式。</p>
 				</td>
 			</tr>
 			<tr>
diff --git a/web/public/js/components/common/source-code-box.js b/web/public/js/components/common/source-code-box.js
index 19ccbb56..a4714357 100644
--- a/web/public/js/components/common/source-code-box.js
+++ b/web/public/js/components/common/source-code-box.js
@@ -1,7 +1,7 @@
 let sourceCodeBoxIndex = 0
 
 Vue.component("source-code-box", {
-	props: ["name", "type", "id", "read-only", "width", "height"],
+	props: ["name", "type", "id", "read-only", "width", "height", "focus"],
 	mounted: function () {
 		let readOnly = this.readOnly
 		if (typeof readOnly != "boolean") {
@@ -53,6 +53,10 @@ Vue.component("source-code-box", {
 			})
 			boxEditor.setValue(value)
 
+			if (this.focus) {
+				boxEditor.focus()
+			}
+
 			let width = this.width
 			let height = this.height
 			if (width != null && height != null) {
@@ -64,6 +68,11 @@ Vue.component("source-code-box", {
 					}
 					boxEditor.setSize(width, height)
 				}
+			} else if (height != null) {
+				height = parseInt(height)
+				if (!isNaN(height)) {
+					boxEditor.setSize("100%", height)
+				}
 			}
 
 			let info = CodeMirror.findModeByMIME(this.type)
diff --git a/web/views/@default/clusters/tasks/listPopup.html b/web/views/@default/clusters/tasks/listPopup.html
index 72f84d51..7624b4bf 100644
--- a/web/views/@default/clusters/tasks/listPopup.html
+++ b/web/views/@default/clusters/tasks/listPopup.html
@@ -9,7 +9,7 @@
         <thead>
             <tr>
                 <th style="width:3em"><checkbox @input="checkAll"></checkbox></th>
-                <th>集群</th>
+                <th class="three wide">集群</th>
                 <th>节点</th>
                 <th>任务</th>
                 <th>状态</th>
@@ -29,6 +29,7 @@
                 <td>
                     <span v-if="task.type == 'configChanged'">同步配置</span>
                     <span v-if="task.type == 'ipItemChanged'">同步IP名单</span>
+                    <span v-if="task.type == 'scriptsChanged'">同步脚本</span>
                 </td>
                 <td>
                     <span v-if="task.isDone" class="red">{{task.error}}</span>
diff --git a/web/views/@default/dns/tasks/listPopup.html b/web/views/@default/dns/tasks/listPopup.html
index b3f594a6..756512c1 100644
--- a/web/views/@default/dns/tasks/listPopup.html
+++ b/web/views/@default/dns/tasks/listPopup.html
@@ -6,7 +6,7 @@
     <table class="ui table selectable celled">
         <thead>
             <tr>
-                <th>对象</th>
+                <th class="three wide">对象</th>
                 <th>任务</th>
                 <th>状态</th>
                 <th>触发时间</th>