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 https://github.com/metersphere/metersphere into v1.8

This commit is contained in:
fit2-zhao 2021-03-31 16:56:20 +08:00
parent 89c7203362 b1a3dd3473
commit b04ffc6334
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/api/definition/components/module/ApiModule.vue
View File

@ -133,16 +133,11 @@
this.data.forEach(node => { this.data.forEach(node => {
buildTree(node, {path: ''}); buildTree(node, {path: ''});
}); });
this.$emit('setModuleOptions', this.data);
this.$emit('setNodeTree', this.data); this.$emit('setNodeTree', this.data);
if (this.$refs.nodeTree) { if (this.$refs.nodeTree) {
this.$refs.nodeTree.filter(this.condition.filterText); this.$refs.nodeTree.filter(this.condition.filterText);
} }
let moduleOptions = [];
this.data.forEach(node => {
buildNodePath(node, {path: ''}, moduleOptions);
});
this.moduleOptions = moduleOptions;
this.$emit('setModuleOptions', moduleOptions);
} }
}); });
}, },

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>