From e0920c3b8ac2ca7f2df1d45dc3a3f4b8cacd6e15 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 15 Jun 2022 15:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=93=E5=AD=98=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1Key=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/servers/components/cache/batch/task.go | 7 ++++---
 .../@default/servers/components/cache/batch/task.html      | 3 ++-
 2 files changed, 6 insertions(+), 4 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 abd8018c..6b361c8e 100644
--- a/internal/web/actions/default/servers/components/cache/batch/task.go
+++ b/internal/web/actions/default/servers/components/cache/batch/task.go
@@ -82,9 +82,10 @@ func (this *TaskAction) RunGet(params struct {
 		}
 
 		keyMaps = append(keyMaps, maps.Map{
-			"key":    key.Key,
-			"isDone": key.IsDone,
-			"errors": errorMaps,
+			"key":     key.Key,
+			"isDone":  key.IsDone,
+			"isDoing": key.IsDoing,
+			"errors":  errorMaps,
 		})
 	}
 
diff --git a/web/views/@default/servers/components/cache/batch/task.html b/web/views/@default/servers/components/cache/batch/task.html
index 24664a09..b5bf89b1 100644
--- a/web/views/@default/servers/components/cache/batch/task.html
+++ b/web/views/@default/servers/components/cache/batch/task.html
@@ -87,7 +87,8 @@
             <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>
-                <span v-if="!key.isDone" class="grey">未执行</span>
+                <span v-if="!key.isDone && !key.isDoing" class="grey">未执行</span>
+                <span v-if="!key.isDone && key.isDoing" class="grey">执行中</span>
             </td>
         </tr>
     </tbody>