From 981646dc4b751bc81e60aa818304909a45cfecbc Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Fri, 12 Jul 2024 14:08:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=90=8C=E6=AD=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E7=9A=84=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=94=A8=E4=BE=8B=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=92=8C=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-associate-case/caseTree.vue   |  2 +-
 .../business/ms-associate-case/index.vue      | 26 ++++++++++++-------
 .../views/test-plan/testPlan/detail/index.vue |  8 ++----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/business/ms-associate-case/caseTree.vue b/frontend/src/components/business/ms-associate-case/caseTree.vue
index e2a7b5330f..f1a88362bd 100644
--- a/frontend/src/components/business/ms-associate-case/caseTree.vue
+++ b/frontend/src/components/business/ms-associate-case/caseTree.vue
@@ -147,7 +147,7 @@
 
   const virtualListProps = computed(() => {
     return {
-      height: 'calc(100vh - 236px)',
+      height: 'calc(100vh - 250px)',
       threshold: 200,
       fixedSize: true,
       buffer: 15, // 缓冲区默认 10 的时候，虚拟滚动的底部 padding 计算有问题
diff --git a/frontend/src/components/business/ms-associate-case/index.vue b/frontend/src/components/business/ms-associate-case/index.vue
index 5b01079aa1..974f0b45ec 100644
--- a/frontend/src/components/business/ms-associate-case/index.vue
+++ b/frontend/src/components/business/ms-associate-case/index.vue
@@ -282,7 +282,7 @@
               />
             </a-tooltip>
           </div>
-          <div v-if="props.associatedType === CaseLinkEnum.FUNCTIONAL" class="ml-[16px] flex items-center">
+          <div v-if="props.associatedType === CaseLinkEnum.FUNCTIONAL && syncCase" class="ml-[16px] flex items-center">
             <a-tree-select
               v-model="apiCaseCollectionId"
               :field-names="{
@@ -292,6 +292,7 @@
               }"
               class="w-[200px]"
               :data="apiSetTree"
+              allow-clear
             >
               <template #prefix>
                 <div class="text-[var(--color-text-brand)]">{{ t('ms.case.associate.api') }}</div>
@@ -311,6 +312,7 @@
                 children: 'children',
               }"
               class="ml-[12px] w-[200px]"
+              allow-clear
               :data="scenarioSetTree"
             >
               <template #prefix>
@@ -366,6 +368,7 @@
 
   import type { ModuleTreeNode, TableQueryParams } from '@/models/common';
   import type { ProjectListItem } from '@/models/setting/project';
+  import type { PlanDetailApiCaseTreeParams } from '@/models/testPlan/testPlan';
   import { CaseModulesApiTypeEnum, CasePageApiTypeEnum } from '@/enums/associateCaseEnum';
   import { CaseLinkEnum } from '@/enums/caseEnum';
 
@@ -626,15 +629,20 @@
 
   async function initTestSet() {
     if (props.extraTableParams?.testPlanId) {
+      const params: PlanDetailApiCaseTreeParams = {
+        testPlanId: props.extraTableParams.testPlanId,
+        treeType: 'COLLECTION',
+      };
       try {
-        apiSetTree.value = await getApiCaseModule({
-          testPlanId: props.extraTableParams.testPlanId,
-          treeType: 'COLLECTION',
-        });
-        scenarioSetTree.value = await getApiScenarioModule({
-          testPlanId: props.extraTableParams.testPlanId,
-          treeType: 'COLLECTION',
-        });
+        const [apiSetTreeResult, scenarioSetTreeResult] = await Promise.all([
+          getApiCaseModule(params),
+          getApiScenarioModule(params),
+        ]);
+
+        apiSetTree.value = apiSetTreeResult;
+        scenarioSetTree.value = scenarioSetTreeResult;
+        apiCaseCollectionId.value = apiSetTree.value[0].id;
+        apiScenarioCollectionId.value = scenarioSetTree.value[0].id;
       } catch (error) {
         console.log(error);
       }
diff --git a/frontend/src/views/test-plan/testPlan/detail/index.vue b/frontend/src/views/test-plan/testPlan/detail/index.vue
index f0aa0003df..efc2c8f340 100644
--- a/frontend/src/views/test-plan/testPlan/detail/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/index.vue
@@ -33,12 +33,8 @@
         <MsIcon type="icon-icon_edit_outlined" class="mr-[8px]" />
         {{ t('common.edit') }}
       </MsButton>
-      <MsTableMoreAction :list="reportMoreAction" @select="handleMoreReportSelect">
-        <MsButton
-          v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) && detail.status !== 'ARCHIVED'"
-          type="button"
-          status="default"
-        >
+      <MsTableMoreAction v-if="detail.status !== 'ARCHIVED'" :list="reportMoreAction" @select="handleMoreReportSelect">
+        <MsButton v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])" type="button" status="default">
           <MsIcon type="icon-icon_generate_report" class="mr-[8px]" />
           {{ t('testPlan.testPlanDetail.generateReport') }}
         </MsButton>