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

backend/pom.xml

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

backend/src/main/java/io/metersphere/track/controller/TestPlanController.java

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

backend/src/main/java/io/metersphere/track/service/TestPlanService.java

@@ -176,7 +176,7 @@ public class TestPlanService {
         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);
         TestPlan res = testPlanMapper.selectByPrimaryKey(testPlan.getId()); //  先查一次库
         testPlan.setUpdateTime(System.currentTimeMillis());
@@ -230,7 +230,7 @@ public class TestPlanService {
                     .build();
             noticeSendService.send(NoticeConstants.TaskType.TEST_PLAN_TASK, noticeModel);
         }
-        return i;
+        return testPlan.getId();
     }
 
     //计划内容

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

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

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

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

frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue

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