From 705f89c07e648f401455471eb7cb00910e269109 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Tue, 18 Jun 2024 20:25:07 +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=92bug&?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=85=B3=E8=81=94=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-add-attachment/index.vue      |  1 +
 .../ms-associate-case/apiCaseTable.vue        |  2 +-
 .../business/ms-associate-case/apiTable.vue   |  2 +-
 .../business/ms-associate-case/caseTable.vue  |  2 +-
 .../ms-associate-case/scenarioCaseTable.vue   |  2 +-
 .../ms-link-file/associatedFileDrawer.vue     | 10 ++++-
 .../business/ms-link-file/linkFileTable.vue   |  4 +-
 .../components/bugDetailTab.vue               |  6 +--
 .../components/caseDetailDrawer.vue           |  1 +
 .../components/tabContent/tabDetail.vue       |  7 +---
 .../detail/component/reportDetailTable.vue    |  4 +-
 .../testPlan/components/planTable.vue         | 38 ++++++++++++-------
 .../testPlan/createAndEditPlanDrawer.vue      | 13 ++++---
 13 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/business/ms-add-attachment/index.vue b/frontend/src/components/business/ms-add-attachment/index.vue
index 24da337a85..8d073e333d 100644
--- a/frontend/src/components/business/ms-add-attachment/index.vue
+++ b/frontend/src/components/business/ms-add-attachment/index.vue
@@ -358,6 +358,7 @@
 
   // 处理关联文件
   function saveSelectAssociatedFile(fileData: AssociatedList[]) {
+    // TODO : 这里需要优化选择跨页的数据
     const fileResultList = fileData.map((fileInfo) => convertToFile(fileInfo));
     if (props.mode === 'button') {
       fileList.value.push(...fileResultList);
diff --git a/frontend/src/components/business/ms-associate-case/apiCaseTable.vue b/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
index b5d8297528..9d5351db08 100644
--- a/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
@@ -194,7 +194,7 @@
         selectable: true,
         showSelectAll: true,
         heightUsed: 310,
-        showSelectorAll: true,
+        showSelectorAll: false,
       },
       (record) => {
         return {
diff --git a/frontend/src/components/business/ms-associate-case/apiTable.vue b/frontend/src/components/business/ms-associate-case/apiTable.vue
index 0787bcaab0..e746b65dd1 100644
--- a/frontend/src/components/business/ms-associate-case/apiTable.vue
+++ b/frontend/src/components/business/ms-associate-case/apiTable.vue
@@ -166,7 +166,7 @@
       selectable: true,
       showSelectAll: true,
       heightUsed: 310,
-      showSelectorAll: true,
+      showSelectorAll: false,
     });
 
   async function getTableParams() {
diff --git a/frontend/src/components/business/ms-associate-case/caseTable.vue b/frontend/src/components/business/ms-associate-case/caseTable.vue
index bbbddcf9a2..24c354b7f0 100644
--- a/frontend/src/components/business/ms-associate-case/caseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/caseTable.vue
@@ -202,7 +202,7 @@
         selectable: true,
         showSelectAll: true,
         heightUsed: 310,
-        showSelectorAll: true,
+        showSelectorAll: false,
       },
       (record) => {
         return {
diff --git a/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue b/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue
index e19f2677f9..e6872efcd9 100644
--- a/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue
@@ -186,7 +186,7 @@
       selectable: true,
       showSelectAll: true,
       heightUsed: 310,
-      showSelectorAll: true,
+      showSelectorAll: false,
     });
 
   async function getTableParams() {
diff --git a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
index 66043a39b2..e9669e78c1 100644
--- a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
+++ b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
@@ -85,6 +85,7 @@
           :file-all-count-by-storage="fileAllCountByStorage"
           :filetype="props.filetype"
           @init="handleModuleTableInit"
+          @update-file-ids="updateFiles"
         />
       </template>
     </MsSplitBox>
@@ -121,7 +122,7 @@
   }>();
 
   const emit = defineEmits<{
-    (e: 'save', val: AssociatedList[]): void;
+    (e: 'save', val: AssociatedList[], selectIds?: string[]): void;
     (e: 'update:visible', val: boolean): void;
   }>();
   const showDrawer = computed({
@@ -244,9 +245,14 @@
   }
 
   const selectFile = ref<AssociatedList[]>([]);
+  const selectIds = ref<string[]>([]);
+
+  function updateFiles(fileIds: string[]) {
+    selectIds.value = fileIds;
+  }
 
   function handleDrawerConfirm() {
-    emit('save', selectFile.value);
+    emit('save', selectFile.value, selectIds.value);
     showDrawer.value = false;
   }
 
diff --git a/frontend/src/components/business/ms-link-file/linkFileTable.vue b/frontend/src/components/business/ms-link-file/linkFileTable.vue
index eec76a3ad3..a3d1c8a2ca 100644
--- a/frontend/src/components/business/ms-link-file/linkFileTable.vue
+++ b/frontend/src/components/business/ms-link-file/linkFileTable.vue
@@ -112,6 +112,7 @@
   const emit = defineEmits<{
     (e: 'init', params: FileListQueryParams): void;
     (e: 'update:selectFile', val: AssociatedList[]): void;
+    (e: 'updateFileIds', val: string[]): void;
   }>();
 
   const tableFileTypeOptions = ref<string[]>([]);
@@ -342,11 +343,12 @@
 
   watch(
     () => selectedIds.value,
-    () => {
+    (val) => {
       emit(
         'update:selectFile',
         propsRes.value.data.filter((item: any) => selectedIds.value.indexOf(item.id) > -1)
       );
+      emit('updateFileIds', val);
     }
   );
 
diff --git a/frontend/src/views/bug-management/components/bugDetailTab.vue b/frontend/src/views/bug-management/components/bugDetailTab.vue
index 895b45afc3..c4b7119df8 100644
--- a/frontend/src/views/bug-management/components/bugDetailTab.vue
+++ b/frontend/src/views/bug-management/components/bugDetailTab.vue
@@ -511,14 +511,12 @@
   }
 
   // 关联文件
-  async function saveSelectAssociatedFile(fileData: AssociatedList[]) {
-    const fileResultList = fileData.map(convertToFileByDetail);
-    fileList.value.push(...fileResultList);
+  async function saveSelectAssociatedFile(fileData: AssociatedList[], selectFileIds?: string[]) {
     const params = {
       request: {
         bugId: bugId.value as string,
         projectId: currentProjectId.value,
-        selectIds: fileResultList.map((item: any) => item.uid),
+        selectIds: selectFileIds || [],
       },
     };
     await uploadOrAssociationFile(params);
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
index 44e7e50f6b..fcc7c5c6f3 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
@@ -139,6 +139,7 @@
           </div>
         </div>
         <inputComment
+          v-if="activeTab !== 'detail'"
           ref="commentInputRef"
           v-model:content="content"
           v-model:notice-user-ids="noticeUserIds"
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
index 13c44986fe..ee2f2aeae3 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
@@ -693,11 +693,8 @@
   }
 
   // 处理关联文件
-  function saveSelectAssociatedFile(fileData: AssociatedList[]) {
-    const fileResultList = fileData.map((fileInfo) => convertToFile(fileInfo));
-    fileList.value.push(...fileResultList);
-    const fileIds = fileResultList.map((item: any) => item.uid);
-    startUpload(fileIds);
+  function saveSelectAssociatedFile(fileData: AssociatedList[], selectIds?: string[]) {
+    startUpload(selectIds || []);
   }
 
   // 更新文件
diff --git a/frontend/src/views/test-plan/report/detail/component/reportDetailTable.vue b/frontend/src/views/test-plan/report/detail/component/reportDetailTable.vue
index 75460959b8..39b18aa701 100644
--- a/frontend/src/views/test-plan/report/detail/component/reportDetailTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/reportDetailTable.vue
@@ -18,7 +18,9 @@
       <ExecutionStatus :status="filterContent.value" />
     </template>
     <template #operation="{ record }">
-      <MsButton class="!mx-0" @click="openReport(record)">{{ t('report.detail.testPlanGroup.viewReport') }}</MsButton>
+      <MsButton class="!mx-0" :disabled="record.deleted" @click="openReport(record)">{{
+        t('report.detail.testPlanGroup.viewReport')
+      }}</MsButton>
     </template>
   </MsBaseTable>
   <ReportDrawer v-model:visible="reportVisible" :report-id="independentReportId" />
diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue
index de19dacc1b..3080007da8 100644
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@@ -249,14 +249,14 @@
     <template #operation="{ record }">
       <div class="flex items-center">
         <MsButton
-          v-if="isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+EXECUTE'])"
+          v-if="isShowExecuteButton(record) && hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])"
           class="!mx-0"
           :disabled="executeId == record.id"
           @click="executePlan(record)"
           >{{ t('testPlan.testPlanIndex.execution') }}</MsButton
         >
         <a-divider
-          v-if="isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+EXECUTE'])"
+          v-if="isShowExecuteButton(record) && hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])"
           direction="vertical"
           :margin="8"
         ></a-divider>
@@ -274,13 +274,13 @@
         ></a-divider>
 
         <MsButton
-          v-if="!isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+ADD'])"
+          v-if="!isShowExecuteButton(record) && hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD'])"
           class="!mx-0"
           @click="copyTestPlanOrGroup(record.id)"
           >{{ t('common.copy') }}</MsButton
         >
         <a-divider
-          v-if="!isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+ADD'])"
+          v-if="!isShowExecuteButton(record) && hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD'])"
           direction="vertical"
           :margin="8"
         ></a-divider>
@@ -290,11 +290,11 @@
     <template v-if="(keyword || '').trim() === ''" #empty>
       <div class="flex w-full items-center justify-center p-[8px] text-[var(--color-text-4)]">
         {{ t('common.noData') }}
-        <MsButton v-permission="['PROJECT_TEST_PLAN:READ+ADD']" class="ml-[8px]" @click="emit('new', 'group')">
+        <MsButton v-permission="['PROJECT_TEST_PLAN:READ+ADD']" class="ml-[8px]" @click="emit('new', 'testPlan')">
           {{ t('testPlan.testPlanIndex.createTestPlan') }}
         </MsButton>
         {{ t('caseManagement.featureCase.or') }}
-        <MsButton v-permission="['PROJECT_TEST_PLAN:READ+ADD']" class="ml-[8px]" @click="emit('new', 'testPlan')">
+        <MsButton v-permission="['PROJECT_TEST_PLAN:READ+ADD']" class="ml-[8px]" @click="emit('new', 'group')">
           {{ t('testPlan.testPlanIndex.createTestPlanGroup') }}
         </MsButton>
       </div>
@@ -473,7 +473,6 @@
       width: 180,
       showInTable: true,
       showDrag: false,
-      showTooltip: true,
       columnSelectorDisabled: true,
     },
     {
@@ -741,11 +740,10 @@
     return defaultCountDetailMap.value[id].scheduleConfig.enable;
   }
 
-  function isShowExecuteButton(record: TestPlanItem, permission: string[]) {
+  function isShowExecuteButton(record: TestPlanItem) {
     return (
       ((record.type === testPlanTypeEnum.TEST_PLAN && getFunctionalCount(record.id) > 0) ||
         (record.type === testPlanTypeEnum.GROUP && record.childrenCount)) &&
-      hasAnyPermission(permission) &&
       record.status !== 'ARCHIVED'
     );
   }
@@ -754,7 +752,8 @@
     const { status: planStatus } = record;
 
     // 有用例数量才可以执行 否则不展示执行
-    const copyAction = isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+ADD']) ? copyActions : [];
+    const copyAction =
+      isShowExecuteButton(record) && hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) ? copyActions : [];
 
     let scheduledTaskAction: ActionsItem[] = [];
     if (planStatus !== 'ARCHIVED' && record.groupId && record.groupId === 'NONE') {
@@ -944,7 +943,7 @@
 
   const confirmLoading = ref<boolean>(false);
 
-  async function executeHandler() {
+  async function batchHandleExecute() {
     confirmLoading.value = true;
     try {
       await executePlanOrGroup(executeForm.value);
@@ -961,29 +960,40 @@
 
   const executeId = ref<string>('');
   async function singleExecute(id: string) {
+    confirmLoading.value = true;
     executeId.value = id;
     try {
       const params: ExecutePlan = {
         executeId: id,
-        runMode: 'SERIAL',
+        runMode: executeForm.value.runMode,
         executionSource: 'MANUAL',
       };
       await executeSinglePlan(params);
       Message.success(t('case.detail.execute.success'));
       fetchData();
+      cancelHandler();
     } catch (error) {
       console.log(error);
     } finally {
       executeId.value = '';
+      confirmLoading.value = false;
+    }
+  }
+
+  async function executeHandler() {
+    if (executeId.value) {
+      singleExecute(executeId.value);
+    } else {
+      batchHandleExecute();
     }
   }
 
   // 测试计划详情
   function executePlan(record: TestPlanItem) {
     const { type, id } = record;
-
+    executeId.value = id;
     if (type === testPlanTypeEnum.GROUP) {
-      singleExecute(record.id);
+      executeVisible.value = true;
       return;
     }
     if (type === testPlanTypeEnum.TEST_PLAN) {
diff --git a/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue b/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
index c23bf69807..809bffbfcb 100644
--- a/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
+++ b/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
@@ -48,7 +48,7 @@
       </a-form-item>
       <a-form-item v-else field="moduleId" :label="t('common.belongModule')" class="w-[436px]">
         <a-tree-select
-          v-model:modelValue="form.moduleId"
+          v-model="form.moduleId"
           :data="props.moduleTree"
           :field-names="{ title: 'name', key: 'id', children: 'children' }"
           :tree-props="{
@@ -181,11 +181,16 @@
 
   const drawerLoading = ref(false);
   const formRef = ref<FormInstance>();
+
+  const moduleId = computed(() => {
+    return props.moduleId && props.moduleId !== 'all' ? props.moduleId : 'root';
+  });
+
   const initForm: AddTestPlanParams = {
     isGroup: false,
     name: '',
     projectId: '',
-    moduleId: 'root',
+    moduleId: moduleId.value,
     cycle: [],
     tags: [],
     description: '',
@@ -359,9 +364,7 @@
         form.value = cloneDeep(initForm);
         getDetail();
         initGroupOptions();
-        if (!props.planId && props.moduleId) {
-          form.value.moduleId = props.moduleId === 'all' ? 'root' : props.moduleId;
-        }
+        form.value.moduleId = moduleId.value;
       }
     }
   );