Merge remote-tracking branch 'origin/v1.3' into v1.3

backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java

@@ -16,16 +16,19 @@ public class KeyValue {
     private boolean enable;
 
     public KeyValue() {
+        this.enable = true;
     }
 
     public KeyValue(String name, String value) {
         this.name = name;
         this.value = value;
+        this.enable = true;
     }
 
     public KeyValue(String name, String value, String description) {
         this.name = name;
         this.value = value;
+        this.enable = true;
         this.description = description;
     }
 }

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;
@@ -492,7 +494,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")) {

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8
+Subproject commit cf6b06526324326a563d933e07118fac014a63b4

frontend/src/business/components/api/test/components/ApiKeyValue.vue

@@ -103,7 +103,7 @@
       },
     },
     created() {
-      if (this.items.length === 0) {
+      if (this.items.length === 0 || this.items[this.items.length - 1].name) {
         this.items.push(new KeyValue({enable: true}));
       }
     }

frontend/src/business/components/api/test/components/ApiVariable.vue

@@ -168,7 +168,7 @@
       }
     },
     created() {
-      if (this.parameters.length === 0) {
+      if (this.parameters.length === 0 || this.parameters[this.parameters.length - 1].name) {
         this.parameters.push(new KeyValue( {type: 'text', enable: true, uuid: this.uuid(), contentType: 'text/plain'}));
       }
     }

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1