Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3

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

@@ -41,7 +41,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -493,7 +495,7 @@ public class TestCaseService {
                 if (t.getTestId() != null && t.getTestId().equals("other")) {
                     data.setRemark(t.getOtherTestName());
                 } else {
-                    data.setRemark(t.getApiName());
+                    data.setRemark("[" + t.getApiName() + "]" + "\n" + t.getRemark());
                 }
 
             } else if (t.getMethod().equals("auto") && t.getType().equals("performance")) {

frontend/src/business/components/api/test/model/ScenarioModel.js

@@ -1219,21 +1219,22 @@ class JMXGenerator {
     if (request.controller.isValid() && request.controller.enable) {
       if (request.controller instanceof IfController) {
         let name = request.controller.label();
-        let variable = request.controller.variable;
+        let variable = "\"" + request.controller.variable + "\"";
         let operator = request.controller.operator;
-        let value = request.controller.value;
+        let value = "\"" + request.controller.value + "\"";
+
         if (operator === "=~" || operator === "!~") {
-          value = "\".*" + value + ".*\"";
+          value = "\".*" + request.controller.value + ".*\"";
         }
 
         if (operator === "is empty") {
-          variable = "empty(\"" + variable + "\")";
+          variable = "empty(" + variable + ")";
           operator = "";
           value = "";
         }
 
         if (operator === "is not empty") {
-          variable = "!empty(\"" + variable + "\")";
+          variable = "!empty(" + variable + ")";
           operator = "";
           value = "";
         }

frontend/src/common/css/main.css

@@ -27,14 +27,14 @@ body {
 }
 
 /*解决高度塌陷和边距重叠*/
-.clearfix:before,.clearfix:after{
+.clearfix:before, .clearfix:after {
   content: "";
   display: table;
   clear: both;
 }
 
 /*解决富文本框中link显示问题*/
-.ck-rounded-corners .ck.ck-balloon-panel,.ck.ck-balloon-panel.ck-rounded-corners {
+.ck-rounded-corners .ck.ck-balloon-panel, .ck.ck-balloon-panel.ck-rounded-corners {
   z-index: 10055 !important;
 }
 
@@ -50,7 +50,7 @@ body {
 
 /* <-- 表格拖拽表头调整宽度，在 t-bable 上添加 border 属性，并添加 adjust-table 类名*/
 .adjust-table td {
-  border-right-color: white;
+  border-right: 0;
 }
 
 .adjust-table th {
@@ -74,12 +74,18 @@ body {
   width: 3px;
   background-color: #EBEEF5;
 }
+
+.adjust-table tr:hover td {
+  border-right: 0;
+}
+
 /* 表格拖拽表头调整宽度 --> */
 
 /* <-- 表格 input 编辑效果*/
 .table-edit-input .el-textarea__inner {
   border-style: hidden;
 }
+
 .table-edit-input.is-disabled .el-textarea__inner {
   background-color: white;
   color: #606266;
@@ -93,6 +99,7 @@ body {
 .table-edit-input .el-textarea__inner:focus {
   border: 1px solid #409EFF;
 }
+
 /* 表格 input 编辑效果 --> */
 
 .ms-border {