From 5769ba327fece2a869557e795c7d0ee8719c1c71 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 28 Mar 2024 19:02:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=9B=9E?=
 =?UTF-8?q?=E6=94=B6=E7=AB=99=E6=8A=A5=E5=91=8A=E5=80=BC=E4=BC=A0=E5=80=BC?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/recycle/case/caseTable.vue     | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue b/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue
index 08955f4066..4c5a227127 100644
--- a/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue
+++ b/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue
@@ -94,7 +94,7 @@
               <div class="flex items-center justify-center px-[6px] py-[2px]">
                 <a-checkbox-group v-model:model-value="lastReportStatusFilters" direction="vertical" size="small">
                   <a-checkbox v-for="val of lastReportStatusList" :key="val" :value="val">
-                    <span>{{ val }}</span>
+                    <ExecutionStatus :module-type="ReportEnum.API_REPORT" :status="val" />
                   </a-checkbox>
                 </a-checkbox-group>
               </div>
@@ -102,6 +102,13 @@
           </template>
         </a-trigger>
       </template>
+      <template #lastReportStatus="{ record }">
+        <ExecutionStatus
+          :module-type="ReportEnum.API_REPORT"
+          :status="record.lastReportStatus"
+          :class="[!record.lastReportId ? '' : 'cursor-pointer']"
+        />
+      </template>
       <template #passRateColumn>
         <div class="flex items-center text-[var(--color-text-3)]">
           {{ t('case.passRate') }}
@@ -150,6 +157,7 @@
   import useTable from '@/components/pure/ms-table/useTable';
   import caseLevel from '@/components/business/ms-case-associate/caseLevel.vue';
   import apiStatus from '@/views/api-test/components/apiStatus.vue';
+  import ExecutionStatus from '@/views/api-test/report/component/reportStatus.vue';
 
   import {
     batchDeleteRecycleCase,
@@ -166,6 +174,7 @@
 
   import { ApiCaseBatchParams, ApiCaseDetail } from '@/models/apiTest/management';
   import { RequestDefinitionStatus } from '@/enums/apiEnum';
+  import { ReportEnum, ReportStatus } from '@/enums/reportEnum';
   import { TableKeyEnum } from '@/enums/tableEnum';
 
   const props = defineProps<{
@@ -180,7 +189,6 @@
   const { openModal } = useModal();
 
   const keyword = ref('');
-  const refreshModuleTree: (() => Promise<any>) | undefined = inject('refreshModuleTree');
 
   const columns: MsTableColumn = [
     {
@@ -247,9 +255,9 @@
     {
       title: 'case.lastReportStatus',
       dataIndex: 'lastReportStatus',
+      slotName: 'lastReportStatus',
       titleSlotName: 'lastReportStatusFilter',
       showInTable: false,
-      showTooltip: true,
       width: 150,
       showDrag: true,
     },
@@ -366,20 +374,26 @@
   };
 
   const statusFilterVisible = ref(false);
-  const statusFilters = ref<string[]>([]);
+  const statusFilters = ref(Object.keys(RequestDefinitionStatus));
+  const defaultStatusFiltersLength = ref(Object.keys(RequestDefinitionStatus)).value.length;
   const caseLevelFields = ref<Record<string, any>>({});
   const caseFilterVisible = ref(false);
   const caseFilters = ref<string[]>([]);
+  const defaultCaseFilters = ref<string[]>([]);
   const caseLevelList = computed(() => {
     return caseLevelFields.value?.options || [];
   });
   const lastReportStatusFilterVisible = ref(false);
-  const lastReportStatusList = ['error', 'FakeError', 'success'];
-  const lastReportStatusFilters = ref<string[]>([]);
+  const lastReportStatusList = computed(() => {
+    return Object.keys(ReportStatus[ReportEnum.API_REPORT]);
+  });
+  const defaultLastReportStatusLength = ref(Object.keys(ReportStatus[ReportEnum.API_REPORT])).value.length;
+  const lastReportStatusFilters = ref<string[]>(Object.keys(ReportStatus[ReportEnum.API_REPORT]));
 
   const moduleIds = computed(() => {
     return props.activeModule === 'all' ? [] : [props.activeModule];
   });
+
   function loadCaseList() {
     const params = {
       keyword: keyword.value,
@@ -387,9 +401,10 @@
       moduleIds: moduleIds.value,
       protocol: props.protocol,
       filter: {
-        status: statusFilters.value,
-        priority: caseFilters.value,
-        lastReportStatus: lastReportStatusFilters.value,
+        status: statusFilters.value.length === defaultStatusFiltersLength ? [] : statusFilters.value,
+        priority: caseFilters.value.length === defaultCaseFilters.value.length ? [] : caseFilters.value,
+        lastReportStatus:
+          lastReportStatusFilters.value.length === defaultLastReportStatusLength ? [] : lastReportStatusFilters.value,
       },
     };
     setLoadListParams(params);
@@ -405,6 +420,7 @@
     const result = await getCaseDefaultFields(appStore.currentProjectId);
     caseLevelFields.value = result.customFields.find((item: any) => item.internal && item.fieldName === '用例等级');
     caseFilters.value = caseLevelFields.value?.options.map((item: any) => item.text);
+    defaultCaseFilters.value = caseLevelFields.value?.options.map((item: any) => item.text);
   }
 
   onBeforeMount(() => {