From a9b35ccdcba50c5c15425b35c2d729918bf50869 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 17 Jun 2024 13:05:59 +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=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B&=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=94=A8=E4=BE=8B=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98&=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/modules/test-plan/report.ts  |  8 ++-
 .../components/bugDetailTab.vue               |  1 -
 .../detail/component/apiAndScenarioTable.vue  | 69 ++++++++++++-------
 .../testPlan/components/planTable.vue         | 61 +++++-----------
 4 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/frontend/src/api/modules/test-plan/report.ts b/frontend/src/api/modules/test-plan/report.ts
index b923f39912..00c8b749ed 100644
--- a/frontend/src/api/modules/test-plan/report.ts
+++ b/frontend/src/api/modules/test-plan/report.ts
@@ -87,17 +87,23 @@ export function getShareValidity(id: string) {
 }
 // 测试计划-独立报告-接口用例
 export function getApiPage(data: TableQueryParams) {
+  if (data.shareId) {
+    return MSR.post<CommonList<ApiOrScenarioCaseItem>>({ url: reportUrl.ReportShareApiUrl, data });
+  }
   return MSR.post<CommonList<ApiOrScenarioCaseItem>>({ url: reportUrl.ReportIndependentApiUrl, data });
 }
 // 测试计划-报告-获取分享链接时效
 export function getScenarioPage(data: TableQueryParams) {
+  if (data.shareId) {
+    return MSR.post<CommonList<ApiOrScenarioCaseItem>>({ url: reportUrl.ReportShareScenarioUrl, data });
+  }
   return MSR.post<CommonList<ApiOrScenarioCaseItem>>({ url: reportUrl.ReportIndependentScenarioUrl, data });
 }
 // 测试计划-独立报告-接口用例
 export function getShareApiPage(data: TableQueryParams) {
   return MSR.post<CommonList<ApiOrScenarioCaseItem>>({ url: reportUrl.ReportShareApiUrl, data });
 }
-// 测试计划-报告-获取分享链接时效
+// 测试计划-报告-场景用例
 export function getShareScenarioPage(data: TableQueryParams) {
   return MSR.post<CommonList<ApiOrScenarioCaseItem>>({ url: reportUrl.ReportShareScenarioUrl, data });
 }
diff --git a/frontend/src/views/bug-management/components/bugDetailTab.vue b/frontend/src/views/bug-management/components/bugDetailTab.vue
index 110f8bb471..895b45afc3 100644
--- a/frontend/src/views/bug-management/components/bugDetailTab.vue
+++ b/frontend/src/views/bug-management/components/bugDetailTab.vue
@@ -25,7 +25,6 @@
             :disabled="!contentEditAble"
             :placeholder="t('editor.placeholder')"
             :upload-image="handleUploadImage"
-            :auto-height="false"
             :preview-url="EditorPreviewFileUrl"
           />
           <div v-else v-dompurify-html="form?.description || '-'" class="markdown-body"></div>
diff --git a/frontend/src/views/test-plan/report/detail/component/apiAndScenarioTable.vue b/frontend/src/views/test-plan/report/detail/component/apiAndScenarioTable.vue
index 81a823051b..555b4e25fa 100644
--- a/frontend/src/views/test-plan/report/detail/component/apiAndScenarioTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/apiAndScenarioTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <MsBaseTable v-bind="propsRes" v-on="propsEvent">
+  <MsBaseTable v-bind="currentCaseTable.propsRes.value" v-on="currentCaseTable.propsEvent.value">
     <template #num="{ record }">
       <MsButton type="text" @click="showReport(record)">{{ record.num }}</MsButton>
     </template>
@@ -32,7 +32,7 @@
   />
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" async>
   import MsButton from '@/components/pure/ms-button/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import type { MsTableColumn } from '@/components/pure/ms-table/type';
@@ -41,7 +41,7 @@
   import ExecuteResult from '@/components/business/ms-case-associate/executeResult.vue';
   import CaseAndScenarioReportDrawer from '@/views/api-test/components/caseAndScenarioReportDrawer.vue';
 
-  import { getApiPage, getScenarioPage, getShareApiPage, getShareScenarioPage } from '@/api/modules/test-plan/report';
+  import { getApiPage, getScenarioPage } from '@/api/modules/test-plan/report';
 
   import { ApiOrScenarioCaseItem } from '@/models/testPlan/report';
   import { FilterSlotNameEnum } from '@/enums/tableFilterEnum';
@@ -117,32 +117,36 @@
       showDrag: true,
     },
   ];
