From eb0ed778b10199ecb477c601b0329a53ec1dc3f6 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Wed, 29 May 2024 18:37:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E7=BB=84=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts                       |  2 +-
 src/typings/api.d.ts                             |  8 +++++++-
 src/views/group/index.vue                        | 10 +++++++++-
 src/views/group/modules/group-operate-drawer.vue |  9 ---------
 src/views/group/modules/group-search.vue         |  9 +++++++++
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 66d1f55..d2c9223 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -525,7 +525,7 @@ const local: App.I18n.Schema = {
       form: {
         groupName: 'Please enter group name',
         token: 'Please enter Token',
-        groupStatus: 'Group status',
+        groupStatus: 'Please select group status',
         description: 'Please enter description',
         idGeneratorMode: 'Please select ID generator mode',
         groupPartition: 'Please select Group partition',
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 3eb66ab..b81cfc4 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -378,9 +378,15 @@ declare namespace Api {
 
     /** groupConfig search params */
     type GroupConfigSearchParams = CommonType.RecordNullable<
-      Pick<Api.GroupConfig.GroupConfig, 'groupName'> & CommonSearchParams
+      Pick<Api.GroupConfig.GroupConfig, 'groupName' | 'groupStatus'> & CommonSearchParams
     >;
 
+    /** export groupConfig */
+    type ExportGroupConfig = Common.CommonRecord<{
+      groupIds: string[];
+    }> &
+      CommonType.RecordNullable<Pick<Api.GroupConfig.GroupConfig, 'groupName' | 'groupStatus'>>;
+
     type GroupConfigRequestVO = {
       groupName: string;
       groupStatus: GroupStatusType;
diff --git a/src/views/group/index.vue b/src/views/group/index.vue
index 768e8f8..d4c3142 100644
--- a/src/views/group/index.vue
+++ b/src/views/group/index.vue
@@ -161,8 +161,16 @@ function edit(id: string) {
   handleEdit(id);
 }
 
+function body(): Api.GroupConfig.ExportGroupConfig {
+  return {
+    groupName: searchParams.groupName,
+    groupStatus: searchParams.groupStatus,
+    groupIds: checkedRowKeys.value
+  };
+}
+
 function handleExport() {
-  downloadFetch('/group/export', checkedRowKeys.value, $t('page.groupConfig.title'));
+  downloadFetch('/group/export', body(), $t('page.groupConfig.title'));
 }
 </script>
 
diff --git a/src/views/group/modules/group-operate-drawer.vue b/src/views/group/modules/group-operate-drawer.vue
index 80c8654..88d8cf4 100644
--- a/src/views/group/modules/group-operate-drawer.vue
+++ b/src/views/group/modules/group-operate-drawer.vue
@@ -66,15 +66,6 @@ type RuleKey = Extract<
   'groupName' | 'token' | 'groupStatus' | 'idGeneratorMode' | 'initScene' | 'groupPartition'
 >;
 
-// const rules: Record<RuleKey, App.Global.FormRule> = {
-//   groupName: defaultRequiredRule,
-//   token: defaultRequiredRule,
-//   groupStatus: defaultRequiredRule,
-//   idGeneratorMode: defaultRequiredRule,
-//   initScene: defaultRequiredRule,
-//   groupPartition: defaultRequiredRule
-// };
-
 const rules = {
   groupName: [
     defaultRequiredRule,
diff --git a/src/views/group/modules/group-search.vue b/src/views/group/modules/group-search.vue
index b585bd6..0b12033 100644
--- a/src/views/group/modules/group-search.vue
+++ b/src/views/group/modules/group-search.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
+import { translateOptions } from '@/utils/common';
+import { groupConfigStatusOptions } from '@/constants/business';
 
 defineOptions({
   name: 'GroupSearch'
@@ -28,6 +30,13 @@ function search() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.groupConfig.groupName')" path="groupName" class="pr-24px">
       <NInput v-model:value="model.groupName" :placeholder="$t('page.groupConfig.form.groupName')" />
     </NFormItemGi>
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.groupConfig.groupStatus')" path="groupStatus" class="pr-24px">
+      <NSelect
+        v-model:value="model.groupStatus"
+        :placeholder="$t('page.groupConfig.form.groupStatus')"
+        :options="translateOptions(groupConfigStatusOptions)"
+      />
+    </NFormItemGi>
   </SearchForm>
 </template>