From 8965678a2ce96eaa75958b8a12c8883f0e4fdd02 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Fri, 14 Jun 2024 17:36:19 +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=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2=E8=81=94=E8=B0=83&?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=BB=BA=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/modules/test-plan/testPlan.ts     |  2 +-
 .../src/api/requrls/test-plan/testPlan.ts     |  4 +--
 frontend/src/assets/style/global.less         | 15 ++++++++++-
 frontend/src/models/testPlan/testPlan.ts      | 12 ++++-----
 .../organization/project/orgProject.vue       |  2 +-
 .../components/systemOrganization.vue         |  2 +-
 .../components/systemProject.vue              |  2 +-
 .../testPlan/createAndEditPlanDrawer.vue      | 20 +++++++--------
 .../testPlan/detail/executeHistory/index.vue  | 25 +++++++++++--------
 .../views/test-plan/testPlan/locale/en-US.ts  |  2 ++
 .../views/test-plan/testPlan/locale/zh-CN.ts  |  2 ++
 11 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/frontend/src/api/modules/test-plan/testPlan.ts b/frontend/src/api/modules/test-plan/testPlan.ts
index 49934a6a88..b445974870 100644
--- a/frontend/src/api/modules/test-plan/testPlan.ts
+++ b/frontend/src/api/modules/test-plan/testPlan.ts
@@ -392,7 +392,7 @@ export function getApiScenarioReport(reportId: string) {
 export function getApiScenarioReportStep(reportId: string, stepId: string) {
   return MSR.get<ReportStepDetail[]>({ url: `${ApiScenarioReportDetailStepUrl}/${reportId}/${stepId}` });
 }
-// 计划详情-执行历史 TODO 联调
+// 计划详情-执行历史
 export function getPlanDetailExecuteHistory(data: PlanDetailFeatureCaseListQueryParams) {
   return MSR.post<CommonList<PlanDetailExecuteHistoryItem>>({ url: PlanDetailExecuteHistoryUrl, data });
 }
diff --git a/frontend/src/api/requrls/test-plan/testPlan.ts b/frontend/src/api/requrls/test-plan/testPlan.ts
index 5d86fd4a66..d5360b1714 100644
--- a/frontend/src/api/requrls/test-plan/testPlan.ts
+++ b/frontend/src/api/requrls/test-plan/testPlan.ts
@@ -80,8 +80,8 @@ export const GetTestPlanUsersUrl = '/test-plan/functional/case/user-option';
 export const BatchUpdateCaseExecutorUrl = '/test-plan/functional/case/batch/update/executor';
 // 计划详情-功能用例-执行历史
 export const ExecuteHistoryUrl = '/test-plan/functional/case/exec/history';
-// 计划详情-执行历史 TODO 联调
-export const PlanDetailExecuteHistoryUrl = '/api/scenario/execute/page';
+// 计划详情-执行历史
+export const PlanDetailExecuteHistoryUrl = '/his/page';
 // 功能用例-关联用例-接口用例-API
 export const TestPlanApiAssociatedPageUrl = '/test-plan/association/api/page';
 // 功能用例-关联用例-接口用例-CASE
diff --git a/frontend/src/assets/style/global.less b/frontend/src/assets/style/global.less
index 000147106d..3da0204fc3 100644
--- a/frontend/src/assets/style/global.less
+++ b/frontend/src/assets/style/global.less
@@ -98,7 +98,7 @@ body {
 }
 
 /* 白色背景的tooltip */
-.tooltip-white {
+.ms-tooltip-white {
   .arco-tooltip-content {
     background-color: var(--color-bg-1);
     box-shadow: 0 4px 10px -1px rgb(100 100 102 / 15%);
@@ -108,3 +108,16 @@ body {
     background-color: var(--color-bg-1);
   }
 }
+
+/* 红色背景的tooltip */
+.ms-tooltip-red {
+  .arco-tooltip-content {
+    color: rgb(var(--danger-6));
+    background-color: rgb(var(--danger-1));
+    box-shadow: 0 4px 10px -1px rgb(100 100 102 / 15%);
+  }
+  .arco-tooltip-popup-arrow {
+    z-index: 1;
+    background-color: rgb(var(--danger-1));
+  }
+}
diff --git a/frontend/src/models/testPlan/testPlan.ts b/frontend/src/models/testPlan/testPlan.ts
index 4635f4905b..2a1a3e3d9b 100644
--- a/frontend/src/models/testPlan/testPlan.ts
+++ b/frontend/src/models/testPlan/testPlan.ts
@@ -61,6 +61,7 @@ export interface AddTestPlanParams {
   projectId?: string;
   testPlanId?: string;
   functionalCaseCount?: number;
+  isGroup?: boolean;
 }
 
 export interface TestPlanDetail extends AddTestPlanParams {
@@ -144,7 +145,7 @@ export interface FollowPlanParams {
 }
 
 export interface TestPlanBaseParams {
-  projectId: string;
+  projectId?: string;
   testPlanId: string;
 }
 
@@ -348,17 +349,16 @@ export interface PlanDetailApiScenarioItem {
   testPlanCollectionId: string; // 测试集id
 }
 
-// 执行历史 TODO 联调
+// 执行历史
 export interface PlanDetailExecuteHistoryItem {
   id: string;
   num: string;
-  name: string;
+  triggerMode: string; // 执行方式
+  execStatus: string; // 执行结果
   operationUser: string;
-  createUser: string;
   startTime: number;
   endTime: number;
-  lastExecResult: LastExecuteResults;
-  triggerMode: string;
+  deleted: boolean;
 }
 
 export interface CreateTask {
diff --git a/frontend/src/views/setting/organization/project/orgProject.vue b/frontend/src/views/setting/organization/project/orgProject.vue
index 7369b4726d..346fb145cc 100644
--- a/frontend/src/views/setting/organization/project/orgProject.vue
+++ b/frontend/src/views/setting/organization/project/orgProject.vue
@@ -19,7 +19,7 @@
     </div>
     <MsBaseTable v-bind="propsRes" v-on="propsEvent">
       <template #revokeDelete="{ record }">
-        <a-tooltip class="tooltip-white">
+        <a-tooltip class="ms-tooltip-white">
           <template #content>
             <div class="flex flex-row">
               <span class="text-[var(--color-text-1)]">
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
index 98dd87c1f8..9e0b303e4b 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
@@ -1,7 +1,7 @@
 <template>
   <MsBaseTable v-bind="propsRes" v-on="propsEvent">
     <template #revokeDelete="{ record }">
-      <a-tooltip class="tooltip-white">
+      <a-tooltip class="ms-tooltip-white">
         <template #content>
           <div class="flex flex-row">
             <span class="text-[var(--color-text-1)]">{{
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
index 8ab5817ad5..1f15cf5753 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
@@ -1,7 +1,7 @@
 <template>
   <MsBaseTable v-bind="propsRes" v-on="propsEvent">
     <template #revokeDelete="{ record }">
-      <a-tooltip class="tooltip-white">
+      <a-tooltip class="ms-tooltip-white">
         <template #content>
           <div class="flex flex-row">
             <span class="text-[var(--color-text-1)]">{{
diff --git a/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue b/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
index 7c46fcd780..5964557047 100644
--- a/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
+++ b/frontend/src/views/test-plan/testPlan/createAndEditPlanDrawer.vue
@@ -28,28 +28,25 @@
         field="type"
         :label="props.planId?.length ? t('caseManagement.featureCase.moveTo') : t('testPlan.planForm.createTo')"
       >
-        <a-radio-group v-model:model-value="form.type">
-          <a-radio :value="testPlanTypeEnum.TEST_PLAN">{{ t('testPlan.testPlanGroup.module') }}</a-radio>
-          <a-radio :value="testPlanTypeEnum.GROUP">{{ t('testPlan.testPlanIndex.testPlanGroup') }}</a-radio>
+        <a-radio-group v-model:model-value="form.isGroup">
+          <a-radio :value="false">{{ t('testPlan.testPlanGroup.module') }}</a-radio>
+          <a-radio :value="true">{{ t('testPlan.testPlanIndex.testPlanGroup') }}</a-radio>
         </a-radio-group>
       </a-form-item>
       <a-form-item
-        v-show="form.type === testPlanTypeEnum.GROUP"
+        v-if="form.isGroup"
         field="groupId"
+        :rules="[{ required: true, message: t('testPlan.planForm.testPlanGroupRequired') }]"
         :label="t('testPlan.testPlanIndex.testPlanGroup')"
         class="w-[436px]"
       >
-        <a-select v-model="form.groupId" :placeholder="t('common.pleaseSelect')">
+        <a-select v-model="form.groupId" allow-search :placeholder="t('common.pleaseSelect')">
           <a-option v-for="item of groupList" :key="item.id" :value="item.id">
             {{ item.name }}
           </a-option>
         </a-select>
       </a-form-item>
-      <a-form-item
-        v-show="form.type === testPlanTypeEnum.TEST_PLAN"
-        :label="t('common.belongModule')"
-        class="w-[436px]"
-      >
+      <a-form-item v-else field="moduleId" :label="t('common.belongModule')" class="w-[436px]">
         <a-tree-select
           v-model:modelValue="form.moduleId"
           :data="props.moduleTree"
@@ -178,7 +175,7 @@
   const drawerLoading = ref(false);
   const formRef = ref<FormInstance>();
   const initForm: AddTestPlanParams = {
-    groupId: 'NONE',
+    isGroup: false,
     name: '',
     projectId: '',
     moduleId: 'root',
@@ -310,6 +307,7 @@
 
         form.value.cycle = [result.plannedStartTime as number, result.plannedEndTime as number];
         form.value.passThreshold = parseFloat(result.passThreshold.toString());
+        form.value.isGroup = result.groupId !== 'none';
       }
     } catch (error) {
       // eslint-disable-next-line no-console
diff --git a/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue b/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
index dc94873cbd..bc7f9cfc4e 100644
--- a/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
@@ -8,16 +8,20 @@
         <span>{{ t(TriggerModeLabel[record.triggerMode as keyof typeof TriggerModeLabel]) }}</span>
       </template>
       <template #lastExecResult="{ record }">
-        <ExecutionStatus :status="record.status" :module-type="ReportEnum.API_REPORT" />
+        <ExecutionStatus :status="record.execStatus" :module-type="ReportEnum.API_REPORT" />
       </template>
       <template #executionStartAndEndTime="{ record }">
-        <!-- TODO 样式 -->
-        <div>{{ record.startTime }} 至 {{ record.endTime ?? '-' }}</div>
+        <div> {{ record.startTime }} 至 {{ record.endTime ?? '-' }} </div>
       </template>
       <template #operation="{ record }">
-        <MsButton class="!mr-0" @click="toReport(record)">
-          {{ t('apiScenario.executeHistory.execution.operation') }}
-        </MsButton>
+        <a-tooltip :content="t('project.executionHistory.cleared')" :disabled="!record.deleted">
+          <MsButton
+            :disabled="record.deleted || !hasAnyPermission(['PROJECT_TEST_PLAN_REPORT:READ'])"
+            class="!mr-0"
+            @click="toReport(record)"
+            >{{ t('apiScenario.executeHistory.execution.operation') }}
+          </MsButton>
+        </a-tooltip>
       </template>
     </ms-base-table>
   </div>
@@ -37,9 +41,10 @@
   import { getPlanDetailExecuteHistory } from '@/api/modules/test-plan/testPlan';
   import { useI18n } from '@/hooks/useI18n';
   import useOpenNewPage from '@/hooks/useOpenNewPage';
-  import useAppStore from '@/store/modules/app';
+  import { hasAnyPermission } from '@/utils/permission';
 
   import type { PlanDetailExecuteHistoryItem } from '@/models/testPlan/testPlan';
+  import { LastExecuteResults } from '@/enums/caseEnum';
   import { ReportEnum, TriggerModeLabel } from '@/enums/reportEnum';
   import { TestPlanRouteEnum } from '@/enums/routeEnum';
   import { FilterSlotNameEnum } from '@/enums/tableFilterEnum';
@@ -49,7 +54,6 @@
 
   const { t } = useI18n();
   const route = useRoute();
-  const appStore = useAppStore();
   const { openNewPage } = useOpenNewPage();
 
   const planId = ref(route.query.id as string);
@@ -73,7 +77,7 @@
     },
     {
       title: 'common.executionResult',
-      dataIndex: 'lastExecResult',
+      dataIndex: 'execStatus',
       slotName: 'lastExecResult',
       filterConfig: {
         valueKey: 'key',
@@ -121,8 +125,7 @@
 
   function loadExecuteList() {
     setLoadListParams({
-      projectId: appStore.currentProjectId,
-      id: planId.value,
+      testPlanId: planId.value,
     });
     loadList();
   }
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 9caa7bac7d..d9ddff4df7 100644
--- a/frontend/src/views/test-plan/testPlan/locale/en-US.ts
+++ b/frontend/src/views/test-plan/testPlan/locale/en-US.ts
@@ -80,6 +80,7 @@ export default {
   'testPlan.testPlanIndex.passRateTitleTip': 'Passed use cases/all use cases *100%',
   'testPlan.planForm.namePlaceholder': 'Please enter the name of the test plan',
   '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',
   'testPlan.planForm.associateRepeatCase': 'Allow associated duplicate cases',
   'testPlan.planForm.passThreshold': 'Pass threshold',
@@ -116,6 +117,7 @@ export default {
   'testPlan.featureCase.autoNextTip2': 'Close: After submitting the results, it is still in the current state',
   'testPlan.api.testSetRequired': 'The test set cannot be empty',
   'testPlan.executeHistory.executionStartAndEndTime': 'Execution start and end time',
+  'testPlan.executeHistory.testPlanHasTimedOut': 'Test plan has timed out',
   'testPlan.testPlanGroup.seeArchived': 'Only see archived',
   'testPlan.testPlanGroup.planNamePlaceholder': 'Please enter the name of the test plan group',
   'testPlan.testPlanGroup.name': 'Group Name',
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 3f9a700489..e7332d6d4e 100644
--- a/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
+++ b/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
@@ -75,6 +75,7 @@ export default {
   'testPlan.testPlanIndex.batchEdit': '批量编辑 (已选 { number } 项数据)',
   'testPlan.planForm.namePlaceholder': '请输入测试计划名称',
   'testPlan.planForm.nameRequired': '测试计划名称不能为空',
+  'testPlan.planForm.testPlanGroupRequired': '计划组不能为空',
   'testPlan.planForm.planStartAndEndTime': '计划起止时间',
   'testPlan.planForm.associateRepeatCase': '允许关联重复用例',
   'testPlan.planForm.passThreshold': '通过阀值',
@@ -110,6 +111,7 @@ export default {
   'testPlan.featureCase.autoNextTip2': '关闭：提交结果后，还在当前',
   'testPlan.api.testSetRequired': '测试集不能为空',
   'testPlan.executeHistory.executionStartAndEndTime': '执行起止时间',
+  'testPlan.executeHistory.testPlanHasTimedOut': '测试计划已超时',
   'testPlan.testPlanGroup.seeArchived': '只看已归档',
   'testPlan.testPlanGroup.planNamePlaceholder': '请输入测试计划组名称',
   'testPlan.testPlanGroup.name': '计划组名称',