test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into pr@dev@feat_测试计划支持允许重复关联用例

This commit is contained in:
jianxing 2021-11-02 16:00:04 +08:00 committed by GitHub
parent 61288a55dd 2ce173a82a
commit ac8b471300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/resources/db/migration/V98__v1.14.1_release.sql
View File

@ -1,4 +1,3 @@
ALTER TABLE mock_expect_config ADD COLUMN expect_num varchar(50); ALTER TABLE mock_expect_config ADD COLUMN expect_num varchar(50);
ALTER TABLE test_plan ADD COLUMN repeat_case TINYINT(1) DEFAULT 0 COMMENT '是否允许重复添加用例'; ALTER TABLE test_plan ADD COLUMN repeat_case TINYINT(1) DEFAULT 0 COMMENT '是否允许重复添加用例';
@ -6,3 +5,8 @@ ALTER TABLE test_plan_api_case DROP INDEX plan_id_case_id;
ALTER TABLE test_plan_load_case DROP INDEX plan_load_case_id; ALTER TABLE test_plan_load_case DROP INDEX plan_load_case_id;
ALTER TABLE test_plan_api_scenario DROP INDEX plan_id_scenario_id; ALTER TABLE test_plan_api_scenario DROP INDEX plan_id_scenario_id;
insert into user_group_permission (id, group_id, permission_id, module_id)
values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR', 'WORKSPACE_PROJECT_MANAGER');
insert into user_group_permission (id, group_id, permission_id, module_id)
values (UUID(), 'ws_member', 'WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR', 'WORKSPACE_PROJECT_MANAGER');

5
backend/src/main/resources/permission.json
View File

@ -195,6 +195,11 @@
"name": "删除项目", "name": "删除项目",
"resourceId": "WORKSPACE_PROJECT_MANAGER" "resourceId": "WORKSPACE_PROJECT_MANAGER"
}, },
{
"id": "WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR",
"name": "上传jar包",
"resourceId": "WORKSPACE_PROJECT_MANAGER"
},
{ {
"id": "WORKSPACE_PROJECT_ENVIRONMENT:READ", "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ",
"name": "查询环境", "name": "查询环境",

2
frontend/src/business/components/settings/workspace/MsProject.vue
View File

@ -6,7 +6,7 @@
@search="search" @create="create" @search="search" @create="create"
:create-tip="btnTips" :title="$t('commons.project')"> :create-tip="btnTips" :title="$t('commons.project')">
<template v-slot:button> <template v-slot:button>
<ms-table-button icon="el-icon-box" <ms-table-button icon="el-icon-box" v-permission="['WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR']"
:content="$t('api_test.jar_config.title')" @click="openJarConfig"/> :content="$t('api_test.jar_config.title')" @click="openJarConfig"/>
</template> </template>
</ms-table-header> </ms-table-header>