From b7681973ce2bd8a7f8d717d5e7042c99d780bb6e Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 10 Mar 2024 11:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BC=93=E5=AD=98=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=94=AE=E5=80=BC=E4=B8=AD=E5=A2=9E=E5=8A=A0=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BA=8E=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/components/cache/batch/task.go  | 13 +++++++++++++
 .../servers/components/cache/batch/task.html        |  9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/internal/web/actions/default/servers/components/cache/batch/task.go b/internal/web/actions/default/servers/components/cache/batch/task.go
index 047190e5..0a1c79d0 100644
--- a/internal/web/actions/default/servers/components/cache/batch/task.go
+++ b/internal/web/actions/default/servers/components/cache/batch/task.go
@@ -99,11 +99,24 @@ func (this *TaskAction) readTask(taskId int64) (ok bool) {
 			})
 		}
 
+		// 集群信息
+		var clusterMap = maps.Map{
+			"id":   0,
+			"name": "",
+		}
+		if key.NodeCluster != nil {
+			clusterMap = maps.Map{
+				"id":   key.NodeCluster.Id,
+				"name": key.NodeCluster.Name,
+			}
+		}
+
 		keyMaps = append(keyMaps, maps.Map{
 			"key":     key.Key,
 			"isDone":  key.IsDone,
 			"isDoing": key.IsDoing,
 			"errors":  errorMaps,
+			"cluster": clusterMap,
 		})
 	}
 
diff --git a/web/views/@default/servers/components/cache/batch/task.html b/web/views/@default/servers/components/cache/batch/task.html
index b5d72fe5..12dc0110 100644
--- a/web/views/@default/servers/components/cache/batch/task.html
+++ b/web/views/@default/servers/components/cache/batch/task.html
@@ -71,19 +71,24 @@
                 <span v-if="task.keyType == 'key'">URL</span>
                 <span v-if="task.keyType == 'prefix'">前缀</span>
             </th>
+            <th class="two wide">所属集群</th>
             <th class="width5">状态</th>
         </tr>
     </thead>
     <tbody v-for="key in task.keys">
         <tr>
-            <td>{{key.key}}
-
+            <td>
+                {{key.key}}
                 <div v-if="key.errors.length > 0" style="margin-top: 0.5em">
                     <a :href="'/clusters/cluster/node?nodeId=' + err.nodeId" v-for="err in key.errors" class="ui label basic tiny red">
                         节点{{err.nodeId}}：{{err.error}}
                     </a>
                 </div>
             </td>
+            <td>
+                <span v-if="key.cluster != null && key.cluster.id > 0">{{key.cluster.name}}</span>
+                <span v-else class="disabled">-</span>
+            </td>
             <td>
                 <span v-if="key.isDone && key.errors.length == 0" class="green">完成</span>
                 <span v-if="key.isDone && key.errors.length > 0" class="red">失败</span>