From 39febe26dd54e61c5cf723245580f1149911648e Mon Sep 17 00:00:00 2001 From: teukkk Date: Wed, 12 Jun 2024 15:07:58 +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=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B&=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=9C=BA=E6=99=AF-=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/modules/test-plan/testPlan.ts | 20 ++++++ .../src/api/requrls/test-plan/testPlan.ts | 8 +++ frontend/src/locale/en-US/common.ts | 1 + frontend/src/locale/zh-CN/common.ts | 1 + frontend/src/models/testPlan/testPlan.ts | 1 + .../caseAndScenarioReportDrawer.vue | 3 +- .../detail/apiCase/components/caseTable.vue | 65 +++++++++++++++++-- .../apiScenario/components/scenarioTable.vue | 49 ++++++++++++-- 8 files changed, 139 insertions(+), 9 deletions(-) diff --git a/frontend/src/api/modules/test-plan/testPlan.ts b/frontend/src/api/modules/test-plan/testPlan.ts index 59e671e9eb..19e96bc254 100644 --- a/frontend/src/api/modules/test-plan/testPlan.ts +++ b/frontend/src/api/modules/test-plan/testPlan.ts @@ -12,6 +12,8 @@ import { BatchDisassociateCaseUrl, BatchEditTestPlanUrl, batchMovePlanUrl, + BatchRunApiCaseUrl, + BatchRunApiScenarioUrl, BatchRunCaseUrl, BatchUpdateApiCaseExecutorUrl, BatchUpdateApiScenarioExecutorUrl, @@ -51,6 +53,8 @@ import { planDetailBugPageUrl, PlanDetailExecuteHistoryUrl, planPassRateUrl, + RunApiCaseUrl, + RunApiScenarioUrl, RunFeatureCaseUrl, SortApiCaseUrl, SortApiScenarioUrl, @@ -296,6 +300,10 @@ export const sortApiCase = (data: SortApiCaseParams) => { export function disassociateApiCase(data: DisassociateCaseParams) { return MSR.post({ url: DisassociateApiCaseUrl, data }); } +// 计划详情-接口用例列表-执行 +export function runApiCase(id: string, reportId?: string) { + return MSR.get({ url: `${RunApiCaseUrl}/${id}`, params: reportId }); +} // 计划详情-接口用例列表-批量取消关联用例 export function batchDisassociateApiCase(data: BatchApiCaseParams) { return MSR.post({ url: BatchDisassociateApiCaseUrl, data }); @@ -304,6 +312,10 @@ export function batchDisassociateApiCase(data: BatchApiCaseParams) { export function batchUpdateApiCaseExecutor(data: BatchUpdateApiCaseExecutorParams) { return MSR.post({ url: BatchUpdateApiCaseExecutorUrl, data }); } +// 计划详情-接口用例列表-批量执行 +export function batchRunApiCase(data: BatchApiCaseParams) { + return MSR.post({ url: BatchRunApiCaseUrl, data }); +} // 计划详情-接口场景列表 export function getPlanDetailApiScenarioList(data: PlanDetailApiScenarioQueryParams) { return MSR.post>({ url: GetPlanDetailApiScenarioListUrl, data }); @@ -320,6 +332,10 @@ export function getApiScenarioModuleCount(data: PlanDetailApiScenarioQueryParams export const sortApiScenario = (data: SortApiCaseParams) => { return MSR.post({ url: SortApiScenarioUrl, data }); }; +// 计划详情-接口场景列表-执行 +export function runApiScenario(id: string, reportId?: string) { + return MSR.get({ url: `${RunApiScenarioUrl}/${id}`, params: reportId }); +} // 计划详情-接口场景列表-取消关联用例 export function disassociateApiScenario(data: DisassociateCaseParams) { return MSR.post({ url: DisassociateApiScenarioUrl, data }); @@ -332,6 +348,10 @@ export function batchDisassociateApiScenario(data: BatchApiCaseParams) { export function batchUpdateApiScenarioExecutor(data: BatchUpdateApiCaseExecutorParams) { return MSR.post({ url: BatchUpdateApiScenarioExecutorUrl, data }); } +// 计划详情-接口场景列表-批量执行 +export function batchRunApiScenario(data: BatchApiCaseParams) { + return MSR.post({ url: BatchRunApiScenarioUrl, data }); +} // 计划详情-执行历史 TODO 联调 export function getPlanDetailExecuteHistory(data: PlanDetailFeatureCaseListQueryParams) { return MSR.post>({ url: PlanDetailExecuteHistoryUrl, data }); diff --git a/frontend/src/api/requrls/test-plan/testPlan.ts b/frontend/src/api/requrls/test-plan/testPlan.ts index c21bf09d26..ca38814553 100644 --- a/frontend/src/api/requrls/test-plan/testPlan.ts +++ b/frontend/src/api/requrls/test-plan/testPlan.ts @@ -107,12 +107,16 @@ export const GetApiCaseModuleUrl = '/test-plan/api/case/tree'; export const GetApiCaseModuleCountUrl = '/test-plan/api/case/module/count'; // 计划详情-接口用例列表-拖拽排序 export const SortApiCaseUrl = '/test-plan/api/case/sort'; +// 计划详情-接口用例列表-执行 +export const RunApiCaseUrl = '/test-plan/api/case/run'; // 计划详情-接口用例列表-取消关联用例 export const DisassociateApiCaseUrl = '/test-plan/api/case/disassociate'; // 计划详情-接口用例列表-批量取消关联用例 export const BatchDisassociateApiCaseUrl = '/test-plan/api/case/batch/disassociate'; // 计划详情-接口用例列表-批量更新执行人 export const BatchUpdateApiCaseExecutorUrl = '/test-plan/api/case/batch/update/executor'; +// 计划详情-接口用例列表-批量执行 +export const BatchRunApiCaseUrl = '/test-plan/api/case/batch/run'; // 计划详情-接口场景列表 export const GetPlanDetailApiScenarioListUrl = '/test-plan/api/scenario/page'; @@ -122,12 +126,16 @@ export const GetApiScenarioModuleUrl = '/test-plan/api/scenario/tree'; export const GetApiScenarioModuleCountUrl = '/test-plan/api/scenario/module/count'; // 计划详情-接口场景列表-拖拽排序 export const SortApiScenarioUrl = '/test-plan/api/scenario/sort'; +// 计划详情-接口场景列表-执行 +export const RunApiScenarioUrl = '/test-plan/api/scenario/run'; // 计划详情-接口场景列表-取消关联用例 export const DisassociateApiScenarioUrl = '/test-plan/api/scenario/disassociate'; // 计划详情-接口场景列表-批量取消关联用例 export const BatchDisassociateApiScenarioUrl = '/test-plan/api/scenario/batch/disassociate'; // 计划详情-接口场景列表-批量更新执行人 export const BatchUpdateApiScenarioExecutorUrl = '/test-plan/api/scenario/batch/update/executor'; +// 计划详情-接口场景列表-批量执行 +export const BatchRunApiScenarioUrl = '/test-plan/api/scenario/batch/run'; // 测试规划脑图 export const GetPlanMinderUrl = '/test-plan/mind/data'; diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts index 961f768fbd..c82eb2a9ef 100644 --- a/frontend/src/locale/en-US/common.ts +++ b/frontend/src/locale/en-US/common.ts @@ -56,6 +56,7 @@ export default { 'common.operationFailed': 'Operation failed', 'common.removeSuccess': 'Remove success', 'common.removeFailed': 'Remove failed', + 'common.executionSuccess': 'Execution success', 'common.admin': 'Admin', 'common.revokeDelete': 'Revoke delete', 'common.revokeDeleteSuccess': 'Revoke delete success', diff --git a/frontend/src/locale/zh-CN/common.ts b/frontend/src/locale/zh-CN/common.ts index 1f78e7a16e..1b5a444b84 100644 --- a/frontend/src/locale/zh-CN/common.ts +++ b/frontend/src/locale/zh-CN/common.ts @@ -57,6 +57,7 @@ export default { 'common.operationFailed': '操作失败', 'common.removeSuccess': '移除成功', 'common.removeFailed': '移除失败', + 'common.executionSuccess': '执行成功', 'common.admin': '管理员', 'common.revokeDelete': '撤销删除', 'common.revokeDeleteSuccess': '已撤销删除', diff --git a/frontend/src/models/testPlan/testPlan.ts b/frontend/src/models/testPlan/testPlan.ts index 4c5e95d9fd..40d9c5014c 100644 --- a/frontend/src/models/testPlan/testPlan.ts +++ b/frontend/src/models/testPlan/testPlan.ts @@ -287,6 +287,7 @@ export interface PlanDetailApiCaseItem { executeUser: string; executeUserName: string; priority: string; + protocol: string; path: string; projectId: string; projectName: string; diff --git a/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue b/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue index b39f27c5c9..b9486f0fbc 100644 --- a/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue +++ b/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue @@ -9,7 +9,7 @@ show-full-screen > - + { @@ -455,6 +473,44 @@ } } + // 执行 + async function handleRun(record: PlanDetailApiCaseItem) { + try { + setLoading(true); + await runApiCase(record.id); + Message.success(t('common.executionSuccess')); + resetSelectorAndCaseList(); + emit('refresh'); + } catch (error) { + // eslint-disable-next-line no-console + console.log(error); + } finally { + setLoading(false); + } + } + + // 批量执行 + async function handleBatchRun() { + try { + setLoading(true); + const tableParams = await getTableParams(true); + await batchRunApiCase({ + selectIds: tableSelected.value as string[], + selectAll: batchParams.value.selectAll, + excludeIds: batchParams.value?.excludeIds || [], + ...tableParams, + }); + Message.success(t('common.executionSuccess')); + resetSelectorAndCaseList(); + emit('refresh'); + } catch (error) { + // eslint-disable-next-line no-console + console.log(error); + } finally { + setLoading(false); + } + } + // 批量取消关联用例 function handleBatchDisassociateCase() { openModal({ @@ -498,6 +554,7 @@ const tableParams = await getTableParams(true); switch (event.eventTag) { case 'execute': + handleBatchRun(); break; case 'disassociate': handleBatchDisassociateCase(); diff --git a/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue b/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue index addae409e0..d221d05101 100644 --- a/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue +++ b/frontend/src/views/test-plan/testPlan/detail/apiScenario/components/scenarioTable.vue @@ -49,7 +49,7 @@ - + { @@ -456,6 +458,44 @@ } } + // 执行 + async function handleRun(record: PlanDetailApiScenarioItem) { + try { + setLoading(true); + await runApiScenario(record.id); + Message.success(t('common.executionSuccess')); + resetSelectorAndCaseList(); + emit('refresh'); + } catch (error) { + // eslint-disable-next-line no-console + console.log(error); + } finally { + setLoading(false); + } + } + + // 批量执行 + async function handleBatchRun() { + try { + setLoading(true); + const tableParams = await getTableParams(true); + await batchRunApiScenario({ + selectIds: tableSelected.value as string[], + selectAll: batchParams.value.selectAll, + excludeIds: batchParams.value?.excludeIds || [], + ...tableParams, + }); + Message.success(t('common.executionSuccess')); + resetSelectorAndCaseList(); + emit('refresh'); + } catch (error) { + // eslint-disable-next-line no-console + console.log(error); + } finally { + setLoading(false); + } + } + // 批量取消关联用例 function handleBatchDisassociateCase() { openModal({ @@ -499,6 +539,7 @@ const tableParams = await getTableParams(true); switch (event.eventTag) { case 'execute': + handleBatchRun(); break; case 'disassociate': handleBatchDisassociateCase();