From 510850db51d9e185e83fb942ef76ec202866b688 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 20 Oct 2020 16:48:37 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=94=AF=E6=8C=81=E6=8F=90=E5=8F=96=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/scenario/extract/ExtractCommon.java     |  1 +
 .../base/mapper/ext/ExtTestReviewCaseMapper.java    |  2 +-
 .../api/test/components/ApiVariableInput.vue        |  6 +++++-
 .../test/components/extract/ApiExtractCommon.vue    | 13 ++++++++++++-
 .../components/api/test/model/ScenarioModel.js      |  2 ++
 frontend/src/i18n/en-US.js                          |  1 +
 frontend/src/i18n/zh-CN.js                          |  1 +
 frontend/src/i18n/zh-TW.js                          |  1 +
 8 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java
index 6757bc4cad..efd38b6a49 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java
@@ -10,4 +10,5 @@ public class ExtractCommon extends ExtractType {
     private String value; // value: ${variable}
     private String expression;
     private String description;
+    private Boolean multipleMatching;
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
index 267793343d..b3a19d01b6 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.java
@@ -11,5 +11,5 @@ public interface ExtTestReviewCaseMapper {
 
     List<TestReviewCaseDTO> list(@Param("request") QueryCaseReviewRequest request);
     List<String> getStatusByReviewId(String reviewId);
-    List<String> findRelateTestReviewId(String userId, String workspaceId);
+    List<String> findRelateTestReviewId(@Param("userId") String userId, @Param("workspaceId") String workspaceId);
 }
diff --git a/frontend/src/business/components/api/test/components/ApiVariableInput.vue b/frontend/src/business/components/api/test/components/ApiVariableInput.vue
index 0cbd17338f..f9319f713b 100644
--- a/frontend/src/business/components/api/test/components/ApiVariableInput.vue
+++ b/frontend/src/business/components/api/test/components/ApiVariableInput.vue
@@ -29,6 +29,10 @@
         type: Boolean,
         default: true
       },
