From fbd0a27486dc84c2008aa3add610ad689ff3e3e6 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 20 Jun 2024 16:44:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8Btable=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E9=87=8F=E4=B8=8D=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?&=E6=8E=A5=E5=8F=A3CASE=E6=97=A0=E9=9C=80=E6=9B=B4=E6=96=B0coun?=
 =?UTF-8?q?t=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-associate-case/apiCaseTable.vue        | 21 +------------------
 .../business/ms-associate-case/apiTable.vue   |  1 +
 .../business/ms-associate-case/caseTree.vue   |  2 +-
 .../business/ms-associate-case/index.vue      |  9 +-------
 frontend/src/locale/en-US/common.ts           |  1 +
 5 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/business/ms-associate-case/apiCaseTable.vue b/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
index 2a9a965c33..0ef4764f73 100644
--- a/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
@@ -8,7 +8,6 @@
       moreAction: [],
     }"
     v-on="propsEvent"
-    @filter-change="getModuleCount"
   >
     <template #num="{ record }">
       <MsButton type="text" @click="toDetail(record)">{{ record.num }}</MsButton>
@@ -238,26 +237,13 @@
       excludeIds: [...excludeKeys],
       condition: {
         keyword: props.keyword,
+        filter: propsRes.value.filter,
       },
       protocols: props.protocols,
       ...props.extraTableParams,
     };
   }
 
-  async function getModuleCount() {
-    if (props.associatedIds && props.associatedIds.length) {
-      props.associatedIds.forEach((hasNotAssociatedId) => {
-        setTableSelected(hasNotAssociatedId);
-      });
-    }
-    const tableParams = await getTableParams();
-    emit('getModuleCount', {
-      ...tableParams,
-      current: propsRes.value.msPagination?.current,
-      pageSize: propsRes.value.msPagination?.pageSize,
-    });
-  }
-
   async function loadCaseList() {
     if (props.associatedIds && props.associatedIds.length) {
       props.associatedIds.forEach((hasNotAssociatedId) => {
@@ -267,11 +253,6 @@
     const tableParams = await getTableParams();
     setLoadListParams(tableParams);
     loadList();
-    emit('getModuleCount', {
-      ...tableParams,
-      current: propsRes.value.msPagination?.current,
-      pageSize: propsRes.value.msPagination?.pageSize,
-    });
   }
 
   const tableRef = ref<InstanceType<typeof MsBaseTable>>();
diff --git a/frontend/src/components/business/ms-associate-case/apiTable.vue b/frontend/src/components/business/ms-associate-case/apiTable.vue
index e8f2bd5dae..2368093b8e 100644
--- a/frontend/src/components/business/ms-associate-case/apiTable.vue
+++ b/frontend/src/components/business/ms-associate-case/apiTable.vue
@@ -193,6 +193,7 @@
       excludeIds: [...excludeKeys],
       condition: {
         keyword: props.keyword,
+        filter: propsRes.value.filter,
       },
       ...props.extraTableParams,
     };
diff --git a/frontend/src/components/business/ms-associate-case/caseTree.vue b/frontend/src/components/business/ms-associate-case/caseTree.vue
index 3b19e0ef62..31ab7bd42e 100644
--- a/frontend/src/components/business/ms-associate-case/caseTree.vue
+++ b/frontend/src/components/business/ms-associate-case/caseTree.vue
@@ -17,7 +17,7 @@
       allow-clear
       :max-length="255"
     />
-    <a-tooltip :content="isExpandAll ? t('common.collapseAllSubModule') : t('common.common.expandAllSubModule')">
+    <a-tooltip :content="isExpandAll ? t('common.collapseAllSubModule') : t('common.expandAllSubModule')">
       <a-button
         type="outline"
         class="expand-btn arco-btn-outline--secondary"
diff --git a/frontend/src/components/business/ms-associate-case/index.vue b/frontend/src/components/business/ms-associate-case/index.vue
index 4803627e90..10b917f1f7 100644
--- a/frontend/src/components/business/ms-associate-case/index.vue
+++ b/frontend/src/components/business/ms-associate-case/index.vue
@@ -136,7 +136,7 @@
           :filter-config-list="[]"
           :custom-fields-config-list="[]"
           :row-count="0"
-          :search-placeholder="t('ms.case.associate.searchPlaceholder')"
+          :search-placeholder="t('common.searchByIdName')"
           @keyword-search="loadCaseList"
           @adv-search="loadCaseList"
           @refresh="loadCaseList"
@@ -530,13 +530,6 @@
       }
     }
   );
-
-  watch(
-    () => innerProject.value,
-    (val) => {
-      innerProject.value = val;
-    }
-  );
 </script>
 
 <style scoped lang="less">
diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts
index 424f75b89d..05762998cb 100644
--- a/frontend/src/locale/en-US/common.ts
+++ b/frontend/src/locale/en-US/common.ts
@@ -166,6 +166,7 @@ export default {
   'common.resourceDeleted': 'Resource has been deleted',
   'common.resourceExpired': 'Link has failed, please get it again',
   'common.refresh': 'Refresh',
+  'common.searchByIdName': 'Search by ID or name',
   'common.searchByNameAndId': 'Search by ID, name, or tag',
   'common.archive': 'archive',
   'common.running': 'Running',