From 25c844cd3beeea79441a576976d4beddab20279c Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Thu, 4 Jul 2024 14:22:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E7=94=A8=E4=BE=8B=E6=98=8E=E7=BB=86=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8&=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/modules/test-plan/report.ts | 13 +++++- frontend/src/api/requrls/test-plan/report.ts | 4 ++ frontend/src/models/testPlan/report.ts | 1 + .../report/detail/component/reportConfig.ts | 1 + .../system-card/featureCaseTable.vue | 44 +++++++++++++------ .../detail/executionHistory/index.vue | 41 +++-------------- .../detail/featureCase/detail/index.vue | 36 ++++++++++++--- 7 files changed, 82 insertions(+), 58 deletions(-) diff --git a/frontend/src/api/modules/test-plan/report.ts b/frontend/src/api/modules/test-plan/report.ts index 9b42a4dfc7..ef44c4f4cd 100644 --- a/frontend/src/api/modules/test-plan/report.ts +++ b/frontend/src/api/modules/test-plan/report.ts @@ -2,7 +2,7 @@ import MSR from '@/api/http'; import * as reportUrl from '@/api/requrls/test-plan/report'; import type { GetShareId } from '@/models/apiTest/report'; -import { ReportDetail, ReportStepDetail } from "@/models/apiTest/report"; +import { ReportDetail, ReportStepDetail } from '@/models/apiTest/report'; import { CommonList, TableQueryParams } from '@/models/common'; import { ApiOrScenarioCaseItem, @@ -10,6 +10,7 @@ import { ReportBugItem, UpdateReportDetailParams, } from '@/models/testPlan/report'; +import type { ExecuteHistoryItem } from '@/models/testPlan/testPlan'; import { PlanReportDetail } from '@/models/testPlan/testPlanReport'; // 报告列表 @@ -150,4 +151,14 @@ export function reportCaseStepDetail(reportId: string, stepId: string, shareId?: return MSR.get({ url: `${reportUrl.ReportDetailApiUrl}/${reportId}/${stepId}` }); } +// 报告详情-用例明细-执行历史步骤 +export function getFunctionalExecuteStep(data: { reportId: string; shareId?: string }) { + if (data.shareId) { + return MSR.get({ + url: `${reportUrl.ReportShareFunctionalStepUrl}/${data.shareId}/${data.reportId}`, + }); + } + return MSR.get({ url: `${reportUrl.ReportFunctionalStepUrl}/${data.reportId}` }); +} + export default {}; diff --git a/frontend/src/api/requrls/test-plan/report.ts b/frontend/src/api/requrls/test-plan/report.ts index 7ff4f1dc3d..b39e06b786 100644 --- a/frontend/src/api/requrls/test-plan/report.ts +++ b/frontend/src/api/requrls/test-plan/report.ts @@ -58,3 +58,7 @@ export const ReportScenarioUrl = '/test-plan/api/scenario/report/get'; export const ReportDetailScenarioUrl = '/test-plan/api/scenario/report/get/detail'; // 测试计划-报告-报告富文本预览压缩图 export const ReportPlanPreviewImageUrl = '/test-plan/report/preview/md'; +// 测试计划-报告-详情-功能用例明细-执行历史步骤 +export const ReportFunctionalStepUrl = '/test-plan/report/detail/functional/case/step'; +// 测试计划-报告-详情-功能用例明细-执行历史步骤-分享 +export const ReportShareFunctionalStepUrl = '/test-plan/report/share/detail/functional/case/step'; diff --git a/frontend/src/models/testPlan/report.ts b/frontend/src/models/testPlan/report.ts index 9965df599c..ec9807d7d2 100644 --- a/frontend/src/models/testPlan/report.ts +++ b/frontend/src/models/testPlan/report.ts @@ -16,6 +16,7 @@ export interface FeatureCaseItem { executeResult: string; executeUserName: string; bugCount: number; + reportId: string; } export interface UpdateReportDetailParams { diff --git a/frontend/src/views/test-plan/report/detail/component/reportConfig.ts b/frontend/src/views/test-plan/report/detail/component/reportConfig.ts index 357d50bbbc..aaaa342062 100644 --- a/frontend/src/views/test-plan/report/detail/component/reportConfig.ts +++ b/frontend/src/views/test-plan/report/detail/component/reportConfig.ts @@ -127,6 +127,7 @@ const functionalList: FeatureCaseItem = { executeResult: 'SUCCESS', executeUserName: '', bugCount: 0, + reportId: '', }; // 缺陷明细 const bugList: ReportBugItem = { diff --git a/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue b/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue index f57a02e093..a241eb5816 100644 --- a/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue +++ b/frontend/src/views/test-plan/report/detail/component/system-card/featureCaseTable.vue @@ -8,7 +8,7 @@ @@ -21,15 +21,9 @@ no-content-padding unmount-on-close > - - +
+ +
@@ -45,11 +39,15 @@ import ExecuteResult from '@/components/business/ms-case-associate/executeResult.vue'; import ExecutionHistory from '@/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue'; - import { getReportFeatureCaseList, getReportShareFeatureCaseList } from '@/api/modules/test-plan/report'; - import { executeHistory } from '@/api/modules/test-plan/testPlan'; + import { + getFunctionalExecuteStep, + getReportFeatureCaseList, + getReportShareFeatureCaseList, + } from '@/api/modules/test-plan/report'; import { useI18n } from '@/hooks/useI18n'; import { FeatureCaseItem } from '@/models/testPlan/report'; + import type { ExecuteHistoryItem } from '@/models/testPlan/testPlan'; import { FilterSlotNameEnum } from '@/enums/tableFilterEnum'; import { ReportCardTypeEnum } from '@/enums/testPlanReportEnum'; @@ -150,10 +148,28 @@ const showDetailVisible = ref(false); - const detailRecord = ref(); + const executeReportId = ref(''); + const executeList = ref([]); + const executeLoading = ref(false); + // 执行历史步骤 + async function getExecuteStep() { + executeLoading.value = true; + try { + const res = await getFunctionalExecuteStep({ + reportId: executeReportId.value, + shareId: props.shareId, + }); + executeList.value = [res]; + } catch (error) { + console.log(error); + } finally { + executeLoading.value = false; + } + } function openExecuteHistory(record: FeatureCaseItem) { - detailRecord.value = record; + executeReportId.value = record.reportId; showDetailVisible.value = true; + getExecuteStep(); } diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue index 04568f4c4a..3b538852ac 100644 --- a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue +++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue @@ -1,7 +1,7 @@ @@ -60,35 +60,16 @@ import { useI18n } from '@/hooks/useI18n'; import { characterLimit } from '@/utils'; - import type { ExecuteHistoryItem, ExecuteHistoryType } from '@/models/testPlan/testPlan'; + import type { ExecuteHistoryItem } from '@/models/testPlan/testPlan'; const { t } = useI18n(); const props = defineProps<{ - loadListFun: (params: ExecuteHistoryType) => Promise; - extraParams: ExecuteHistoryType; + executeList: ExecuteHistoryItem[]; + loading: boolean; showStepResult?: boolean; // 是否展示执行步骤 }>(); - const executeHistoryList = ref([]); - - const loading = ref(false); - - async function initList() { - loading.value = true; - try { - if (props.loadListFun) { - executeHistoryList.value = await props.loadListFun({ - ...props.extraParams, - }); - } - } catch (error) { - console.log(error); - } finally { - loading.value = false; - } - } - function getStepData(steps: string) { if (steps) { return JSON.parse(steps).map((item: any) => { @@ -103,18 +84,6 @@ } return []; } - - watch( - () => props.extraParams.caseId, - (val) => { - if (val) { - initList(); - } - }, - { - immediate: true, - } - );