From 26a0d25f1fcace10bec54af76cb08e3e77e93fc1 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Wed, 22 Feb 2023 19:06:22 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=BA=93=E7=A7=BB=E9=99=A4=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1023636 --user=陈建星 【测试跟踪】公共用例库-当前用户对无项目权限的用例进行操作-问题汇总 https://www.tapd.cn/55049933/s/1341205 --- .../io/metersphere/controller/TestCaseController.java | 1 - .../case/components/public/PublicTestCaseList.vue | 8 ++++---- test-track/frontend/src/i18n/lang/en-US.js | 6 +++++- test-track/frontend/src/i18n/lang/zh-CN.js | 6 +++++- test-track/frontend/src/i18n/lang/zh-TW.js | 6 +++++- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java b/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java index c4eed78d0f..e2a9ae49a0 100644 --- a/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java +++ b/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java @@ -337,7 +337,6 @@ public class TestCaseController { } @PostMapping("/batch/movePublic/deleteToGc") - @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ_DELETE) @MsAuditLog(module = OperLogModule.TRACK_TEST_CASE, type = OperLogConstants.BATCH_DEL, beforeEvent = "#msClass.getLogDetails(#request.ids)", msClass = TestCaseService.class) @SendNotice(taskType = NoticeConstants.TaskType.TRACK_TEST_CASE_TASK, target = "#targetClass.findByBatchRequest(#request)", targetClass = TestCaseService.class, event = NoticeConstants.Event.DELETE, subject = "测试用例通知") diff --git a/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue b/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue index 93cf126228..4a0f7598af 100644 --- a/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue +++ b/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue @@ -478,8 +478,8 @@ export default { // 删除提供列表删除和全部版本删除 this.$refs.apiDeleteConfirm.open(testCase, this.$t('test_track.case.delete_confirm')); } else { - let title = this.$t('test_track.case.case_delete_confirm') + ": " + testCase.name + "?"; - this.$confirm(this.$t('test_track.case.batch_delete_tip'), title, { + let title = this.$t('case.public.remove') + ": " + testCase.name + "?"; + this.$confirm(title, '', { cancelButtonText: this.$t("commons.cancel"), confirmButtonText: this.$t("commons.delete"), customClass: 'custom-confirm-delete', @@ -556,8 +556,8 @@ export default { this.$emit('refreshAll'); }, handleDeleteBatchToPublic() { - let title = this.$t('test_track.case.batch_delete_confirm', [this.$refs.table.selectIds.length]); - this.$confirm(this.$t('test_track.case.batch_delete_tip'), title, { + let title = this.$t('case.public.batch_remove_confirm', [this.$refs.table.selectIds.length]); + this.$confirm(title, '', { cancelButtonText: this.$t("commons.cancel"), confirmButtonText: this.$t("commons.delete"), customClass: 'custom-confirm-delete', diff --git a/test-track/frontend/src/i18n/lang/en-US.js b/test-track/frontend/src/i18n/lang/en-US.js index a4c3ccbc4d..b3dd0f5788 100644 --- a/test-track/frontend/src/i18n/lang/en-US.js +++ b/test-track/frontend/src/i18n/lang/en-US.js @@ -147,7 +147,11 @@ const message = { cancel_relate_case_tips_title: "Confirm cancel?", cancel_relate_case_tips_content: "Cancel it will affect the test plan statistics. Sure?", back_tips: "TestCase is not saved, Are you sure to quit?", - dependency_remove_confirm: "Is dependency release confirmed?" + dependency_remove_confirm: "Is dependency release confirmed?", + public: { + remove: 'Whether to remove the use case ', + batch_remove_confirm: "Confirm remove {0} item use case?", + } }, attachment: { preview: "Preview", diff --git a/test-track/frontend/src/i18n/lang/zh-CN.js b/test-track/frontend/src/i18n/lang/zh-CN.js index d08063ed03..c99cd36cc8 100644 --- a/test-track/frontend/src/i18n/lang/zh-CN.js +++ b/test-track/frontend/src/i18n/lang/zh-CN.js @@ -147,7 +147,11 @@ const message = { cancel_relate_case_tips_title: "确定取消关联关系吗?", cancel_relate_case_tips_content: "取消关联会影响测试计划相关统计, 确定取消吗?", back_tips: "你填写的信息未保存, 确定退出吗?", - dependency_remove_confirm: "确定解除依赖吗?" + dependency_remove_confirm: "确定解除依赖吗?", + public: { + remove: '是否移除用例', + batch_remove_confirm: "确定移除{0}项用例?", + } }, attachment: { preview: "预览", diff --git a/test-track/frontend/src/i18n/lang/zh-TW.js b/test-track/frontend/src/i18n/lang/zh-TW.js index b3ef51b1a0..ca19268933 100644 --- a/test-track/frontend/src/i18n/lang/zh-TW.js +++ b/test-track/frontend/src/i18n/lang/zh-TW.js @@ -147,7 +147,11 @@ const message = { cancel_relate_case_tips_title: "確定取消關聯關係嗎?", cancel_relate_case_tips_content: "取消關聯會影響測試計劃相關統計, 確定取消嗎?", back_tips: "你填寫的信息未保存, 確定退出嗎?", - dependency_remove_confirm: "確定解除依賴嗎?" + dependency_remove_confirm: "確定解除依賴嗎?", + public: { + remove: '是否移除用例', + batch_remove_confirm: "確定移除{0}項用例?", + } }, attachment: { preview: "預覽",