From 6787bbc9d41627e171d20916377a217e0867ea5a Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 22 May 2024 18:49:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E8=A1=A8=E5=A4=B4=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/management/mock/mockTable.vue  |  4 ++--
 .../test-plan/report/component/reportList.vue | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
index 405326ed5b..5720c83080 100644
--- a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
+++ b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
@@ -74,8 +74,8 @@
           class="!mr-0"
           @click="handleCopyMock(record)"
         >
-          {{ t('common.copy') }} </MsButton
-        >x
+          {{ t('common.copy') }}
+        </MsButton>
         <a-divider direction="vertical" :margin="8"></a-divider>
         <MsTableMoreAction :list="tableMoreActionList" @select="handleTableMoreActionSelect($event, record)" />
       </template>
diff --git a/frontend/src/views/test-plan/report/component/reportList.vue b/frontend/src/views/test-plan/report/component/reportList.vue
index 76ee58ab80..9a7849ecc7 100644
--- a/frontend/src/views/test-plan/report/component/reportList.vue
+++ b/frontend/src/views/test-plan/report/component/reportList.vue
@@ -16,7 +16,7 @@
           @press-enter="searchList"
           @clear="searchList"
         />
-        <a-button type="outline" class="arco-btn-outline--secondary !p-[8px]" @click="initData">
+        <a-button type="outline" class="arco-btn-outline--secondary !p-[8px]" @click="initData()">
           <template #icon>
             <icon-refresh class="text-[var(--color-text-4)]" />
           </template>
@@ -30,6 +30,7 @@
       :action-config="tableBatchActions"
       v-on="propsEvent"
       @batch-action="handleTableBatch"
+      @filter-change="filterChange"
     >
       <template #name="{ record, rowIndex }">
         <div
@@ -209,7 +210,6 @@
       title: 'report.result',
       dataIndex: 'resultStatus',
       slotName: 'resultStatus',
-      titleSlotName: 'statusFilter',
       sortable: {
         sortDirections: ['ascend', 'descend'],
         sorter: true,
@@ -280,7 +280,7 @@
       return false;
     }
   };
-  const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
+  const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector, resetFilterParams } = useTable(
     reportList,
     {
       tableKey: TableKeyEnum.TEST_PLAN_REPORT_TABLE,
@@ -300,11 +300,17 @@
     rename
   );
 
-  function initData() {
+  function initData(dataIndex?: string, value?: string[] | (string | number | boolean)[] | undefined) {
+    const filterParams = {
+      ...propsRes.value.filter,
+    };
+    if (dataIndex && value) {
+      filterParams[dataIndex] = value;
+    }
     setLoadListParams({
       keyword: keyword.value,
       projectId: appStore.currentProjectId,
-      filter: { ...propsRes.value.filter, integrated: integratedFilters.value },
+      filter: { ...filterParams, integrated: integratedFilters.value },
     });
     loadList();
   }
@@ -368,6 +374,7 @@
     resetSelector();
     initData();
   }
+
   const handleDelete = async (id: string, currentName: string) => {
     openModal({
       type: 'error',
@@ -398,14 +405,18 @@
 
   function changeShowType(val: string | number | boolean) {
     showType.value = val as ReportShowType;
+    resetFilterParams();
     resetSelector();
-    console.log(propsRes.value);
     propsRes.value.filter = {
       integrated: integratedFilters.value,
     };
     initData();
   }
 
+  function filterChange(dataIndex: string, value: string[] | (string | number | boolean)[] | undefined) {
+    initData(dataIndex, value);
+  }
+
   /**
    * 报告详情 showReportDetail
    */