From a445c6e83eff0f093fdbef0e7ce14bc04dc84034 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Tue, 16 Jul 2024 11:14:42 +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=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5=E5=91=8A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/detail/component/reportConfig.ts   |  4 +--
 .../system-card/apiAndScenarioTable.vue       | 14 +++++----
 .../detail/component/system-card/bugTable.vue | 24 +++++++++------
 .../system-card/featureCaseTable.vue          | 29 +++++++++++--------
 .../system-card/reportDetailTable.vue         |  9 ++++--
 .../test-plan/report/detail/configReport.vue  |  2 +-
 6 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/frontend/src/views/test-plan/report/detail/component/reportConfig.ts b/frontend/src/views/test-plan/report/detail/component/reportConfig.ts
index f506d35515..41abfde5ce 100644
--- a/frontend/src/views/test-plan/report/detail/component/reportConfig.ts
+++ b/frontend/src/views/test-plan/report/detail/component/reportConfig.ts
@@ -106,8 +106,8 @@ const subPlanList: PlanReportDetail = {
   endTime: 0,
   summary: '',
   caseTotal: 1,
-  passThreshold: 100.0,
-  passRate: 0.0,
+  passThreshold: 100,
+  passRate: 100,
   executeRate: 0,
   bugCount: 0,
   planCount: 0,
diff --git a/frontend/src/views/test-plan/report/detail/component/system-card/apiAndScenarioTable.vue b/frontend/src/views/test-plan/report/detail/component/system-card/apiAndScenarioTable.vue
index 6423704509..a819f3bc68 100644
--- a/frontend/src/views/test-plan/report/detail/component/system-card/apiAndScenarioTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/system-card/apiAndScenarioTable.vue
@@ -95,7 +95,7 @@
       dataIndex: 'priority',
       slotName: 'priority',
       filterConfig: {
-        options: casePriorityOptions,
+        options: props.isPreview ? casePriorityOptions : [],
         filterSlotName: FilterSlotNameEnum.CASE_MANAGEMENT_CASE_LEVEL,
       },
       width: 150,
@@ -106,7 +106,7 @@
       dataIndex: 'executeResult',
       slotName: 'lastExecResult',
       filterConfig: {
-        options: lastReportStatusListOptions.value,
+        options: props.isPreview ? lastReportStatusListOptions.value : [],
         filterSlotName: FilterSlotNameEnum.API_TEST_CASE_API_LAST_EXECUTE_STATUS,
       },
       width: 150,
@@ -153,7 +153,10 @@
   });
 
   async function loadCaseList() {
-    currentCaseTable.value.setLoadListParams({ reportId: props.reportId, shareId: props.shareId ?? undefined });
+    currentCaseTable.value.setLoadListParams({
+      reportId: props.reportId,
+      shareId: props.shareId ?? undefined,
+    });
     currentCaseTable.value.loadList();
   }
 
@@ -183,9 +186,8 @@
     }
   }
 