-  const reportApiList = () => {
-    if (props.activeTab === 'scenarioCase') {
-      return !props.shareId ? getScenarioPage : getShareScenarioPage;
+
+  const getReportApiList = () => {
+    if (props.activeTab === 'apiCase') {
+      return getApiPage;
     }
-    return !props.shareId ? getApiPage : getShareApiPage;
+    return getScenarioPage;
   };
-  const { propsRes, propsEvent, loadList, setLoadListParams, resetFilterParams, resetPagination } = useTable(
-    reportApiList(),
-    {
-      scroll: { x: '100%' },
-      columns,
-      showSelectorAll: false,
-    }
-  );
+
+  const useApiTable = useTable(getApiPage, {
+    scroll: { x: '100%' },
+    columns,
+    showSelectorAll: false,
+    showSetting: false,
+  });
+  const useScenarioTable = useTable(getScenarioPage, {
+    scroll: { x: '100%' },
+    columns,
+    showSelectorAll: false,
+    showSetting: false,
+  });
+
+  const currentCaseTable = computed(() => {
+    return props.activeTab === 'apiCase' ? useApiTable : useScenarioTable;
+  });
 
   async function loadCaseList() {
-    setLoadListParams({ reportId: props.reportId, shareId: props.shareId ?? undefined });
-    loadList();
+    currentCaseTable.value.setLoadListParams({ reportId: props.reportId, shareId: props.shareId ?? undefined });
+    currentCaseTable.value.loadList();
   }
 
-  watchEffect(() => {
-    if (props.reportId) {
-      loadCaseList();
-    }
-  });
-
   // 显示执行报告
   const reportVisible = ref(false);
 
@@ -156,9 +160,24 @@
   watch(
     () => props.activeTab,
     () => {
-      resetFilterParams();
-      resetPagination();
+      currentCaseTable.value.resetFilterParams();
+      currentCaseTable.value.resetPagination();
       loadCaseList();
     }
   );
+
+  // onBeforeMount(() => {
+  //   if (props.reportId) {
+  //     loadCaseList();
+  //   }
+  // });
+
+  watch(
+    () => props.reportId,
+    (val) => {
+      if (val) {
+        loadCaseList();
+      }
+    }
+  );
 </script>
diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue
index b0b31c9ff3..1e47f7e9ee 100644
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@@ -239,27 +239,10 @@
 
     <template #operation="{ record }">
       <div class="flex items-center">
-        <!-- TODO 测试计划组手动生成报告 -->
-        <!-- <MsButton class="mr-2" @click="handleGenerateReport(record.id)">生成报告</MsButton> -->
-        <MsButton
-          v-if="
-            getFunctionalCount(record.id) > 0 &&
-            hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) &&
-            record.status !== 'ARCHIVED'
-          "
-          class="!mx-0"
-          @click="executePlan(record)"
-          >{{ t('testPlan.testPlanIndex.execution') }}</MsButton
-        >
-        <a-divider
-          v-if="
-            getFunctionalCount(record.id) > 0 &&
-            hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) &&
-            record.status !== 'ARCHIVED'
-          "
-          direction="vertical"
-          :margin="8"
-        ></a-divider>
+        <MsButton v-if="isShowExecuteButton(record)" class="!mx-0" @click="executePlan(record)">{{
+          t('testPlan.testPlanIndex.execution')
+        }}</MsButton>
+        <a-divider v-if="isShowExecuteButton(record)" direction="vertical" :margin="8"></a-divider>
 
         <MsButton
           v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) && record.status !== 'ARCHIVED'"
@@ -273,25 +256,10 @@
           :margin="8"
         ></a-divider>
 
-        <MsButton
-          v-if="
-            hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) &&
-            getFunctionalCount(record.id) < 1 &&
-            record.status !== 'ARCHIVED'
-          "
-          class="!mx-0"
-          @click="copyTestPlanOrGroup(record.id)"
-          >{{ t('common.copy') }}</MsButton
-        >
-        <a-divider
-          v-if="
-            hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) &&
-            getFunctionalCount(record.id) < 1 &&
-            record.status !== 'ARCHIVED'
-          "
-          direction="vertical"
-          :margin="8"
-        ></a-divider>
+        <MsButton v-if="!isShowExecuteButton(record)" class="!mx-0" @click="copyTestPlanOrGroup(record.id)">{{
+          t('common.copy')
+        }}</MsButton>
+        <a-divider v-if="!isShowExecuteButton(record)" direction="vertical" :margin="8"></a-divider>
         <MsTableMoreAction :list="getMoreActions(record)" @select="handleMoreActionSelect($event, record)" />
       </div>
     </template>
@@ -727,13 +695,20 @@
     return defaultCountDetailMap.value[id].scheduleConfig.enable;
   }
 
+  function isShowExecuteButton(record: TestPlanItem) {
+    return (
+      ((record.type === testPlanTypeEnum.TEST_PLAN && getFunctionalCount(record.id) > 0) ||
+        (record.type === testPlanTypeEnum.GROUP && record.childrenCount)) &&
+      hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) &&
+      record.status !== 'ARCHIVED'
+    );
+  }
+
   function getMoreActions(record: TestPlanItem) {
     const { status: planStatus } = record;
-    const useCount = defaultCountDetailMap.value[record.id]?.caseTotal ?? 0;
 
     // 有用例数量才可以执行 否则不展示执行
-    const copyAction =
-      useCount > 0 && hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) && planStatus !== 'ARCHIVED' ? copyActions : [];
+    const copyAction = isShowExecuteButton(record) ? copyActions : [];
 
     let scheduledTaskAction: ActionsItem[] = [];
     if (planStatus !== 'ARCHIVED' && record.groupId && record.groupId === 'NONE') {