From 40c289b725f4885d67df52218f37b8116ea98f59 Mon Sep 17 00:00:00 2001
From: wodeyangzipingpingwuqi <zhengweilins@foxmail.com>
Date: Tue, 28 May 2024 11:00:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.0.0=5Fbeta3):=20=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1bug=E4=BF=AE=E6=94=B9=201.=20=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E4=BB=BB=E5=8A=A1-=E9=87=8D=E7=BD=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=97=A0=E6=95=88=202.=20=E9=87=8D=E8=AF=95=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1-=E5=88=A0=E9=99=A4=E9=87=8D=E8=AF=95=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E3=80=81=E6=AD=BB=E4=BF=A1=E4=BB=BB=E5=8A=A1=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/retry/dead-letter/index.vue         |  5 ++-
 .../modules/dead-letter-search.vue            | 38 ++++---------------
 src/views/retry/log/index.vue                 |  1 +
 .../retry/log/modules/retry-log-search.vue    |  2 +-
 .../retry/scene/modules/scene-search.vue      |  2 +-
 5 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/views/retry/dead-letter/index.vue b/src/views/retry/dead-letter/index.vue
index 574524b..50c2ace 100644
--- a/src/views/retry/dead-letter/index.vue
+++ b/src/views/retry/dead-letter/index.vue
@@ -27,7 +27,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
   apiFn: fetchGetRetryDeadLetterPageList,
   apiParams: {
     page: 1,
-    size: 10
+    size: 10,
+    groupName: null,
+    sceneName: null
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
   },
@@ -191,6 +193,7 @@ async function rollback(row: Api.RetryDeadLetter.DeadLetter) {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
+          :show-add="false"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @refresh="getData"
diff --git a/src/views/retry/dead-letter/modules/dead-letter-search.vue b/src/views/retry/dead-letter/modules/dead-letter-search.vue
index 70af4e3..ef90023 100644
--- a/src/views/retry/dead-letter/modules/dead-letter-search.vue
+++ b/src/views/retry/dead-letter/modules/dead-letter-search.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import { $t } from '@/locales';
-import { translateOptions2 } from '@/utils/common';
-import { fetchGetAllGroupNameList, fetchGetRetrySceneList } from '@/service/api';
+import { fetchGetAllGroupNameList } from '@/service/api';
+import SelectGroup from '@/components/common/select-group.vue';
+import SelectScene from '@/components/common/select-scene.vue';
 
 defineOptions({
   name: 'RetryDeadLetterSearch'
@@ -19,24 +20,12 @@ const model = defineModel<Api.RetryDeadLetter.RetryDeadLetterSearchParams>('mode
 
 /** 组列表 */
 const groupNameList = ref<string[]>([]);
-/** 场景列表 */
-const sceneNameList = ref<string[]>([]);
 
 async function getGroupNameList() {
   const res = await fetchGetAllGroupNameList();
   groupNameList.value = res.data as string[];
 }
 
-async function handleGroupNameUpdate(groupName: string) {
-  if (groupName) {
-    const res = await fetchGetRetrySceneList({ groupName });
-    sceneNameList.value = res.data!.map((scene: Api.RetryScene.Scene) => scene.sceneName);
-  } else {
-    model.value.sceneName = '';
-    sceneNameList.value = [];
-  }
-}
-
 function reset() {
   emit('reset');
 }
@@ -52,24 +41,11 @@ onMounted(() => {
 
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryDeadLetter.groupName')" path="groupName" class="py-1 pr-24px">
-      <NSelect
-        v-model:value="model.groupName"
-        :placeholder="$t('page.retryDeadLetter.form.groupName')"
-        :options="translateOptions2(groupNameList)"
-        clearable
-        filterable
-        @update:value="handleGroupNameUpdate"
-      />
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
+      <SelectGroup v-model:value="model.groupName" />
     </NFormItemGi>
-
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryDeadLetter.sceneName')" path="sceneName" class="py-1 pr-24px">
-      <NSelect
-        v-model:value="model.sceneName"
-        :placeholder="$t('page.retryDeadLetter.form.sceneName')"
-        :options="translateOptions2(sceneNameList)"
-        clearable
-      />
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index b92bee7..2857515 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -184,6 +184,7 @@ async function loadRetryInfo(row: Api.RetryLog.RetryLog) {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
+          :show-add="false"
           @delete="handleBatchDelete"
           @refresh="getData"
         />
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index f183740..2f5fba8 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -28,7 +28,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.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" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
       <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
diff --git a/src/views/retry/scene/modules/scene-search.vue b/src/views/retry/scene/modules/scene-search.vue
index 5a886ec..1472458 100644
--- a/src/views/retry/scene/modules/scene-search.vue
+++ b/src/views/retry/scene/modules/scene-search.vue
@@ -28,7 +28,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.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" :label="$t('page.retryScene.sceneName')" path="sceneName" class="pr-24px">
       <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />