From 9cdfd0da1bf16f42e97506ee3bb5b6feb9dcf000 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 18 Apr 2022 21:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clusters/cluster/settings/dns/index.html         |  4 ++--
 web/views/@default/dns/tasks/listPopup.html          | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/views/@default/clusters/cluster/settings/dns/index.html b/web/views/@default/clusters/cluster/settings/dns/index.html
index 14e95c50..e4d8f341 100644
--- a/web/views/@default/clusters/cluster/settings/dns/index.html
+++ b/web/views/@default/clusters/cluster/settings/dns/index.html
@@ -13,7 +13,7 @@
 				<td>选择主域名 *</td>
 				<td>
 					<dns-domain-selector :v-domain-id="domainId" :v-domain-name="domainName" @change="changeDomain"></dns-domain-selector>
-					<p class="comment">用于生成集群节点和网站服务的DNS解析记录。</p>
+                    <p class="comment">用于生成集群节点和网站服务的DNS解析记录<span v-if="domainId > 0">，修改后将自动删除旧域名中的相关记录</span>。</p>
 				</td>
 			</tr>
 			<tr>
@@ -24,7 +24,7 @@
                         <span class="ui label" v-if="domain != null && domain.name != null && domain.name.length > 0">.{{domain.name}}</span>
                         <span class="ui label" v-else>.主域名</span>
 					</div>
-					<p class="comment">当前集群的子域名，和主域名一起组成集群节点的子域名。<a href="" @click.prevent="generateRandName()">[随机生成]</a>。</p>
+					<p class="comment">当前集群的子域名，和主域名一起组成集群节点的子域名，修改后将自动删除旧域名中的相关记录。<a href="" @click.prevent="generateRandName()">[随机生成]</a>。</p>
 				</td>
 			</tr>
             <tr>
diff --git a/web/views/@default/dns/tasks/listPopup.html b/web/views/@default/dns/tasks/listPopup.html
index 756512c1..0b81727d 100644
--- a/web/views/@default/dns/tasks/listPopup.html
+++ b/web/views/@default/dns/tasks/listPopup.html
@@ -10,20 +10,20 @@
                 <th>任务</th>
                 <th>状态</th>
                 <th>触发时间</th>
-                <th></th>
+                <th class="one op"></th>
             </tr>
         </thead>
         <tr v-for="task in tasks">
-            <td>
-                <span v-if="task.type == 'clusterChange'">{{task.cluster.name}}
+            <td nowrap="">
+                <span v-if="(task.type == 'clusterChange' || task.type == 'clusterRemoveDomain') && task.cluster != null">{{task.cluster.name}}
                     <link-icon :href="'/dns/clusters/cluster?clusterId=' + task.cluster.id" target="_top"></link-icon>
                 </span>
                 <span v-if="task.type == 'nodeChange'">{{task.node.name}}</span>
                 <span v-if="task.type == 'serverChange'">{{task.server.name}}</span>
                 <span v-if="task.type == 'domainChange'">{{task.domain.name}}</span>
             </td>
-            <td>
-                <span v-if="task.type == 'clusterChange'">集群</span>
+            <td nowrap="">
+                <span v-if="task.type == 'clusterChange' || task.type == 'clusterRemoveDomain'">集群</span>
                 <span v-if="task.type == 'nodeChange'">节点</span>
                 <span v-if="task.type == 'serverChange'">服务</span>
                 <span v-if="task.type == 'domainChange'">域名</span>
@@ -32,7 +32,7 @@
                 <span v-if="task.isDone" class="red">{{task.error}}</span>
                 <span v-else>正在同步...</span>
             </td>
-            <td>{{task.updatedTime}}</td>
+            <td nowrap="">{{task.updatedTime}}</td>
             <td>
                 <a href="" title="删除" class="remove-btn" @click.prevent="deleteTask(task.id)"><i class="icon remove small grey"></i></a>
             </td>