From 8ac203b885d1294740eb5c4bb8eedfd307460ba0 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 23 Apr 2024 09:23:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/select-group.vue        | 40 +++++++++++++------
 .../retry/scene/modules/scene-search.vue      |  2 +-
 .../workflow/modules/workflow-search.vue      |  2 +-
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/components/common/select-group.vue b/src/components/common/select-group.vue
index b52f61c..d344aa2 100644
--- a/src/components/common/select-group.vue
+++ b/src/components/common/select-group.vue
@@ -1,44 +1,60 @@
 <script setup lang="ts">
-import { onMounted, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 import { $t } from '@/locales';
 import { translateOptions2 } from '@/utils/common';
 import { fetchGetAllGroupNameList } from '@/service/api';
 
+defineOptions({
+  name: 'SelectGroup'
+});
+
+interface Props {
+  modelValue?: string | null;
+}
+
+const props = defineProps<Props>();
+
 const emit = defineEmits<Emits>();
 
 interface Emits {
-  (e: 'update:value', value: string): void;
+  (e: 'update:modelValue', value: string): void;
 }
 
 /** 组列表 */
 const groupNameList = ref<string[]>([]);
 /** 组列表 */
-const groupNameRef = ref<string>('');
+const groupName = ref<string>();
 
 async function getGroupNameList() {
-  const res = await fetchGetAllGroupNameList();
-  groupNameList.value = res.data as string[];
+  const { data, error } = await fetchGetAllGroupNameList();
+  if (!error) {
+    groupNameList.value = data;
+  }
 }
 
-onMounted(() => {
-  getGroupNameList();
-});
+getGroupNameList();
 
 watch(
-  () => groupNameRef.value,
+  () => props.modelValue,
   () => {
-    emit('update:value', groupNameRef.value);
-  }
+    groupName.value = props.modelValue!;
+  },
+  { immediate: true }
 );
+
+const handleUpdate = (value: string) => {
+  emit('update:modelValue', value);
+};
 </script>
 
 <template>
   <NSelect
-    v-model:value="groupNameRef"
+    v-model:value="groupName"
     :placeholder="$t('page.retryTask.form.groupName')"
     :options="translateOptions2(groupNameList)"
     clearable
     filterable
+    @update:value="handleUpdate"
   />
 </template>
 
diff --git a/src/views/retry/scene/modules/scene-search.vue b/src/views/retry/scene/modules/scene-search.vue
index 65a2137..c54abc3 100644
--- a/src/views/retry/scene/modules/scene-search.vue
+++ b/src/views/retry/scene/modules/scene-search.vue
@@ -61,7 +61,7 @@ function search() {
       <!--        @update:value="handleGroupNameUpdate"-->
       <!--      />-->
 
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model="model.groupName" />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.sceneName')" path="userName" class="pr-24px">
       <!--      <NSelect-->
diff --git a/src/views/workflow/modules/workflow-search.vue b/src/views/workflow/modules/workflow-search.vue
index dbd7c2d..5909638 100644
--- a/src/views/workflow/modules/workflow-search.vue
+++ b/src/views/workflow/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:value="model.groupName" />
+      <SelectGroup v-model="model.groupName" />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflow.workflowName')" path="workflowName" class="pr-24px">
       <NInput v-model:value="model.workflowName" :placeholder="$t('page.workflow.form.workflowName')" />