From 094a310ffe433a8485c125a959c94f8e3b02fd75 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 18 Apr 2022 12:33:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(UI=E6=B5=8B=E8=AF=95):=20=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1012337 --user=刘瑞斌 【UI测试】权限控制问题汇总 https://www.tapd.cn/55049933/s/1137659 --- .../resources/db/migration/V115__1.20__release.sql | 4 +--- backend/src/main/resources/permission.json | 10 ++-------- frontend/src/i18n/en-US.js | 2 +- frontend/src/i18n/zh-CN.js | 2 +- frontend/src/i18n/zh-TW.js | 2 +- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/backend/src/main/resources/db/migration/V115__1.20__release.sql b/backend/src/main/resources/db/migration/V115__1.20__release.sql index ff1dee606f..0f778b3e23 100644 --- a/backend/src/main/resources/db/migration/V115__1.20__release.sql +++ b/backend/src/main/resources/db/migration/V115__1.20__release.sql @@ -135,8 +135,6 @@ VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+CREATE', 'PROJECT_UI_ INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+BATCH_COPY', 'PROJECT_UI_SCENARIO'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) -VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+SCHEDULE', 'PROJECT_UI_SCENARIO'); -INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+COPY', 'PROJECT_UI_SCENARIO'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+DELETE', 'PROJECT_UI_SCENARIO'); @@ -153,7 +151,7 @@ VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+EDIT', 'PROJECT_UI_SC INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_REPORT:READ+DELETE', 'PROJECT_UI_REPORT'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) -VALUES (UUID(), 'project_admin', 'PROJECT_UI_REPORT:READ+EXPORT', 'PROJECT_UI_REPORT'); +VALUES (UUID(), 'project_admin', 'PROJECT_UI_REPORT:READ+SHARE', 'PROJECT_UI_REPORT'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_REPORT:READ', 'PROJECT_UI_REPORT'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json index 1cbb75c2fb..b126badf1d 100644 --- a/backend/src/main/resources/permission.json +++ b/backend/src/main/resources/permission.json @@ -844,12 +844,6 @@ "resourceId": "PROJECT_UI_SCENARIO", "license": true }, - { - "id": "PROJECT_UI_SCENARIO:READ+SCHEDULE", - "name": "permission.project_ui_scenario.schedule", - "resourceId": "PROJECT_UI_SCENARIO", - "license": true - }, { "id": "PROJECT_UI_SCENARIO:READ+IMPORT_SCENARIO", "name": "permission.project_ui_scenario.import", @@ -887,8 +881,8 @@ "license": true }, { - "id": "PROJECT_UI_REPORT:READ+EXPORT", - "name": "permission.project_ui_report.export", + "id": "PROJECT_UI_REPORT:READ+SHARE", + "name": "permission.project_ui_report.share", "resourceId": "PROJECT_UI_REPORT", "license": true }, diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index a85c560f80..5715c17213 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -3059,7 +3059,7 @@ export default { name: "Report", read: "READ", delete: "DELETE", - export: "EXPORT", + share: "SHARE", }, project_ui_element: { name: "Element", diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index d4ea05057f..2155dacbd4 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -3063,7 +3063,7 @@ export default { name: "测试报告", read: "查询报告", delete: "删除报告", - export: "导出报告", + share: "分享报告", }, project_ui_element: { name: "元素库", diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 8c8a47f259..7f599b2e42 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -3062,7 +3062,7 @@ export default { name: "測試報告", read: "查詢報告", delete: "刪除報告", - export: "導出報告", + share: "分享報告", }, project_ui_element: { name: "元素庫",