From 6928cf0041ba710207d70d7401c98c620e8c9416 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Mon, 22 Apr 2024 15:17:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E8=A7=A3=E5=86=B3groupConf?=
 =?UTF-8?q?ig=E6=90=9C=E7=B4=A2=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8Cdrawer=E6=89=93=E5=BC=80=E5=88=B7=E6=96=B0=E5=88=86?=
 =?UTF-8?q?=E5=8C=BA=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/group-config/index.vue                           | 2 +-
 .../group-config/modules/groupConfig-operate-drawer.vue    | 7 ++-----
 src/views/group-config/modules/groupConfig-search.vue      | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/group-config/index.vue b/src/views/group-config/index.vue
index f8695a8..cfdc3e8 100644
--- a/src/views/group-config/index.vue
+++ b/src/views/group-config/index.vue
@@ -15,7 +15,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
   apiParams: {
     page: 1,
     size: 10,
-    groupName: undefined
+    groupName: null
   },
   columns: () => [
     {
diff --git a/src/views/group-config/modules/groupConfig-operate-drawer.vue b/src/views/group-config/modules/groupConfig-operate-drawer.vue
index a4ee63c..c245d14 100644
--- a/src/views/group-config/modules/groupConfig-operate-drawer.vue
+++ b/src/views/group-config/modules/groupConfig-operate-drawer.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref, watch } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import { $t } from '@/locales';
 import { translateOptions, translateOptions2 } from '@/utils/common';
@@ -149,14 +149,11 @@ const getAllPartitions = async () => {
 
 watch(visible, () => {
   if (visible.value) {
+    getAllPartitions(); // 因为drawer会keepalive，onMounted不能报账每次打开drawer会调用刷新
     handleUpdateModelWhenEdit();
     restoreValidation();
   }
 });
-
-onMounted(async () => {
-  await getAllPartitions();
-});
 </script>
 
 <template>
diff --git a/src/views/group-config/modules/groupConfig-search.vue b/src/views/group-config/modules/groupConfig-search.vue
index ac11060..a25edcf 100644
--- a/src/views/group-config/modules/groupConfig-search.vue
+++ b/src/views/group-config/modules/groupConfig-search.vue
@@ -25,7 +25,7 @@ function search() {
 
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.groupConfig.groupName')" path="userName" class="pr-24px">
+    <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>
   </SearchForm>