From fbee1276c1bdd1baebd062927692e433d93f1e93 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Thu, 25 Apr 2024 23:45:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=85=A5=E5=88=A0=E9=99=A4/=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=A4=E4=B8=AA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts   |  2 ++
 src/locales/langs/zh-cn.ts   |  2 ++
 src/service/api/job.ts       | 18 ++++++++++-
 src/typings/app.d.ts         |  2 ++
 src/views/job/task/index.vue | 58 ++++++++++++++++--------------------
 5 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index f5f2b64..4fba786 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -50,6 +50,8 @@ const local: App.I18n.Schema = {
     pause: 'Pause',
     finish: 'Finish',
     running: 'Running',
+    executeSuccess: 'Execute successfully',
+    executeFailed: 'Execute failed',
     confirmExecute: 'Are you sure you want to execute?',
     confirmResume: 'Are you sure you want to resume?',
     confirmPause: 'Are you sure you want to pause?',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 3e6d720..f3ac3d1 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -50,6 +50,8 @@ const local: App.I18n.Schema = {
     pause: '暂停',
     finish: '完成',
     running: '运行中',
+    executeSuccess: '执行成功',
+    executeFailed: '执行失败',
     confirmExecute: '确认执行吗？',
     confirmResume: '确认恢复吗？',
     confirmPause: '确认暂停吗？',
diff --git a/src/service/api/job.ts b/src/service/api/job.ts
index 51ac746..d38ff2c 100644
--- a/src/service/api/job.ts
+++ b/src/service/api/job.ts
@@ -27,7 +27,7 @@ export function fetchEditJob(data: Api.Job.Job) {
   });
 }
 
-/** edit Job */
+/** edit Job status */
 export function fetchUpdateJobStatus(data: Api.Job.JobUpdateJobStatusRequestVO) {
   return request<boolean>({
     url: '/job/status',
@@ -35,3 +35,19 @@ export function fetchUpdateJobStatus(data: Api.Job.JobUpdateJobStatusRequestVO)
     data
   });
 }
+
+/** delete Job by id */
+export function fetchDeleteJob(id: string) {
+  return request<boolean>({
+    url: `/job/${id}`,
+    method: 'delete'
+  });
+}
+
+/** trigger Job by id */
+export function fetchTriggerJob(jobId: string) {
+  return request<boolean>({
+    url: `/job/trigger/${jobId}`,
+    method: 'post'
+  });
+}
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index 34f04c3..7499405 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -296,6 +296,8 @@ declare namespace App {
         pause: string;
         finish: string;
         running: string;
+        executeSuccess: string;
+        executeFailed: string;
         confirmExecute: string;
         confirmResume: string;
         confirmPause: string;
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index e6f5503..865cc3e 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { NButton, NPopconfirm, NTag } from 'naive-ui';
-import { fetchGetJobPage, fetchUpdateJobStatus } from '@/service/api';
+import { fetchDeleteJob, fetchGetJobPage, fetchTriggerJob, fetchUpdateJobStatus } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
@@ -11,7 +11,7 @@ import JobTaskSearch from './modules/job-task-search.vue';
 
 const appStore = useAppStore();
 
-const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
+const { columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetJobPage,
   apiParams: {
     page: 1,
@@ -21,11 +21,6 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     jobStatus: null
   },
   columns: () => [
-    {
-      type: 'selection',
-      align: 'center',
-      width: 48
-    },
     {
       key: 'index',
       title: $t('common.index'),
@@ -65,11 +60,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
           callback();
         };
 
-        return (
-          <>
-            <StatusSwitch v-model:value={row.jobStatus} onFetch={fetchFn} />
-          </>
-        );
+        return <StatusSwitch v-model:value={row.jobStatus} onFetch={fetchFn} />;
       }
     },
     {
@@ -167,6 +158,16 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
               )
             }}
           </NPopconfirm>
+          <NPopconfirm onPositiveClick={() => handleTriggerJob(row.id!)}>
+            {{
+              default: () => $t('common.confirmExecute'),
+              trigger: () => (
+                <NButton type="error" ghost size="small">
+                  {$t('common.execute')}
+                </NButton>
+              )
+            }}
+          </NPopconfirm>
         </div>
       )
     }
@@ -180,28 +181,28 @@ const {
   handleAdd,
   handleEdit,
   checkedRowKeys,
-  onBatchDeleted,
   onDeleted
   // closeDrawer
 } = useTableOperate(data, getData);
 
-async function handleBatchDelete() {
-  // request
-  console.log(checkedRowKeys.value);
-
-  onBatchDeleted();
-}
-
-function handleDelete(id: string) {
-  // request
-  console.log(id);
-
+async function handleDelete(id: string) {
+  const { error } = await fetchDeleteJob(id);
+  if (error) return;
   onDeleted();
 }
 
 function edit(id: string) {
   handleEdit(id);
 }
+
+async function handleTriggerJob(id: string) {
+  const { error } = await fetchTriggerJob(id);
+  if (error) {
+    window.$message?.success($t('common.executeSuccess'));
+  } else {
+    window.$message?.error($t('common.executeFailed'));
+  }
+}
 </script>
 
 <template>
@@ -215,14 +216,7 @@ function edit(id: string) {
       header-class="view-card-header"
     >
       <template #header-extra>
-        <TableHeaderOperation
-          v-model:columns="columnChecks"
-          :disabled-delete="checkedRowKeys.length === 0"
-          :loading="loading"
-          @add="handleAdd"
-          @delete="handleBatchDelete"
-          @refresh="getData"
-        />
+        <TableHeaderOperation :loading="loading" :show-delete="false" @add="handleAdd" @refresh="getData" />
       </template>
       <NDataTable
         v-model:checked-row-keys="checkedRowKeys"