From 4b14f649a972ef93269ae7b6a9e22df8bdbc1b53 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 17 Jun 2024 19:50:33 +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=8Abug&=E6=8A=A5=E5=91=8A=E6=98=8E=E7=BB=86=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98&=E7=8A=B6=E6=80=81=E7=AD=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-minders/testPlanMinder/index.vue       |  13 ++-
 frontend/src/models/testPlan/testPlan.ts      |   1 +
 .../detail/component/executeAnalysis.vue      |   8 +-
 .../detail/component/reportDetailTable.vue    |   7 +-
 .../testPlan/components/actionModal.vue       |   7 +-
 .../testPlan/components/planTable.vue         | 109 +++++++++++++-----
 .../testPlan/components/statusProgress.vue    |   5 +-
 .../views/test-plan/testPlan/locale/en-US.ts  |   3 +
 .../views/test-plan/testPlan/locale/zh-CN.ts  |   3 +
 .../planGroup/createAndUpdatePlanGroup.vue    |   2 +-
 10 files changed, 119 insertions(+), 39 deletions(-)

diff --git a/frontend/src/components/business/ms-minders/testPlanMinder/index.vue b/frontend/src/components/business/ms-minders/testPlanMinder/index.vue
index f12eb6c237..4ecc74a8a0 100644
--- a/frontend/src/components/business/ms-minders/testPlanMinder/index.vue
+++ b/frontend/src/components/business/ms-minders/testPlanMinder/index.vue
@@ -579,11 +579,20 @@
   function writeAssociateCases(param: AssociateCaseRequest) {
     selectedAssociateCasesParams.value = { ...param };
     const node: PlanMinderNode = window.minder.getSelectedNode();
+    let associateType: string = '';
+    // TODO 类型对应的上 但是node保存的时候节点好像不太对
+    if (node.data.type === PlanMinderCollectionType.SCENARIO) {
+      associateType = PlanMinderAssociateType.SCENARIO_CASE;
+    } else {
+      associateType =
+        node.data.type === PlanMinderCollectionType.API && param.associateApiType
+          ? param.associateApiType
+          : node.data.type;
+    }
     node.data.associateDTOS = [
       {
         ids: param.selectIds,
-        associateType:
-          node.data.type === PlanMinderCollectionType.SCENARIO ? PlanMinderAssociateType.SCENARIO_CASE : node.data.type,
+        associateType,
       },
     ];
     caseAssociateVisible.value = false;
diff --git a/frontend/src/models/testPlan/testPlan.ts b/frontend/src/models/testPlan/testPlan.ts
index 7cf10b233d..a3a1e74eb9 100644
--- a/frontend/src/models/testPlan/testPlan.ts
+++ b/frontend/src/models/testPlan/testPlan.ts
@@ -37,6 +37,7 @@ export interface AssociateCaseRequest extends BatchApiParams {
   apiScenarioSelectIds?: string[];
   totalCount?: number;
   testPlanId?: string;
+  associateApiType?: string;
 }
 
 export type AssociateCaseRequestType = Pick<AssociateCaseRequest, 'functionalSelectIds' | 'testPlanId'>;
diff --git a/frontend/src/views/test-plan/report/detail/component/executeAnalysis.vue b/frontend/src/views/test-plan/report/detail/component/executeAnalysis.vue
index d89452eeb9..05a220f446 100644
--- a/frontend/src/views/test-plan/report/detail/component/executeAnalysis.vue
+++ b/frontend/src/views/test-plan/report/detail/component/executeAnalysis.vue
@@ -4,7 +4,7 @@
     size="160px"
     :legend-data="legendData"
     :options="executeCharOptions"
-    :request-total="getIndicators(detail.caseTotal) || 0"
+    :request-total="getIndicators(getTotal) || 0"
   />
 </template>
 
@@ -97,6 +97,12 @@
     }) as unknown as LegendData[];
   }
 
