From ca99eeca1411df51417def9e50fe41587b9a96b1 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 21 Mar 2024 19:59:34 +0800
Subject: [PATCH] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=BA=E6=99=AF=E8=A1=A8=E6=A0=BC=E9=92=88?=
 =?UTF-8?q?=E4=B8=AD=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/mapper/ExtApiScenarioMapper.xml       | 14 ++++++
 .../scenario/components/scenarioTable.vue     | 49 ++++++++++++++++++-
 .../src/views/api-test/scenario/index.vue     | 15 +++---
 .../scenario/recycle/recycleTable.vue         | 49 ++++++++++++++++++-
 4 files changed, 118 insertions(+), 9 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
index 0830d96c0b..e4ba3be4ba 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
@@ -214,6 +214,20 @@
             <foreach collection="${filter}.entrySet()" index="key" item="values">
                 <if test="values != null and values.size() > 0">
                     <choose>
+                        <when test="key=='lastReportStatus' and values.size() != 7 ">
+                            <!--    取值范围在7个状态（成功、失败、误报、停止、执行中、重跑中、排队中）内选。如果全部全选，则不用拼接这条语句-->
+                            <if test="values.contains('PENDING')">
+                                and (
+                                (api_scenario.last_report_status is null or api_scenario.last_report_status = '')
+                                or api_scenario.last_report_status in
+                                <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
+                                )
+                            </if>
+                            <if test="!values.contains('PENDING')">
+                                and api_scenario.last_report_status in
+                                <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
+                            </if>
+                        </when>
                         <when test="key=='status'">
                             and api_scenario.status in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
diff --git a/frontend/src/views/api-test/scenario/components/scenarioTable.vue b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
index 19d0587e6d..91c3b00549 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioTable.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
@@ -86,6 +86,43 @@
           </a-option>
         </a-select>
       </template>
+      <!-- 报告结果筛选 -->
+      <template #lastReportStatusFilter="{ columnConfig }">
+        <a-trigger
+          v-model:popup-visible="lastReportStatusFilterVisible"
+          trigger="click"
+          @popup-visible-change="handleFilterHidden"
+        >
+          <a-button
+            type="text"
+            class="arco-btn-text--secondary p-[8px_4px]"
+            @click="lastReportStatusFilterVisible = true"
+          >
+            <div class="font-medium">
+              {{ t(columnConfig.title as string) }}
+            </div>
+            <icon-down :class="lastReportStatusFilterVisible ? 'text-[rgb(var(--primary-5))]' : ''" />
+          </a-button>
+          <template #content>
+            <div class="arco-table-filters-content">
+              <div class="flex items-center justify-center px-[6px] py-[2px]">
+                <a-checkbox-group v-model:model-value="lastReportStatusListFilters" direction="vertical" size="small">
+                  <a-checkbox v-for="key of lastReportStatusFilters" :key="key" :value="key">
+                    <ExecutionStatus :module-type="ReportEnum.API_SCENARIO_REPORT" :status="key" />
+                  </a-checkbox>
+                </a-checkbox-group>
+              </div>
+            </div>
+          </template>
+        </a-trigger>
+      </template>
+      <template #lastReportStatus="{ record }">
+        <ExecutionStatus
+          v-if="record.lastReportStatus"
+          :module-type="ReportEnum.API_SCENARIO_REPORT"
+          :status="record.lastReportStatus"
+        />
+      </template>
       <template #operation="{ record }">
         <MsButton
           v-permission="['PROJECT_API_SCENARIO:READ+EXECUTE']"
@@ -256,6 +293,7 @@
   import type { CaseLevel } from '@/components/business/ms-case-associate/types';
   import type { MsTreeNodeData } from '@/components/business/ms-tree/types';
   import apiStatus from '@/views/api-test/components/apiStatus.vue';
+  import ExecutionStatus from '@/views/api-test/report/component/reportStatus.vue';
   import operationScenarioModuleTree from '@/views/api-test/scenario/components/operationScenarioModuleTree.vue';
 
   import {
@@ -273,6 +311,7 @@
 
   import { ApiScenarioTableItem, ApiScenarioUpdateDTO } from '@/models/apiTest/scenario';
   import { ApiScenarioStatus } from '@/enums/apiEnum';
+  import { ReportEnum, ReportStatus } from '@/enums/reportEnum';
   import { TableKeyEnum } from '@/enums/tableEnum';
 
   const props = defineProps<{
@@ -281,7 +320,11 @@
     offspringIds: string[];
     readOnly?: boolean; // 是否是只读模式
   }>();
-
+  const lastReportStatusFilterVisible = ref(false);
+  const lastReportStatusListFilters = ref<string[]>(Object.keys(ReportStatus[ReportEnum.API_SCENARIO_REPORT]));
+  const lastReportStatusFilters = computed(() => {
+    return Object.keys(ReportStatus[ReportEnum.API_SCENARIO_REPORT]);
+  });
   const appStore = useAppStore();
   const { t } = useI18n();
   const { openModal } = useModal();
@@ -354,8 +397,9 @@
     },
     {
       title: 'apiScenario.table.columns.runResult',
-      titleSlotName: 'lastReportStatus',
+      titleSlotName: 'lastReportStatusFilter',
       dataIndex: 'lastReportStatus',
+      slotName: 'lastReportStatus',
       showTooltip: true,
       width: 100,
       showDrag: true,
@@ -510,6 +554,7 @@
       projectId: appStore.currentProjectId,
       moduleIds,
       filter: {
+        lastReportStatus: lastReportStatusListFilters.value,
         status: statusFilters.value.length === Object.keys(ApiScenarioStatus).length ? undefined : statusFilters.value,
       },
     };
