Merge branch 'master' of https://github.com/metersphere/metersphere

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");
-                    result.append(num + "." + jsonArray.getJSONObject(j).getString("result") + "\n");
+                    step.append(num + "." + jsonArray.getJSONObject(j).getString("desc") + "\r\n");
+                    result.append(num + "." + jsonArray.getJSONObject(j).getString("result") + "\r\n");
 
                 }
                 data.setStepDesc(step.toString());

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"/>