+  const getTotal = computed(() => {
+    const { executeCount } = props.detail;
+    const { success, error, fakeError, pending, block } = executeCount;
+    return success + error + fakeError + pending + block;
+  });
+
   watchEffect(() => {
     if (props.detail) {
       initExecuteOptions();
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 1163b62476..75460959b8 100644
--- a/frontend/src/views/test-plan/report/detail/component/reportDetailTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/reportDetailTable.vue
@@ -21,7 +21,7 @@
       <MsButton class="!mx-0" @click="openReport(record)">{{ t('report.detail.testPlanGroup.viewReport') }}</MsButton>
     </template>
   </MsBaseTable>
-  <ReportDrawer v-model:visible="reportVisible" :report-id="reportId" />
+  <ReportDrawer v-model:visible="reportVisible" :report-id="independentReportId" />
 </template>
 
 <script setup lang="ts">
@@ -133,12 +133,15 @@
 
   const reportVisible = ref(false);
 
+  const independentReportId = ref<string>('');
+
   function openReport(record: PlanReportDetail) {
+    independentReportId.value = record.id;
     if (props.currentMode === 'drawer') {
       reportVisible.value = true;
     } else {
       openNewPage(RouteEnum.TEST_PLAN_REPORT_DETAIL, {
-        reportId: record.id,
+        id: record.id,
       });
     }
   }
diff --git a/frontend/src/views/test-plan/testPlan/components/actionModal.vue b/frontend/src/views/test-plan/testPlan/components/actionModal.vue
index 631e38e6af..99a4542abb 100644
--- a/frontend/src/views/test-plan/testPlan/components/actionModal.vue
+++ b/frontend/src/views/test-plan/testPlan/components/actionModal.vue
@@ -48,7 +48,7 @@
   import { useI18n } from '@/hooks/useI18n';
   import { characterLimit } from '@/utils';
 
-  import type { TestPlanDetail, TestPlanItem } from '@/models/testPlan/testPlan';
+  import type { CreateTask, TestPlanDetail, TestPlanItem } from '@/models/testPlan/testPlan';
   import { testPlanTypeEnum } from '@/enums/testPlanEnum';
 
   const { t } = useI18n();
@@ -56,6 +56,7 @@
   const props = defineProps<{
     visible: boolean;
     record: TestPlanItem | TestPlanDetail | undefined; // 表record
+    scheduleConfig?: CreateTask;
   }>();
 
   const emit = defineEmits<{
@@ -98,7 +99,9 @@
       case 'ARCHIVED':
         return t('testPlan.testPlanIndex.deleteArchivedPlan');
       case 'UNDERWAY':
-        return t('testPlan.testPlanIndex.deleteRunningPlan');
+        return props.scheduleConfig && props.scheduleConfig.enable
+          ? t('testPlan.testPlanIndex.deleteRunningSchedulePlan')
+          : t('testPlan.testPlanIndex.deleteRunningPlan');
       case 'COMPLETED':
         return t('testPlan.testPlanIndex.deleteCompletedPlan');
       default:
diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue
index 1e47f7e9ee..d3bd51086c 100644
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@@ -47,6 +47,7 @@
     @batch-action="handleTableBatch"
     @filter-change="filterChange"
     @drag-change="handleDragChange"
+    @sorter-change="saveSort"
   >
     <!-- TODO: 快捷创建暂时不上 -->
     <!-- <template v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD'])" #quickCreate>
@@ -159,30 +160,32 @@
     </template>
     <template #planStartToEndTime="{ record }">
       <div>
-        {{ record.plannedStartTime ? dayjs(record.plannedStartTime) : '-' }} {{ t('common.to') }}
+        {{ record.plannedStartTime ? dayjs(record.plannedStartTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+        {{ t('common.to') }}
         <a-tooltip
           class="ms-tooltip-red"
           :content="t('testPlan.planStartToEndTimeTip')"
           :disabled="record.execStatus !== LastExecuteResults.ERROR"
         >
           <span :class="[`${record.execStatus === LastExecuteResults.ERROR ? 'text-[rgb(var(--danger-6))' : ''}`]">
-            {{ record?.plannedEndTime ? dayjs(record.plannedEndTime) : '-' }}
+            {{ record?.plannedEndTime ? dayjs(record.plannedEndTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
           </span>
         </a-tooltip>
       </div>
     </template>
     <template #actualStartToEndTime="{ record }">
-      {{ record?.actualStartTime ? dayjs(record.actualStartTime) : '-' }}{{ t('common.to')
-      }}{{ record.actualEndTime ? dayjs(record.actualEndTime) : '-' }}
+      {{ record?.actualStartTime ? dayjs(record.actualStartTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+      {{ t('common.to') }} {{ record.actualEndTime ? dayjs(record.actualEndTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
     </template>
 
     <template #passRate="{ record }">
-      <div class="mr-[8px] w-[100px]">
+      <div v-if="record.type === testPlanTypeEnum.TEST_PLAN" class="mr-[8px] w-[100px]">
         <StatusProgress :status-detail="defaultCountDetailMap[record.id]" height="5px" />
       </div>
-      <div class="text-[var(--color-text-1)]">
+      <div v-if="record.type === testPlanTypeEnum.TEST_PLAN" class="text-[var(--color-text-1)]">
         {{ `${defaultCountDetailMap[record.id]?.passRate ? defaultCountDetailMap[record.id].passRate : '-'}%` }}
       </div>
+      <span v-else> - </span>
     </template>
     <template #passRateTitleSlot="{ columnConfig }">
       <div class="flex items-center text-[var(--color-text-3)]">
@@ -196,8 +199,13 @@
       </div>
     </template>
     <template #functionalCaseCount="{ record }">
-      <a-popover position="bottom" content-class="p-[16px]" :disabled="getFunctionalCount(record.id) < 1">
-        <div>{{ getFunctionalCount(record.id) }}</div>
+      <a-popover
+        v-if="record.type === testPlanTypeEnum.TEST_PLAN"
+        position="bottom"
+        content-class="p-[16px]"
+        :disabled="getFunctionalCount(record.id) < 1"
+      >
+        <div v-if="record.type === testPlanTypeEnum.TEST_PLAN">{{ getFunctionalCount(record.id) }}</div>
         <template #content>
           <table class="min-w-[140px] max-w-[176px]">
             <tr>
@@ -235,14 +243,22 @@
           </table>
         </template>
       </a-popover>
+      <span v-else>-</span>
     </template>
 
     <template #operation="{ record }">
       <div class="flex items-center">
-        <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="isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+EXECUTE'])"
+          class="!mx-0"
+          @click="executePlan(record)"
+          >{{ t('testPlan.testPlanIndex.execution') }}</MsButton
+        >
+        <a-divider
+          v-if="isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+EXECUTE'])"
+          direction="vertical"
+          :margin="8"
+        ></a-divider>
 
         <MsButton
           v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) && record.status !== 'ARCHIVED'"
@@ -256,10 +272,17 @@
           :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>
+        <MsButton
+          v-if="!isShowExecuteButton(record, ['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'])"
+          direction="vertical"
+          :margin="8"
+        ></a-divider>
         <MsTableMoreAction :list="getMoreActions(record)" @select="handleMoreActionSelect($event, record)" />
       </div>
     </template>
@@ -308,7 +331,12 @@
     :task-config="taskForm"
     @handle-success="fetchData()"
   />
-  <ActionModal v-model:visible="showStatusDeleteModal" :record="activeRecord" @success="fetchData()" />
+  <ActionModal
+    v-model:visible="showStatusDeleteModal"
+    :record="activeRecord"
+    :schedule-config="defaultCountDetailMap[activeRecord?.id || 'none']?.scheduleConfig"
+    @success="fetchData()"
+  />
   <BatchEditModal
     v-model:visible="showEditModel"
     :batch-params="batchParams"
@@ -501,6 +529,7 @@
       dataIndex: 'moduleId',
       showInTable: true,
       showDrag: true,
+      showTooltip: true,
       width: 200,
     },
     {
@@ -514,6 +543,7 @@
       },
       width: 200,
       showDrag: true,
+      showTooltip: true,
     },
     {
       title: 'testPlan.testPlanIndex.planStartToEndTime',
@@ -523,7 +553,8 @@
         sortDirections: ['ascend', 'descend'],
         sorter: true,
       },
-      width: 200,
+      width: 370,
+      showTooltip: true,
       showDrag: true,
     },
     {
@@ -534,7 +565,8 @@
         sortDirections: ['ascend', 'descend'],
         sorter: true,
       },
-      width: 200,
+      showTooltip: true,
+      width: 370,
       showDrag: true,
     },
     {
@@ -668,19 +700,19 @@
     {
       label: 'testPlan.testPlanIndex.createScheduledTask',
       eventTag: 'createScheduledTask',
-      permission: ['PROJECT_TEST_PLAN:READ+UPDATE'],
+      permission: ['PROJECT_TEST_PLAN:READ+EXECUTE'],
     },
   ];
   const updateAndDeleteScheduledActions: ActionsItem[] = [
     {
       label: 'testPlan.testPlanIndex.updateScheduledTask',
       eventTag: 'updateScheduledTask',
-      permission: ['PROJECT_TEST_PLAN:READ+UPDATE'],
+      permission: ['PROJECT_TEST_PLAN:READ+EXECUTE'],
     },
     {
       label: 'testPlan.testPlanIndex.deleteScheduledTask',
       eventTag: 'deleteScheduledTask',
-      permission: ['PROJECT_TEST_PLAN:READ+UPDATE'],
+      permission: ['PROJECT_TEST_PLAN:READ+EXECUTE'],
     },
   ];
 
@@ -695,11 +727,11 @@
     return defaultCountDetailMap.value[id].scheduleConfig.enable;
   }
 
-  function isShowExecuteButton(record: TestPlanItem) {
+  function isShowExecuteButton(record: TestPlanItem, permission: string[]) {
     return (
       ((record.type === testPlanTypeEnum.TEST_PLAN && getFunctionalCount(record.id) > 0) ||
         (record.type === testPlanTypeEnum.GROUP && record.childrenCount)) &&
-      hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) &&
+      hasAnyPermission(permission) &&
       record.status !== 'ARCHIVED'
     );
   }
@@ -708,7 +740,7 @@
     const { status: planStatus } = record;
 
     // 有用例数量才可以执行 否则不展示执行
-    const copyAction = isShowExecuteButton(record) ? copyActions : [];
+    const copyAction = isShowExecuteButton(record, ['PROJECT_TEST_PLAN:READ+ADD']) ? copyActions : [];
 
     let scheduledTaskAction: ActionsItem[] = [];
     if (planStatus !== 'ARCHIVED' && record.groupId && record.groupId === 'NONE') {
@@ -825,6 +857,11 @@
     setLoadListParams(await initTableParams());
     loadList();
   }
+  // 排序
+  const sort = ref<{ [key: string]: string }>({});
+  function saveSort(sortObj: { [key: string]: string }) {
+    sort.value = sortObj;
+  }
 
   // 获取父组件模块数量
   async function emitTableParams(isInit = false) {
@@ -871,7 +908,7 @@
     projectId: appStore.currentProjectId,
     executeIds: [],
     runMode: 'SERIAL',
-    executionSource: 'JENKINS',
+    executionSource: 'MANUAL',
   };
 
   const executeForm = ref<BatchExecutePlan>(cloneDeep(initExecuteForm));
@@ -913,7 +950,7 @@
       const params: ExecutePlan = {
         executeId: id,
         runMode: 'SERIAL',
-        executionSource: 'JENKINS',
+        executionSource: 'MANUAL',
       };
       await executeSinglePlan(params);
       Message.success(t('case.detail.execute.success'));
@@ -1331,7 +1368,8 @@
     () => showType.value,
     (val) => {
       if (val) {
-        tableProps.value.draggableCondition = hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) && val === 'ALL';
+        tableProps.value.draggableCondition =
+          hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) && val !== 'TEST_PLAN' && !Object.keys(sort.value).length;
         setPagination({
           current: 1,
         });
@@ -1342,6 +1380,21 @@
     }
   );
 
+  watch(
+    () => sort.value,
+    (val) => {
+      if (val) {
+        tableProps.value.draggableCondition =
+          hasAnyPermission(['PROJECT_TEST_PLAN:READ+UPDATE']) &&
+          showType.value !== 'GROUP' &&
+          !Object.keys(sort.value).length;
+      }
+    },
+    {
+      deep: true,
+    }
+  );
+
   watch(
     () => props.activeFolder,
     (val) => {
diff --git a/frontend/src/views/test-plan/testPlan/components/statusProgress.vue b/frontend/src/views/test-plan/testPlan/components/statusProgress.vue
index 672ad61a58..d3f13a657d 100644
--- a/frontend/src/views/test-plan/testPlan/components/statusProgress.vue
+++ b/frontend/src/views/test-plan/testPlan/components/statusProgress.vue
@@ -32,8 +32,7 @@
             {{ detailCount.errorCount }}
           </td>
         </tr>
-        <!-- TODO 这个版本暂时不上 -->
-        <!-- <tr>
+        <tr>
           <td class="popover-label-td">
             <div class="mb-[2px] mr-[4px] h-[6px] w-[6px] rounded-full bg-[rgb(var(--warning-6))]"></div>
             <div>{{ t('common.fakeError') }}</div>
@@ -41,7 +40,7 @@
           <td class="popover-value-td">
             {{ detailCount.fakeErrorCount }}
           </td>
-        </tr> -->
+        </tr>
         <tr>
           <td class="popover-label-td">
             <div class="mb-[2px] mr-[4px] h-[6px] w-[6px] rounded-full bg-[var(--color-fill-p-3)]"></div>
diff --git a/frontend/src/views/test-plan/testPlan/locale/en-US.ts b/frontend/src/views/test-plan/testPlan/locale/en-US.ts
index e16f90bfbf..8456df098b 100644
--- a/frontend/src/views/test-plan/testPlan/locale/en-US.ts
+++ b/frontend/src/views/test-plan/testPlan/locale/en-US.ts
@@ -73,12 +73,15 @@ export default {
     'The plan is not executed, the data cannot be recovered after deletion, please operate carefully!',
   'testPlan.testPlanIndex.deleteRunningPlan':
     'Scheduled tasks are stopped and deleted. Exercise caution when performing this operation',
+  'testPlan.testPlanIndex.deleteRunningSchedulePlan':
+    'Scheduled tasks are stopped and deleted. Exercise caution when performing this operation.',
   'testPlan.testPlanIndex.deleteCompletedPlan':
     'The proposed plan is completed, the option is archived, and the use case information and execution results are retained;If you continue to delete, the data will not be restored, please be careful!',
   'testPlan.testPlanIndex.confirmArchivePlan':
     'After filing, implement information no longer update and editing, data unrecoverable, please careful operation！',
   'testPlan.testPlanIndex.passRateTitleTip': 'Passed use cases/all use cases *100%',
   'testPlan.planForm.namePlaceholder': 'Please enter the name of the test plan',
+  'testPlan.planForm.nameGroupPlaceholder': 'Please enter a plan group name',
   'testPlan.planForm.nameRequired': 'Test plan name cannot be empty',
   'testPlan.planForm.testPlanGroupRequired': 'Plan group cannot be empty',
   'testPlan.planForm.planStartAndEndTime': 'Planned start and end time',
diff --git a/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts b/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
index 2f51fb5483..4e5ed6befd 100644
--- a/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
+++ b/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
@@ -68,12 +68,15 @@ export default {
   'testPlan.testPlanIndex.deleteArchivedPlan': '计划 已归档，删除后数据不可恢复，请谨慎操作！',
   'testPlan.testPlanIndex.deletePendingPlan': '计划 未执行，删除后数据不可恢复，请谨慎操作！',
   'testPlan.testPlanIndex.deleteRunningPlan': '计划 进行中，删除后，终止执行且不可恢复，请谨慎操作！',
+  'testPlan.testPlanIndex.deleteRunningSchedulePlan':
+    '计划 进行中，删除后，终止执行且不可恢复，定时任务停止并删除，请谨慎操作！',
   'testPlan.testPlanIndex.deleteCompletedPlan':
     '建议计划 已完成 ，选择归档，用例信息及执行结果都将被保留；若继续删除，数据将不会恢复，请谨慎操作！',
   'testPlan.testPlanIndex.confirmArchivePlan': '归档后，执行信息不再更新且不可编辑，数据不可恢复，请谨慎操作！',
   'testPlan.testPlanIndex.passRateTitleTip': '已通过用例/全部用例*100%',
   'testPlan.testPlanIndex.batchEdit': '批量编辑 (已选 { number } 项数据)',
   'testPlan.planForm.namePlaceholder': '请输入测试计划名称',
+  'testPlan.planForm.nameGroupPlaceholder': '请输入计划组名称',
   'testPlan.planForm.nameRequired': '测试计划名称不能为空',
   'testPlan.planForm.testPlanGroupRequired': '计划组不能为空',
   'testPlan.planForm.planStartAndEndTime': '计划起止时间',
diff --git a/frontend/src/views/test-plan/testPlan/planGroup/createAndUpdatePlanGroup.vue b/frontend/src/views/test-plan/testPlan/planGroup/createAndUpdatePlanGroup.vue
index 550f43b313..9d71c348ee 100644
--- a/frontend/src/views/test-plan/testPlan/planGroup/createAndUpdatePlanGroup.vue
+++ b/frontend/src/views/test-plan/testPlan/planGroup/createAndUpdatePlanGroup.vue
@@ -15,7 +15,7 @@
       <a-form-item
         field="name"
         :label="t('testPlan.testPlanGroup.name')"
-        :rules="[{ required: true, message: t('apiTestDebug.requestNameRequired') }]"
+        :rules="[{ required: true, message: t('testPlan.planForm.nameGroupPlaceholder') }]"
         asterisk-position="end"
       >
         <a-input