diff --git a/backend/src/main/resources/db/migration/V85__v1.10_permission_refactor.sql b/backend/src/main/resources/db/migration/V85__v1.10_permission_refactor.sql index a9eb27510f..27a9084960 100644 --- a/backend/src/main/resources/db/migration/V85__v1.10_permission_refactor.sql +++ b/backend/src/main/resources/db/migration/V85__v1.10_permission_refactor.sql @@ -204,7 +204,7 @@ VALUES (uuid(), 'org_admin', 'ORGANIZATION_SERVICE:READ+EDIT', 'ORGANIZATION_SER INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (uuid(), 'org_admin', 'ORGANIZATION_GROUP:READ+DELETE', 'ORGANIZATION_GROUP'); insert into user_group_permission (id, group_id, permission_id, module_id) -values (uuid(), 'org_admin', 'ORGANIZATION_OPERATING_LOG:READ','ORGANIZATION_OPERATING_LOG'); +values (uuid(), 'org_admin', 'ORGANIZATION_OPERATING_LOG:READ', 'ORGANIZATION_OPERATING_LOG'); -- 组织成员 INSERT INTO user_group_permission (id, group_id, permission_id, module_id) @@ -218,7 +218,7 @@ VALUES (uuid(), 'org_member', 'ORGANIZATION_MESSAGE:READ', 'ORGANIZATION_MESSAGE INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (uuid(), 'org_member', 'ORGANIZATION_USER:READ', 'ORGANIZATION_USER'); insert into user_group_permission (id, group_id, permission_id, module_id) -values (uuid(), 'org_member', 'ORGANIZATION_OPERATING_LOG:READ','ORGANIZATION_OPERATING_LOG'); +values (uuid(), 'org_member', 'ORGANIZATION_OPERATING_LOG:READ', 'ORGANIZATION_OPERATING_LOG'); -- 工作空间管理员 INSERT INTO user_group_permission (id, group_id, permission_id, module_id) @@ -421,7 +421,10 @@ values (uuid(), 'project_admin', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_EDIT', 'PRO insert into user_group_permission (id, group_id, permission_id, module_id) values (uuid(), 'project_admin', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_RUN', 'PROJECT_TRACK_PLAN'); insert into user_group_permission (id, group_id, permission_id, module_id) -values (uuid(), 'project_admin', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_DELETE','PROJECT_TRACK_PLAN'); +values (uuid(), 'project_admin', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_DELETE', 'PROJECT_TRACK_PLAN'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (uuid(), 'project_admin', 'PROJECT_TRACK_PLAN:READ+REPORT_DELETE','PROJECT_TRACK_PLAN'); + -- 项目成员 INSERT INTO user_group_permission (id, group_id, permission_id, module_id) @@ -563,7 +566,9 @@ values (uuid(), 'project_member', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_EDIT', 'PR insert into user_group_permission (id, group_id, permission_id, module_id) values (uuid(), 'project_member', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_RUN', 'PROJECT_TRACK_PLAN'); insert into user_group_permission (id, group_id, permission_id, module_id) -values (uuid(), 'project_member', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_DELETE','PROJECT_TRACK_PLAN'); +values (uuid(), 'project_member', 'PROJECT_TRACK_PLAN:READ+CASE_BATCH_DELETE', 'PROJECT_TRACK_PLAN'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (uuid(), 'project_member', 'PROJECT_TRACK_PLAN:READ+REPORT_DELETE','PROJECT_TRACK_PLAN'); -- 只读用户 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 12a2397037..f49a859cd5 100644 --- a/backend/src/main/resources/permission.json +++ b/backend/src/main/resources/permission.json @@ -529,6 +529,11 @@ "name": "关联/取消关联用例", "resourceId": "PROJECT_TRACK_PLAN" }, + { + "id": "PROJECT_TRACK_PLAN:READ+REPORT_DELETE", + "name": "删除测试计划报告", + "resourceId": "PROJECT_TRACK_PLAN" + }, { "id": "PROJECT_TRACK_PLAN:READ+CASE_BATCH_DELETE", "name": "批量取消关联用例", @@ -853,11 +858,11 @@ }, { "id": "PROJECT_PERFORMANCE_TEST", - "name": "测试" + "name": "性能测试" }, { "id": "PROJECT_PERFORMANCE_REPORT", - "name": "报告" + "name": "性能测试报告" } ] } \ No newline at end of file diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue index 62eb333d58..c6b291a84b 100644 --- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue +++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue @@ -163,8 +163,8 @@ userIds: [ {required: true, message: this.$t('member.please_choose_member'), trigger: ['blur']} ], - roleIds: [ - {required: true, message: this.$t('role.please_choose_role'), trigger: ['blur']} + groupIds: [ + {required: true, message: "请选择用户组", trigger: ['blur']} ] }, screenHeight: 'calc(100vh - 255px)', diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue index 40b37bb6a7..b99ff90cc8 100644 --- a/frontend/src/business/components/track/case/components/TestCaseList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseList.vue @@ -64,7 +64,7 @@ - @@ -124,7 +124,7 @@ export default { {text: this.$t('test_track.plan.regression_test'), value: 'regression'}, ], buttons: [ - {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch}, + {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch, permission: ['PROJECT_TRACK_PLAN:READ+REPORT_DELETE']}, ], selectDataCounts: 0, } diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue index 3025f5401e..bae3b129e3 100644 --- a/frontend/src/business/components/track/review/commom/ReviewComment.vue +++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue @@ -16,6 +16,7 @@