From 6748d5bc244c5288253a748c5e53da87c3dbed35 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Thu, 30 May 2024 17:13:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=201=E3=80=81=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=202=E3=80=81=E5=AF=BC=E5=85=A5=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/file-upload.vue         |  7 ++++++
 src/typings/api.d.ts                          |  5 ++++
 src/views/group/index.vue                     |  2 +-
 src/views/job/task/index.vue                  |  2 +-
 src/views/retry/scene/index.vue               |  2 +-
 src/views/workflow/task/index.vue             | 23 +++++++++++++------
 .../workflow/task/modules/workflow-search.vue |  2 +-
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/components/common/file-upload.vue b/src/components/common/file-upload.vue
index 853dd63..0b40d64 100644
--- a/src/components/common/file-upload.vue
+++ b/src/components/common/file-upload.vue
@@ -7,6 +7,12 @@ defineOptions({
   name: 'FileUpload'
 });
 
+const emit = defineEmits<Emits>();
+
+interface Emits {
+  (e: 'refresh'): void;
+}
+
 interface Props {
   accept?: string;
   action?: string;
@@ -51,6 +57,7 @@ const handleImport = ({
   })
     .then(() => {
       onFinish();
+      emit('refresh');
     })
     .catch(() => onError());
 };
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index b81cfc4..056cb72 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -894,6 +894,11 @@ declare namespace Api {
       Pick<Api.Workflow.Workflow, 'workflowName' | 'groupName' | 'workflowStatus'> & CommonSearchParams
     >;
 
+    type ExportWorkflow = Common.CommonRecord<{
+      workflowIds: String[];
+    }> &
+      WorkflowSearchParams;
+
     /** workflow list */
     type WorkflowList = Common.PaginatingQueryRecord<Workflow>;
   }
diff --git a/src/views/group/index.vue b/src/views/group/index.vue
index d4c3142..b59a7dc 100644
--- a/src/views/group/index.vue
+++ b/src/views/group/index.vue
@@ -195,7 +195,7 @@ function handleExport() {
           @refresh="getData"
         >
           <template #addAfter>
-            <FileUpload v-if="hasAuth('R_ADMIN')" action="/group/import" accept="application/json" />
+            <FileUpload v-if="hasAuth('R_ADMIN')" action="/group/import" accept="application/json" @refresh="getData" />
             <NPopconfirm @positive-click="handleExport">
               <template #trigger>
                 <NButton size="small" ghost type="primary" :disabled="checkedRowKeys.length === 0 && hasAuth('R_USER')">
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 821af29..586b237 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -277,7 +277,7 @@ function handleExport() {
           @refresh="getData"
         >
           <template #addAfter>
-            <FileUpload action="/job/import" accept="application/json" />
+            <FileUpload action="/job/import" accept="application/json" @refresh="getData" />
             <NPopconfirm @positive-click="handleExport">
               <template #trigger>
                 <NButton size="small" ghost type="primary" :disabled="checkedRowKeys.length === 0 && hasAuth('R_USER')">
diff --git a/src/views/retry/scene/index.vue b/src/views/retry/scene/index.vue
index f569479..fa0ffd2 100644
--- a/src/views/retry/scene/index.vue
+++ b/src/views/retry/scene/index.vue
@@ -222,7 +222,7 @@ function handleExport() {
           @refresh="getData"
         >
           <template #addAfter>
-            <FileUpload action="/scene-config/import" accept="application/json" />
+            <FileUpload action="/scene-config/import" accept="application/json" @refresh="getData" />
             <NPopconfirm @positive-click="handleExport">
               <template #trigger>
                 <NButton size="small" ghost type="primary" :disabled="checkedRowKeys.length === 0 && hasAuth('R_USER')">
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index 4841aa6..fb5d736 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -33,11 +33,11 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     workflowStatus: null
   },
   columns: () => [
-    // {
-    //   type: 'selection',
-    //   align: 'center',
-    //   width: 48
-    // },
+    {
+      type: 'selection',
+      align: 'center',
+      width: 48
+    },
     {
       key: 'id',
       title: $t('common.index'),
@@ -251,8 +251,17 @@ async function execute(id: string) {
   }
 }
 
+function body(): Api.Workflow.ExportWorkflow {
+  return {
+    workflowIds: checkedRowKeys.value,
+    groupName: searchParams.groupName,
+    workflowName: searchParams.workflowName,
+    workflowStatus: searchParams.workflowStatus
+  };
+}
+
 function handleExport() {
-  downloadFetch('/workflow/export', checkedRowKeys.value, $t('page.workflow.title'));
+  downloadFetch('/workflow/export', body(), $t('page.workflow.title'));
 }
 </script>
 
@@ -277,7 +286,7 @@ function handleExport() {
           @refresh="getData"
         >
           <template #addAfter>
-            <FileUpload action="/workflow/import" accept="application/json" />
+            <FileUpload action="/workflow/import" accept="application/json" @refresh="getData" />
             <NPopconfirm @positive-click="handleExport">
               <template #trigger>
                 <NButton size="small" ghost type="primary" :disabled="checkedRowKeys.length === 0 && hasAuth('R_USER')">
diff --git a/src/views/workflow/task/modules/workflow-search.vue b/src/views/workflow/task/modules/workflow-search.vue
index d7943b1..622755b 100644
--- a/src/views/workflow/task/modules/workflow-search.vue
+++ b/src/views/workflow/task/modules/workflow-search.vue
@@ -29,7 +29,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflow.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:12 m:6"