From 701da484c6a4b6bdd9fbc21e882ab7acd3a24543 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Wed, 1 Mar 2023 18:17:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/cornjob.go              | 5 +----
 frontend/src/lang/modules/en.ts             | 1 +
 frontend/src/lang/modules/zh.ts             | 1 +
 frontend/src/views/cronjob/record/index.vue | 7 ++++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/backend/app/service/cornjob.go b/backend/app/service/cornjob.go
index 046629421..fc9d2d7ee 100644
--- a/backend/app/service/cornjob.go
+++ b/backend/app/service/cornjob.go
@@ -162,10 +162,7 @@ func (u *CronjobService) HandleOnce(id uint) error {
 	if cronjob.ID == 0 {
 		return constant.ErrRecordNotFound
 	}
-
-	record := cronjobRepo.StartRecords(cronjob.ID, "")
-	record.FromLocal = cronjob.KeepLocal
-	go u.HandleJob(&cronjob)
+	u.HandleJob(&cronjob)
 	return nil
 }
 
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 1cebd52ed..0278297e4 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -164,6 +164,7 @@ export default {
         status: {
             running: 'Running',
             stopped: 'Stopped',
+            waiting: 'Waiting',
             success: 'Success',
             failed: 'Failed',
             error: 'Error',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index e396ccdb1..754f40284 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -170,6 +170,7 @@ export default {
         status: {
             running: '已启动',
             success: '成功',
+            waiting: '执行中',
             failed: '失败',
             stopped: '已停止',
             error: '失败',
diff --git a/frontend/src/views/cronjob/record/index.vue b/frontend/src/views/cronjob/record/index.vue
index b59179e1e..5c182c360 100644
--- a/frontend/src/views/cronjob/record/index.vue
+++ b/frontend/src/views/cronjob/record/index.vue
@@ -94,6 +94,7 @@
                             <template #prefix>{{ $t('commons.table.status') }}</template>
                             <el-option :label="$t('commons.table.all')" value="" />
                             <el-option :label="$t('commons.status.success')" value="Success" />
+                            <el-option :label="$t('commons.status.waiting')" value="Waiting" />
                             <el-option :label="$t('commons.status.failed')" value="Failed" />
                         </el-select>
                     </el-col>
@@ -111,6 +112,7 @@
                                     class="infinite-list-item"
                                 >
                                     <el-icon v-if="item.status === 'Success'"><Select /></el-icon>
+                                    <el-icon v-if="item.status === 'Waiting'"><Loading /></el-icon>
                                     <el-icon v-if="item.status === 'Failed'"><CloseBold /></el-icon>
                                     <span v-if="index === currentRecordIndex" style="color: red">
                                         {{ dateFormat(0, 0, item.startTime) }}
@@ -242,9 +244,12 @@
                                             >
                                                 <el-tag type="danger">{{ $t('commons.table.statusFailed') }}</el-tag>
                                             </el-tooltip>
-                                            <el-tag type="success" v-else>
+                                            <el-tag type="success" v-if="currentRecord?.status === 'Success'">
                                                 {{ $t('commons.table.statusSuccess') }}
                                             </el-tag>
+                                            <el-tag type="info" v-if="currentRecord?.status === 'Waiting'">
+                                                {{ $t('commons.table.statusWaiting') }}
+                                            </el-tag>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>