diff --git a/frontend/src/views/api-test/scenario/index.vue b/frontend/src/views/api-test/scenario/index.vue
index b6ba3d735f..39ef38e309 100644
--- a/frontend/src/views/api-test/scenario/index.vue
+++ b/frontend/src/views/api-test/scenario/index.vue
@@ -156,8 +156,16 @@
     offspringIds.value = _offspringIds;
   }
 
+  async function selectRecycleCount() {
+    const res = await getTrashModuleCount({
+      projectId: appStore.currentProjectId,
+    });
+    recycleModulesCount.value = res.all;
+  }
+
   function refreshTree(params: ApiScenarioGetModuleParams) {
     scenarioModuleTreeRef.value?.initModuleCount(params);
+    selectRecycleCount();
   }
 
   function redirectRecycle() {
@@ -166,12 +174,7 @@
     });
   }
 
-  onBeforeMount(async () => {
-    const res = await getTrashModuleCount({
-      projectId: appStore.currentProjectId,
-    });
-    recycleModulesCount.value = res.all;
-  });
+  onBeforeMount(selectRecycleCount);
 
   const saveLoading = ref(false);
 
diff --git a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
index d419fb57b7..6c3b1e9242 100644
--- a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
+++ b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
@@ -61,6 +61,43 @@
         <template #priority="{ record }">
           <caseLevel :case-level="record.priority as CaseLevel" />
         </template>
+        <!-- 报告结果筛选 -->
+        <template #lastReportStatusFilter="{ columnConfig }">
+          <a-trigger
+            v-model:popup-visible="lastReportStatusFilterVisible"
+            trigger="click"
+            @popup-visible-change="handleFilterHidden"
+          >
+            <a-button
+              type="text"
+              class="arco-btn-text--secondary p-[8px_4px]"
+              @click="lastReportStatusFilterVisible = true"
+            >
+              <div class="font-medium">
+                {{ t(columnConfig.title as string) }}
+              </div>
+              <icon-down :class="lastReportStatusFilterVisible ? 'text-[rgb(var(--primary-5))]' : ''" />
+            </a-button>
+            <template #content>
+              <div class="arco-table-filters-content">
+                <div class="flex items-center justify-center px-[6px] py-[2px]">
+                  <a-checkbox-group v-model:model-value="lastReportStatusListFilters" direction="vertical" size="small">
+                    <a-checkbox v-for="key of lastReportStatusFilters" :key="key" :value="key">
+                      <ExecutionStatus :module-type="ReportEnum.API_SCENARIO_REPORT" :status="key" />
+                    </a-checkbox>
+                  </a-checkbox-group>
+                </div>
+              </div>
+            </template>
+          </a-trigger>
+        </template>
+        <template #lastReportStatus="{ record }">
+          <ExecutionStatus
+            v-if="record.lastReportStatus"
+            :module-type="ReportEnum.API_SCENARIO_REPORT"
+            :status="record.lastReportStatus"
+          />
+        </template>
         <template #operation="{ record }">
           <MsButton
             v-permission="['PROJECT_API_SCENARIO:READ+DELETED']"
@@ -86,6 +123,7 @@
 </template>
 
 <script setup lang="ts">
+  import { ref } from 'vue';
   import { Message } from '@arco-design/web-vue';
   import dayjs from 'dayjs';
 
@@ -96,6 +134,7 @@
   import caseLevel from '@/components/business/ms-case-associate/caseLevel.vue';
   import type { CaseLevel } from '@/components/business/ms-case-associate/types';
   import apiStatus from '@/views/api-test/components/apiStatus.vue';
+  import ExecutionStatus from '@/views/api-test/report/component/reportStatus.vue';
 
   import {
     batchDeleteScenario,
@@ -111,6 +150,7 @@
 
   import { ApiScenarioTableItem } from '@/models/apiTest/scenario';
   import { ApiScenarioStatus } from '@/enums/apiEnum';
+  import { ReportEnum, ReportStatus } from '@/enums/reportEnum';
   import { TableKeyEnum } from '@/enums/tableEnum';
 
   const props = defineProps<{
@@ -120,6 +160,11 @@
     readOnly?: boolean; // 是否是只读模式
   }>();
 
+  const lastReportStatusFilterVisible = ref(false);
+  const lastReportStatusListFilters = ref<string[]>(Object.keys(ReportStatus[ReportEnum.API_SCENARIO_REPORT]));
+  const lastReportStatusFilters = computed(() => {
+    return Object.keys(ReportStatus[ReportEnum.API_SCENARIO_REPORT]);
+  });
   const appStore = useAppStore();
   const { t } = useI18n();
   const { openModal } = useModal();
@@ -172,8 +217,9 @@
     },
     {
       title: 'apiScenario.table.columns.runResult',
-      titleSlotName: 'lastReportStatus',
+      titleSlotName: 'lastReportStatusFilter',
       dataIndex: 'lastReportStatus',
+      slotName: 'lastReportStatus',
       showTooltip: true,
       width: 100,
       showDrag: true,
@@ -305,6 +351,7 @@
       projectId: appStore.currentProjectId,
       moduleIds,
       filter: {
+        lastReportStatus: lastReportStatusListFilters.value,
         status: statusFilters.value.length === Object.keys(ApiScenarioStatus).length ? undefined : statusFilters.value,
       },
     };