-  watchEffect(() => {
-    if (props.reportId && props.activeType && props.isPreview) {
-      currentCaseTable.value.resetFilterParams();
+  onMounted(() => {
+    if (props.reportId && props.isPreview) {
       currentCaseTable.value.resetPagination();
       loadCaseList();
     } else {
diff --git a/frontend/src/views/test-plan/report/detail/component/system-card/bugTable.vue b/frontend/src/views/test-plan/report/detail/component/system-card/bugTable.vue
index cbd258bae7..a8707e8d80 100644
--- a/frontend/src/views/test-plan/report/detail/component/system-card/bugTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/system-card/bugTable.vue
@@ -3,6 +3,9 @@
 </template>
 
 <script setup lang="ts">
+  import { TableSortable } from '@arco-design/web-vue';
+  import { cloneDeep } from 'lodash-es';
+
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import type { MsTableColumn } from '@/components/pure/ms-table/type';
   import useTable from '@/components/pure/ms-table/useTable';
@@ -22,16 +25,22 @@
     isPreview?: boolean;
   }>();
 
+  const sortableConfig = computed<TableSortable | undefined>(() => {
+    return props.isPreview
+      ? {
+          sortDirections: ['ascend', 'descend'],
+          sorter: true,
+        }
+      : undefined;
+  });
+
   const columns: MsTableColumn = [
     {
       title: 'ID',
       dataIndex: 'num',
       slotName: 'num',
       sortIndex: 1,
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-        sorter: true,
-      },
+      sortable: cloneDeep(sortableConfig.value),
       fixed: 'left',
       width: 100,
       showTooltip: true,
@@ -41,10 +50,7 @@
       dataIndex: 'title',
       width: 150,
       showTooltip: true,
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-        sorter: true,
-      },
+      sortable: cloneDeep(sortableConfig.value),
     },
     {
       title: 'bugManagement.status',
@@ -78,7 +84,7 @@
     loadList();
   }
 
-  watchEffect(() => {
+  onMounted(() => {
     if (props.reportId && props.isPreview) {
       loadCaseList();
     } else {
diff --git a/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue b/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue
index c261a47dce..8183dc800e 100644
--- a/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue
@@ -28,7 +28,8 @@
 </template>
 
 <script setup lang="ts">
-  import { onBeforeMount } from 'vue';
+  import { TableSortable } from '@arco-design/web-vue';
+  import { cloneDeep } from 'lodash-es';
 
   import MsButton from '@/components/pure/ms-button/index.vue';
   import MsDrawer from '@/components/pure/ms-drawer/index.vue';
@@ -62,16 +63,22 @@
   }>();
   const { t } = useI18n();
 
+  const sortableConfig = computed<TableSortable | undefined>(() => {
+    return props.isPreview
+      ? {
+          sortDirections: ['ascend', 'descend'],
+          sorter: true,
+        }
+      : undefined;
+  });
+
   const staticColumns: MsTableColumn = [
     {
       title: 'ID',
       dataIndex: 'num',
       slotName: 'num',
       sortIndex: 1,
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-        sorter: true,
-      },
+      sortable: cloneDeep(sortableConfig.value),
       fixed: 'left',
       width: 100,
       ellipsis: true,
@@ -81,10 +88,7 @@
       title: 'case.caseName',
       dataIndex: 'name',
       showTooltip: true,
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-        sorter: true,
-      },
+      sortable: cloneDeep(sortableConfig.value),
       width: 180,
     },
     {
@@ -94,7 +98,7 @@
       filterConfig: {
         valueKey: 'key',
         labelKey: 'statusText',
-        options: Object.values(executionResultMap),
+        options: props.isPreview ? Object.values(executionResultMap) : [],
         filterSlotName: FilterSlotNameEnum.CASE_MANAGEMENT_EXECUTE_RESULT,
       },
       width: 150,
@@ -127,7 +131,7 @@
       width: 100,
     },
   ];
-  // TODO 计划组用例明细字段接口目前还没有
+
   const testPlanNameColumns: MsTableColumn = [
     {
       title: 'report.plan.name',
@@ -159,7 +163,7 @@
     loadList();
   }
 
-  watchEffect(() => {
+  onMounted(() => {
     if (props.reportId && props.isPreview) {
       loadCaseList();
     } else {
@@ -182,6 +186,7 @@
       });
       executeList.value = [res];
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     } finally {
       executeLoading.value = false;
diff --git a/frontend/src/views/test-plan/report/detail/component/system-card/reportDetailTable.vue b/frontend/src/views/test-plan/report/detail/component/system-card/reportDetailTable.vue
index 1478871bde..b6c53a8f9c 100644
--- a/frontend/src/views/test-plan/report/detail/component/system-card/reportDetailTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/system-card/reportDetailTable.vue
@@ -14,6 +14,11 @@
     <template #resultStatus="{ record }">
       <ExecutionStatus v-if="record.resultStatus !== '-'" :status="record.resultStatus" />
     </template>
+    <template #passThreshold="{ record }">
+      <div>
+        {{ `${record.passThreshold || '0.00'}%` }}
+      </div>
+    </template>
     <template #passRate="{ record }">
       <div>
         {{ `${record.passRate || '0.00'}%` }}
@@ -97,7 +102,7 @@
       dataIndex: 'resultStatus',
       slotName: 'resultStatus',
       filterConfig: {
-        options: statusResultOptions.value,
+        options: props.isPreview ? statusResultOptions.value : [],
         filterSlotName: FilterSlotNameEnum.TEST_PLAN_STATUS_FILTER,
       },
       width: 200,
@@ -138,7 +143,7 @@
     loadList();
   }
 
-  watchEffect(() => {
+  onMounted(() => {
     if (props.reportId && props.isPreview) {
       loadReportDetailList();
     } else {
diff --git a/frontend/src/views/test-plan/report/detail/configReport.vue b/frontend/src/views/test-plan/report/detail/configReport.vue
index aa7b176fdb..b2747526bd 100644
--- a/frontend/src/views/test-plan/report/detail/configReport.vue
+++ b/frontend/src/views/test-plan/report/detail/configReport.vue
@@ -24,7 +24,7 @@
     passThreshold: 100, // 通过阈值
     passRate: 100, // 通过率
     executeRate: 100, // 执行完成率
-    bugCount: 0,
+    bugCount: 10,
     caseTotal: 0,
     executeCount: {
       success: 0,