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

Merge branch 'v1.8' of http://github.com/metersphere/metersphere into v1.8

This commit is contained in:
song-tianyang 2021-03-31 16:44:45 +08:00
parent 5b3df1ab15 f4a745ca81
commit 2fd563f670
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/pom.xml
View File

@ -139,7 +139,7 @@
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId> <artifactId>springdoc-openapi-ui</artifactId>
<version>1.2.32</version> <version>1.5.6</version>
</dependency> </dependency>
<!-- jmeter --> <!-- jmeter -->
@ -280,7 +280,7 @@
<dependency> <dependency>
<groupId>io.swagger.parser.v3</groupId> <groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId> <artifactId>swagger-parser</artifactId>
<version>2.0.22</version> <version>2.0.24</version>
</dependency> </dependency>
<!-- ApacheJMeter_core scope 是 runtime，这里去掉scope --> <!-- ApacheJMeter_core scope 是 runtime，这里去掉scope -->

4
backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
View File

@ -91,8 +91,8 @@ public class TestPlanController {
@PostMapping("/edit") @PostMapping("/edit")
@RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR) @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
public void editTestPlan(@RequestBody TestPlanDTO testPlanDTO) { public String editTestPlan(@RequestBody TestPlanDTO testPlanDTO) {
testPlanService.editTestPlan(testPlanDTO, true); return testPlanService.editTestPlan(testPlanDTO, true);
} }
@PostMapping("/edit/status/{planId}") @PostMapping("/edit/status/{planId}")

4
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -176,7 +176,7 @@ public class TestPlanService {
return Optional.ofNullable(testPlanMapper.selectByPrimaryKey(testPlanId)).orElse(new TestPlan()); return Optional.ofNullable(testPlanMapper.selectByPrimaryKey(testPlanId)).orElse(new TestPlan());
} }
public int editTestPlan(TestPlanDTO testPlan, Boolean isSendMessage) { public String editTestPlan(TestPlanDTO testPlan, Boolean isSendMessage) {
checkTestPlanExist(testPlan); checkTestPlanExist(testPlan);
TestPlan res = testPlanMapper.selectByPrimaryKey(testPlan.getId()); // 先查一次库 TestPlan res = testPlanMapper.selectByPrimaryKey(testPlan.getId()); // 先查一次库
testPlan.setUpdateTime(System.currentTimeMillis()); testPlan.setUpdateTime(System.currentTimeMillis());
@ -230,7 +230,7 @@ public class TestPlanService {
.build(); .build();
noticeSendService.send(NoticeConstants.TaskType.TEST_PLAN_TASK, noticeModel); noticeSendService.send(NoticeConstants.TaskType.TEST_PLAN_TASK, noticeModel);
} }
return i; return testPlan.getId();
} }
//计划内容 //计划内容

7
frontend/src/business/components/common/select-tree/SelectTree.vue
View File

@ -379,14 +379,17 @@
.common-tree { .common-tree {
overflow: auto; overflow: auto;
height: 200px; min-height: 200px;
max-height: 400px;
} }
.ms-tree-select { .ms-tree-select {
width: 100%; width: 100%;
z-index: 111; z-index: 111;
} }
/deep/.el-tree-node__children{
overflow: inherit;
}
.ok { .ok {
float: right; float: right;
} }

3
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
View File

@ -711,7 +711,7 @@ export default {
.border-hidden >>> .el-textarea__inner { .border-hidden >>> .el-textarea__inner {
border-style: hidden; border-style: hidden;
background-color: white; background-color: white;
color: #606266; color: #060505;
} }
.cast_label { .cast_label {
@ -785,4 +785,5 @@ p {
height: 550px; height: 550px;
overflow: auto; overflow: auto;
} }
</style> </style>

6
frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
View File

@ -549,4 +549,10 @@ export default {
.comment-card >>> .el-card__body { .comment-card >>> .el-card__body {
height: calc(100vh - 120px); height: calc(100vh - 120px);
} }
.tb-edit >>> .el-textarea__inner {
border-style: hidden;
background-color: white;
color: #060505;
}
</style> </style>