From 6d32a839d9850f87fe210cb2cc4eadfd460b5f97 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Mon, 27 May 2024 23:00:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0=5Fbeta3):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BB=84=E5=AF=BC=E5=87=BA=E5=AF=BC=E5=85=A5=E5=92=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F=201.=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BB=84=E7=9A=84=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=202.=20=E8=B0=83=E6=95=B4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F=203.=20=E8=B0=83=E6=95=B4=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E4=BB=BB=E5=8A=A1=E6=89=B9=E9=87=8F=E5=92=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E7=9A=84=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=204.=20=E8=B0=83=E6=95=B4=E9=87=8D=E8=AF=95=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/file-upload.vue |  5 ++-
 src/locales/langs/en-us.ts            |  1 +
 src/locales/langs/zh-cn.ts            |  1 +
 src/router/elegant/routes.ts          | 62 +++++++++++++--------------
 src/typings/app.d.ts                  |  1 +
 src/views/group/index.vue             | 17 +++++++-
 6 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/src/components/common/file-upload.vue b/src/components/common/file-upload.vue
index e22591b..853dd63 100644
--- a/src/components/common/file-upload.vue
+++ b/src/components/common/file-upload.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import type { UploadCustomRequestOptions, UploadFileInfo } from 'naive-ui';
 import { request } from '@/service/request';
+import { $t } from '@/locales';
 
 defineOptions({
-  name: 'FlieUpload'
+  name: 'FileUpload'
 });
 
 interface Props {
@@ -15,7 +16,7 @@ defineProps<Props>();
 
 const beforeUpload = (fileData: { file: UploadFileInfo; fileList: UploadFileInfo[] }) => {
   if (fileData.file.file?.type !== 'application/json') {
-    window.$message?.error('只能上传json格式的文件，请重新上传');
+    window.$message?.error($t('common.checkUploadType'));
     return false;
   }
   return true;
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index a7810c0..7f65c22 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -24,6 +24,7 @@ const local: App.I18n.Schema = {
     rollbackSuccess: 'Rollback Success',
     deleteSuccess: 'Delete Success',
     confirmDelete: 'Are you sure you want to delete?',
+    checkUploadType: 'Only JSON format files can be uploaded, please re-upload',
     import: 'import',
     export: 'export',
     batchCopy: 'BatchCopy',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 1e3e025..33aecae 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -24,6 +24,7 @@ const local: App.I18n.Schema = {
     rollbackSuccess: '回滚成功',
     deleteSuccess: '删除成功',
     confirmDelete: '确认删除吗？',
+    checkUploadType: '只能上传json格式的文件，请重新上传',
     import: '导入',
     export: '导出',
     batchCopy: '批量复制',
diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
index 16bf425..2a08ac6 100644
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@@ -215,16 +215,6 @@ export const generatedRoutes: GeneratedRoute[] = [
       icon: 'eos-icons:cronjob'
     },
     children: [
-      {
-        name: 'job_batch',
-        path: '/job/batch',
-        component: 'view.job_batch',
-        meta: {
-          title: 'job_batch',
-          i18nKey: 'route.job_batch',
-          icon: 'carbon:batch-job'
-        }
-      },
       {
         name: 'job_task',
         path: '/job/task',
@@ -234,6 +224,16 @@ export const generatedRoutes: GeneratedRoute[] = [
           i18nKey: 'route.job_task',
           icon: 'octicon:tasklist'
         }
+      },
+      {
+        name: 'job_batch',
+        path: '/job/batch',
+        component: 'view.job_batch',
+        meta: {
+          title: 'job_batch',
+          i18nKey: 'route.job_batch',
+          icon: 'carbon:batch-job'
+        }
       }
     ]
   },
@@ -444,6 +444,17 @@ export const generatedRoutes: GeneratedRoute[] = [
       icon: 'carbon:retry-failed'
     },
     children: [
+      {
+        name: 'retry_scene',
+        path: '/retry/scene',
+        component: 'view.retry_scene',
+        meta: {
+          title: 'retry_scene',
+          i18nKey: 'route.retry_scene',
+          icon: 'cbi:scene-dynamic',
+          order: 1
+        }
+      },
       {
         name: 'retry_dead-letter',
         path: '/retry/dead-letter',
@@ -466,17 +477,6 @@ export const generatedRoutes: GeneratedRoute[] = [
           order: 20
         }
       },
-      {
-        name: 'retry_scene',
-        path: '/retry/scene',
-        component: 'view.retry_scene',
-        meta: {
-          title: 'retry_scene',
-          i18nKey: 'route.retry_scene',
-          icon: 'cbi:scene-dynamic',
-          order: 40
-        }
-      },
       {
         name: 'retry_task',
         path: '/retry/task',
@@ -537,6 +537,16 @@ export const generatedRoutes: GeneratedRoute[] = [
       icon: 'lucide:workflow'
     },
     children: [
+      {
+        name: 'workflow_task',
+        path: '/workflow/task',
+        component: 'view.workflow_task',
+        meta: {
+          title: 'workflow_task',
+          i18nKey: 'route.workflow_task',
+          icon: 'octicon:tasklist'
+        }
+      },
       {
         name: 'workflow_batch',
         path: '/workflow/batch',
@@ -597,16 +607,6 @@ export const generatedRoutes: GeneratedRoute[] = [
             }
           }
         ]
-      },
-      {
-        name: 'workflow_task',
-        path: '/workflow/task',
-        component: 'view.workflow_task',
-        meta: {
-          title: 'workflow_task',
-          i18nKey: 'route.workflow_task',
-          icon: 'octicon:tasklist'
-        }
       }
     ]
   }
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index e616be8..3c409c9 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -274,6 +274,7 @@ declare namespace App {
         rollbackSuccess: string;
         deleteSuccess: string;
         confirmDelete: string;
+        checkUploadType: string;
         import: string;
         export: string;
         batchCopy: string;
diff --git a/src/views/group/index.vue b/src/views/group/index.vue
index 51d77d8..214499d 100644
--- a/src/views/group/index.vue
+++ b/src/views/group/index.vue
@@ -10,6 +10,7 @@ import { groupConfigIdModeRecord, yesOrNoRecord } from '@/constants/business';
 import { tagColor } from '@/utils/common';
 import StatusSwitch from '@/components/common/status-switch.vue';
 import { useAuth } from '@/hooks/business/auth';
+import { downloadFetch } from '@/utils/download';
 import GroupOperateDrawer from './modules/group-operate-drawer.vue';
 import GroupDetailDrawer from './modules/group-detail-drawer.vue';
 import GroupSearch from './modules/group-search.vue';
@@ -154,6 +155,10 @@ const {
 function edit(id: string) {
   handleEdit(id);
 }
+
+function handleExport() {
+  downloadFetch('/group/export', checkedRowKeys.value, $t('page.groupConfig.title'));
+}
 </script>
 
 <template>
@@ -175,7 +180,17 @@ function edit(id: string) {
           :show-add="hasAuth('R_ADMIN')"
           @add="handleAdd"
           @refresh="getData"
-        />
+        >
+          <template #addAfter>
+            <FileUpload action="/group/import" accept="application/json" />
+            <NButton size="small" ghost type="primary" @click="handleExport">
+              <template #icon>
+                <IconPajamasExport class="text-icon" />
+              </template>
+              {{ $t('common.export') }}
+            </NButton>
+          </template>
+        </TableHeaderOperation>
       </template>
       <NDataTable
         v-model:checked-row-keys="checkedRowKeys"