+      showCopyTipWithMultiple: {
+        type: Boolean,
+        default: false
+      },
     },
 
     data() {
@@ -63,7 +67,7 @@
 
     computed: {
       variable() {
-        return "${" + this.value + "}";
+        return "${" + (this.showCopyTipWithMultiple ? (this.value + "_n") : this.value) + "}";
       }
     }
 
diff --git a/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue b/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
index 2ad04fa5ae..0413286773 100644
--- a/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
+++ b/frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
@@ -8,12 +8,17 @@
       </el-col>
       <el-col>
         <ms-api-variable-input :is-read-only="isReadOnly" v-model="common.variable" size="small" maxlength="60"
-                               @change="change" show-word-limit :placeholder="$t('api_test.variable_name')"/>
+                               @change="change" :show-copy-tip-with-multiple="common.multipleMatching" show-word-limit :placeholder="$t('api_test.variable_name')"/>
       </el-col>
       <el-col>
         <el-input :disabled="isReadOnly" v-model="common.expression" size="small" show-word-limit
                   :placeholder="expression"/>
       </el-col>
+      <el-col class="multiple_checkbox">
+        <el-checkbox v-model="common.multipleMatching" :disabled="isReadOnly">
+          {{ $t('api_test.request.extract.multiple_matching') }}
+        </el-checkbox>
+      </el-col>
       <el-col class="extract-btn">
         <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove"
                    v-if="edit"/>
@@ -159,4 +164,10 @@
   .extract-btn {
     width: 60px;
   }
+
+  .multiple_checkbox {
+    text-align: center;
+    width: 120px;
+  }
+
 </style>
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index f79efe313e..a95344447c 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -855,6 +855,7 @@ export class ExtractCommon extends ExtractType {
     this.value = ""; // ${variable}
     this.expression = undefined;
     this.description = undefined;
+    this.multipleMatching = undefined;
 
     this.set(options);
   }
@@ -1460,6 +1461,7 @@ class JMXGenerator {
     let props = {
       name: extractCommon.variable,
       expression: extractCommon.expression,
+      match: extractCommon.multipleMatching ? -1 : undefined
     }
     let testName = props.name
     switch (extractCommon.type) {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 19f9ed48c5..bd5080f504 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -554,6 +554,7 @@ export default {
         select_type: "Choose type",
         description: "Extract data from the response and store it in variables. Use the variables in subsequent requests.",
         regex: "Regex",
+        multiple_matching: "Multiple matching",
         regex_expression: "Regular expression",
         json_path_expression: "JSONPath expression",
         xpath_expression: "XPath expression",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 58ff7df239..ecf0997d9d 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -554,6 +554,7 @@ export default {
       },
       extract: {
         label: "提取",
+        multiple_matching: "匹配多条",
         select_type: "请选择类型",
         description: "从响应结果中提取数据并将其存储在变量中，在后续请求中使用变量。",
         regex: "正则",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 01d7cd0532..3a25b475ec 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -554,6 +554,7 @@ export default {
       },
       extract: {
         label: "提取",
+        multiple_matching: "匹配多條",
         select_type: "請選擇類型",
         description: "從響應結果中提取數據並將其存儲在變量中，在後續請求中使用變量。",
         regex: "正則",

From fd77afcfc622d4518dba324743156e351261a54c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 20 Oct 2020 16:59:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/controller/TestCaseController.java  | 11 ++++-
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 frontend/package.json                         |  3 +-
 .../track/case/components/TestCaseEdit.vue    | 16 ++++++-
 .../track/case/components/TestCaseFile.vue    | 48 +++++++++++++++++++
 .../track/case/components/TestCasePdf.vue     | 38 +++++++++++++++
 6 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/business/components/track/case/components/TestCaseFile.vue
 create mode 100644 frontend/src/business/components/track/case/components/TestCasePdf.vue

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
index 1d5d86db88..790279babb 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -167,7 +167,7 @@ public class TestCaseController {
     }
 
     @PostMapping("/file/download")
-    public ResponseEntity<byte[]> downloadJmx(@RequestBody FileOperationRequest fileOperationRequest) {
+    public ResponseEntity<byte[]> download(@RequestBody FileOperationRequest fileOperationRequest) {
         byte[] bytes = fileService.loadFileAsBytes(fileOperationRequest.getId());
         return ResponseEntity.ok()
                 .contentType(MediaType.parseMediaType("application/octet-stream"))
@@ -175,4 +175,13 @@ public class TestCaseController {
                 .body(bytes);
     }
 
+    @GetMapping("/file/preview/{fileId}")
+    public ResponseEntity<byte[]> preview(@PathVariable String fileId) {
+        byte[] bytes = fileService.loadFileAsBytes(fileId);
+        return ResponseEntity.ok()
+                .contentType(MediaType.parseMediaType("application/octet-stream"))
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileId + "\"")
+                .body(bytes);
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index cf6b065263..ee74568be0 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit ee74568be0beba46da19616f5832e83f9164c688
diff --git a/frontend/package.json b/frontend/package.json
index c0ead7bf5d..1b15b96a2d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -35,7 +35,8 @@
     "jspdf": "^2.1.1",
     "yan-progress": "^1.0.3",
     "nprogress": "^0.2.0",
-    "el-table-infinite-scroll": "^1.0.10"
+    "el-table-infinite-scroll": "^1.0.10",
+    "vue-pdf": "^4.2.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.0",
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index dabae32940..9d9addf80b 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -252,6 +252,10 @@
               <el-table-column
                 :label="$t('commons.operating')">
                 <template v-slot:default="scope">
+                  <el-button @click="preview(scope.row)" :disabled="!scope.row.id || readOnly" type="primary"
+                             v-if="isPreview(scope.row)"
+                             icon="el-icon-view"
+                             size="mini" circle/>
                   <el-button @click="handleDownload(scope.row)" :disabled="!scope.row.id || readOnly" type="primary"
                              icon="el-icon-download"
                              size="mini" circle/>
@@ -277,6 +281,7 @@
 
     </el-dialog>
 
+    <test-case-file ref="testCaseFile"/>
   </div>
 
 
@@ -289,10 +294,11 @@ import MsDialogFooter from '../../../common/components/MsDialogFooter'
 import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {Message} from "element-ui";
+import TestCaseFile from "@/business/components/track/case/components/TestCaseFile";
 
 export default {
   name: "TestCaseEdit",
-  components: {MsDialogFooter},
+  components: {MsDialogFooter, TestCaseFile},
   data() {
     return {
       result: {},
@@ -718,7 +724,13 @@ export default {
       /// todo: 是否需要对文件内容和大小做限制
       return file.size > 0;
     },
-
+    preview(row) {
+      this.$refs.testCaseFile.open(row);
+    },
+    isPreview(row) {
+      const fileType = row.type;
+      return fileType === 'JPG' || fileType === 'JPEG' || fileType === 'PDF' || fileType === 'PNG';
+    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/track/case/components/TestCaseFile.vue b/frontend/src/business/components/track/case/components/TestCaseFile.vue
new file mode 100644
index 0000000000..dbbb9dea29
--- /dev/null
+++ b/frontend/src/business/components/track/case/components/TestCaseFile.vue
@@ -0,0 +1,48 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" width="80%" :destroy-on-close="true" :before-close="close">
+    <div>
+      <img :src="'/test/case/file/preview/' + file.id" alt="图片显示异常" style="width: 100%;height: 100%;"
+           v-if="file.type === 'JPG' || file.type === 'JPEG' || file.type === 'PNG'">
+      <div v-if="file.type === 'PDF'">
+        <test-case-pdf :file-id="file.id"/>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import TestCasePdf from "@/business/components/track/case/components/TestCasePdf";
+
+export default {
+  name: "TestCaseFiles",
+  components: {TestCasePdf},
+  props: {},
+  data() {
+    return {
+      file: {
+        id: '',
+        type: ''
+      },
+      dialogVisible: false,
+    }
+  },
+  methods: {
+    open(file) {
+      this.file = file;
+      this.dialogVisible = true;
+    },
+    close() {
+      this.file = {
+        id: '',
+        type: ''
+      };
+      this.dialogVisible = false;
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCasePdf.vue b/frontend/src/business/components/track/case/components/TestCasePdf.vue
new file mode 100644
index 0000000000..520ddb32b9
--- /dev/null
+++ b/frontend/src/business/components/track/case/components/TestCasePdf.vue
@@ -0,0 +1,38 @@
+<template>
+  <div v-loading="loading">
+    <pdf ref="pdf" v-for="i in numPages" :key="i" :src="loadingTask" :page="i"/>
+  </div>
+</template>
+
+<script>
+import pdf from "vue-pdf";
+export default {
+  name: "TestCasePdf",
+  components: {pdf},
+  props: {
+    fileId: String
+  },
+  data() {
+    return {
+      loading: false,
+      numPages: null,
+      loadingTask: null,
+    }
+  },
+  mounted() {
+    this.loading = true;
+    this.loadingTask = pdf.createLoadingTask("/test/case/file/preview/" + this.fileId);
+    this.loadingTask.promise.then(pdf => {
+      this.numPages = pdf.numPages
+      this.loading = false;
+    }).catch(() => {
+      this.loading = false;
+      this.$error("pdf 加载失败");
+    })
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 6ee4ca092143327fd33ceba9735e37bab2c31419 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 20 Oct 2020 17:41:06 +0800
Subject: [PATCH 3/6] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=AF=BC=E5=85=A5=E7=94=A8=E4=BE=8B=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=B6=88=E6=81=AF=E4=BC=98=E5=8C=96=EF=BC=8C=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C=E5=88=92=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestCaseService.java        | 22 +++---
 .../io/metersphere/xmind/XmindCaseParser.java | 60 +++++++-------
 .../metersphere/xmind/parser/XmindParser.java |  2 +-
 .../metersphere/xmind/utils/ProcMessage.java  | 78 +++++++++++++++++++
 frontend/src/i18n/en-US.js                    |  2 +-
 frontend/src/i18n/zh-CN.js                    |  2 +-
 frontend/src/i18n/zh-TW.js                    |  2 +-
 7 files changed, 117 insertions(+), 51 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/xmind/utils/ProcMessage.java

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 1503384dc0..726f5f0379 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -263,25 +263,22 @@ public class TestCaseService {
                 .map(TestCase::getName)
                 .collect(Collectors.toSet());
         List<ExcelErrData<TestCaseExcelData>> errList = null;
-        if (multipartFile == null)
+        if (multipartFile == null) {
             MSException.throwException(Translator.get("upload_fail"));
-
+        }
         if (multipartFile.getOriginalFilename().endsWith(".xmind")) {
             try {
-                errList = new ArrayList<>();
                 XmindCaseParser xmindParser = new XmindCaseParser(this, userId, projectId, testCaseNames);
-                String processLog = xmindParser.parse(multipartFile);
-                if (!StringUtils.isEmpty(processLog)) {
-                    excelResponse.setSuccess(false);
-                    ExcelErrData excelErrData = new ExcelErrData(null, 1, Translator.get("upload_fail") + "：" + processLog);
-                    errList.add(excelErrData);
-                    excelResponse.setErrList(errList);
-                } else if (xmindParser.getNodePaths().isEmpty() && xmindParser.getTestCase().isEmpty()) {
-                    excelResponse.setSuccess(false);
+                errList = xmindParser.parse(multipartFile);
+                if (xmindParser.getNodePaths().isEmpty() && xmindParser.getTestCase().isEmpty()) {
+                    if (errList == null) {
+                        errList = new ArrayList<>();
+                    }
                     ExcelErrData excelErrData = new ExcelErrData(null, 1, Translator.get("upload_fail") + "：" + Translator.get("upload_content_is_null"));
                     errList.add(excelErrData);
                     excelResponse.setErrList(errList);
-                } else {
+                }
+                if (errList.isEmpty()) {
                     if (!xmindParser.getNodePaths().isEmpty()) {
                         testCaseNodeService.createNodes(xmindParser.getNodePaths(), projectId);
                     }
@@ -290,7 +287,6 @@ public class TestCaseService {
                         this.saveImportData(xmindParser.getTestCase(), projectId);
                         xmindParser.clear();
                     }
-                    excelResponse.setSuccess(true);
                 }
             } catch (Exception e) {
                 LogUtil.error(e.getMessage(), e);
diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index 9eaaca932f..8137156a8e 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -6,12 +6,14 @@ import com.google.common.collect.ImmutableMap;
 import io.metersphere.base.domain.TestCaseWithBLOBs;
 import io.metersphere.commons.constants.TestCaseConstants;
 import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.excel.domain.ExcelErrData;
 import io.metersphere.excel.domain.TestCaseExcelData;
 import io.metersphere.i18n.Translator;
 import io.metersphere.track.service.TestCaseService;
 import io.metersphere.xmind.parser.XmindParser;
 import io.metersphere.xmind.parser.pojo.Attached;
 import io.metersphere.xmind.parser.pojo.JsonRootBean;
+import io.metersphere.xmind.utils.ProcMessage;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -32,7 +34,7 @@ public class XmindCaseParser {
     /**
      * 过程校验记录
      */
-    private StringBuffer process;
+    private ProcMessage process;
     /**
      * 已存在用例名称
      */
@@ -57,7 +59,7 @@ public class XmindCaseParser {
         this.testCaseNames = testCaseNames;
         testCases = new LinkedList<>();
         compartDatas = new ArrayList<>();
-        process = new StringBuffer();
+        process = new ProcMessage();
         nodePaths = new ArrayList<>();
     }
 
@@ -90,15 +92,15 @@ public class XmindCaseParser {
         nodePaths.forEach(nodePath -> {
             String[] nodes = nodePath.split("/");
             if (nodes.length > TestCaseConstants.MAX_NODE_DEPTH + 1) {
-                process.append(Translator.get("test_case_node_level_tip") +
-                        TestCaseConstants.MAX_NODE_DEPTH + Translator.get("test_case_node_level") + "; ");
+                process.add(Translator.get("test_case_node_level_tip") +
+                        TestCaseConstants.MAX_NODE_DEPTH + Translator.get("test_case_node_level"), nodePath);
             }
             String path = "";
             for (int i = 0; i < nodes.length; i++) {
                 if (i != 0 && StringUtils.equals(nodes[i].trim(), "")) {
-                    process.append(Translator.get("module") + "：【" + path + "】" + Translator.get("module_not_null") + "; ");
+                    process.add(Translator.get("module_not_null"), path);
                 } else if (nodes[i].trim().length() > 30) {
-                    process.append(nodes[i].trim() + "：" + Translator.get("test_track.length_less_than") + "30 ;");
+                    process.add(Translator.get("module") + Translator.get("test_track.length_less_than") + "30", path + nodes[i].trim());
                 } else {
                     path += nodes[i].trim() + "/";
                 }
@@ -109,7 +111,7 @@ public class XmindCaseParser {
     /**
      * 验证用例的合规性
      */
-    private boolean validate(TestCaseWithBLOBs data) {
+    private void validate(TestCaseWithBLOBs data) {
         String nodePath = data.getNodePath();
         if (!nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;
@@ -119,37 +121,36 @@ public class XmindCaseParser {
         }
         data.setNodePath(nodePath);
 
-        StringBuilder stringBuilder = new StringBuilder();
 
         if (data.getName().length() > 50) {
-            stringBuilder.append(data.getName() + "：" + Translator.get("test_case") + Translator.get("test_track.length_less_than") + "50 ;");
+            process.add(Translator.get("test_case") + Translator.get("test_track.length_less_than") + "50", nodePath + data.getName());
         }
 
         if (!StringUtils.isEmpty(nodePath)) {
             String[] nodes = nodePath.split("/");
             if (nodes.length > TestCaseConstants.MAX_NODE_DEPTH + 1) {
-                stringBuilder.append(Translator.get("test_case_node_level_tip") +
-                        TestCaseConstants.MAX_NODE_DEPTH + Translator.get("test_case_node_level") + "; ");
+                process.add(Translator.get("test_case_node_level_tip") +
+                        TestCaseConstants.MAX_NODE_DEPTH + Translator.get("test_case_node_level"), nodePath);
             }
             for (int i = 0; i < nodes.length; i++) {
                 if (i != 0 && StringUtils.equals(nodes[i].trim(), "")) {
-                    stringBuilder.append(Translator.get("test_case") + "：【" + data.getName() + "】" + Translator.get("module_not_null") + "; ");
+                    process.add(Translator.get("test_case") + Translator.get("module_not_null"), nodePath + data.getName());
                     break;
                 } else if (nodes[i].trim().length() > 30) {
-                    stringBuilder.append(nodes[i].trim() + "：" + Translator.get("module") + Translator.get("test_track.length_less_than") + "30 ;");
+                    process.add(Translator.get("module") + Translator.get("test_track.length_less_than") + "30 ", nodes[i].trim());
                     break;
                 }
             }
         }
 
         if (StringUtils.equals(data.getType(), TestCaseConstants.Type.Functional.getValue()) && StringUtils.equals(data.getMethod(), TestCaseConstants.Method.Auto.getValue())) {
-            stringBuilder.append(Translator.get("functional_method_tip") + "; ");
+            process.add(Translator.get("functional_method_tip"), nodePath + data.getName());
         }
 
         if (testCaseNames.contains(data.getName())) {
             boolean dbExist = testCaseService.exist(data);
             if (dbExist) {
-                stringBuilder.append(Translator.get("test_case_already_exists_excel") + "：" + data.getName() + "; ");
+                process.add(Translator.get("test_case_already_exists_excel"), nodePath + data.getName());
             }
         } else {
             testCaseNames.add(data.getName());
@@ -157,26 +158,19 @@ public class XmindCaseParser {
 
         // 用例等级和用例性质处理
         if (!priorityList.contains(data.getPriority())) {
-            stringBuilder.append(data.getName() + "：" + Translator.get("test_case_priority") + Translator.get("incorrect_format") + "; ");
+            process.add(Translator.get("test_case_priority") + Translator.get("incorrect_format"), nodePath + data.getName());
         }
         if (data.getType() == null) {
-            stringBuilder.append(data.getName() + "：" + Translator.get("test_case_type") + Translator.get("incorrect_format") + "; ");
+            process.add(Translator.get("test_case_type") + Translator.get("incorrect_format"), nodePath + data.getName());
         }
 
-
         // 重复用例校验
         TestCaseExcelData compartData = new TestCaseExcelData();
         BeanUtils.copyBean(compartData, data);
         if (compartDatas.contains(compartData)) {
-            stringBuilder.append(Translator.get("test_case_already_exists_excel") + "：" + compartData.getName() + "; ");
-        }
-        if (!StringUtils.isEmpty(stringBuilder.toString())) {
-            process.append(stringBuilder.toString());
-            return false;
+            process.add(Translator.get("test_case_already_exists_excel"), nodePath + compartData.getName());
         }
         compartDatas.add(compartData);
-
-        return true;
     }
 
     /**
@@ -267,7 +261,7 @@ public class XmindCaseParser {
         String tc = title.replace("：", ":");
         String[] tcArr = tc.split(":");
         if (tcArr.length != 2) {
-            process.append(Translator.get("test_case_name") + "【 " + title + " 】" + Translator.get("incorrect_format"));
+            process.add(Translator.get("test_case_name") + Translator.get("incorrect_format"), title);
             return;
         }
         // 用例名称
@@ -301,17 +295,15 @@ public class XmindCaseParser {
             });
         }
         testCase.setSteps(this.getSteps(steps));
-
+        testCases.add(testCase);
         // 校验合规性
-        if (validate(testCase)) {
-            testCases.add(testCase);
-        }
+        validate(testCase);
     }
 
     /**
      * 导入思维导图处理
      */
-    public String parse(MultipartFile multipartFile) {
+    public List<ExcelErrData<TestCaseExcelData>> parse(MultipartFile multipartFile) {
         try {
             // 获取思维导图内容
             List<JsonRootBean> roots = XmindParser.parseObject(multipartFile);
@@ -321,7 +313,7 @@ public class XmindCaseParser {
                     for (Attached item : root.getRootTopic().getChildren().getAttached()) {
                         // 用例
                         if (isAvailable(item.getTitle(), TC_REGEX)) {
-                            return replace(item.getTitle(), TC_REGEX) + "：" + Translator.get("test_case_create_module_fail");
+                            return process.parse(replace(item.getTitle(), TC_REGEX) + "：" + Translator.get("test_case_create_module_fail"));
                         } else {
                             String nodePath = item.getTitle();
                             item.setPath(nodePath);
@@ -344,8 +336,8 @@ public class XmindCaseParser {
             //检查目录合规性
             this.validate();
         } catch (Exception ex) {
-            return ex.getMessage();
+            return process.parse(ex.getMessage());
         }
-        return process.toString();
+        return process.parse();
     }
 }
diff --git a/backend/src/main/java/io/metersphere/xmind/parser/XmindParser.java b/backend/src/main/java/io/metersphere/xmind/parser/XmindParser.java
index f93356a645..f1e29b585a 100644
--- a/backend/src/main/java/io/metersphere/xmind/parser/XmindParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/parser/XmindParser.java
@@ -73,7 +73,7 @@ public class XmindParser {
                 JsonRootBean jsonRootBean = JSON.parseObject(content, JsonRootBean.class);
                 jsonRootBeans.add(jsonRootBean);
             }
-            if (caseCount > 500) {
+            if (caseCount > 800) {
                 MSException.throwException(Translator.get("import_xmind_count_error"));
             }
         }
diff --git a/backend/src/main/java/io/metersphere/xmind/utils/ProcMessage.java b/backend/src/main/java/io/metersphere/xmind/utils/ProcMessage.java
new file mode 100644
index 0000000000..271eaf4d13
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/xmind/utils/ProcMessage.java
@@ -0,0 +1,78 @@
+package io.metersphere.xmind.utils;
+
+import com.sun.deploy.util.StringUtils;
+import io.metersphere.excel.domain.ExcelErrData;
+import io.metersphere.excel.domain.TestCaseExcelData;
+import io.metersphere.i18n.Translator;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+public class ProcMessage implements Serializable {
+
+    private Map<String, StringBuilder> process;
+
+    public ProcMessage() {
+        process = new LinkedHashMap<>();
+    }
+
+    public void add(String type, String msContent) {
+        if (process.containsKey(type)) {
+            process.get(type).append(msContent + "；");
+        } else {
+            process.put(type, new StringBuilder(msContent+"；"));
+        }
+    }
+
+    public List<ExcelErrData<TestCaseExcelData>> parse(String content) {
+        List<ExcelErrData<TestCaseExcelData>> errList = new ArrayList<>();
+        ExcelErrData excelErrData = new ExcelErrData(null, 1, content);
+        errList.add(excelErrData);
+        return errList;
+    }
+
+    public List<ExcelErrData<TestCaseExcelData>> parse() {
+        List<ExcelErrData<TestCaseExcelData>> errList = new ArrayList<>();
+        List<String> result = new ArrayList<>();
+        process.entrySet().parallelStream().reduce(result, (first, second) -> {
+            first.add(second.getKey() + "：" + second.getValue());
+            return first;
+        }, (first, second) -> {
+            if (first == second) {
+                return first;
+            }
+            first.addAll(second);
+            return first;
+        });
+
+        for (int i = 0; i < result.size(); i++) {
+            ExcelErrData excelErrData = new ExcelErrData(null, i, result.get(i));
+            errList.add(excelErrData);
+        }
+        return errList;
+    }
+
+    @Override
+    public String toString() {
+        List<String> result = new ArrayList<>();
+        process.entrySet().parallelStream().reduce(result, (first, second) -> {
+            first.add(second.getKey() + "：" + second.getValue());
+            return first;
+        }, (first, second) -> {
+            if (first == second) {
+                return first;
+            }
+            first.addAll(second);
+            return first;
+        });
+
+        return StringUtils.join(result, "\n");
+    }
+}
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 19f9ed48c5..bc768e3542 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -748,7 +748,7 @@ export default {
         click_upload: "Upload",
         upload_limit: "Only XLS/XLSX/XMIND files can be uploaded, and no more than 20M",
         upload_xmind_format: "Upload files can only be .xmind format",
-        upload_xmind: "Only xmind files can be uploaded, and no more than 500",
+        upload_xmind: "Only xmind files can be uploaded, and no more than 800",
         upload_limit_count: "Only one file can be uploaded at a time",
         upload_limit_format: "Upload files can only be XLS, XLSX format!",
         upload_limit_size: "Upload file size cannot exceed 20MB!",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 58ff7df239..1aba6660bc 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -751,7 +751,7 @@ export default {
         download_template: "下载模版",
         click_upload: "点击上传",
         upload_limit: "只能上传xls/xlsx文件，且不超过20M",
-        upload_xmind: "支持文件类型：.xmind；一次至多导入500 条用例",
+        upload_xmind: "支持文件类型：.xmind；一次至多导入800 条用例",
         upload_xmind_format: "上传文件只能是 .xmind 格式",
         upload_limit_other_size: "上传文件大小不能超过",
         upload_limit_count: "一次只能上传一个文件",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 01d7cd0532..2c65d3c31c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -751,7 +751,7 @@ export default {
         download_template: "下載模版",
         click_upload: "點擊上傳",
         upload_limit: "只能上傳xls/xlsx文件，且不超過20M",
-        upload_xmind: "支持文件類型：.xmind；壹次至多導入500 條用例",
+        upload_xmind: "支持文件類型：.xmind；壹次至多導入800 條用例",
         upload_xmind_format: "上傳文件只能是 .xmind 格式",
         upload_limit_other_size: "上傳文件大小不能超過",
         upload_limit_count: "壹次只能上傳壹個文件",

From fa95095110905bf851c8f047e71a7e66c9b263ce Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 20 Oct 2020 17:45:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E9=87=8D=E5=91=BD=E5=90=8DUtil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/metersphere/xmind/XmindCaseParser.java | 6 +++---
 .../xmind/utils/{ProcMessage.java => DetailUtil.java}       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename backend/src/main/java/io/metersphere/xmind/utils/{ProcMessage.java => DetailUtil.java} (93%)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index 8137156a8e..e229285af5 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -13,7 +13,7 @@ import io.metersphere.track.service.TestCaseService;
 import io.metersphere.xmind.parser.XmindParser;
 import io.metersphere.xmind.parser.pojo.Attached;
 import io.metersphere.xmind.parser.pojo.JsonRootBean;
-import io.metersphere.xmind.utils.ProcMessage;
+import io.metersphere.xmind.utils.DetailUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -34,7 +34,7 @@ public class XmindCaseParser {
     /**
      * 过程校验记录
      */
-    private ProcMessage process;
+    private DetailUtil process;
     /**
      * 已存在用例名称
      */
@@ -59,7 +59,7 @@ public class XmindCaseParser {
         this.testCaseNames = testCaseNames;
         testCases = new LinkedList<>();
         compartDatas = new ArrayList<>();
-        process = new ProcMessage();
+        process = new DetailUtil();
         nodePaths = new ArrayList<>();
     }
 
diff --git a/backend/src/main/java/io/metersphere/xmind/utils/ProcMessage.java b/backend/src/main/java/io/metersphere/xmind/utils/DetailUtil.java
similarity index 93%
rename from backend/src/main/java/io/metersphere/xmind/utils/ProcMessage.java
rename to backend/src/main/java/io/metersphere/xmind/utils/DetailUtil.java
index 271eaf4d13..d3f8711784 100644
--- a/backend/src/main/java/io/metersphere/xmind/utils/ProcMessage.java
+++ b/backend/src/main/java/io/metersphere/xmind/utils/DetailUtil.java
@@ -15,11 +15,11 @@ import java.util.Map;
 
 @Getter
 @Setter
-public class ProcMessage implements Serializable {
+public class DetailUtil implements Serializable {
 
     private Map<String, StringBuilder> process;
 
-    public ProcMessage() {
+    public DetailUtil() {
         process = new LinkedHashMap<>();
     }
 
@@ -27,7 +27,7 @@ public class ProcMessage implements Serializable {
         if (process.containsKey(type)) {
             process.get(type).append(msContent + "；");
         } else {
-            process.put(type, new StringBuilder(msContent+"；"));
+            process.put(type, new StringBuilder(msContent + "；"));
         }
     }
 

From f6f533f9bfa7a7b4bf9b5f77a9576abe34bd29e0 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 20 Oct 2020 17:48:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/xmind/utils/DetailUtil.java   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/utils/DetailUtil.java b/backend/src/main/java/io/metersphere/xmind/utils/DetailUtil.java
index d3f8711784..110bb4b61f 100644
--- a/backend/src/main/java/io/metersphere/xmind/utils/DetailUtil.java
+++ b/backend/src/main/java/io/metersphere/xmind/utils/DetailUtil.java
@@ -1,9 +1,7 @@
 package io.metersphere.xmind.utils;
 
-import com.sun.deploy.util.StringUtils;
 import io.metersphere.excel.domain.ExcelErrData;
 import io.metersphere.excel.domain.TestCaseExcelData;
-import io.metersphere.i18n.Translator;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -58,21 +56,4 @@ public class DetailUtil implements Serializable {
         }
         return errList;
     }
-
-    @Override
-    public String toString() {
-        List<String> result = new ArrayList<>();
-        process.entrySet().parallelStream().reduce(result, (first, second) -> {
-            first.add(second.getKey() + "：" + second.getValue());
-            return first;
-        }, (first, second) -> {
-            if (first == second) {
-                return first;
-            }
-            first.addAll(second);
-            return first;
-        });
-
-        return StringUtils.join(result, "\n");
-    }
 }

From 0616c483b0c02c82b19760418e25b8bc948f0cf5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 20 Oct 2020 17:55:12 +0800
Subject: [PATCH 6/6] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/metersphere/xmind/XmindCaseParser.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index e229285af5..1c765f8ae7 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -150,7 +150,7 @@ public class XmindCaseParser {
         if (testCaseNames.contains(data.getName())) {
             boolean dbExist = testCaseService.exist(data);
             if (dbExist) {
-                process.add(Translator.get("test_case_already_exists_excel"), nodePath + data.getName());
+                process.add(Translator.get("test_case_already_exists_excel"), nodePath + "/" + data.getName());
             }
         } else {
             testCaseNames.add(data.getName());
@@ -168,7 +168,7 @@ public class XmindCaseParser {
         TestCaseExcelData compartData = new TestCaseExcelData();
         BeanUtils.copyBean(compartData, data);
         if (compartDatas.contains(compartData)) {
-            process.add(Translator.get("test_case_already_exists_excel"), nodePath + compartData.getName());
+            process.add(Translator.get("test_case_already_exists_excel"), nodePath + "/" + compartData.getName());
         }
         compartDatas.add(compartData);
     }