From d6d5c695d4471e34707130db32360a1c14bd269f Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 23 Apr 2024 12:13:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=9C=BA=E6=99=AF=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/business/ms-common-script/insertCommonScript.vue | 2 +-
 frontend/src/views/api-test/scenario/recycle/recycleTable.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/business/ms-common-script/insertCommonScript.vue b/frontend/src/components/business/ms-common-script/insertCommonScript.vue
index e665f0f5ef..eaf1fb188f 100644
--- a/frontend/src/components/business/ms-common-script/insertCommonScript.vue
+++ b/frontend/src/components/business/ms-common-script/insertCommonScript.vue
@@ -21,7 +21,7 @@
       </a-button>
       <a-input-search
         v-model:model-value="keyword"
-        :placeholder="t('project.menu.nameSearch')"
+        :placeholder="t('apiScenario.params.searchPlaceholder')"
         allow-clear
         class="mx-[8px] w-[240px]"
         @search="searchList"
diff --git a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
index 03da615f9d..227ba6a82d 100644
--- a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
+++ b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
@@ -570,7 +570,7 @@
               selectIds,
               selectAll: !!params?.selectAll,
               excludeIds: params?.excludeIds || [],
-              condition: { keyword: keyword.value },
+              condition: { ...params?.condition, keyword: keyword.value },
               projectId: appStore.currentProjectId,
               moduleIds: props.activeModule === 'all' ? [] : [props.activeModule],
             });