Merge branch 'master' into compare

backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java

@@ -73,6 +73,10 @@ public class MsScenario extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         if (this.getReferenced() != null && this.getReferenced().equals("Deleted")) {
             return;
         } else if (this.getReferenced() != null && this.getReferenced().equals("REF")) {
@@ -198,6 +202,8 @@ public class MsScenario extends MsTestElement {
             config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
                     arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")
             );
+            // 清空变量，防止重复添加
+            config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables().clear();
         }
         if (arguments.getArguments() != null && arguments.getArguments().size() > 0) {
             return arguments;

backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java

@@ -27,6 +27,10 @@ public class MsAssertions extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         addAssertions(tree);
     }
 

backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsIfController.java

@@ -26,6 +26,10 @@ public class MsIfController extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         final HashTree groupTree = tree.add(ifController());
         if (CollectionUtils.isNotEmpty(hashTree)) {
             hashTree.forEach(el -> {

backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java

@@ -44,6 +44,10 @@ public class MsLoopController extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         final HashTree groupTree = controller(tree);
         if (CollectionUtils.isNotEmpty(config.getVariables())) {
             this.addCsvDataSet(groupTree, config.getVariables());

backend/src/main/java/io/metersphere/api/dto/definition/request/dns/MsDNSCacheManager.java

@@ -26,7 +26,8 @@ public class MsDNSCacheManager extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
-        if (!this.isEnable()) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
             return;
         }
         for (MsTestElement el : hashTree) {

backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java

@@ -30,6 +30,10 @@ public class MsExtract extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         addRequestExtractors(tree);
     }
 

backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java

@@ -29,6 +29,10 @@ public class MsJSR223Processor extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         JSR223Sampler processor = new JSR223Sampler();
         processor.setEnabled(this.isEnable());
         if (StringUtils.isNotEmpty(this.getName())) {

backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java

@@ -29,6 +29,10 @@ public class MsJSR223PostProcessor extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         JSR223PostProcessor processor = new JSR223PostProcessor();
         processor.setEnabled(this.isEnable());
         if (StringUtils.isNotEmpty(this.getName())) {

backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java

@@ -30,6 +30,10 @@ public class MsJSR223PreProcessor extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         final HashTree jsr223PreTree = tree.add(getJSR223PreProcessor());
         if (CollectionUtils.isNotEmpty(hashTree)) {
             hashTree.forEach(el -> {

backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java

@@ -60,6 +60,10 @@ public class MsDubboSampler extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         if (this.getReferenced() != null && "Deleted".equals(this.getReferenced())) {
             return;
         }

backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java

@@ -93,7 +93,10 @@ public class MsHTTPSamplerProxy extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
-
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
             this.getRefElement(this);
         }
@@ -315,7 +318,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         headers.stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
                 headerManager.add(new Header(keyValue.getName(), keyValue.getValue()))
         );
-        tree.add(headerManager);
+        if (headerManager.getHeaders().size() > 0) {
+            tree.add(headerManager);
+        }
     }
 
     public boolean isURL(String str) {

backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java

@@ -58,6 +58,10 @@ public class MsJDBCSampler extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
             this.getRefElement(this);
         }

backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java

@@ -72,6 +72,10 @@ public class MsTCPSampler extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
             this.getRefElement(this);
         }

backend/src/main/java/io/metersphere/api/dto/definition/request/timer/MsConstantTimer.java

@@ -26,7 +26,10 @@ public class MsConstantTimer extends MsTestElement {
 
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
-
+        // 非导出操作，且不是启用状态则跳过执行
+        if (!config.isOperating() && !this.isEnable()) {
+            return;
+        }
         final HashTree groupTree = tree.add(constantTimer());
         if (CollectionUtils.isNotEmpty(hashTree)) {
             hashTree.forEach(el -> {

backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java

@@ -3,6 +3,7 @@ package io.metersphere.api.dto.definition.request.unknown;
 import com.alibaba.fastjson.annotation.JSONType;
 import io.metersphere.api.dto.definition.request.MsTestElement;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.commons.utils.LogUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.collections.CollectionUtils;
@@ -36,17 +37,22 @@ public class MsJmeterElement extends MsTestElement {
                 Object scriptWrapper = SaveService.loadElement(inputSource);
                 HashTree elementTree = tree;
                 this.setElementType(scriptWrapper.getClass().getName());
+                if (scriptWrapper instanceof TestElement) {
+                    ((TestElement) scriptWrapper).setName(this.getName());
+                    ((TestElement) scriptWrapper).setEnabled(this.isEnable());
+                }
                 if (config.isOperating()) {
                     elementTree = tree.add(scriptWrapper);
                 } else if (!(scriptWrapper instanceof TestPlan) && !(scriptWrapper instanceof ThreadGroup)) {
                     elementTree = tree.add(scriptWrapper);
                 }
-                if (scriptWrapper instanceof TestElement) {
+                if (!config.isOperating() && scriptWrapper instanceof ThreadGroup && !((ThreadGroup) scriptWrapper).isEnabled()) {
-                    ((TestElement) scriptWrapper).setName(this.getName());
+                    LogUtil.info(((ThreadGroup) scriptWrapper).getName() + "是被禁用线程组不加入执行");
-                }
+                } else {
-                if (CollectionUtils.isNotEmpty(hashTree)) {
+                    if (CollectionUtils.isNotEmpty(hashTree)) {
-                    for (MsTestElement el : hashTree) {
+                        for (MsTestElement el : hashTree) {
-                        el.toHashTree(elementTree, el.getHashTree(), config);
+                            el.toHashTree(elementTree, el.getHashTree(), config);
+                        }
                     }
                 }
             }

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -115,7 +115,9 @@ public class ApiAutomationService {
                 if (map != null) {
                     if (map.isEmpty()) {
                         List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
-                        idList.addAll(new HashSet<>(ids));
+                        if (CollectionUtils.isNotEmpty(ids)) {
+                            idList.addAll(new HashSet<>(ids));
+                        }
                     } else {
                         Set<String> set = d.getEnvironmentMap().keySet();
                         idList = new ArrayList<>(set);
@@ -601,6 +603,7 @@ public class ApiAutomationService {
         ParameterConfig config = new ParameterConfig();
         config.setConfig(envConfig);
         HashTree hashTree = request.getTestElement().generateHashTree(config);
+        System.out.println(request.getTestElement().getJmx(hashTree));
         // 调用执行方法
         APIScenarioReportResult reportResult = createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
                 SessionUtils.getUserId());

backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java

@@ -144,12 +144,12 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
         String[] stepRes = new String[1];
 
         if (data.getStepDesc() != null) {
-            stepDesc = data.getStepDesc().split("\n");
+            stepDesc = data.getStepDesc().split("\r\n");
         } else {
             stepDesc[0] = "";
         }
         if (data.getStepResult() != null) {
-            stepRes = data.getStepResult().split("\n");
+            stepRes = data.getStepResult().split("\r\n");
         } else {
             stepRes[0] = "";
         }

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

@@ -520,8 +520,8 @@ public class TestCaseService {
 
                 for (int j = 0; j < jsonArray.size(); j++) {
                     int num = j + 1;
-                    step.append(num + "." + jsonArray.getJSONObject(j).getString("desc") + "\n");
+                    step.append(num + "." + jsonArray.getJSONObject(j).getString("desc") + "\r\n");
-                    result.append(num + "." + jsonArray.getJSONObject(j).getString("result") + "\n");
+                    result.append(num + "." + jsonArray.getJSONObject(j).getString("result") + "\r\n");
 
                 }
                 data.setStepDesc(step.toString());

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

@@ -1 +1 @@
-Subproject commit 6806c68338543cf1d04bb25dc24201dd1949e111
+Subproject commit c9fd084c8f4453d7697677a79d9a0a953c045e38

frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue

@@ -159,7 +159,7 @@ export default {
   data() {
     return {
       timeout: 60000,
-      responseTimeout: null,
+      responseTimeout: 60000,
       statusCode: [],
       domains: [],
       params: [],

frontend/src/business/components/track/case/TestCase.vue

@@ -8,6 +8,7 @@
         @setTreeNodes="setTreeNodes"
         @exportTestCase="exportTestCase"
         @saveAsEdit="editTestCase"
+        @refreshAll="refreshAll"
         :type="'edit'"
         ref="nodeTree"
       />

frontend/src/business/components/track/common/TestCaseNodeTree.vue

@@ -101,7 +101,7 @@ export default {
       this.$emit("refreshTable");
     },
     refreshAll() {
-      this.selectRows.clear();
+      // this.selectRows.clear();
       this.$emit('refreshAll');
     },
     handleCommand(e) {

frontend/src/business/components/track/home/components/ReviewList.vue

@@ -2,7 +2,7 @@
   <el-card class="table-card" v-loading="result.loading" body-style="padding:10px;">
     <div slot="header">
       <span class="title">
-        遗留缺陷统计
+        用例评审
       </span>
       <ms-table-button :is-tester-permission="true" v-if="!showMyCreator" icon="el-icon-view"
                        :content="$t('test_track.review.my_create')" @click="searchMyCreator" style="float: right"/>