From 9a3166f150232e951f3c94072f7f9e474bc52fd8 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 7 Dec 2024 08:07:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.3.0-beta1):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=E5=A4=8D=E5=88=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE,=20=E4=BD=BF=E7=94=A8[=E6=9B=B4=E5=A4=9A]=E5=AF=B9?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E8=BF=9B=E8=A1=8C=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/common/table.ts                     |  10 ++
 src/views/job/task/index.vue                  | 120 +++++++++++++-----
 .../task/modules/job-task-operate-drawer.vue  |   4 +-
 3 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts
index 3e86d38..3544cfd 100644
--- a/src/hooks/common/table.ts
+++ b/src/hooks/common/table.ts
@@ -245,6 +245,15 @@ export function useTableOperate<T extends TableData = TableData>(data: Ref<T[]>,
     openDrawer();
   }
 
+  function handleCopy(id: T['id']) {
+    operateType.value = 'add';
+    const findItem = data.value.find(item => item.id === id) || null;
+    editingData.value = jsonClone(findItem);
+    delete editingData.value?.id;
+
+    openDrawer();
+  }
+
   /** the checked row keys of table */
   const checkedRowKeys = ref<string[]>([]);
 
@@ -272,6 +281,7 @@ export function useTableOperate<T extends TableData = TableData>(data: Ref<T[]>,
     handleAdd,
     editingData,
     handleEdit,
+    handleCopy,
     checkedRowKeys,
     onBatchDeleted,
     onDeleted
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 9a7349e..0aa96cc 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="tsx">
-import { NButton, NPopconfirm, NTag } from 'naive-ui';
+import { NButton, NDropdown, NPopconfirm, NTag } from 'naive-ui';
 import { useBoolean } from '@sa/hooks';
 import { ref } from 'vue';
 import { fetchBatchDeleteJob, fetchGetJobPage, fetchTriggerJob, fetchUpdateJobStatus } from '@/service/api';
@@ -177,41 +177,86 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       key: 'operate',
       title: $t('common.operate'),
       align: 'center',
-      width: 180,
+      width: 120,
       fixed: 'right',
-      render: row => (
-        <div class="flex-center gap-8px">
-          <NPopconfirm onPositiveClick={() => handleTriggerJob(row.id!)}>
-            {{
-              default: () => $t('common.confirmExecute'),
-              trigger: () => (
-                <NButton type="error" text ghost size="small">
-                  {$t('common.execute')}
-                </NButton>
-              )
-            }}
-          </NPopconfirm>
-          <n-divider vertical />
-          <NButton type="primary" ghost text size="small" onClick={() => goToBatch(row.id!)}>
-            {$t('common.batchList')}
-          </NButton>
-          <n-divider vertical />
-          <NButton type="warning" ghost text size="small" onClick={() => edit(row.id!)}>
-            {$t('common.edit')}
-          </NButton>
-          <n-divider vertical />
-          <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
-            {{
-              default: () => $t('common.confirmDelete'),
-              trigger: () => (
-                <NButton type="error" text ghost size="small">
-                  {$t('common.delete')}
-                </NButton>
-              )
-            }}
-          </NPopconfirm>
-        </div>
-      )
+      render: row => {
+        const options = [
+          {
+            label: $t('common.copy'),
+            key: 'copy',
+            click: () => copy(row.id!)
+          },
+          {
+            type: 'divider',
+            key: 'd2'
+          },
+          {
+            label: $t('common.batchList'),
+            key: 'batchList',
+            click: () => goToBatch(row.id!)
+          },
+          {
+            type: 'divider',
+            key: 'd2'
+          },
+          {
+            type: 'render',
+            key: 'delete',
+            render: () => (
+              <div class="flex-center">
+                <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
+                  {{
+                    default: () => $t('common.confirmDelete'),
+                    trigger: () => (
+                      <NButton quaternary size="small">
+                        {$t('common.delete')}
+                      </NButton>
+                    )
+                  }}
+                </NPopconfirm>
+              </div>
+            )
+          }
+        ];
+
+        const onSelect = (key: string) => {
+          const fun = options.filter(o => o.key === key)[0].click;
+          if (fun) fun();
+        };
+
+        return (
+          <div class="flex-center gap-8px">
+            <NButton text type="warning" ghost size="small" onClick={() => edit(row.id!)}>
+              {$t('common.edit')}
+            </NButton>
+
+            <n-divider vertical />
+
+            <NPopconfirm onPositiveClick={() => handleTriggerJob(row.id!)}>
+              {{
+                default: () => $t('common.confirmExecute'),
+                trigger: () => (
+                  <NButton type="error" text ghost size="small">
+                    {$t('common.execute')}
+                  </NButton>
+                )
+              }}
+            </NPopconfirm>
+
+            <n-divider vertical />
+
+            <NDropdown trigger="click" show-arrow={false} options={options} size="small" on-select={onSelect}>
+              {{
+                default: () => (
+                  <NButton text type="primary" ghost size="small">
+                    更多
+                  </NButton>
+                )
+              }}
+            </NDropdown>
+          </div>
+        );
+      }
     }
   ]
 });
@@ -222,6 +267,7 @@ const {
   editingData,
   handleAdd,
   handleEdit,
+  handleCopy,
   checkedRowKeys,
   onDeleted,
   onBatchDeleted
@@ -244,6 +290,10 @@ function edit(id: string) {
   handleEdit(id);
 }
 
+function copy(id: string) {
+  handleCopy(id);
+}
+
 async function handleTriggerJob(id: string) {
   const { error } = await fetchTriggerJob(id);
   if (error) {
diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue
index 684b692..1cf40c3 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -202,7 +202,7 @@ function createDefaultScriptParams() {
 }
 
 function handleUpdateModelWhenEdit() {
-  if (props.operateType === 'add') {
+  if (props.operateType === 'add' && !props.rowData) {
     Object.assign(model, createDefaultModel());
     executorCustomType.value = 0;
     httpHeaders.value = [];
@@ -211,7 +211,7 @@ function handleUpdateModelWhenEdit() {
     return;
   }
 
-  if (props.operateType === 'edit' && props.rowData) {
+  if (props.rowData) {
     Object.assign(model, props.rowData);
     if (model.taskType === 3 && model.argsStr) {
       Object.assign(dynamicForm, {