diff --git a/frontend/src/views/test-plan/testPlan/components/actionModal.vue b/frontend/src/views/test-plan/testPlan/components/actionModal.vue index 99a4542abb..e17da61522 100644 --- a/frontend/src/views/test-plan/testPlan/components/actionModal.vue +++ b/frontend/src/views/test-plan/testPlan/components/actionModal.vue @@ -95,18 +95,22 @@ if (props.record?.type === testPlanTypeEnum.GROUP) { return t('testPlan.testPlanGroup.planGroupDeleteContent'); } + let deleteMessage; switch (props.record && props.record.status) { case 'ARCHIVED': - return t('testPlan.testPlanIndex.deleteArchivedPlan'); + deleteMessage = t('testPlan.testPlanIndex.deleteArchivedPlan'); + break; case 'UNDERWAY': - return props.scheduleConfig && props.scheduleConfig.enable - ? t('testPlan.testPlanIndex.deleteRunningSchedulePlan') - : t('testPlan.testPlanIndex.deleteRunningPlan'); + deleteMessage = t('testPlan.testPlanIndex.deleteRunningPlan'); + break; case 'COMPLETED': - return t('testPlan.testPlanIndex.deleteCompletedPlan'); + deleteMessage = t('testPlan.testPlanIndex.deleteCompletedPlan'); + break; default: - return t('testPlan.testPlanIndex.deletePendingPlan'); + deleteMessage = t('testPlan.testPlanIndex.deletePendingPlan'); } + const scheduledMessage = props.scheduleConfig ? t('testPlan.testPlanIndex.scheduledTask') : ''; + return `${deleteMessage}${scheduledMessage}${t('testPlan.testPlanIndex.operateWithCaution')}`; }); const showArchive = computed(() => { diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue index 1e0fcef4de..cf8ec90b5a 100644 --- a/frontend/src/views/test-plan/testPlan/components/planTable.vue +++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue @@ -1284,7 +1284,7 @@ showStatusDeleteModal.value = true; } - // 拖拽排序 TODO 待联调 + // 拖拽排序 async function handleDragChange(params: DragSortParams) { try { await dragPlanOnGroup(params); 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 910e64b74a..6a6ef19c04 100644 --- a/frontend/src/views/test-plan/testPlan/locale/en-US.ts +++ b/frontend/src/views/test-plan/testPlan/locale/en-US.ts @@ -67,16 +67,14 @@ export default { 'testPlan.testPlanIndex.functionalUseCase': 'case', 'testPlan.testPlanIndex.apiCase': 'Api use case', 'testPlan.testPlanIndex.apiScenarioCase': 'Api scenario use cases', - 'testPlan.testPlanIndex.deleteArchivedPlan': - 'After the program has been archived, delete data unrecoverable, please careful operation.', - 'testPlan.testPlanIndex.deletePendingPlan': - 'The plan is not executed, the data cannot be recovered after deletion, please operate carefully!', + 'testPlan.testPlanIndex.scheduledTask': 'stop and delete scheduled tasks, ', + 'testPlan.testPlanIndex.operateWithCaution': 'please operate with caution!', + 'testPlan.testPlanIndex.deleteArchivedPlan': 'After the program has been archived, delete data unrecoverable,', + 'testPlan.testPlanIndex.deletePendingPlan': 'The plan is not executed, the data cannot be recovered after deletion,', '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.', + 'The plan is in progress. After deletion, the execution will be terminated and cannot be restored,', '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!', + 'Suggest that completed plans, choose archiving, and retain use case information and execution results; If the deletion continues, the data will not be restored,', '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%', 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 99231f0969..491351d4b7 100644 --- a/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts +++ b/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts @@ -65,13 +65,13 @@ export default { 'testPlan.testPlanIndex.functionalUseCase': '功能用例', 'testPlan.testPlanIndex.apiCase': '接口用例', 'testPlan.testPlanIndex.apiScenarioCase': '接口场景用例', - 'testPlan.testPlanIndex.deleteArchivedPlan': '计划 已归档,删除后数据不可恢复,请谨慎操作!', - 'testPlan.testPlanIndex.deletePendingPlan': '计划 未执行,删除后数据不可恢复,请谨慎操作!', - 'testPlan.testPlanIndex.deleteRunningPlan': '计划 进行中,删除后,终止执行且不可恢复,请谨慎操作!', - 'testPlan.testPlanIndex.deleteRunningSchedulePlan': - '计划 进行中,删除后,终止执行且不可恢复,定时任务停止并删除,请谨慎操作!', + 'testPlan.testPlanIndex.scheduledTask': '定时任务停止并删除,', + 'testPlan.testPlanIndex.operateWithCaution': '请谨慎操作!', + 'testPlan.testPlanIndex.deleteArchivedPlan': '计划 已归档,删除后数据不可恢复,', + 'testPlan.testPlanIndex.deletePendingPlan': '计划 未执行,删除后数据不可恢复,', + 'testPlan.testPlanIndex.deleteRunningPlan': '计划 进行中,删除后,终止执行且不可恢复,', 'testPlan.testPlanIndex.deleteCompletedPlan': - '建议计划 已完成 ,选择归档,用例信息及执行结果都将被保留;若继续删除,数据将不会恢复,请谨慎操作!', + '建议计划 已完成 ,选择归档,用例信息及执行结果都将被保留;若继续删除,数据将不会恢复,', 'testPlan.testPlanIndex.confirmArchivePlan': '归档后,执行信息不再更新且不可编辑,数据不可恢复,请谨慎操作!', 'testPlan.testPlanIndex.passRateTitleTip': '已通过用例/全部用例*100%', 'testPlan.testPlanIndex.batchEdit': '批量编辑 (已选 { number } 项数据)',