From 38a34b0527e3973108c009583870ab6bc17a6fdf Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 29 Sep 2020 17:35:51 +0800
Subject: [PATCH 01/36] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/en-US.js | 4 ++++
 frontend/src/i18n/zh-TW.js | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 41c74198e5..6a7915696f 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -740,6 +740,10 @@ export default {
       plan_status_prepare: "Not started",
       plan_status_running: "Starting",
       plan_status_completed: "Completed",
+      planned_start_time: "Scheduled Start Time",
+      planned_end_time: "Scheduled End Time",
+      actual_start_time: "Actual Start Time",
+      actual_end_time: "Actual End Time",
       plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
       plan_delete: "Delete test plan",
     },
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 50cd10d8df..813673c0be 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -469,9 +469,9 @@ export default {
       input_url: "請輸入請求URL",
       input_path: "請輸入請求路徑",
       name: "請求名稱",
+      content_type: "請求類型",
       method: "請求方法",
       url: "請求URL",
-      content_type: "請求類型",
       path: "請求路徑",
       address: "請求地址",
       refer_to_environment: "引用環境",
@@ -742,6 +742,10 @@ export default {
       plan_status_prepare: "未開始",
       plan_status_running: "進行中",
       plan_status_completed: "已完成",
+      planned_start_time: "計劃開始",
+      planned_end_time: "計劃結束",
+      actual_start_time: "實際開始",
+      actual_end_time: "實際結束",
       plan_delete_confirm: "將刪除該測試計劃下所有用例，確認刪除測試計劃: ",
       plan_delete: "刪除計劃",
     },

From 776ed4252daa58d25b63c97d00b02d5150bf7a3e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 29 Sep 2020 18:11:17 +0800
Subject: [PATCH 02/36] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/import/ApiImport.vue          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/components/import/ApiImport.vue b/frontend/src/business/components/api/test/components/import/ApiImport.vue
index 7d695d4f56..77dfb1fd67 100644
--- a/frontend/src/business/components/api/test/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/test/components/import/ApiImport.vue
@@ -30,7 +30,7 @@
           </el-form-item>
           <el-form-item v-if="useEnvironment || selectedPlatformValue == 'Swagger2'" :label="$t('api_test.environment.environment_config')" prop="environmentId">
             <el-select v-if="showEnvironmentSelect" size="small"  v-model="formData.environmentId" class="environment-select" clearable>
-              <el-option v-for="(environment, index) in environments" :key="index" :label="environment.name + ': ' + environment.protocol + '://' + environment.socket" :value="environment.id"/>
+              <el-option v-for="(environment, index) in environments" :key="index" :label="environment.name" :value="environment.id"/>
               <el-button class="environment-button" size="mini" type="primary" @click="openEnvironmentConfig">{{$t('api_test.environment.environment_config')}}</el-button>
               <template v-slot:empty>
                 <div class="empty-environment">
@@ -203,6 +203,15 @@
           if (this.formData.projectId) {
             this.$get('/api/environment/list/' + this.formData.projectId, response => {
               this.environments = response.data;
+              let hasEnvironmentId = false;
+              this.environments.forEach(env => {
+                if (env.id === this.formData.environmentId) {
+                  hasEnvironmentId = true;
+                }
+              });
+              if (!hasEnvironmentId) {
+                this.formData.environmentId = '';
+              }
             });
           } else {
             this.environments = [];

From 1c7ce5e20b67a2ab51b29ed4ae56b4949db3eaca Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 29 Sep 2020 18:54:20 +0800
Subject: [PATCH 03/36] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E7=82=B9=E5=87=BB=E6=9C=80=E8=BF=91=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=90=8E=E8=8F=9C=E5=8D=95=E6=A0=8F=E6=9C=AA?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../components/api/head/ApiHeaderMenus.vue    | 57 +++++++++++++++----
 frontend/src/business/components/xpack        |  2 +-
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index c2dacf960c..cf6b065263 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8
+Subproject commit cf6b06526324326a563d933e07118fac014a63b4
diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 1bc88dc6b9..5e1e6f1d1f 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="menu-bar">
+  <div id="menu-bar" v-if="isRouterAlive">
     <el-row type="flex">
       <el-col :span="8">
         <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router :default-active='$route.path'>
@@ -7,7 +7,7 @@
             {{ $t("i18n.home") }}
           </el-menu-item>
 
-          <el-submenu v-permission="['test_manager','test_user','test_viewer']" index="3">
+          <el-submenu :class="{'deactivation':!isProjectActivation}" v-permission="['test_manager','test_user','test_viewer']" index="3">
             <template v-slot:title>{{ $t('commons.project') }}</template>
             <ms-recent-list ref="projectRecent" :options="projectRecent"/>
             <el-divider class="menu-divider"/>
@@ -21,6 +21,7 @@
             <ms-recent-list ref="testRecent" :options="testRecent"/>
             <el-divider class="menu-divider"/>
             <ms-show-all :index="'/api/test/list/all'"/>
+            <el-menu-item :index="apiTestProjectPath" class="blank_item"></el-menu-item>
             <ms-create-button v-permission="['test_manager','test_user']" :index="'/api/test/create'"
                               :title="$t('load_test.create')"/>
           </el-submenu>
@@ -84,7 +85,15 @@ export default {
         index: function (item) {
           return '/api/report/view/' + item.id;
         }
-      }
+      },
+      isProjectActivation: true,
+      isRouterAlive: true,
+      apiTestProjectPath: '',
+    }
+  },
+  watch: {
+    '$route'(to) {
+      this.init();
     }
   },
   methods: {
@@ -98,7 +107,25 @@ export default {
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();
       });
-    }
+    },
+    reload() {
+      this.isRouterAlive = false;
+      this.$nextTick(function () {
+        this.isRouterAlive = true;
+      });
+    },
+    init() {
+      let path = this.$route.path;
+      if (path.indexOf("/api/test/list") >= 0 && !!this.$route.params.projectId) {
+        this.apiTestProjectPath = path;
+        //不激活项目菜单栏
+        this.isProjectActivation = false;
+        this.reload();
+      } else {
+        this.isProjectActivation = true;
+      }
+
+    },
   },
   mounted() {
     this.registerEvents();
@@ -108,12 +135,20 @@ export default {
 </script>
 
 <style scoped>
-#menu-bar {
-  border-bottom: 1px solid #E6E6E6;
-  background-color: #FFF;
-}
+  #menu-bar {
+    border-bottom: 1px solid #E6E6E6;
+    background-color: #FFF;
+  }
 
-.menu-divider {
-  margin: 0;
-}
+  .menu-divider {
+    margin: 0;
+  }
+
+  .blank_item {
+    display: none;
+  }
+
+  .deactivation >>> .el-submenu__title {
+    border-bottom: white !important;
+  }
 </style>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index cc38137a69..06d935cd1d 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1

From 8ba24261b6b28b02a0bf994483f44cfcd03144a7 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 30 Sep 2020 11:14:01 +0800
Subject: [PATCH 04/36] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E5=AF=BC=E5=85=A5xmind=E6=94=AF=E6=8C=81=20=E8=87=AA?=
 =?UTF-8?q?=E7=94=B1=E4=B8=BB=E9=A2=98=E9=A3=8E=E6=A0=BC/=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E7=94=BB=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/xmind/XmindCaseParser.java |  35 +++--
 .../metersphere/xmind/parser/XmindLegacy.java | 124 ++++++++++--------
 .../metersphere/xmind/parser/XmindParser.java |  77 ++++++-----
 .../io/metersphere/xmind/parser/XmindZen.java | 109 ++++++++-------
 4 files changed, 188 insertions(+), 157 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index b6b864170a..2585b37376 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -270,25 +270,34 @@ public class XmindCaseParser {
         StringBuffer processBuffer = new StringBuffer();
         try {
             // 获取思维导图内容
-            JsonRootBean root = XmindParser.parseObject(multipartFile);
-            if (root != null && root.getRootTopic() != null && root.getRootTopic().getChildren() != null) {
-                // 判断是模块还是用例
-                for (Attached item : root.getRootTopic().getChildren().getAttached()) {
-                    if (isAvailable(item.getTitle(), "(?:tc:|tc：|tc)")) { // 用例
-                        return replace(item.getTitle(), "(?:tc:|tc：|tc)") + "：" + Translator.get("test_case_create_module_fail");
-                    } else {
-                        item.setPath(item.getTitle());
-                        if (item.getChildren() != null && !item.getChildren().getAttached().isEmpty()) {
-                            recursion(processBuffer, item, 1, item.getChildren().getAttached());
+            List<JsonRootBean> roots = XmindParser.parseObject(multipartFile);
+            for (JsonRootBean root : roots) {
+                if (root != null && root.getRootTopic() != null && root.getRootTopic().getChildren() != null) {
+                    // 判断是模块还是用例
+                    for (Attached item : root.getRootTopic().getChildren().getAttached()) {
+                        if (isAvailable(item.getTitle(), "(?:tc:|tc：|tc)")) { // 用例
+                            return replace(item.getTitle(), "(?:tc:|tc：|tc)") + "：" + Translator.get("test_case_create_module_fail");
+                        } else {
+                            String nodePath = item.getTitle();
+                            item.setPath(nodePath);
+                            if (item.getChildren() != null && !item.getChildren().getAttached().isEmpty()) {
+                                recursion(processBuffer, item, 1, item.getChildren().getAttached());
+                            } else {
+                                if (!nodePath.startsWith("/")) {
+                                    nodePath = "/" + nodePath;
+                                }
+                                if (nodePath.endsWith("/")) {
+                                    nodePath = nodePath.substring(0, nodePath.length() - 1);
+                                }
+                                nodePaths.add(nodePath); // 没有用例的路径
+                            }
                         }
                     }
                 }
             }
             this.validate();
         } catch (Exception ex) {
-            processBuffer.append(Translator.get("incorrect_format"));
-            LogUtil.error(ex.getMessage());
-            return "xmind "+Translator.get("incorrect_format");
+            return ex.getMessage();
         }
         return process.toString();
     }
diff --git a/backend/src/main/java/io/metersphere/xmind/parser/XmindLegacy.java b/backend/src/main/java/io/metersphere/xmind/parser/XmindLegacy.java
index 1a6ae73728..55c17cc6d3 100644
--- a/backend/src/main/java/io/metersphere/xmind/parser/XmindLegacy.java
+++ b/backend/src/main/java/io/metersphere/xmind/parser/XmindLegacy.java
@@ -5,75 +5,83 @@ import org.json.JSONObject;
 import org.json.XML;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 public class XmindLegacy {
 
-	/**
-	 * 返回content.xml和comments.xml合并后的json
-	 *
-	 * @param xmlContent
-	 * @param xmlComments
-	 * @return
-	 * @throws IOException
-	 * @throws DocumentException
-	 */
-	public static String getContent(String xmlContent, String xmlComments) throws IOException, DocumentException {
-		// 删除content.xml里面不能识别的字符串
-		xmlContent = xmlContent.replace("xmlns=\"urn:xmind:xmap:xmlns:content:2.0\"", "");
-		xmlContent = xmlContent.replace("xmlns:fo=\"http://www.w3.org/1999/XSL/Format\"", "");
-		// 删除<topic>节点
-		xmlContent = xmlContent.replace("<topics type=\"attached\">", "");
-		xmlContent = xmlContent.replace("</topics>", "");
+    /**
+     * 返回content.xml和comments.xml合并后的json
+     *
+     * @param xmlContent
+     * @param xmlComments
+     * @return
+     * @throws IOException
+     * @throws DocumentException
+     */
+    public static List<String> getContent(String xmlContent, String xmlComments) throws IOException, DocumentException {
+        // 删除content.xml里面不能识别的字符串
+        xmlContent = xmlContent.replace("xmlns=\"urn:xmind:xmap:xmlns:content:2.0\"", "");
+        xmlContent = xmlContent.replace("xmlns:fo=\"http://www.w3.org/1999/XSL/Format\"", "");
+        // 删除<topic>节点
+        xmlContent = xmlContent.replace("<topics type=\"attached\">", "");
+        xmlContent = xmlContent.replace("</topics>", "");
 
-		// 去除title中svg:width属性
-		xmlContent = xmlContent.replaceAll("<title svg:width=\"[0-9]*\">", "<title>");
+        // 去除title中svg:width属性
+        xmlContent = xmlContent.replaceAll("<title svg:width=\"[0-9]*\">", "<title>");
+        //去除自由风格主题
+        xmlContent = xmlContent.replaceAll("<topics type=\"detached\">", "");
 
-		Document document = DocumentHelper.parseText(xmlContent);// 读取XML文件,获得document对象
-		Element root = document.getRootElement();
-		List<Node> topics = root.selectNodes("//topic");
+        Document document = DocumentHelper.parseText(xmlContent);// 读取XML文件,获得document对象
+        Element root = document.getRootElement();
+        List<Node> topics = root.selectNodes("//topic");
 
-		if (xmlComments != null) {
-			// 删除comments.xml里面不能识别的字符串
-			xmlComments = xmlComments.replace("xmlns=\"urn:xmind:xmap:xmlns:comments:2.0\"", "");
+        if (xmlComments != null) {
+            // 删除comments.xml里面不能识别的字符串
+            xmlComments = xmlComments.replace("xmlns=\"urn:xmind:xmap:xmlns:comments:2.0\"", "");
 
-			// 添加评论到content中
-			Document commentDocument = DocumentHelper.parseText(xmlComments);
-			List<Node> commentsList = commentDocument.selectNodes("//comment");
+            // 添加评论到content中
+            Document commentDocument = DocumentHelper.parseText(xmlComments);
+            List<Node> commentsList = commentDocument.selectNodes("//comment");
 
-			for (Node topic : topics) {
-				for (Node commentNode : commentsList) {
-					Element commentElement = (Element) commentNode;
-					Element topicElement = (Element) topic;
-					if (topicElement.attribute("id").getValue()
-							.equals(commentElement.attribute("object-id").getValue())) {
-						Element comment = topicElement.addElement("comments");
-						comment.addAttribute("creationTime", commentElement.attribute("time").getValue());
-						comment.addAttribute("author", commentElement.attribute("author").getValue());
-						comment.addAttribute("content", commentElement.element("content").getText());
-					}
-				}
+            for (Node topic : topics) {
+                for (Node commentNode : commentsList) {
+                    Element commentElement = (Element) commentNode;
+                    Element topicElement = (Element) topic;
+                    if (topicElement.attribute("id").getValue()
+                            .equals(commentElement.attribute("object-id").getValue())) {
+                        Element comment = topicElement.addElement("comments");
+                        comment.addAttribute("creationTime", commentElement.attribute("time").getValue());
+                        comment.addAttribute("author", commentElement.attribute("author").getValue());
+                        comment.addAttribute("content", commentElement.element("content").getText());
+                    }
+                }
 
-			}
-		}
+            }
+        }
 
-		// 第一个topic转换为json中的rootTopic
-		Node rootTopic = root.selectSingleNode("/xmap-content/sheet/topic");
-		rootTopic.setName("rootTopic");
+        // 第一个topic转换为json中的rootTopic
+        List<Node> rootTopics = root.selectNodes("/xmap-content/sheet/topic");
+        for (Node rootTopic : rootTopics) {
+            rootTopic.setName("rootTopic");
 
-		// 将xml中topic节点转换为attached节点
-		List<Node> topicList = rootTopic.selectNodes("//topic");
+            // 将xml中topic节点转换为attached节点
+            List<Node> topicList = rootTopic.selectNodes("//topic");
+            for (Node node : topicList) {
+                node.setName("attached");
+            }
 
-		for (Node node : topicList) {
-			node.setName("attached");
-		}
-		// 选取第一个sheet
-		Element sheet = root.elements("sheet").get(0);
-		String res = sheet.asXML();
-		// 将xml转为json
-		JSONObject xmlJSONObj = XML.toJSONObject(res);
-		JSONObject jsonObject = xmlJSONObj.getJSONObject("sheet");
-		// 设置缩进
-		return jsonObject.toString(4);
-	}
+        }
+
+        List<String> sheets = new ArrayList<>();
+        for (Element sheet : root.elements("sheet")) {
+            String res = sheet.asXML();
+            // 将xml转为json
+            JSONObject xmlJSONObj = XML.toJSONObject(res);
+            JSONObject jsonObject = xmlJSONObj.getJSONObject("sheet");
+            sheets.add(jsonObject.toString(4));
+        }
+        // 设置缩进
+        return sheets;
+    }
 }
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 d61a28a9d7..2d7ef83919 100644
--- a/backend/src/main/java/io/metersphere/xmind/parser/XmindParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/parser/XmindParser.java
@@ -34,61 +34,68 @@ public class XmindParser {
      * @throws ArchiveException
      * @throws DocumentException
      */
-    public static String parseJson(MultipartFile multipartFile) throws IOException, ArchiveException, DocumentException {
-
+    public static List<String> parseJson(MultipartFile multipartFile) throws IOException, ArchiveException, DocumentException {
         File file = FileUtil.multipartFileToFile(multipartFile);
+        List<String> contents = null;
+        String res = null;
         if (file == null || !file.exists())
             MSException.throwException(Translator.get("incorrect_format"));
-
-        String res = ZipUtils.extract(file);
-        String content = null;
-        if (isXmindZen(res, file)) {
-            content = getXmindZenContent(file, res);
-        } else {
-            content = getXmindLegacyContent(file, res);
+        try {
+            res = ZipUtils.extract(file);
+            if (isXmindZen(res, file)) {
+                contents = (getXmindZenContent(file, res));
+            } else {
+                contents = getXmindLegacyContent(file, res);
+            }
+        } catch (Exception e) {
+            MSException.throwException(e.getMessage());
+        } finally {
+            // 删除生成的文件夹
+            if (res != null) {
+                File dir = new File(res);
+                FileUtil.deleteDir(dir);
+            }
+            // 删除零时文件
+            if (file != null)
+                file.delete();
         }
-
-        // 删除生成的文件夹
-        File dir = new File(res);
-        FileUtil.deleteDir(dir);
-        JsonRootBean jsonRootBean = JSON.parseObject(content, JsonRootBean.class);
-        // 删除零时文件
-        if (file != null)
-            file.delete();
-        String json = (JSON.toJSONString(jsonRootBean, false));
-
-        if (StringUtils.isEmpty(content) || content.split("(?:tc:|tc：|TC:|TC：|tc|TC)").length == 1) {
-            MSException.throwException(Translator.get("import_xmind_not_found"));
-        }
-        if (!StringUtils.isEmpty(content) && content.split("(?:tc:|tc：|TC:|TC：|tc|TC)").length > 500) {
-            MSException.throwException(Translator.get("import_xmind_count_error"));
-        }
-        return json;
+        return contents;
     }
 
-    public static JsonRootBean parseObject(MultipartFile multipartFile) throws DocumentException, ArchiveException, IOException {
-        String content = parseJson(multipartFile);
-        JsonRootBean jsonRootBean = JSON.parseObject(content, JsonRootBean.class);
-        return jsonRootBean;
+    public static List<JsonRootBean> parseObject(MultipartFile multipartFile) throws DocumentException, ArchiveException, IOException {
+        List<String> contents = parseJson(multipartFile);
+        int caseCount = 0;
+        List<JsonRootBean> jsonRootBeans = new ArrayList<>();
+        if (contents != null) {
+            for (String content : contents) {
+                caseCount += content.split("(?:tc:|tc：|TC:|TC：|tc|TC)").length;
+                JsonRootBean jsonRootBean = JSON.parseObject(content, JsonRootBean.class);
+                jsonRootBeans.add(jsonRootBean);
+            }
+            if (caseCount > 500) {
+                MSException.throwException(Translator.get("import_xmind_count_error"));
+            }
+        }
+        return jsonRootBeans;
+
     }
 
     /**
      * @return
      */
-    public static String getXmindZenContent(File file, String extractFileDir)
+    public static List<String> getXmindZenContent(File file, String extractFileDir)
             throws IOException, ArchiveException {
         List<String> keys = new ArrayList<>();
         keys.add(xmindZenJson);
         Map<String, String> map = ZipUtils.getContents(keys, file, extractFileDir);
         String content = map.get(xmindZenJson);
-        content = XmindZen.getContent(content);
-        return content;
+        return XmindZen.getContent(content);
     }
 
     /**
      * @return
      */
-    public static String getXmindLegacyContent(File file, String extractFileDir)
+    public static List<String> getXmindLegacyContent(File file, String extractFileDir)
             throws IOException, ArchiveException, DocumentException {
         List<String> keys = new ArrayList<>();
         keys.add(xmindLegacyContent);
@@ -97,7 +104,7 @@ public class XmindParser {
 
         String contentXml = map.get(xmindLegacyContent);
         String commentsXml = map.get(xmindLegacyComments);
-        String xmlContent = XmindLegacy.getContent(contentXml, commentsXml);
+        List<String> xmlContent = XmindLegacy.getContent(contentXml, commentsXml);
 
         return xmlContent;
     }
diff --git a/backend/src/main/java/io/metersphere/xmind/parser/XmindZen.java b/backend/src/main/java/io/metersphere/xmind/parser/XmindZen.java
index 6ba9d2021b..4de22142be 100644
--- a/backend/src/main/java/io/metersphere/xmind/parser/XmindZen.java
+++ b/backend/src/main/java/io/metersphere/xmind/parser/XmindZen.java
@@ -5,61 +5,68 @@ import com.alibaba.fastjson.JSONObject;
 import org.dom4j.DocumentException;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class XmindZen {
 
-	/**
-	 * @param jsonContent
-	 * @return
-	 * @throws IOException
-	 * @throws DocumentException
-	 */
-	public static String getContent(String jsonContent) {
-		JSONObject jsonObject = JSONArray.parseArray(jsonContent).getJSONObject(0);
-		JSONObject rootTopic = jsonObject.getJSONObject("rootTopic");
-		transferNotes(rootTopic);
-		JSONObject children = rootTopic.getJSONObject("children");
-		recursionChildren(children);
-		return jsonObject.toString();
-	}
+    /**
+     * @param jsonContent
+     * @return
+     * @throws IOException
+     * @throws DocumentException
+     */
+    public static List<String> getContent(String jsonContent) {
+        JSONArray jsonArray = JSONArray.parseArray(jsonContent);//.getJSONObject(0);
+        List<String> contents = new ArrayList<>();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObject = (JSONObject) jsonArray.get(i);
+            JSONObject rootTopic = jsonObject.getJSONObject("rootTopic");
+            transferNotes(rootTopic);
+            JSONObject children = rootTopic.getJSONObject("children");
+            recursionChildren(children);
+            contents.add(jsonObject.toString());
+        }
+        return contents;
+    }
 
-	/**
-	 * 递归转换children
-	 *
-	 * @param children
-	 */
-	private static void recursionChildren(JSONObject children) {
-		if (children == null) {
-			return;
-		}
-		JSONArray attachedArray = children.getJSONArray("attached");
-		if (attachedArray == null) {
-			return;
-		}
-		for (Object attached : attachedArray) {
-			JSONObject attachedObject = (JSONObject) attached;
-			transferNotes(attachedObject);
-			JSONObject childrenObject = attachedObject.getJSONObject("children");
-			if (childrenObject == null) {
-				continue;
-			}
-			recursionChildren(childrenObject);
-		}
-	}
+    /**
+     * 递归转换children
+     *
+     * @param children
+     */
+    private static void recursionChildren(JSONObject children) {
+        if (children == null) {
+            return;
+        }
+        JSONArray attachedArray = children.getJSONArray("attached");
+        if (attachedArray == null) {
+            return;
+        }
+        for (Object attached : attachedArray) {
+            JSONObject attachedObject = (JSONObject) attached;
+            transferNotes(attachedObject);
+            JSONObject childrenObject = attachedObject.getJSONObject("children");
+            if (childrenObject == null) {
+                continue;
+            }
+            recursionChildren(childrenObject);
+        }
+    }
 
-	private static void transferNotes(JSONObject object) {
-		JSONObject notes = object.getJSONObject("notes");
-		if (notes == null) {
-			return;
-		}
-		JSONObject plain = notes.getJSONObject("plain");
-		if (plain != null) {
-			String content = plain.getString("content");
-			notes.remove("plain");
-			notes.put("content", content);
-		} else {
-			notes.put("content", null);
-		}
-	}
+    private static void transferNotes(JSONObject object) {
+        JSONObject notes = object.getJSONObject("notes");
+        if (notes == null) {
+            return;
+        }
+        JSONObject plain = notes.getJSONObject("plain");
+        if (plain != null) {
+            String content = plain.getString("content");
+            notes.remove("plain");
+            notes.put("content", content);
+        } else {
+            notes.put("content", null);
+        }
+    }
 
 }

From c671c8a5572156437ce133f5858f59738843583a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 30 Sep 2020 11:20:54 +0800
Subject: [PATCH 05/36] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=97=B6=E4=BC=9A=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestCaseReviewService.java  | 20 ++++++++++++-------
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 frontend/src/business/components/xpack        |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index d0b7e590f9..74f1c842a6 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -272,14 +272,20 @@ public class TestCaseReviewService {
         List<Project> projects = projectMapper.selectByExample(projectExample);
         List<String> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
 
-        TestCaseReviewProjectExample testCaseReviewProjectExample = new TestCaseReviewProjectExample();
-        testCaseReviewProjectExample.createCriteria().andProjectIdIn(projectIds);
-        List<TestCaseReviewProject> testCaseReviewProjects = testCaseReviewProjectMapper.selectByExample(testCaseReviewProjectExample);
-        List<String> reviewIds = testCaseReviewProjects.stream().map(TestCaseReviewProject::getReviewId).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(projectIds)) {
+            TestCaseReviewProjectExample testCaseReviewProjectExample = new TestCaseReviewProjectExample();
+            testCaseReviewProjectExample.createCriteria().andProjectIdIn(projectIds);
+            List<TestCaseReviewProject> testCaseReviewProjects = testCaseReviewProjectMapper.selectByExample(testCaseReviewProjectExample);
+            List<String> reviewIds = testCaseReviewProjects.stream().map(TestCaseReviewProject::getReviewId).collect(Collectors.toList());
 
-        TestCaseReviewExample testCaseReviewExample = new TestCaseReviewExample();
-        testCaseReviewExample.createCriteria().andIdIn(reviewIds);
-        return testCaseReviewMapper.selectByExample(testCaseReviewExample);
+            if (!CollectionUtils.isEmpty(reviewIds)) {
+                TestCaseReviewExample testCaseReviewExample = new TestCaseReviewExample();
+                testCaseReviewExample.createCriteria().andIdIn(reviewIds);
+                return testCaseReviewMapper.selectByExample(testCaseReviewExample);
+            }
+        }
+
+        return new ArrayList<>();
     }
 
     public void testReviewRelevance(ReviewRelevanceRequest request) {
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index cf6b065263..c2dacf960c 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 06d935cd1d..cc38137a69 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9

From a66741406f6241dc666671af59ef3eb6d85cc58a Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 30 Sep 2020 14:07:09 +0800
Subject: [PATCH 06/36] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=AF=BC=E8=88=AA=E8=B7=AF=E7=94=B1=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/components/MsTableHeader.vue         | 4 ++--
 frontend/src/business/components/common/router/router.js   | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsTableHeader.vue b/frontend/src/business/components/common/components/MsTableHeader.vue
index e48db2f2b0..3caf914e37 100644
--- a/frontend/src/business/components/common/components/MsTableHeader.vue
+++ b/frontend/src/business/components/common/components/MsTableHeader.vue
@@ -7,15 +7,15 @@
       </slot>
     </el-row>
     <el-row type="flex" justify="space-between" align="middle">
+      <template v-slot:button>
       <span class="operate-button">
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showCreate" icon="el-icon-circle-plus-outline"
                          :content="createTip" @click="create"/>
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showRun" icon="el-icon-video-play"
                          type="primary"
                          :content="runTip" @click="runTest"/>
-
-        <slot name="button"></slot>
       </span>
+      </template>
       <span>
         <ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar" :tip="tip"/>
         <ms-table-adv-search-bar :condition.sync="condition" @search="search" v-if="isCombine"/>
diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js
index da7d79e786..f5821015c4 100644
--- a/frontend/src/business/components/common/router/router.js
+++ b/frontend/src/business/components/common/router/router.js
@@ -41,6 +41,13 @@ router.beforeEach((to, from, next) => {
   }
 });
 
+//重复点击导航路由报错
+const routerPush = VueRouter.prototype.push;
+VueRouter.prototype.push = function push(location) {
+  return routerPush.call(this, location).catch(error => error)
+}
+
+
 // 登入后跳转至原路径
 function redirectLoginPath(originPath) {
   let redirectUrl = sessionStorage.getItem('redirectUrl');

From 0f38b7f2ab636545a569af561af612ff6070200c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 30 Sep 2020 15:46:23 +0800
Subject: [PATCH 07/36] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E5=9B=BA=E5=AE=9Acard=20=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/home/ApiReportRecentList.vue    | 2 +-
 frontend/src/business/components/api/home/ApiTestRecentList.vue | 2 +-
 .../components/performance/home/PerformanceReportRecentList.vue | 2 +-
 .../components/performance/home/PerformanceTestRecentList.vue   | 2 +-
 .../components/track/home/components/RelatedTestPlanList.vue    | 2 +-
 .../business/components/track/home/components/ReviewList.vue    | 2 +-
 .../components/track/home/components/TestCaseSideList.vue       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/api/home/ApiReportRecentList.vue b/frontend/src/business/components/api/home/ApiReportRecentList.vue
index 629610d079..188124fa5e 100644
--- a/frontend/src/business/components/api/home/ApiReportRecentList.vue
+++ b/frontend/src/business/components/api/home/ApiReportRecentList.vue
@@ -3,7 +3,7 @@
     <template v-slot:header>
       <span class="title">{{$t('api_report.title')}}</span>
     </template>
-    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
+    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
       <el-table-column prop="name"  :label="$t('commons.name')" width="150" show-overflow-tooltip/>
       <el-table-column width="250" :label="$t('commons.create_time')">
         <template v-slot:default="scope">
diff --git a/frontend/src/business/components/api/home/ApiTestRecentList.vue b/frontend/src/business/components/api/home/ApiTestRecentList.vue
index d0ee99383d..722afac12b 100644
--- a/frontend/src/business/components/api/home/ApiTestRecentList.vue
+++ b/frontend/src/business/components/api/home/ApiTestRecentList.vue
@@ -3,7 +3,7 @@
     <template v-slot:header>
       <span class="title">{{$t('commons.test')}}</span>
     </template>
-    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
+    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
       <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
       <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
       <el-table-column width="250" :label="$t('commons.create_time')">
diff --git a/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue b/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
index 333ae225c5..f06edffa44 100644
--- a/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
+++ b/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
@@ -3,7 +3,7 @@
     <template v-slot:header>
       <span class="title">{{$t('api_report.title')}}</span>
     </template>
-    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
+    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
       <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
       <el-table-column width="250" :label="$t('commons.create_time')">
         <template v-slot:default="scope">
diff --git a/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue b/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
index 71f4f830e5..2f24c965ab 100644
--- a/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
+++ b/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
@@ -3,7 +3,7 @@
     <template v-slot:header>
       <span class="title">{{$t('commons.test')}}</span>
     </template>
-    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
+    <el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
       <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
       <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
       <el-table-column width="250" :label="$t('commons.create_time')">
diff --git a/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue b/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue
index 9740c1ed94..900f57868e 100644
--- a/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue
+++ b/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue
@@ -5,7 +5,7 @@
       border
       :data="tableData"
       @row-click="intoPlan"
-      v-loading="result.loading">
+      v-loading="result.loading" height="300px">
       <el-table-column
         prop="name"
         fixed
diff --git a/frontend/src/business/components/track/home/components/ReviewList.vue b/frontend/src/business/components/track/home/components/ReviewList.vue
index 9029225708..1ce623205d 100644
--- a/frontend/src/business/components/track/home/components/ReviewList.vue
+++ b/frontend/src/business/components/track/home/components/ReviewList.vue
@@ -14,7 +14,7 @@
       border
       :data="tableData"
       @row-click="intoPlan"
-      v-loading="result.loading">
+      v-loading="result.loading" height="300px">
       <el-table-column
         prop="name"
         fixed
diff --git a/frontend/src/business/components/track/home/components/TestCaseSideList.vue b/frontend/src/business/components/track/home/components/TestCaseSideList.vue
index 3fda7b8bac..fa51914573 100644
--- a/frontend/src/business/components/track/home/components/TestCaseSideList.vue
+++ b/frontend/src/business/components/track/home/components/TestCaseSideList.vue
@@ -8,7 +8,7 @@
       class="adjust-table"
       @row-click="editTestCase"
       :data="tableData"
-      v-loading="result.loading">
+      v-loading="result.loading" height="300px">
 
       <el-table-column
         prop="name"

From f32b6b530b7e0f204abbe783847bc56a33d64507 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 30 Sep 2020 16:19:50 +0800
Subject: [PATCH 08/36] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E5=A2=9E=E5=8A=A0domain=20=E4=B8=BA=20undefined=E6=97=B6?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/model/ScenarioModel.js         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 4c247d0874..d024dbdca5 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -1140,10 +1140,12 @@ class JMXGenerator {
         let domain = request.environment.config.httpConfig.domain;
         let validHosts = [];
         hosts.forEach(item => {
-          let d = item.domain.trim().replace("http://", "").replace("https://", "");
-          if (item && d === domain.trim()) {
-            item.domain = d; // 域名去掉协议
-            validHosts.push(item);
+          if (item.domain != undefined && domain != undefined) {
+            let d = item.domain.trim().replace("http://", "").replace("https://", "");
+            if (d === domain.trim()) {
+              item.domain = d; // 域名去掉协议
+              validHosts.push(item);
+            }
           }
         });
         if (validHosts.length > 0) {

From 794af4605ef835695d5d09cd429bbc3ed2d38c3c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 30 Sep 2020 16:24:07 +0800
Subject: [PATCH 09/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E8=AE=BE=E7=BD=AE=E4=B8=AD=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/service/UserService.java   | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 6147c90641..c4ea86f490 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -487,20 +487,18 @@ public class UserService {
 
     /*修改当前用户用户密码*/
     private User updateCurrentUserPwd(EditPassWordRequest request) {
-        if (SessionUtils.getUser() != null) {
-            User user = userMapper.selectByPrimaryKey(SessionUtils.getUser().getId());
-            String pwd = user.getPassword();
-            String prepwd = CodingUtil.md5(request.getPassword(), "utf-8");
-            String newped = request.getNewpassword();
-            if (StringUtils.isNotBlank(prepwd)) {
-                if (prepwd.trim().equals(pwd.trim())) {
-                    user.setPassword(CodingUtil.md5(newped));
-                    user.setUpdateTime(System.currentTimeMillis());
-                    return user;
-                }
-            }
-            MSException.throwException(Translator.get("password_modification_failed"));
+        String oldPassword = CodingUtil.md5(request.getPassword(), "utf-8");
+        String newPassword = request.getNewpassword();
+        UserExample userExample = new UserExample();
+        userExample.createCriteria().andIdEqualTo(SessionUtils.getUser().getId()).andPasswordEqualTo(oldPassword);
+        List<User> users = userMapper.selectByExample(userExample);
+        if (!CollectionUtils.isEmpty(users)) {
+            User user = users.get(0);
+            user.setPassword(CodingUtil.md5(newPassword));
+            user.setUpdateTime(System.currentTimeMillis());
+            return user;
         }
+        MSException.throwException(Translator.get("password_modification_failed"));
         return null;
     }
 
@@ -512,8 +510,8 @@ public class UserService {
     /*管理员修改用户密码*/
     private User updateUserPwd(EditPassWordRequest request) {
         User user = userMapper.selectByPrimaryKey(request.getId());
-        String newped = request.getNewpassword();
-        user.setPassword(CodingUtil.md5(newped));
+        String newPassword = request.getNewpassword();
+        user.setPassword(CodingUtil.md5(newPassword));
         user.setUpdateTime(System.currentTimeMillis());
         return user;
     }

From c64f5847f82c53d163429d9c26b3daa6b178eac5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 30 Sep 2020 17:10:16 +0800
Subject: [PATCH 10/36] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/track/service/TestCaseService.java | 2 ++
 .../business/components/api/report/components/ResponseText.vue  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

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 ddb81b8678..69ef838766 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -273,6 +273,8 @@ public class TestCaseService {
                 .map(TestCase::getName)
                 .collect(Collectors.toSet());
         List<ExcelErrData<TestCaseExcelData>> errList = null;
+        if(multipartFile == null )
+            MSException.throwException(Translator.get("upload_fail"));
 
         if (multipartFile.getOriginalFilename().endsWith(".xmind")) {
             try {
diff --git a/frontend/src/business/components/api/report/components/ResponseText.vue b/frontend/src/business/components/api/report/components/ResponseText.vue
index cae4c07172..b6335bd764 100644
--- a/frontend/src/business/components/api/report/components/ResponseText.vue
+++ b/frontend/src/business/components/api/report/components/ResponseText.vue
@@ -65,7 +65,6 @@ export default {
   },
 
   mounted() {
-    console.log(this.response.headers);
     if (!this.response.headers) {
       return;
     }

From fa0841a36b2909f5ffb4b3360488a7a4a8c9b909 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 30 Sep 2020 17:33:49 +0800
Subject: [PATCH 11/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/APIReportController.java   |  4 ++
 .../api/controller/APITestController.java     | 10 ++-
 .../ApiTestEnvironmentController.java         |  4 ++
 .../controller/ProjectController.java         |  4 ++
 .../RestControllerExceptionHandler.java       |  8 +++
 .../controller/PerformanceTestController.java | 11 ++++
 .../service/CheckOwnerService.java            | 64 +++++++++++++++++++
 .../track/controller/TestCaseController.java  | 11 +++-
 .../controller/TestCaseNodeController.java    |  4 ++
 .../resources/i18n/messages_en_US.properties  |  3 +
 .../resources/i18n/messages_zh_CN.properties  |  4 +-
 .../resources/i18n/messages_zh_TW.properties  |  5 +-
 12 files changed, 127 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/service/CheckOwnerService.java

diff --git a/backend/src/main/java/io/metersphere/api/controller/APIReportController.java b/backend/src/main/java/io/metersphere/api/controller/APIReportController.java
index caa7374ebf..fd6db503ca 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APIReportController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APIReportController.java
@@ -11,6 +11,7 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.dto.DashboardTestDTO;
+import io.metersphere.service.CheckOwnerService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,8 @@ public class APIReportController {
 
     @Resource
     private APIReportService apiReportService;
+    @Resource
+    private CheckOwnerService checkOwnerService;
 
     @GetMapping("recent/{count}")
     public List<APIReportResult> recentTest(@PathVariable int count) {
@@ -37,6 +40,7 @@ public class APIReportController {
 
     @GetMapping("/list/{testId}")
     public List<APIReportResult> listByTestId(@PathVariable String testId) {
+        checkOwnerService.checkApiTestOwner(testId);
         return apiReportService.listByTestId(testId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index ad3940ac7a..3eb82dddba 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -13,6 +13,7 @@ import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.QueryScheduleRequest;
 import io.metersphere.dto.ScheduleDao;
+import io.metersphere.service.CheckOwnerService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +28,8 @@ import java.util.List;
 public class APITestController {
     @Resource
     private APITestService apiTestService;
+    @Resource
+    private CheckOwnerService checkownerService;
 
     @GetMapping("recent/{count}")
     public List<APITestResult> recentTest(@PathVariable int count) {
@@ -51,6 +54,7 @@ public class APITestController {
 
     @GetMapping("/list/{projectId}")
     public List<ApiTest> list(@PathVariable String projectId) {
+        checkownerService.checkProjectOwner(projectId);
         return apiTestService.getApiTestByProjectId(projectId);
     }
 
@@ -71,6 +75,7 @@ public class APITestController {
 
     @PostMapping(value = "/update", consumes = {"multipart/form-data"})
     public void update(@RequestPart("request") SaveAPITestRequest request, @RequestPart(value = "file") MultipartFile file, @RequestPart(value = "files") List<MultipartFile> bodyFiles) {
+        checkownerService.checkApiTestOwner(request.getId());
         apiTestService.update(request, file, bodyFiles);
     }
 
@@ -81,13 +86,16 @@ public class APITestController {
 
     @GetMapping("/get/{testId}")
     public APITestResult get(@PathVariable String testId) {
+        checkownerService.checkApiTestOwner(testId);
         return apiTestService.get(testId);
     }
 
 
     @PostMapping("/delete")
     public void delete(@RequestBody DeleteAPITestRequest request) {
-        apiTestService.delete(request.getId());
+        String testId = request.getId();
+        checkownerService.checkApiTestOwner(testId);
+        apiTestService.delete(testId);
     }
 
     @PostMapping(value = "/run")
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
index 9cee0a427b..ae274c383e 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
@@ -3,6 +3,7 @@ package io.metersphere.api.controller;
 import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import io.metersphere.commons.constants.RoleConstants;
+import io.metersphere.service.CheckOwnerService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
@@ -17,9 +18,12 @@ public class ApiTestEnvironmentController {
 
     @Resource
     ApiTestEnvironmentService apiTestEnvironmentService;
+    @Resource
+    private CheckOwnerService checkOwnerService;
 
     @GetMapping("/list/{projectId}")
     public List<ApiTestEnvironmentWithBLOBs> list(@PathVariable String projectId) {
+        checkOwnerService.checkProjectOwner(projectId);
         return apiTestEnvironmentService.list(projectId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/controller/ProjectController.java b/backend/src/main/java/io/metersphere/controller/ProjectController.java
index d2d302ea71..9b3940b79e 100644
--- a/backend/src/main/java/io/metersphere/controller/ProjectController.java
+++ b/backend/src/main/java/io/metersphere/controller/ProjectController.java
@@ -9,6 +9,7 @@ import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.ProjectRequest;
 import io.metersphere.dto.ProjectDTO;
+import io.metersphere.service.CheckOwnerService;
 import io.metersphere.service.ProjectService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -22,6 +23,8 @@ import java.util.List;
 public class ProjectController {
     @Resource
     private ProjectService projectService;
+    @Resource
+    private CheckOwnerService checkOwnerService;
 
     @GetMapping("/listAll")
     public List<ProjectDTO> listAll() {
@@ -71,6 +74,7 @@ public class ProjectController {
     @GetMapping("/delete/{projectId}")
     @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER,}, logical = Logical.OR)
     public void deleteProject(@PathVariable(value = "projectId") String projectId) {
+        checkOwnerService.checkProjectOwner(projectId);
         projectService.deleteProject(projectId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java b/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
index 352a56b338..411ccc6c42 100644
--- a/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
+++ b/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
@@ -4,6 +4,7 @@ package io.metersphere.controller.handler;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.controller.ResultHolder;
 import org.apache.shiro.ShiroException;
+import org.apache.shiro.authz.UnauthorizedException;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -21,6 +22,13 @@ public class RestControllerExceptionHandler {
         return ResultHolder.error(exception.getMessage());
     }
 
+    /*=========== Shiro 异常拦截==============*/
+    @ExceptionHandler(UnauthorizedException.class)
+    public ResultHolder unauthorizedExceptionHandler(HttpServletRequest request, HttpServletResponse response, Exception exception) {
+        response.setStatus(HttpStatus.FORBIDDEN.value());
+        return ResultHolder.error(exception.getMessage());
+    }
+
 
     @ExceptionHandler(MSException.class)
     public ResultHolder msExceptionHandler(HttpServletRequest request, HttpServletResponse response, MSException e) {
diff --git a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
index fbc5086d11..9580e6f9a1 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
@@ -14,6 +14,7 @@ import io.metersphere.dto.DashboardTestDTO;
 import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.dto.ScheduleDao;
 import io.metersphere.performance.service.PerformanceTestService;
+import io.metersphere.service.CheckOwnerService;
 import io.metersphere.service.FileService;
 import io.metersphere.track.request.testplan.*;
 import org.apache.shiro.authz.annotation.Logical;
@@ -35,6 +36,8 @@ public class PerformanceTestController {
     private PerformanceTestService performanceTestService;
     @Resource
     private FileService fileService;
+    @Resource
+    private CheckOwnerService checkOwnerService;
 
     @GetMapping("recent/{count}")
     public List<LoadTestDTO> recentTestPlans(@PathVariable int count) {
@@ -54,12 +57,14 @@ public class PerformanceTestController {
 
     @GetMapping("/list/{projectId}")
     public List<LoadTest> list(@PathVariable String projectId) {
+        checkOwnerService.checkProjectOwner(projectId);
         return performanceTestService.getLoadTestByProjectId(projectId);
     }
 
 
     @GetMapping("/state/get/{testId}")
     public LoadTest listByTestId(@PathVariable String testId) {
+        checkOwnerService.checkPerformanceTestOwner(testId);
         return performanceTestService.getLoadTestBytestId(testId);
     }
 
@@ -76,26 +81,31 @@ public class PerformanceTestController {
             @RequestPart("request") EditTestPlanRequest request,
             @RequestPart(value = "file", required = false) List<MultipartFile> files
     ) {
+        checkOwnerService.checkPerformanceTestOwner(request.getId());
         return performanceTestService.edit(request, files);
     }
 
     @GetMapping("/get/{testId}")
     public LoadTestDTO get(@PathVariable String testId) {
+        checkOwnerService.checkPerformanceTestOwner(testId);
         return performanceTestService.get(testId);
     }
 
     @GetMapping("/get-advanced-config/{testId}")
     public String getAdvancedConfiguration(@PathVariable String testId) {
+        checkOwnerService.checkPerformanceTestOwner(testId);
         return performanceTestService.getAdvancedConfiguration(testId);
     }
 
     @GetMapping("/get-load-config/{testId}")
     public String getLoadConfiguration(@PathVariable String testId) {
+        checkOwnerService.checkPerformanceTestOwner(testId);
         return performanceTestService.getLoadConfiguration(testId);
     }
 
     @PostMapping("/delete")
     public void delete(@RequestBody DeleteTestPlanRequest request) {
+        checkOwnerService.checkPerformanceTestOwner(request.getId());
         performanceTestService.delete(request);
     }
 
@@ -111,6 +121,7 @@ public class PerformanceTestController {
 
     @GetMapping("/file/metadata/{testId}")
     public List<FileMetadata> getFileMetadata(@PathVariable String testId) {
+        checkOwnerService.checkPerformanceTestOwner(testId);
         return fileService.getFileMetadataByTestId(testId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/service/CheckOwnerService.java b/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
new file mode 100644
index 0000000000..2a0ef39497
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
@@ -0,0 +1,64 @@
+package io.metersphere.service;
+
+import io.metersphere.api.dto.APITestResult;
+import io.metersphere.api.dto.QueryAPITestRequest;
+import io.metersphere.base.domain.Project;
+import io.metersphere.base.mapper.ProjectMapper;
+import io.metersphere.base.mapper.ext.ExtApiTestMapper;
+import io.metersphere.base.mapper.ext.ExtLoadTestMapper;
+import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.dto.LoadTestDTO;
+import io.metersphere.i18n.Translator;
+import io.metersphere.track.request.testplan.QueryTestPlanRequest;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class CheckOwnerService {
+    @Resource
+    private ProjectMapper projectMapper;
+    @Resource
+    private ExtApiTestMapper extApiTestMapper;
+    @Resource
+    private ExtLoadTestMapper extLoadTestMapper;
+
+    public void checkProjectOwner(String projectId) {
+        String workspaceId = SessionUtils.getCurrentWorkspaceId();
+        Project project = projectMapper.selectByPrimaryKey(projectId);
+        if (project == null) {
+            return;
+        }
+        if (!StringUtils.equals(workspaceId, project.getWorkspaceId())) {
+            throw new UnauthorizedException(Translator.get("check_owner_project"));
+        }
+    }
+
+    public void checkApiTestOwner(String testId) {
+        String workspaceId = SessionUtils.getCurrentWorkspaceId();
+        QueryAPITestRequest request = new QueryAPITestRequest();
+        request.setWorkspaceId(workspaceId);
+        request.setId(testId);
+        List<APITestResult> apiTestResults = extApiTestMapper.list(request);
+
+        if (CollectionUtils.size(apiTestResults) != 1) {
+            throw new UnauthorizedException(Translator.get("check_owner_test"));
+        }
+    }
+
+    public void checkPerformanceTestOwner(String testId) {
+        String workspaceId = SessionUtils.getCurrentWorkspaceId();
+        QueryTestPlanRequest request = new QueryTestPlanRequest();
+        request.setWorkspaceId(workspaceId);
+        request.setId(testId);
+        List<LoadTestDTO> loadTestDTOS = extLoadTestMapper.list(request);
+
+        if (CollectionUtils.size(loadTestDTOS) != 1) {
+            throw new UnauthorizedException(Translator.get("check_owner_test"));
+        }
+    }
+}
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 fac2c1cb7c..d1def98d05 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -10,6 +10,7 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.excel.domain.ExcelResponse;
+import io.metersphere.service.CheckOwnerService;
 import io.metersphere.track.dto.TestCaseDTO;
 import io.metersphere.track.request.testcase.QueryTestCaseRequest;
 import io.metersphere.track.request.testcase.TestCaseBatchRequest;
@@ -30,6 +31,8 @@ public class TestCaseController {
 
     @Resource
     TestCaseService testCaseService;
+    @Resource
+    private CheckOwnerService checkOwnerService;
 
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<TestCaseDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
@@ -39,6 +42,7 @@ public class TestCaseController {
 
     @GetMapping("/list/{projectId}")
     public List<TestCaseDTO> list(@PathVariable String projectId) {
+        checkOwnerService.checkProjectOwner(projectId);
         QueryTestCaseRequest request = new QueryTestCaseRequest();
         request.setProjectId(projectId);
         return testCaseService.listTestCase(request);
@@ -47,6 +51,7 @@ public class TestCaseController {
 
     @GetMapping("/list/method/{projectId}")
     public List<TestCaseDTO> listByMethod(@PathVariable String projectId) {
+        checkOwnerService.checkProjectOwner(projectId);
         QueryTestCaseRequest request = new QueryTestCaseRequest();
         request.setProjectId(projectId);
         return testCaseService.listTestCaseMthod(request);
@@ -106,8 +111,9 @@ public class TestCaseController {
 
     @PostMapping("/import/{projectId}/{userId}")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public ExcelResponse testCaseImport(MultipartFile file, @PathVariable String projectId,@PathVariable String userId) throws NoSuchFieldException {
-        return testCaseService.testCaseImport(file, projectId,userId);
+    public ExcelResponse testCaseImport(MultipartFile file, @PathVariable String projectId, @PathVariable String userId) {
+        checkOwnerService.checkProjectOwner(projectId);
+        return testCaseService.testCaseImport(file, projectId, userId);
     }
 
     @GetMapping("/export/template")
@@ -115,6 +121,7 @@ public class TestCaseController {
     public void testCaseTemplateExport(HttpServletResponse response) {
         testCaseService.testCaseTemplateExport(response);
     }
+
     @GetMapping("/export/xmindTemplate")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public void xmindTemplate(HttpServletResponse response) {
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
index d1062619fd..83328ec917 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
@@ -2,6 +2,7 @@ package io.metersphere.track.controller;
 
 import io.metersphere.base.domain.TestCaseNode;
 import io.metersphere.commons.constants.RoleConstants;
+import io.metersphere.service.CheckOwnerService;
 import io.metersphere.track.dto.TestCaseNodeDTO;
 import io.metersphere.track.request.testcase.DragNodeRequest;
 import io.metersphere.track.request.testcase.QueryNodeRequest;
@@ -20,9 +21,12 @@ public class TestCaseNodeController {
 
     @Resource
     TestCaseNodeService testCaseNodeService;
+    @Resource
+    private CheckOwnerService checkOwnerService;
 
     @GetMapping("/list/{projectId}")
     public List<TestCaseNodeDTO> getNodeByProjectId(@PathVariable String projectId) {
+        checkOwnerService.checkProjectOwner(projectId);
         return testCaseNodeService.getNodeTreeByProjectId(projectId);
     }
 
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 4004f8fac2..abd1d31f1f 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -158,3 +158,6 @@ license_valid_license_error=Authorization authentication failed
 timing_task_result_notification=Timing task result notification
 test_review_task_notice=Test review task notice
 test_track.length_less_than=The title is too long, the length must be less than
+# check owner
+check_owner_project=The current user does not have permission to operate this project
+check_owner_test=The current user does not have permission to operate this test
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index d4596937ce..d4aebdce4d 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -158,4 +158,6 @@ import_xmind_not_found=未找到测试用例
 timing_task_result_notification=定时任务结果通知
 test_review_task_notice=测试评审任务通知
 test_track.length_less_than=标题过长，字数必须小于
-
+# check owner
+check_owner_project=当前用户没有操作此项目的权限
+check_owner_test=当前用户没有操作此测试的权限
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 05655a009f..21433d9522 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -158,4 +158,7 @@ import_xmind_count_error=思維導圖導入用例數量不能超過 500 條
 import_xmind_not_found=未找到测试用例
 timing_task_result_notification=定時任務結果通知
 test_review_task_notice=測試評審任務通知
-test_track.length_less_than=標題過長，字數必須小於
\ No newline at end of file
+test_track.length_less_than=標題過長，字數必須小於
+# check owner
+check_owner_project=當前用戶沒有操作此項目的權限
+check_owner_test=當前用戶沒有操作此測試的權限
\ No newline at end of file

From df919bd6ac1210e5bb230a77e3be6af4dc21e7ac Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 30 Sep 2020 17:35:55 +0800
Subject: [PATCH 12/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/ajax.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js
index 0e500b68e9..8d2e1edc4b 100644
--- a/frontend/src/common/js/ajax.js
+++ b/frontend/src/common/js/ajax.js
@@ -53,6 +53,10 @@ export default {
         login();
         return;
       }
+      if (error.response && error.response.status === 403) {
+        window.location.href = "/";
+        return;
+      }
       result.loading = false;
       window.console.error(error.response || error.message);
       if (error.response && error.response.data) {

From 01f5dd02a1ab59e3590ac4d2560e830617360970 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 30 Sep 2020 18:01:46 +0800
Subject: [PATCH 13/36] =?UTF-8?q?fix:=E9=80=80=E5=9B=9Eheader=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/common/components/MsTableHeader.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsTableHeader.vue b/frontend/src/business/components/common/components/MsTableHeader.vue
index 3caf914e37..e48db2f2b0 100644
--- a/frontend/src/business/components/common/components/MsTableHeader.vue
+++ b/frontend/src/business/components/common/components/MsTableHeader.vue
@@ -7,15 +7,15 @@
       </slot>
     </el-row>
     <el-row type="flex" justify="space-between" align="middle">
-      <template v-slot:button>
       <span class="operate-button">
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showCreate" icon="el-icon-circle-plus-outline"
                          :content="createTip" @click="create"/>
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showRun" icon="el-icon-video-play"
                          type="primary"
                          :content="runTip" @click="runTest"/>
+
+        <slot name="button"></slot>
       </span>
-      </template>
       <span>
         <ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar" :tip="tip"/>
         <ms-table-adv-search-bar :condition.sync="condition" @search="search" v-if="isCombine"/>

From b2fc59b3986d45dd48c201a9c611cd06043b6d00 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 9 Oct 2020 15:38:25 +0800
Subject: [PATCH 14/36] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/test/components/PerformanceAdvancedConfig.vue  | 3 +--
 frontend/src/business/components/settings/personal/ApiKeys.vue | 3 +--
 .../business/components/settings/system/TestResourcePool.vue   | 3 +--
 frontend/src/business/components/settings/system/User.vue      | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
index 4459d8ef45..023fa1bad2 100644
--- a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
@@ -39,8 +39,7 @@
                 :disabled="!row.edit || readOnly"
                 size="mini"
                 v-model="row.enable"
-                active-color="#13ce66"
-                inactive-color="#ff4949">
+                inactive-color="#DCDFE6">
               </el-switch>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/personal/ApiKeys.vue b/frontend/src/business/components/settings/personal/ApiKeys.vue
index c9c16c9c68..8e2a85eb05 100644
--- a/frontend/src/business/components/settings/personal/ApiKeys.vue
+++ b/frontend/src/business/components/settings/personal/ApiKeys.vue
@@ -37,8 +37,7 @@
         <el-table-column prop="status" :label="$t('commons.status')">
           <template v-slot:default="scope">
             <el-switch v-model="scope.row.status"
-                       active-color="#13ce66"
-                       inactive-color="#ff4949"
+                       inactive-color="#DCDFE6"
                        active-value="ACTIVE"
                        inactive-value="DISABLED"
                        @change="changeSwitch(scope.row)"
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index f1a20228c0..4746d5bc42 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -16,8 +16,7 @@
         <el-table-column prop="status" :label="$t('test_resource_pool.enable_disable')">
           <template v-slot:default="scope">
             <el-switch v-model="scope.row.status"
-                       active-color="#13ce66"
-                       inactive-color="#ff4949"
+                       inactive-color="#DCDFE6"
                        active-value="VALID"
                        inactive-value="INVALID"
                        @change="changeSwitch(scope.row)"
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 8489239a0e..c8dd3f9cd9 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -19,8 +19,7 @@
         <el-table-column prop="status" :label="$t('commons.status')" width="120">
           <template v-slot:default="scope">
             <el-switch v-model="scope.row.status"
-                       active-color="#13ce66"
-                       inactive-color="#ff4949"
+                       inactive-color="#DCDFE6"
                        active-value="1"
                        inactive-value="0"
                        @change="changeSwitch(scope.row)"

From 47ed2145029b402ba95884e63bb91efce9d488ff Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 9 Oct 2020 15:49:33 +0800
Subject: [PATCH 15/36] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/domain/TestCase.java  |  2 +
 .../base/domain/TestCaseExample.java          | 70 +++++++++++++++++++
 .../base/mapper/TestCaseMapper.xml            | 31 ++++++--
 .../mapper/ext/ExtTestReviewCaseMapper.java   |  2 +-
 .../mapper/ext/ExtTestReviewCaseMapper.xml    |  6 +-
 .../track/dto/TestReviewCaseDTO.java          |  2 +-
 .../track/service/TestCaseReviewService.java  | 13 ++--
 .../track/service/TestCaseService.java        |  3 +
 .../service/TestReviewTestCaseService.java    | 11 +++
 .../db/migration/V28__modify_test_case.sql    |  3 +
 .../track/case/components/TestCaseList.vue    | 21 +++++-
 .../components/TestReviewTestCaseEdit.vue     |  1 +
 .../components/TestReviewTestCaseList.vue     |  3 +-
 frontend/src/i18n/zh-CN.js                    |  2 +-
 frontend/src/i18n/zh-TW.js                    |  2 +-
 15 files changed, 148 insertions(+), 24 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V28__modify_test_case.sql

diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCase.java b/backend/src/main/java/io/metersphere/base/domain/TestCase.java
index 1857b2a7b2..17c137992d 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCase.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCase.java
@@ -37,5 +37,7 @@ public class TestCase implements Serializable {
 
     private String otherTestName;
 
+    private String reviewStatus;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
index 1ff860c2c1..bb20ae6985 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
@@ -1183,6 +1183,76 @@ public class TestCaseExample {
             addCriterion("other_test_name not between", value1, value2, "otherTestName");
             return (Criteria) this;
         }
+
+        public Criteria andReviewStatusIsNull() {
+            addCriterion("review_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusIsNotNull() {
+            addCriterion("review_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusEqualTo(String value) {
+            addCriterion("review_status =", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusNotEqualTo(String value) {
+            addCriterion("review_status <>", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusGreaterThan(String value) {
+            addCriterion("review_status >", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("review_status >=", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusLessThan(String value) {
+            addCriterion("review_status <", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusLessThanOrEqualTo(String value) {
+            addCriterion("review_status <=", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusLike(String value) {
+            addCriterion("review_status like", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusNotLike(String value) {
+            addCriterion("review_status not like", value, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusIn(List<String> values) {
+            addCriterion("review_status in", values, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusNotIn(List<String> values) {
+            addCriterion("review_status not in", values, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusBetween(String value1, String value2) {
+            addCriterion("review_status between", value1, value2, "reviewStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReviewStatusNotBetween(String value1, String value2) {
+            addCriterion("review_status not between", value1, value2, "reviewStatus");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml
index aa1548a110..e23276c123 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml
@@ -18,6 +18,7 @@
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="num" jdbcType="INTEGER" property="num" />
     <result column="other_test_name" jdbcType="VARCHAR" property="otherTestName" />
+    <result column="review_status" jdbcType="VARCHAR" property="reviewStatus" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseWithBLOBs">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -83,7 +84,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`, 
-    prerequisite, create_time, update_time, test_id, sort, num, other_test_name
+    prerequisite, create_time, update_time, test_id, sort, num, other_test_name, review_status
   </sql>
   <sql id="Blob_Column_List">
     remark, steps
@@ -142,15 +143,15 @@
       maintainer, priority, `method`, 
       prerequisite, create_time, update_time, 
       test_id, sort, num, 
-      other_test_name, remark, steps
-      )
+      other_test_name, review_status, remark, 
+      steps)
     values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{nodePath,jdbcType=VARCHAR}, 
       #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
       #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, 
       #{prerequisite,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
       #{testId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, 
-      #{otherTestName,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}
-      )
+      #{otherTestName,jdbcType=VARCHAR}, #{reviewStatus,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, 
+      #{steps,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
     insert into test_case
@@ -203,6 +204,9 @@
       <if test="otherTestName != null">
         other_test_name,
       </if>
+      <if test="reviewStatus != null">
+        review_status,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -259,6 +263,9 @@
       <if test="otherTestName != null">
         #{otherTestName,jdbcType=VARCHAR},
       </if>
+      <if test="reviewStatus != null">
+        #{reviewStatus,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -324,6 +331,9 @@
       <if test="record.otherTestName != null">
         other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
       </if>
+      <if test="record.reviewStatus != null">
+        review_status = #{record.reviewStatus,jdbcType=VARCHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -353,6 +363,7 @@
       sort = #{record.sort,jdbcType=INTEGER},
       num = #{record.num,jdbcType=INTEGER},
       other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
+      review_status = #{record.reviewStatus,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=LONGVARCHAR},
       steps = #{record.steps,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -376,7 +387,8 @@
       test_id = #{record.testId,jdbcType=VARCHAR},
       sort = #{record.sort,jdbcType=INTEGER},
       num = #{record.num,jdbcType=INTEGER},
-      other_test_name = #{record.otherTestName,jdbcType=VARCHAR}
+      other_test_name = #{record.otherTestName,jdbcType=VARCHAR},
+      review_status = #{record.reviewStatus,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -429,6 +441,9 @@
       <if test="otherTestName != null">
         other_test_name = #{otherTestName,jdbcType=VARCHAR},
       </if>
+      <if test="reviewStatus != null">
+        review_status = #{reviewStatus,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -455,6 +470,7 @@
       sort = #{sort,jdbcType=INTEGER},
       num = #{num,jdbcType=INTEGER},
       other_test_name = #{otherTestName,jdbcType=VARCHAR},
+      review_status = #{reviewStatus,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=LONGVARCHAR},
       steps = #{steps,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -475,7 +491,8 @@
       test_id = #{testId,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},
       num = #{num,jdbcType=INTEGER},
-      other_test_name = #{otherTestName,jdbcType=VARCHAR}
+      other_test_name = #{otherTestName,jdbcType=VARCHAR},
+      review_status = #{reviewStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
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 446e38acfd..267793343d 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
@@ -10,6 +10,6 @@ import java.util.List;
 public interface ExtTestReviewCaseMapper {
 
     List<TestReviewCaseDTO> list(@Param("request") QueryCaseReviewRequest request);
-    List<String> getStatusByReviewId(String planId);
+    List<String> getStatusByReviewId(String reviewId);
     List<String> findRelateTestReviewId(String userId, String workspaceId);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
index 068a797d4d..d49214cba6 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
@@ -182,9 +182,9 @@
     </select>
 
     <select id="getStatusByReviewId" resultType="java.lang.String">
-        select status
-        from test_case_review_test_case
-        where review_id = #{reviewId}
+        select review_status
+        from test_case
+        where id in (select case_id from test_case_review_test_case where review_id = #{reviewId});
     </select>
 
     <select id="findRelateTestReviewId" resultType="java.lang.String">
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
index b996d93d29..8440dd3c8b 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
@@ -9,7 +9,7 @@ import lombok.Setter;
 public class TestReviewCaseDTO extends TestCaseWithBLOBs {
     private String reviewer;
     private String reviewerName;
-    private String status;
+    private String reviewStatus;
     private String results;
     private String reviewId;
     private String caseId;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index 74f1c842a6..fde3846510 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -6,8 +6,8 @@ import io.metersphere.base.mapper.ext.ExtProjectMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseReviewMapper;
 import io.metersphere.base.mapper.ext.ExtTestReviewCaseMapper;
 import io.metersphere.commons.constants.TestCaseReviewStatus;
-import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.commons.constants.TestPlanTestCaseStatus;
+import io.metersphere.commons.constants.TestReviewCaseStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.LogUtil;
@@ -32,7 +32,6 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -346,13 +345,13 @@ public class TestCaseReviewService {
         testCaseReview.setId(reviewId);
 
         for (String status : statusList) {
-            if (StringUtils.equals(status, TestPlanTestCaseStatus.Prepare.name())) {
-                testCaseReview.setStatus(TestPlanStatus.Underway.name());
+            if (StringUtils.equals(status, TestReviewCaseStatus.Prepare.name())) {
+                testCaseReview.setStatus(TestCaseReviewStatus.Underway.name());
                 testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview);
                 return;
             }
         }
-        testCaseReview.setStatus(TestPlanStatus.Completed.name());
+        testCaseReview.setStatus(TestCaseReviewStatus.Completed.name());
         SaveTestCaseReviewRequest testCaseReviewRequest = new SaveTestCaseReviewRequest();
         TestCaseReview _testCaseReview = testCaseReviewMapper.selectByPrimaryKey(reviewId);
         List<String> userIds = new ArrayList<>();
@@ -414,8 +413,8 @@ public class TestCaseReviewService {
                 if (testCases != null) {
                     testReview.setTotal(testCases.size());
                     testCases.forEach(testCase -> {
-                        if (!StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Prepare.name())
-                                && !StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Underway.name())) {
+                        if (!StringUtils.equals(testCase.getReviewStatus(), TestPlanTestCaseStatus.Prepare.name())
+                                && !StringUtils.equals(testCase.getReviewStatus(), TestPlanTestCaseStatus.Underway.name())) {
                             testReview.setReviewed(testReview.getReviewed() + 1);
                         }
                     });
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 69ef838766..10aa7ef89b 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -10,6 +10,7 @@ import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.constants.TestCaseConstants;
+import io.metersphere.commons.constants.TestCaseReviewStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.BeanUtils;
@@ -88,6 +89,7 @@ public class TestCaseService {
         testCase.setCreateTime(System.currentTimeMillis());
         testCase.setUpdateTime(System.currentTimeMillis());
         testCase.setNum(getNextNum(testCase.getProjectId()));
+        testCase.setReviewStatus(TestCaseReviewStatus.Prepare.name());
         testCaseMapper.insert(testCase);
     }
 
@@ -341,6 +343,7 @@ public class TestCaseService {
                 testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
                 testcase.setSort(sort.getAndIncrement());
                 testcase.setNum(num.decrementAndGet());
+                testcase.setReviewStatus(TestCaseReviewStatus.Prepare.name());
                 mapper.insert(testcase);
             });
         }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
index 1a88233cad..3c0270b8c3 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -1,6 +1,7 @@
 package io.metersphere.track.service;
 
 import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.TestCaseMapper;
 import io.metersphere.base.mapper.TestCaseReviewMapper;
 import io.metersphere.base.mapper.TestCaseReviewTestCaseMapper;
 import io.metersphere.base.mapper.TestCaseReviewUsersMapper;
@@ -38,6 +39,8 @@ public class TestReviewTestCaseService {
     TestCaseReviewMapper testCaseReviewMapper;
     @Resource
     TestCaseReviewService testCaseReviewService;
+    @Resource
+    TestCaseMapper testCaseMapper;
 
     public List<TestReviewCaseDTO> list(QueryCaseReviewRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
@@ -111,9 +114,17 @@ public class TestReviewTestCaseService {
             MSException.throwException("此用例评审已到截止时间！");
         }
 
+        // 记录测试用例评审状态变更
         testCaseReviewTestCase.setStatus(testCaseReviewTestCase.getStatus());
         testCaseReviewTestCase.setReviewer(SessionUtils.getUser().getId());
         testCaseReviewTestCase.setUpdateTime(System.currentTimeMillis());
         testCaseReviewTestCaseMapper.updateByPrimaryKeySelective(testCaseReviewTestCase);
+
+        // 修改用例评审状态
+        String caseId = testCaseReviewTestCase.getCaseId();
+        TestCaseWithBLOBs testCase = new TestCaseWithBLOBs();
+        testCase.setId(caseId);
+        testCase.setReviewStatus(testCaseReviewTestCase.getStatus());
+        testCaseMapper.updateByPrimaryKeySelective(testCase);
     }
 }
diff --git a/backend/src/main/resources/db/migration/V28__modify_test_case.sql b/backend/src/main/resources/db/migration/V28__modify_test_case.sql
new file mode 100644
index 0000000000..44c725aed3
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V28__modify_test_case.sql
@@ -0,0 +1,3 @@
+alter table test_case add review_status varchar(25) null;
+
+update test_case set review_status = 'Prepare' where review_status is null;
\ No newline at end of file
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 1f6a4ad342..f666c6bf17 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -86,6 +86,18 @@
             <method-table-item :value="scope.row.method"/>
           </template>
         </el-table-column>
+
+        <el-table-column
+          :filters="statusFilters"
+          column-key="status"
+          :label="$t('test_track.review_view.execute_result')">
+          <template v-slot:default="scope">
+            <span class="el-dropdown-link">
+              <status-table-item :value="scope.row.reviewStatus"/>
+            </span>
+          </template>
+        </el-table-column>
+
         <el-table-column
           prop="nodePath"
           :label="$t('test_track.case.module')"
@@ -146,6 +158,7 @@
   import BatchEdit from "./BatchEdit";
   import {WORKSPACE_ID} from "../../../../../common/js/constants";
   import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+  import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
 
   export default {
     name: "TestCaseList",
@@ -163,7 +176,8 @@
       NodeBreadcrumb,
       MsTableHeader,
       ShowMoreBtn,
-      BatchEdit
+      BatchEdit,
+      StatusTableItem
     },
     data() {
       return {
@@ -192,6 +206,11 @@
           {text: this.$t('commons.performance'), value: 'performance'},
           {text: this.$t('commons.api'), value: 'api'}
         ],
+        statusFilters: [
+          {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
+          {text: this.$t('test_track.plan_view.pass'), value: 'Pass'},
+          {text: '未通过', value: 'UnPass'},
+        ],
         showMore: false,
         buttons: [
           {
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index 5b777316a9..b03372812f 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -283,6 +283,7 @@ export default {
     saveCase(status) {
       let param = {};
       param.id = this.testCase.id;
+      param.caseId = this.testCase.caseId;
       param.reviewId = this.testCase.reviewId;
       param.status = status;
       this.$post('/test/review/case/edit', param, () => {
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index b4fe3d4106..86aaf20d53 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -104,13 +104,12 @@
         </el-table-column>
 
         <el-table-column
-          prop="status"
           :filters="statusFilters"
           column-key="status"
           :label="$t('test_track.review_view.execute_result')">
           <template v-slot:default="scope">
             <span class="el-dropdown-link">
-              <status-table-item :value="scope.row.status"/>
+              <status-table-item :value="scope.row.reviewStatus"/>
             </span>
           </template>
         </el-table-column>
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index ef1c26ff75..dc917699bd 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -785,7 +785,7 @@ export default {
       all_case: "全部用例",
       start_review: "开始评审",
       relevance_case: "关联用例",
-      execute_result: "执行结果",
+      execute_result: "评审结果",
     },
     module: {
       search: "搜索模块",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 3342aa9677..b98d6cb8cc 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -785,7 +785,7 @@ export default {
       all_case: "全部用例",
       start_review: "開始評審",
       relevance_case: "關聯用例",
-      execute_result: "執行結果",
+      execute_result: "評審結果",
     },
     module: {
       search: "搜索模塊",

From 021e6b51fa3423fe258bc6a8c8aaaf781a81550e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 9 Oct 2020 16:02:54 +0800
Subject: [PATCH 16/36] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E7=BB=9F=E4=B8=80=E5=AF=BC=E5=85=A5=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=9A=84=E8=BF=87=E7=A8=8B=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/xmind/XmindCaseParser.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index 2585b37376..79ed5e1625 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -90,7 +90,7 @@ public class XmindCaseParser {
     }
 
     // 递归处理案例数据
-    private void recursion(StringBuffer processBuffer, Attached parent, int level, List<Attached> attacheds) {
+    private void recursion(Attached parent, int level, List<Attached> attacheds) {
         for (Attached item : attacheds) {
             if (isAvailable(item.getTitle(), "(?:tc：|tc:|tc)")) { // 用例
                 item.setParent(parent);
@@ -100,7 +100,7 @@ public class XmindCaseParser {
                 item.setPath(nodePath);
                 item.setParent(parent);
                 if (item.getChildren() != null && !item.getChildren().getAttached().isEmpty()) {
-                    recursion(processBuffer, item, level + 1, item.getChildren().getAttached());
+                    recursion(item, level + 1, item.getChildren().getAttached());
                 } else {
                     if (!nodePath.startsWith("/")) {
                         nodePath = "/" + nodePath;
@@ -267,7 +267,6 @@ public class XmindCaseParser {
 
     // 导入思维导图处理
     public String parse(MultipartFile multipartFile) {
-        StringBuffer processBuffer = new StringBuffer();
         try {
             // 获取思维导图内容
             List<JsonRootBean> roots = XmindParser.parseObject(multipartFile);
@@ -281,7 +280,7 @@ public class XmindCaseParser {
                             String nodePath = item.getTitle();
                             item.setPath(nodePath);
                             if (item.getChildren() != null && !item.getChildren().getAttached().isEmpty()) {
-                                recursion(processBuffer, item, 1, item.getChildren().getAttached());
+                                recursion(item, 1, item.getChildren().getAttached());
                             } else {
                                 if (!nodePath.startsWith("/")) {
                                     nodePath = "/" + nodePath;
@@ -295,7 +294,8 @@ public class XmindCaseParser {
                     }
                 }
             }
-            this.validate();
+
+            this.validate(); //检查目录合规性
         } catch (Exception ex) {
             return ex.getMessage();
         }

From 9a0c0857bc4b1caede83e6b99fc6e3d46b042c74 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 9 Oct 2020 16:29:27 +0800
Subject: [PATCH 17/36] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E5=85=B3=E8=81=94=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 14 +++++++-
 .../track/case/components/TestCaseList.vue    |  2 +-
 .../track/home/components/ReviewList.vue      | 34 +++++++++----------
 .../view/components/TestReviewRelevance.vue   | 20 +++++++++--
 .../components/TestReviewTestCaseList.vue     |  6 ++--
 frontend/src/i18n/en-US.js                    |  4 +++
 frontend/src/i18n/zh-CN.js                    |  4 +++
 frontend/src/i18n/zh-TW.js                    |  4 +++
 8 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 3fea349a04..d12d9656fe 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -99,7 +99,7 @@
 
 
     <select id="getTestCaseNames" resultType="io.metersphere.base.domain.TestCase">
-        select test_case.id, test_case.name, test_case.priority, test_case.type
+        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status
         from test_case
         <where>
             <if test="request.combine != null">
@@ -130,6 +130,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='status'">
+                                and test_case.review_status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <otherwise>
                                 and test_case.type in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
@@ -181,6 +187,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='status'">
+                                and test_case.review_status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <otherwise>
                                 and test_case.method in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index f666c6bf17..546842ca63 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -90,7 +90,7 @@
         <el-table-column
           :filters="statusFilters"
           column-key="status"
-          :label="$t('test_track.review_view.execute_result')">
+          :label="$t('test_track.case.status')">
           <template v-slot:default="scope">
             <span class="el-dropdown-link">
               <status-table-item :value="scope.row.reviewStatus"/>
diff --git a/frontend/src/business/components/track/home/components/ReviewList.vue b/frontend/src/business/components/track/home/components/ReviewList.vue
index 1ce623205d..5c2dbb8c89 100644
--- a/frontend/src/business/components/track/home/components/ReviewList.vue
+++ b/frontend/src/business/components/track/home/components/ReviewList.vue
@@ -43,24 +43,24 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        prop="projectName"
-        :label="$t('test_track.review.done')"
-        show-overflow-tooltip>
-        <template v-slot:default="scope">
-          {{scope.row.reviewed}}/{{scope.row.total}}
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="projectName"-->
+<!--        :label="$t('test_track.review.done')"-->
+<!--        show-overflow-tooltip>-->
+<!--        <template v-slot:default="scope">-->
+<!--          {{scope.row.reviewed}}/{{scope.row.total}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column
-        prop="projectName"
-        :label="$t('test_track.home.review_progress')"
-        min-width="100"
-        show-overflow-tooltip>
-        <template v-slot:default="scope">
-          <el-progress :percentage="scope.row.testRate"></el-progress>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="projectName"-->
+<!--        :label="$t('test_track.home.review_progress')"-->
+<!--        min-width="100"-->
+<!--        show-overflow-tooltip>-->
+<!--        <template v-slot:default="scope">-->
+<!--          <el-progress :percentage="scope.row.testRate"></el-progress>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
       <el-table-column
         prop="projectName"
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
index 4d2baa2268..8b7cb45dc0 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -62,6 +62,15 @@
                   <type-table-item :value="scope.row.type"/>
                 </template>
               </el-table-column>
+              <el-table-column
+                :filters="statusFilters"
+                column-key="status"
+                :label="$t('test_track.case.status')"
+                show-overflow-tooltip>
+                <template v-slot:default="scope">
+                  <status-table-item :value="scope.row.reviewStatus"/>
+                </template>
+              </el-table-column>
             </el-table>
             <div style="text-align: center">共 {{testReviews.length}} 条</div>
           </el-main>
@@ -91,6 +100,7 @@ import MsTableHeader from "../../../../common/components/MsTableHeader";
 import SwitchProject from "../../../case/components/SwitchProject";
 import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components";
 import {_filter} from "../../../../../../common/js/utils";
+import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
 
 export default {
   name: "TestReviewRelevance",
@@ -102,7 +112,8 @@ export default {
     MsTableSearchBar,
     MsTableAdvSearchBar,
     MsTableHeader,
-    SwitchProject
+    SwitchProject,
+    StatusTableItem
   },
   data() {
     return {
@@ -130,7 +141,12 @@ export default {
         {text: this.$t('commons.functional'), value: 'functional'},
         {text: this.$t('commons.performance'), value: 'performance'},
         {text: this.$t('commons.api'), value: 'api'}
-      ]
+      ],
+      statusFilters: [
+        {text: this.$t('test_track.case.status_prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.case.status_pass'), value: 'Pass'},
+        {text: this.$t('test_track.case.status_un_pass'), value: 'UnPass'},
+      ],
     };
   },
   props: {
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index 86aaf20d53..e4acd96f0a 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -206,9 +206,9 @@ export default {
         {text: this.$t('commons.api'), value: 'api'}
       ],
       statusFilters: [
-        {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
-        {text: this.$t('test_track.plan_view.pass'), value: 'Pass'},
-        {text: '未通过', value: 'UnPass'},
+        {text: this.$t('test_track.case.status_prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.case.status_pass'), value: 'Pass'},
+        {text: this.$t('test_track.case.status_un_pass'), value: 'UnPass'},
       ],
       showMore: false,
       buttons: [
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 49b7c994d4..86f14ad8ae 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -695,6 +695,10 @@ export default {
       batch_delete_case: 'Batch delete',
       batch_unlink: 'Batch Unlink',
       project_name: "Project",
+      status: 'Status',
+      status_prepare: 'Prepare',
+      status_pass: 'Pass',
+      status_un_pass: 'UnPass',
       import: {
         import: "Import test case",
         case_import: "Import test case",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index dc917699bd..742b62ff62 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -697,6 +697,10 @@ export default {
       batch_delete_case: '批量删除用例',
       batch_unlink: '批量取消关联',
       project_name: '所属项目',
+      status: '状态',
+      status_prepare: '未开始',
+      status_pass: '通过',
+      status_un_pass: '未通过',
       import: {
         import: "导入用例",
         case_import: "导入测试用例",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index b98d6cb8cc..dc38ef69e3 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -697,6 +697,10 @@ export default {
       batch_delete_case: '批量刪除用例',
       batch_unlink: '批量取消關聯',
       project_name: '所屬項目',
+      status: '狀態',
+      status_prepare: '未開始',
+      status_pass: '通過',
+      status_un_pass: '未通過',
       import: {
         import: "導入用例",
         case_import: "導入測試用例",

From f8d2322386c793aa530992e247f8080a3d3b9d7b Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 9 Oct 2020 17:31:12 +0800
Subject: [PATCH 18/36] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=8A=A0=E5=BC=BA=E5=AF=BC=E5=85=A5=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E6=9C=89=E6=95=88=E5=88=A4=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E5=90=88=E8=A7=84=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/service/TestCaseService.java     | 8 +++++++-
 backend/src/main/resources/i18n/messages_en_US.properties | 3 ++-
 backend/src/main/resources/i18n/messages_zh_CN.properties | 3 ++-
 backend/src/main/resources/i18n/messages_zh_TW.properties | 3 ++-
 4 files changed, 13 insertions(+), 4 deletions(-)

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 69ef838766..97e3546abb 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -286,7 +286,13 @@ public class TestCaseService {
                     ExcelErrData excelErrData = new ExcelErrData(null, 1, Translator.get("upload_fail") + "：" + processLog);
                     errList.add(excelErrData);
                     excelResponse.setErrList(errList);
-                } else {
+                }else if(xmindParser.getNodePaths().isEmpty() && xmindParser.getTestCase().isEmpty() ){
+                    excelResponse.setSuccess(false);
+                    ExcelErrData excelErrData = new ExcelErrData(null, 1, Translator.get("upload_fail") + "：" + Translator.get("upload_content_is_null"));
+                    errList.add(excelErrData);
+                    excelResponse.setErrList(errList);
+                }
+                else {
                     if (!xmindParser.getNodePaths().isEmpty()) {
                         testCaseNodeService.createNodes(xmindParser.getNodePaths(), projectId);
                     }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index abd1d31f1f..a6f319bf20 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -160,4 +160,5 @@ test_review_task_notice=Test review task notice
 test_track.length_less_than=The title is too long, the length must be less than
 # check owner
 check_owner_project=The current user does not have permission to operate this project
-check_owner_test=The current user does not have permission to operate this test
\ No newline at end of file
+check_owner_test=The current user does not have permission to operate this test
+upload_content_is_null=Imported content is empty
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index d4aebdce4d..fa4611ee14 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -160,4 +160,5 @@ test_review_task_notice=测试评审任务通知
 test_track.length_less_than=标题过长，字数必须小于
 # check owner
 check_owner_project=当前用户没有操作此项目的权限
-check_owner_test=当前用户没有操作此测试的权限
\ No newline at end of file
+check_owner_test=当前用户没有操作此测试的权限
+upload_content_is_null=导入内容为空
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 21433d9522..13f7ba0b9a 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -161,4 +161,5 @@ test_review_task_notice=測試評審任務通知
 test_track.length_less_than=標題過長，字數必須小於
 # check owner
 check_owner_project=當前用戶沒有操作此項目的權限
-check_owner_test=當前用戶沒有操作此測試的權限
\ No newline at end of file
+check_owner_test=當前用戶沒有操作此測試的權限
+upload_content_is_null=導入內容為空
\ No newline at end of file

From 7833150db91f25b5689e43fd2358176f2cda1d10 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 9 Oct 2020 17:32:29 +0800
Subject: [PATCH 19/36] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E8=A7=84=E8=8C=83=E6=97=A5=E5=BF=97=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/service/TestCaseService.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 97e3546abb..e6ed3c62e3 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -273,7 +273,7 @@ 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")) {
@@ -286,13 +286,12 @@ public class TestCaseService {
                     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() ){
+                } else if (xmindParser.getNodePaths().isEmpty() && xmindParser.getTestCase().isEmpty()) {
                     excelResponse.setSuccess(false);
                     ExcelErrData excelErrData = new ExcelErrData(null, 1, Translator.get("upload_fail") + "：" + Translator.get("upload_content_is_null"));
                     errList.add(excelErrData);
                     excelResponse.setErrList(errList);
-                }
-                else {
+                } else {
                     if (!xmindParser.getNodePaths().isEmpty()) {
                         testCaseNodeService.createNodes(xmindParser.getNodePaths(), projectId);
                     }
@@ -303,7 +302,8 @@ public class TestCaseService {
                     excelResponse.setSuccess(true);
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                LogUtil.error(e.getMessage(), e);
+                MSException.throwException(e.getMessage());
             }
 
         } else {

From e9619aba995e49227bb492bdbc129a87fff4b70a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 9 Oct 2020 18:35:33 +0800
Subject: [PATCH 20/36] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA=E9=A6=96=E9=A1=B5=E6=88=91=E7=9A=84=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=BB=93=E6=9E=9C=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/dto/TestReviewDTOWithMetric.java    |  1 +
 .../track/service/TestCaseReviewService.java  |  9 ++--
 frontend/package.json                         |  3 +-
 .../track/home/components/ReviewList.vue      | 53 +++++++++++--------
 frontend/src/business/main.js                 |  2 +
 frontend/src/i18n/en-US.js                    |  3 +-
 frontend/src/i18n/zh-CN.js                    |  3 +-
 frontend/src/i18n/zh-TW.js                    |  3 +-
 8 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/dto/TestReviewDTOWithMetric.java b/backend/src/main/java/io/metersphere/track/dto/TestReviewDTOWithMetric.java
index 5c620319c7..eafb7d94cd 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestReviewDTOWithMetric.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestReviewDTOWithMetric.java
@@ -9,4 +9,5 @@ public class TestReviewDTOWithMetric extends TestCaseReviewDTO {
     private Double testRate;
     private Integer reviewed;
     private Integer total;
+    private Integer pass;
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index fde3846510..4717468b20 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -410,16 +410,19 @@ public class TestCaseReviewService {
 
                 testReview.setReviewed(0);
                 testReview.setTotal(0);
+                testReview.setPass(0);
                 if (testCases != null) {
                     testReview.setTotal(testCases.size());
                     testCases.forEach(testCase -> {
-                        if (!StringUtils.equals(testCase.getReviewStatus(), TestPlanTestCaseStatus.Prepare.name())
-                                && !StringUtils.equals(testCase.getReviewStatus(), TestPlanTestCaseStatus.Underway.name())) {
+                        if (!StringUtils.equals(testCase.getReviewStatus(), TestReviewCaseStatus.Prepare.name())) {
                             testReview.setReviewed(testReview.getReviewed() + 1);
                         }
+                        if (StringUtils.equals(testCase.getReviewStatus(), TestReviewCaseStatus.Pass.name())) {
+                            testReview.setPass(testReview.getPass() + 1);
+                        }
                     });
                 }
-                testReview.setTestRate(MathUtils.getPercentWithDecimal(testReview.getTotal() == 0 ? 0 : testReview.getReviewed() * 1.0 / testReview.getTotal()));
+
             });
         }
         return testReviews;
diff --git a/frontend/package.json b/frontend/package.json
index fa0ad64992..1a91e893a5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -32,7 +32,8 @@
     "js-base64": "^3.4.4",
     "json-bigint": "^1.0.0",
     "html2canvas": "^1.0.0-rc.7",
-    "jspdf": "^2.1.1"
+    "jspdf": "^2.1.1",
+    "yan-progress": "^1.0.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.0",
diff --git a/frontend/src/business/components/track/home/components/ReviewList.vue b/frontend/src/business/components/track/home/components/ReviewList.vue
index 5c2dbb8c89..c59b5fa8f6 100644
--- a/frontend/src/business/components/track/home/components/ReviewList.vue
+++ b/frontend/src/business/components/track/home/components/ReviewList.vue
@@ -36,31 +36,37 @@
 
       <el-table-column
         prop="status"
-        :label="$t('test_track.plan.plan_status')"
-        show-overflow-tooltip>
+        :label="$t('test_track.plan.plan_status')">
         <template v-slot:default="scope">
           <plan-status-table-item :value="scope.row.status"/>
         </template>
       </el-table-column>
 
-<!--      <el-table-column-->
-<!--        prop="projectName"-->
-<!--        :label="$t('test_track.review.done')"-->
-<!--        show-overflow-tooltip>-->
-<!--        <template v-slot:default="scope">-->
-<!--          {{scope.row.reviewed}}/{{scope.row.total}}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column
+        :label="$t('test_track.review.result_distribution')">
+        <template v-slot:default="scope">
+          <yan-progress :total="scope.row.total" :done="scope.row.reviewed" :modify="scope.row.pass" :tip="tip"/>
+        </template>
+      </el-table-column>
 
-<!--      <el-table-column-->
-<!--        prop="projectName"-->
-<!--        :label="$t('test_track.home.review_progress')"-->
-<!--        min-width="100"-->
-<!--        show-overflow-tooltip>-->
-<!--        <template v-slot:default="scope">-->
-<!--          <el-progress :percentage="scope.row.testRate"></el-progress>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        prop="projectName"-->
+      <!--        :label="$t('test_track.review.done')"-->
+      <!--        show-overflow-tooltip>-->
+      <!--        <template v-slot:default="scope">-->
+      <!--          {{scope.row.reviewed}}/{{scope.row.total}}-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+
+      <!--      <el-table-column-->
+      <!--        prop="projectName"-->
+      <!--        :label="$t('test_track.home.review_progress')"-->
+      <!--        min-width="100"-->
+      <!--        show-overflow-tooltip>-->
+      <!--        <template v-slot:default="scope">-->
+      <!--          <el-progress :percentage="scope.row.testRate"></el-progress>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
 
       <el-table-column
         prop="projectName"
@@ -87,7 +93,12 @@ export default {
     return {
       result: {},
       tableData: [],
-      showMyCreator: false
+      showMyCreator: false,
+      tip: [
+        {text: "总共X个", fillStyle: '#D3D3D3'},
+        {text: "评审了X个", fillStyle: '#F08080'},
+        {text: "通过X个", fillStyle: '#90EE90'}
+      ]
     }
   },
   mounted() {
@@ -115,7 +126,7 @@ export default {
     },
     searchMyCreator() {
       this.showMyCreator = !this.showMyCreator;
-      if (this.showMyCreator){
+      if (this.showMyCreator) {
         this.initTableData("creator");
       } else {
         this.initTableData("reviewer");
diff --git a/frontend/src/business/main.js b/frontend/src/business/main.js
index 2783d1f491..99c53e0e39 100644
--- a/frontend/src/business/main.js
+++ b/frontend/src/business/main.js
@@ -7,6 +7,7 @@ import ajax from "../common/js/ajax";
 import App from './App.vue';
 import message from "../common/js/message";
 import router from "./components/common/router/router";
+import YanProgress from 'yan-progress';
 import './permission' // permission control
 import i18n from "../i18n/i18n";
 import store from "./store";
@@ -28,6 +29,7 @@ Vue.use(chart);
 Vue.use(CalendarHeatmap);
 Vue.use(message);
 Vue.use(CKEditor);
+Vue.use(YanProgress)
 
 // v-permission
 Vue.directive('permission', permission);
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 86f14ad8ae..aceaa6ba46 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -773,7 +773,8 @@ export default {
       my_create: "My Create",
       reviewed_by_me: "Review By Me",
       creator: "Creator",
-      done: "Commented use cases"
+      done: "Commented use cases",
+      result_distribution: "Result Distribution"
     },
     comment: {
       no_comment: "No Comment",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 742b62ff62..6c83999281 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -775,7 +775,8 @@ export default {
       my_create: "我创建的评审",
       reviewed_by_me: "待我评审",
       creator: "创建人",
-      done: "已评用例"
+      done: "已评用例",
+      result_distribution: "结果分布"
     },
     comment: {
       no_comment: "暂无评论",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index dc38ef69e3..097906232f 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -775,7 +775,8 @@ export default {
       my_create: "我創建的評審",
       reviewed_by_me: "待我評審",
       creator: "創建人",
-      done: "已評用例"
+      done: "已評用例",
+      result_distribution: "結果分佈"
     },
     comment: {
       no_comment: "暫無評論",

From 956358e3b0e55344beca8da560778d0d47c6563b Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 10 Oct 2020 11:32:05 +0800
Subject: [PATCH 21/36] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E7=BB=9F=E4=B8=80=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/xmind/XmindCaseParser.java | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index 79ed5e1625..57feda8da3 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -33,13 +33,10 @@ public class XmindCaseParser {
     private StringBuffer process; // 过程校验记录
     // 已存在用例名称
     private Set<String> testCaseNames;
-
     // 转换后的案例信息
     private List<TestCaseWithBLOBs> testCases;
-
     // 案例详情重写了hashCode方法去重用
     private List<TestCaseExcelData> compartDatas;
-
     // 记录没有用例的目录
     private List<String> nodePaths;
 
@@ -54,7 +51,10 @@ public class XmindCaseParser {
         nodePaths = new ArrayList<>();
     }
 
-    // 这里清理是为了 加快jvm 回收
+    private static final String TC_REGEX = "(?:tc:|tc：|tc)";
+    private static final String PC_REGEX = "(?:pc:|pc：|pc)";
+    private static final String RC_REGEX = "(?:rc:|rc：|rc)";
+
     public void clear() {
         compartDatas.clear();
         testCases.clear();
@@ -92,7 +92,7 @@ public class XmindCaseParser {
     // 递归处理案例数据
     private void recursion(Attached parent, int level, List<Attached> attacheds) {
         for (Attached item : attacheds) {
-            if (isAvailable(item.getTitle(), "(?:tc：|tc:|tc)")) { // 用例
+            if (isAvailable(item.getTitle(), TC_REGEX)) { // 用例
                 item.setParent(parent);
                 this.newTestCase(item.getTitle(), parent.getPath(), item.getChildren() != null ? item.getChildren().getAttached() : null);
             } else {
@@ -188,10 +188,10 @@ public class XmindCaseParser {
         List<Attached> steps = new LinkedList<>();
         if (attacheds != null && !attacheds.isEmpty()) {
             attacheds.forEach(item -> {
-                if (isAvailable(item.getTitle(), "(?:pc:|pc：)")) {
-                    testCase.setPrerequisite(replace(item.getTitle(), "(?:pc:|pc：)"));
-                } else if (isAvailable(item.getTitle(), "(?:rc:|rc：)")) {
-                    testCase.setRemark(replace(item.getTitle(), "(?:rc:|rc：)"));
+                if (isAvailable(item.getTitle(), PC_REGEX)) {
+                    testCase.setPrerequisite(replace(item.getTitle(), PC_REGEX));
+                } else if (isAvailable(item.getTitle(), RC_REGEX)) {
+                    testCase.setRemark(replace(item.getTitle(), RC_REGEX));
                 } else {
                     steps.add(item);
                 }
@@ -274,8 +274,8 @@ public class XmindCaseParser {
                 if (root != null && root.getRootTopic() != null && root.getRootTopic().getChildren() != null) {
                     // 判断是模块还是用例
                     for (Attached item : root.getRootTopic().getChildren().getAttached()) {
-                        if (isAvailable(item.getTitle(), "(?:tc:|tc：|tc)")) { // 用例
-                            return replace(item.getTitle(), "(?:tc:|tc：|tc)") + "：" + Translator.get("test_case_create_module_fail");
+                        if (isAvailable(item.getTitle(), TC_REGEX)) { // 用例
+                            return replace(item.getTitle(), TC_REGEX) + "：" + Translator.get("test_case_create_module_fail");
                         } else {
                             String nodePath = item.getTitle();
                             item.setPath(nodePath);

From ab6b566cb3f7978c169790bfc84c257d9f3d52be Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 10 Oct 2020 12:40:17 +0800
Subject: [PATCH 22/36] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E7=BB=9F=E4=B8=80=E5=8F=98=E9=87=8F,=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E8=A7=84=E8=8C=83=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
index 57feda8da3..b0954d66d2 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@@ -163,7 +163,7 @@ public class XmindCaseParser {
             return;
         }
         // 用例名称
-        testCase.setName(this.replace(tcArr[1], "tc:|tc：|tc"));
+        testCase.setName(this.replace(tcArr[1], TC_REGEX));
 
         if (!nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;

From 3e3a43d1139973651ee7796316d0f72dfe36b730 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Sat, 10 Oct 2020 14:32:43 +0800
Subject: [PATCH 23/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E8=AF=84=E5=AE=A1=E7=BB=93=E6=9E=9C=E5=88=86=E5=B8=83?=
 =?UTF-8?q?tip=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/home/components/ReviewList.vue      | 33 ++++++-------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/frontend/src/business/components/track/home/components/ReviewList.vue b/frontend/src/business/components/track/home/components/ReviewList.vue
index c59b5fa8f6..c4256b9ccf 100644
--- a/frontend/src/business/components/track/home/components/ReviewList.vue
+++ b/frontend/src/business/components/track/home/components/ReviewList.vue
@@ -45,29 +45,13 @@
       <el-table-column
         :label="$t('test_track.review.result_distribution')">
         <template v-slot:default="scope">
-          <yan-progress :total="scope.row.total" :done="scope.row.reviewed" :modify="scope.row.pass" :tip="tip"/>
+          <el-tooltip :content="getResultTip(scope.row.total,scope.row.reviewed,scope.row.pass)"
+                      placement="top" :enterable="false" class="item" effect="dark">
+            <yan-progress :total="scope.row.total" :done="scope.row.reviewed" :modify="scope.row.pass" :tip="tip"/>
+          </el-tooltip>
         </template>
       </el-table-column>
 
-      <!--      <el-table-column-->
-      <!--        prop="projectName"-->
-      <!--        :label="$t('test_track.review.done')"-->
-      <!--        show-overflow-tooltip>-->
-      <!--        <template v-slot:default="scope">-->
-      <!--          {{scope.row.reviewed}}/{{scope.row.total}}-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-
-      <!--      <el-table-column-->
-      <!--        prop="projectName"-->
-      <!--        :label="$t('test_track.home.review_progress')"-->
-      <!--        min-width="100"-->
-      <!--        show-overflow-tooltip>-->
-      <!--        <template v-slot:default="scope">-->
-      <!--          <el-progress :percentage="scope.row.testRate"></el-progress>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-
       <el-table-column
         prop="projectName"
         :label="$t('test_track.plan.plan_project')"
@@ -95,9 +79,9 @@ export default {
       tableData: [],
       showMyCreator: false,
       tip: [
-        {text: "总共X个", fillStyle: '#D3D3D3'},
-        {text: "评审了X个", fillStyle: '#F08080'},
-        {text: "通过X个", fillStyle: '#90EE90'}
+        {text: "X", fillStyle: '#D3D3D3'},
+        {text: "X", fillStyle: '#ee4545'},
+        {text: "X", fillStyle: '#4dcf4d'}
       ]
     }
   },
@@ -131,6 +115,9 @@ export default {
       } else {
         this.initTableData("reviewer");
       }
+    },
+    getResultTip(total, reviewed, pass) {
+      return '通过: ' + pass + '; ' + '未通过: ' + (reviewed - pass) + '; ' + '未评审: ' + (total - reviewed);
     }
   }
 }

From 1771cd4f8218d63d5ee2846deaf310d7f592ce12 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Sat, 10 Oct 2020 15:28:43 +0800
Subject: [PATCH 24/36] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/case/components/TestCaseList.vue    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 546842ca63..94b9b5c67e 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -35,7 +35,6 @@
         @filter-change="filter"
         @select-all="handleSelectAll"
         @select="handleSelectionChange"
-        @row-click="showDetail"
         row-key="id"
         class="test-content adjust-table">
         <el-table-column
@@ -54,7 +53,13 @@
         <el-table-column
           prop="name"
           :label="$t('commons.name')"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
+          <template v-slot:default="scope">
+            <div @mouseover="showDetail(scope.row)">
+              <p>{{ scope.row.name }}</p>
+            </div>
+          </template>
         </el-table-column>
         <el-table-column
           prop="priority"

From 0a57ff49404475908618e844f7e4237ea090db1c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Sat, 10 Oct 2020 17:05:19 +0800
Subject: [PATCH 25/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.java    |  8 ++++
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  7 ++++
 .../mapper/ext/ExtTestCaseReviewMapper.java   |  8 ++++
 .../mapper/ext/ExtTestCaseReviewMapper.xml    |  7 ++++
 .../service/CheckOwnerService.java            | 37 ++++++++++++++++++-
 .../track/controller/TestCaseController.java  |  3 ++
 .../controller/TestCaseNodeController.java    |  2 +
 .../controller/TestCaseReviewController.java  |  6 +++
 .../track/controller/TestPlanController.java  |  7 ++++
 .../resources/i18n/messages_en_US.properties  |  3 ++
 .../resources/i18n/messages_zh_CN.properties  |  3 ++
 .../resources/i18n/messages_zh_TW.properties  |  3 ++
 12 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
index 9661a711db..87a829a773 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
@@ -20,4 +20,12 @@ public interface ExtTestCaseMapper {
 
     TestCase getMaxNumByProjectId(@Param("projectId") String projectId);
 
+    /**
+     * 检查某工作空间下是否有某用例
+     * @param caseId
+     * @param workspaceId
+     * @return TestCase ID
+     */
+    List<String> checkIsHave(@Param("caseId") String caseId, @Param("workspaceId") String workspaceId);
+
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index d12d9656fe..51195acfbf 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -251,4 +251,11 @@
     <select id="getMaxNumByProjectId" resultType="io.metersphere.base.domain.TestCase">
         select * from test_case where test_case.project_id = #{projectId} order by num desc limit 1;
     </select>
+    <select id="checkIsHave" resultType="java.lang.String">
+        select distinct test_case.id
+        from test_case, project
+        where test_case.project_id = project.id
+        and project.workspace_id = #{workspaceId}
+        and test_case.id = #{caseId};
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java
index 7dcd8afe4e..aab6849b78 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java
@@ -15,4 +15,12 @@ public interface ExtTestCaseReviewMapper {
     List<TestCaseReviewDTO> listByWorkspaceId(@Param("workspaceId") String workspaceId);
 
     List<TestReviewDTOWithMetric> listRelate(@Param("request") QueryTestReviewRequest request);
+
+    /**
+     * 检查某工作空间下是否有某测试评审
+     * @param reviewId
+     * @param workspaceId
+     * @return Review ID
+     */
+    List<String> checkIsHave(@Param("reviewId") String reviewId, @Param("workspaceId") String workspaceId);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
index 30b739c64d..d0eac18a7f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
@@ -58,4 +58,11 @@
 
         order by test_case_review.update_time desc
     </select>
+    <select id="checkIsHave" resultType="java.lang.String">
+        select distinct review_id
+        from project, test_case_review_project
+        where project.id = test_case_review_project.project_id
+        and project.workspace_id = #{workspaceId}
+        and test_case_review_project.review_id = #{reviewId};
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/service/CheckOwnerService.java b/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
index 2a0ef39497..c14517cc50 100644
--- a/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
+++ b/backend/src/main/java/io/metersphere/service/CheckOwnerService.java
@@ -4,11 +4,11 @@ import io.metersphere.api.dto.APITestResult;
 import io.metersphere.api.dto.QueryAPITestRequest;
 import io.metersphere.base.domain.Project;
 import io.metersphere.base.mapper.ProjectMapper;
-import io.metersphere.base.mapper.ext.ExtApiTestMapper;
-import io.metersphere.base.mapper.ext.ExtLoadTestMapper;
+import io.metersphere.base.mapper.ext.*;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.i18n.Translator;
+import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.request.testplan.QueryTestPlanRequest;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,6 +26,12 @@ public class CheckOwnerService {
     private ExtApiTestMapper extApiTestMapper;
     @Resource
     private ExtLoadTestMapper extLoadTestMapper;
+    @Resource
+    private ExtTestCaseMapper extTestCaseMapper;
+    @Resource
+    private ExtTestPlanMapper extTestPlanMapper;
+    @Resource
+    private ExtTestCaseReviewMapper extTestCaseReviewMapper;
 
     public void checkProjectOwner(String projectId) {
         String workspaceId = SessionUtils.getCurrentWorkspaceId();
@@ -61,4 +67,31 @@ public class CheckOwnerService {
             throw new UnauthorizedException(Translator.get("check_owner_test"));
         }
     }
+
+    public void checkTestCaseOwner(String caseId) {
+        String workspaceId = SessionUtils.getCurrentWorkspaceId();
+        List<String> list = extTestCaseMapper.checkIsHave(caseId, workspaceId);
+        if (CollectionUtils.size(list) != 1) {
+            throw new UnauthorizedException(Translator.get("check_owner_case"));
+        }
+    }
+
+    public void checkTestPlanOwner(String planId) {
+        String workspaceId = SessionUtils.getCurrentWorkspaceId();
+        io.metersphere.track.request.testcase.QueryTestPlanRequest request = new io.metersphere.track.request.testcase.QueryTestPlanRequest();
+        request.setWorkspaceId(workspaceId);
+        request.setId(planId);
+        List<TestPlanDTO> list = extTestPlanMapper.list(request);
+        if (CollectionUtils.size(list) != 1) {
+            throw new UnauthorizedException(Translator.get("check_owner_plan"));
+        }
+    }
+
+    public void checkTestReviewOwner(String reviewId) {
+        String workspaceId = SessionUtils.getCurrentWorkspaceId();
+        List<String> list = extTestCaseReviewMapper.checkIsHave(reviewId, workspaceId);
+        if (CollectionUtils.size(list) != 1) {
+            throw new UnauthorizedException(Translator.get("check_owner_review"));
+        }
+    }
 }
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 d1def98d05..c6778e9ec8 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -83,11 +83,13 @@ public class TestCaseController {
 
     @GetMapping("/get/{testCaseId}")
     public TestCaseWithBLOBs getTestCase(@PathVariable String testCaseId) {
+        checkOwnerService.checkTestCaseOwner(testCaseId);
         return testCaseService.getTestCase(testCaseId);
     }
 
     @GetMapping("/project/{testCaseId}")
     public Project getProjectByTestCaseId(@PathVariable String testCaseId) {
+        checkOwnerService.checkTestCaseOwner(testCaseId);
         return testCaseService.getProjectByTestCaseId(testCaseId);
     }
 
@@ -106,6 +108,7 @@ public class TestCaseController {
     @PostMapping("/delete/{testCaseId}")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public int deleteTestCase(@PathVariable String testCaseId) {
+        checkOwnerService.checkTestCaseOwner(testCaseId);
         return testCaseService.deleteTestCase(testCaseId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
index 83328ec917..e1109a1428 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
@@ -43,11 +43,13 @@ public class TestCaseNodeController {
 
     @GetMapping("/list/plan/{planId}")
     public List<TestCaseNodeDTO> getNodeByPlanId(@PathVariable String planId) {
+        checkOwnerService.checkTestPlanOwner(planId);
         return testCaseNodeService.getNodeByPlanId(planId);
     }
 
     @GetMapping("/list/review/{reviewId}")
     public List<TestCaseNodeDTO> getNodeByReviewId(@PathVariable String reviewId) {
+        checkOwnerService.checkTestReviewOwner(reviewId);
         return testCaseNodeService.getNodeByReviewId(reviewId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java
index 2bc29ebad7..7f52fc1bf3 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java
@@ -9,6 +9,7 @@ import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.service.CheckOwnerService;
 import io.metersphere.track.dto.TestCaseReviewDTO;
 import io.metersphere.track.dto.TestReviewDTOWithMetric;
 import io.metersphere.track.request.testreview.ReviewRelevanceRequest;
@@ -32,6 +33,8 @@ public class TestCaseReviewController {
     TestCaseReviewService testCaseReviewService;
     @Resource
     TestReviewProjectService testReviewProjectService;
+    @Resource
+    CheckOwnerService checkOwnerService;
 
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<TestCaseReviewDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryCaseReviewRequest request) {
@@ -71,6 +74,7 @@ public class TestCaseReviewController {
     @GetMapping("/delete/{reviewId}")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public void deleteCaseReview(@PathVariable String reviewId) {
+        checkOwnerService.checkTestReviewOwner(reviewId);
         testCaseReviewService.deleteCaseReview(reviewId);
     }
 
@@ -103,12 +107,14 @@ public class TestCaseReviewController {
 
     @PostMapping("/get/{reviewId}")
     public TestCaseReview getTestReview(@PathVariable String reviewId) {
+        checkOwnerService.checkTestReviewOwner(reviewId);
         return testCaseReviewService.getTestReview(reviewId);
     }
 
     @PostMapping("/edit/status/{reviewId}")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public void editTestPlanStatus(@PathVariable String reviewId) {
+        checkOwnerService.checkTestReviewOwner(reviewId);
         testCaseReviewService.editTestReviewStatus(reviewId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
index 7f9135fcb9..d34f960a38 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
@@ -8,6 +8,7 @@ import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.service.CheckOwnerService;
 import io.metersphere.track.dto.TestCaseReportMetricDTO;
 import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.dto.TestPlanDTOWithMetric;
@@ -32,6 +33,8 @@ public class TestPlanController {
     TestPlanService testPlanService;
     @Resource
     TestPlanProjectService testPlanProjectService;
+    @Resource
+    CheckOwnerService checkOwnerService;
 
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<TestPlanDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestPlanRequest request) {
@@ -70,6 +73,7 @@ public class TestPlanController {
 
     @PostMapping("/get/{testPlanId}")
     public TestPlan getTestPlan(@PathVariable String testPlanId) {
+        checkOwnerService.checkTestPlanOwner(testPlanId);
         return testPlanService.getTestPlan(testPlanId);
     }
 
@@ -88,12 +92,14 @@ public class TestPlanController {
     @PostMapping("/edit/status/{planId}")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public void editTestPlanStatus(@PathVariable String planId) {
+        checkOwnerService.checkTestPlanOwner(planId);
         testPlanService.editTestPlanStatus(planId);
     }
 
     @PostMapping("/delete/{testPlanId}")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public int deleteTestPlan(@PathVariable String testPlanId) {
+        checkOwnerService.checkTestPlanOwner(testPlanId);
         return testPlanService.deleteTestPlan(testPlanId);
     }
 
@@ -109,6 +115,7 @@ public class TestPlanController {
 
     @GetMapping("/project/name/{planId}")
     public String getProjectNameByPlanId(@PathVariable String planId) {
+        checkOwnerService.checkTestPlanOwner(planId);
         return testPlanService.getProjectNameByPlanId(planId);
     }
 
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index a6f319bf20..03340f13b2 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -161,4 +161,7 @@ test_track.length_less_than=The title is too long, the length must be less than
 # check owner
 check_owner_project=The current user does not have permission to operate this project
 check_owner_test=The current user does not have permission to operate this test
+check_owner_case=The current user does not have permission to operate this use case
+check_owner_plan=The current user does not have permission to operate this plan
+check_owner_review=The current user does not have permission to operate this review
 upload_content_is_null=Imported content is empty
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index fa4611ee14..efc123244f 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -161,4 +161,7 @@ test_track.length_less_than=标题过长，字数必须小于
 # check owner
 check_owner_project=当前用户没有操作此项目的权限
 check_owner_test=当前用户没有操作此测试的权限
+check_owner_case=当前用户没有操作此用例的权限
+check_owner_plan=当前用户没有操作此计划的权限
+check_owner_review=当前用户没有操作此评审的权限
 upload_content_is_null=导入内容为空
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 13f7ba0b9a..4916b0c676 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -162,4 +162,7 @@ test_track.length_less_than=標題過長，字數必須小於
 # check owner
 check_owner_project=當前用戶沒有操作此項目的權限
 check_owner_test=當前用戶沒有操作此測試的權限
+check_owner_case=當前用戶沒有操作此用例的權限
+check_owner_plan=當前用戶沒有操作此計劃的權限
+check_owner_review=當前用戶沒有操作此評審的權限
 upload_content_is_null=導入內容為空
\ No newline at end of file

From 4cfaa9a1bbf496d6be9b538e721662435474a9ae Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Sat, 10 Oct 2020 17:51:46 +0800
Subject: [PATCH 26/36] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E8=A1=A8=E4=B8=AD=E7=BB=B4=E6=8A=A4=E4=BA=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=95=BF=E5=BA=A6=E4=B8=8D=E5=A4=9F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes 531
---
 .../src/main/resources/db/migration/V29__test_case_matainer.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 backend/src/main/resources/db/migration/V29__test_case_matainer.sql

diff --git a/backend/src/main/resources/db/migration/V29__test_case_matainer.sql b/backend/src/main/resources/db/migration/V29__test_case_matainer.sql
new file mode 100644
index 0000000000..fb713b2421
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V29__test_case_matainer.sql
@@ -0,0 +1,2 @@
+ALTER TABLE test_case
+    MODIFY maintainer varchar(50) NOT NULL COMMENT 'Test case maintainer';
\ No newline at end of file

From 90e857b10540251319efb162df2cb4d24612be10 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 10 Oct 2020 19:52:39 +0800
Subject: [PATCH 27/36] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20hosts=20=E5=88=97=E8=A1=A8=E6=89=A7=E8=A1=8C=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/ApiTestConfig.vue     | 626 +++++++++---------
 .../api/test/model/ScenarioModel.js           |  21 +-
 2 files changed, 321 insertions(+), 326 deletions(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index e76812463e..9c19a6666e 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -70,348 +70,348 @@
 </template>
 
 <script>
-import MsApiScenarioConfig from "./components/ApiScenarioConfig";
-import {Scenario, Test} from "./model/ScenarioModel"
-import MsApiReportStatus from "../report/ApiReportStatus";
-import MsApiReportDialog from "./ApiReportDialog";
-import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
-import MsScheduleConfig from "../../common/components/MsScheduleConfig";
-import ApiImport from "./components/import/ApiImport";
-import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
-import MsContainer from "@/business/components/common/components/MsContainer";
-import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+  import MsApiScenarioConfig from "./components/ApiScenarioConfig";
+  import {Scenario, Test} from "./model/ScenarioModel"
+  import MsApiReportStatus from "../report/ApiReportStatus";
+  import MsApiReportDialog from "./ApiReportDialog";
+  import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
+  import MsScheduleConfig from "../../common/components/MsScheduleConfig";
+  import ApiImport from "./components/import/ApiImport";
+  import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
+  import MsContainer from "@/business/components/common/components/MsContainer";
+  import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 
-export default {
-  name: "MsApiTestConfig",
+  export default {
+    name: "MsApiTestConfig",
 
-  components: {
-    MsMainContainer,
-    MsContainer, ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig
-  },
-
-  props: ["id"],
-
-  data() {
-    return {
-      reportVisible: false,
-      create: false,
-      result: {},
-      projects: [],
-      change: false,
-      test: new Test(),
-      isReadOnly: false,
-      debugReportId: ''
-    }
-  },
-
-  watch: {
-    '$route': 'init',
-    test: {
-      handler: function () {
-        this.change = true;
-      },
-      deep: true
-    }
-  },
-
-  methods: {
-    init() {
-      let projectId;
-
-      this.isReadOnly = !checkoutTestManagerOrTestUser();
-
-      if (this.id) {
-        this.create = false;
-        this.getTest(this.id);
-      } else {
-        this.create = true;
-        this.test = new Test();
-        if (this.$refs.config) {
-          this.$refs.config.reset();
-        }
-        // 仅创建时获取选择的项目
-        projectId = this.$store.state.common.projectId;
-      }
-      this.result = this.$get("/project/listAll", response => {
-        this.projects = response.data;
-        // 等待项目列表加载完
-        if (projectId) this.test.projectId = projectId;
-      })
+    components: {
+      MsMainContainer,
+      MsContainer, ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig
     },
-    updateReference() {
-      let updateIds = [];
-      this.test.scenarioDefinition.forEach(scenario => {
-        if (scenario.isReference()) {
-          updateIds.push(scenario.id.split("#")[0]);
-        }
-      })
 
-      if (updateIds.length === 0) return;
-      // 更新引用场景
-      this.result = this.$post("/api/list/ids", {ids: updateIds}, response => {
-        let scenarioMap = {};
-        if (response.data) {
-          response.data.forEach(test => {
-            JSON.parse(test.scenarioDefinition).forEach(options => {
-              let referenceId = test.id + "#" + options.id;
-              scenarioMap[referenceId] = new Scenario(options);
-              scenarioMap[referenceId].id = referenceId;
-            })
-          })
-        }
+    props: ["id"],
 
-        let scenarios = [];
+    data() {
+      return {
+        reportVisible: false,
+        create: false,
+        result: {},
+        projects: [],
+        change: false,
+        test: new Test(),
+        isReadOnly: false,
+        debugReportId: ''
+      }
+    },
+
+    watch: {
+      '$route': 'init',
+      test: {
+        handler: function () {
+          this.change = true;
+        },
+        deep: true
+      }
+    },
+
+    methods: {
+      init() {
+        let projectId;
+
+        this.isReadOnly = !checkoutTestManagerOrTestUser();
+
+        if (this.id) {
+          this.create = false;
+          this.getTest(this.id);
+        } else {
+          this.create = true;
+          this.test = new Test();
+          if (this.$refs.config) {
+            this.$refs.config.reset();
+          }
+          // 仅创建时获取选择的项目
+          projectId = this.$store.state.common.projectId;
+        }
+        this.result = this.$get("/project/listAll", response => {
+          this.projects = response.data;
+          // 等待项目列表加载完
+          if (projectId) this.test.projectId = projectId;
+        })
+      },
+      updateReference() {
+        let updateIds = [];
         this.test.scenarioDefinition.forEach(scenario => {
           if (scenario.isReference()) {
-            if (scenarioMap[scenario.id]) scenarios.push(scenarioMap[scenario.id]);
-          } else {
-            scenarios.push(scenario);
+            updateIds.push(scenario.id.split("#")[0]);
           }
         })
-        this.test.scenarioDefinition = scenarios;
-      })
-    },
-    getTest(id) {
-      this.result = this.$get("/api/get/" + id, response => {
-        if (response.data) {
-          let item = response.data;
 
-          this.test = new Test({
-            id: item.id,
-            projectId: item.projectId,
-            name: item.name,
-            status: item.status,
-            scenarioDefinition: JSON.parse(item.scenarioDefinition),
-            schedule: item.schedule ? item.schedule : {},
-          });
-          this.updateReference();
+        if (updateIds.length === 0) return;
+        // 更新引用场景
+        this.result = this.$post("/api/list/ids", {ids: updateIds}, response => {
+          let scenarioMap = {};
+          if (response.data) {
+            response.data.forEach(test => {
+              JSON.parse(test.scenarioDefinition).forEach(options => {
+                let referenceId = test.id + "#" + options.id;
+                scenarioMap[referenceId] = new Scenario(options);
+                scenarioMap[referenceId].id = referenceId;
+              })
+            })
+          }
 
-          this.$refs.config.reset();
-        }
-      });
-    },
-    save(callback) {
-      let validator = this.test.isValid();
-      if (!validator.isValid) {
-        this.$warning(this.$t(validator.info));
-        return;
-      }
-      this.change = false;
-      let bodyFiles = this.getBodyUploadFiles();
-      let url = this.create ? "/api/create" : "/api/update";
-      let jmx = this.test.toJMX();
-      let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
-      let file = new File([blob], jmx.name);
-      this.result = this.$fileUpload(url, file, bodyFiles, this.test, () => {
-        if (callback) callback();
-        this.create = false;
-        this.resetBodyFile();
-      });
-    },
-    saveTest() {
-      this.save(() => {
-        this.$success(this.$t('commons.save_success'));
-        if (this.create) {
-          this.$router.push({
-            path: '/api/test/edit?id=' + this.test.id
+          let scenarios = [];
+          this.test.scenarioDefinition.forEach(scenario => {
+            if (scenario.isReference()) {
+              if (scenarioMap[scenario.id]) scenarios.push(scenarioMap[scenario.id]);
+            } else {
+              scenarios.push(scenario);
+            }
           })
-        }
-        // 发送广播，刷新 head 上的最新列表
-        ApiEvent.$emit(LIST_CHANGE);
-      })
-    },
-    runTest() {
-      this.result = this.$post("/api/run", {id: this.test.id, triggerMode: 'MANUAL'}, (response) => {
-        this.$success(this.$t('api_test.running'));
-        this.$router.push({
-          path: '/api/report/view/' + response.data
+          this.test.scenarioDefinition = scenarios;
         })
-      });
-    },
-    saveRunTest() {
-      this.change = false;
-      if (!this.validateEnableTest()) {
-        this.$warning(this.$t('api_test.enable_validate_tip'));
-        return;
-      }
-      this.save(() => {
-        this.$success(this.$t('commons.save_success'));
-        this.runTest();
-        // 发送广播，刷新 head 上的最新列表
-        ApiEvent.$emit(LIST_CHANGE);
-      })
-    },
-    getBodyUploadFiles() {
-      let bodyUploadFiles = [];
-      this.test.bodyUploadIds = [];
-      this.test.scenarioDefinition.forEach(scenario => {
-        scenario.requests.forEach(request => {
-          if (request.body) {
-            request.body.kvs.forEach(param => {
-              if (param.files) {
-                param.files.forEach(item => {
-                  if (item.file) {
-                    let fileId = getUUID().substring(0, 8);
-                    item.name = item.file.name;
-                    item.id = fileId;
-                    this.test.bodyUploadIds.push(fileId);
-                    bodyUploadFiles.push(item.file);
-                  }
-                });
-              }
+      },
+      getTest(id) {
+        this.result = this.$get("/api/get/" + id, response => {
+          if (response.data) {
+            let item = response.data;
+
+            this.test = new Test({
+              id: item.id,
+              projectId: item.projectId,
+              name: item.name,
+              status: item.status,
+              scenarioDefinition: JSON.parse(item.scenarioDefinition),
+              schedule: item.schedule ? item.schedule : {},
             });
+            this.updateReference();
+
+            this.$refs.config.reset();
           }
         });
-      });
-      return bodyUploadFiles;
-    },
-    validateEnableTest() {
-      for (let scenario of this.test.scenarioDefinition) {
-        if (scenario.enable) {
-          for (let request of scenario.requests) {
-            if (request.enable) {
-              return true;
+      },
+      save(callback) {
+        let validator = this.test.isValid();
+        if (!validator.isValid) {
+          this.$warning(this.$t(validator.info));
+          return;
+        }
+        this.change = false;
+        let bodyFiles = this.getBodyUploadFiles();
+        let url = this.create ? "/api/create" : "/api/update";
+        let jmx = this.test.toJMX();
+        let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
+        let file = new File([blob], jmx.name);
+        this.result = this.$fileUpload(url, file, bodyFiles, this.test, () => {
+          if (callback) callback();
+          this.create = false;
+          this.resetBodyFile();
+        });
+      },
+      saveTest() {
+        this.save(() => {
+          this.$success(this.$t('commons.save_success'));
+          if (this.create) {
+            this.$router.push({
+              path: '/api/test/edit?id=' + this.test.id
+            })
+          }
+          // 发送广播，刷新 head 上的最新列表
+          ApiEvent.$emit(LIST_CHANGE);
+        })
+      },
+      runTest() {
+        this.result = this.$post("/api/run", {id: this.test.id, triggerMode: 'MANUAL'}, (response) => {
+          this.$success(this.$t('api_test.running'));
+          this.$router.push({
+            path: '/api/report/view/' + response.data
+          })
+        });
+      },
+      saveRunTest() {
+        this.change = false;
+        if (!this.validateEnableTest()) {
+          this.$warning(this.$t('api_test.enable_validate_tip'));
+          return;
+        }
+        this.save(() => {
+          this.$success(this.$t('commons.save_success'));
+          this.runTest();
+          // 发送广播，刷新 head 上的最新列表
+          ApiEvent.$emit(LIST_CHANGE);
+        })
+      },
+      getBodyUploadFiles() {
+        let bodyUploadFiles = [];
+        this.test.bodyUploadIds = [];
+        this.test.scenarioDefinition.forEach(scenario => {
+          scenario.requests.forEach(request => {
+            if (request.body) {
+              request.body.kvs.forEach(param => {
+                if (param.files) {
+                  param.files.forEach(item => {
+                    if (item.file) {
+                      let fileId = getUUID().substring(0, 8);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                      this.test.bodyUploadIds.push(fileId);
+                      bodyUploadFiles.push(item.file);
+                    }
+                  });
+                }
+              });
+            }
+          });
+        });
+        return bodyUploadFiles;
+      },
+      validateEnableTest() {
+        for (let scenario of this.test.scenarioDefinition) {
+          if (scenario.enable) {
+            for (let request of scenario.requests) {
+              if (request.enable) {
+                return true;
+              }
             }
           }
         }
-      }
-      return false;
-    },
-    resetBodyFile() {
-      //下次保存不再上传已传文件
-      this.test.scenarioDefinition.forEach(scenario => {
-        scenario.requests.forEach(request => {
-          if (request.body) {
-            request.body.kvs.forEach(param => {
-              if (param.files) {
-                param.files.forEach(item => {
-                  if (item.file) {
-                    item.file = undefined;
-                  }
-                });
-              }
-            });
-          }
+        return false;
+      },
+      resetBodyFile() {
+        //下次保存不再上传已传文件
+        this.test.scenarioDefinition.forEach(scenario => {
+          scenario.requests.forEach(request => {
+            if (request.body) {
+              request.body.kvs.forEach(param => {
+                if (param.files) {
+                  param.files.forEach(item => {
+                    if (item.file) {
+                      item.file = undefined;
+                    }
+                  });
+                }
+              });
+            }
+          });
         });
-      });
-    },
-    cancel() {
-      this.$router.push('/api/test/list/all');
-    },
-    handleCommand(command) {
-      switch (command) {
-        case "report":
-          this.$refs.reportDialog.open();
-          break;
-        case "performance":
-          this.$store.commit('setTest', {
-            projectId: this.test.projectId,
-            name: this.test.name,
-            jmx: this.test.toJMX()
-          })
-          this.$router.push({
-            path: "/performance/test/create"
-          })
-          break;
-        case "export":
-          downloadFile(this.test.name + ".json", this.test.export());
-          break;
-        case "import":
-          this.$refs.apiImport.open();
-          break;
-      }
-    },
-    saveCronExpression(cronExpression) {
-      this.test.schedule.enable = true;
-      this.test.schedule.value = cronExpression;
-      this.saveSchedule();
-    },
-    saveSchedule() {
-      this.checkScheduleEdit();
-      let param = {};
-      param = this.test.schedule;
-      param.resourceId = this.test.id;
-      let url = '/api/schedule/create';
-      if (param.id) {
-        url = '/api/schedule/update';
-      }
-      this.$post(url, param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.getTest(this.test.id);
-      });
-    },
-    checkScheduleEdit() {
-      if (this.create) {
-        this.$message(this.$t('api_test.environment.please_save_test'));
-        return false;
-      }
-      return true;
-    },
-    runDebug(scenario) {
-      if (this.create) {
-        this.$warning(this.$t('api_test.environment.please_save_test'));
-        return;
-      }
+      },
+      cancel() {
+        this.$router.push('/api/test/list/all');
+      },
+      handleCommand(command) {
+        switch (command) {
+          case "report":
+            this.$refs.reportDialog.open();
+            break;
+          case "performance":
+            this.$store.commit('setTest', {
+              projectId: this.test.projectId,
+              name: this.test.name,
+              jmx: this.test.toJMX()
+            })
+            this.$router.push({
+              path: "/performance/test/create"
+            })
+            break;
+          case "export":
+            downloadFile(this.test.name + ".json", this.test.export());
+            break;
+          case "import":
+            this.$refs.apiImport.open();
+            break;
+        }
+      },
+      saveCronExpression(cronExpression) {
+        this.test.schedule.enable = true;
+        this.test.schedule.value = cronExpression;
+        this.saveSchedule();
+      },
+      saveSchedule() {
+        this.checkScheduleEdit();
+        let param = {};
+        param = this.test.schedule;
+        param.resourceId = this.test.id;
+        let url = '/api/schedule/create';
+        if (param.id) {
+          url = '/api/schedule/update';
+        }
+        this.$post(url, param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.getTest(this.test.id);
+        });
+      },
+      checkScheduleEdit() {
+        if (this.create) {
+          this.$message(this.$t('api_test.environment.please_save_test'));
+          return false;
+        }
+        return true;
+      },
+      runDebug(scenario) {
+        if (this.create) {
+          this.$warning(this.$t('api_test.environment.please_save_test'));
+          return;
+        }
 
-      let url = "/api/run/debug";
-      let runningTest = new Test();
-      Object.assign(runningTest, this.test);
-      let bodyFiles = this.getBodyUploadFiles();
-      runningTest.scenarioDefinition = [];
-      runningTest.scenarioDefinition.push(scenario);
-      let validator = runningTest.isValid();
-      if (!validator.isValid) {
-        this.$warning(this.$t(validator.info));
-        return;
-      }
+        let url = "/api/run/debug";
+        let runningTest = new Test();
+        Object.assign(runningTest, this.test);
+        let bodyFiles = this.getBodyUploadFiles();
+        runningTest.scenarioDefinition = [];
+        runningTest.scenarioDefinition.push(scenario);
+        let validator = runningTest.isValid();
+        if (!validator.isValid) {
+          this.$warning(this.$t(validator.info));
+          return;
+        }
 
-      let jmx = runningTest.toJMX();
-      let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
-      let file = new File([blob], jmx.name);
-      this.$fileUpload(url, file, bodyFiles, this.test, response => {
-        this.debugReportId = response.data;
-        this.resetBodyFile();
-      });
+        let jmx = runningTest.toJMX();
+        let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
+        let file = new File([blob], jmx.name);
+        this.$fileUpload(url, file, bodyFiles, this.test, response => {
+          this.debugReportId = response.data;
+          this.resetBodyFile();
+        });
+      },
+      handleEvent(event) {
+        if (event.keyCode === 83 && event.ctrlKey) {
+          console.log('拦截到 ctrl + s');//ctrl+s
+          this.saveTest();
+          event.preventDefault();
+          event.returnValue = false;
+          return false;
+        }
+      },
     },
-    handleEvent(event) {
-      if (event.keyCode === 83 && event.ctrlKey) {
-        console.log('拦截到 ctrl + s');//ctrl+s
-        this.saveTest();
-        event.preventDefault();
-        event.returnValue = false;
-        return false;
-      }
-    },
-  },
 
-  created() {
-    this.init();
-    //
-    document.addEventListener('keydown', this.handleEvent)
-  },
-  beforeDestroy() {
-    document.removeEventListener('keydown', this.handleEvent);
+    created() {
+      this.init();
+      //
+      document.addEventListener('keydown', this.handleEvent)
+    },
+    beforeDestroy() {
+      document.removeEventListener('keydown', this.handleEvent);
+    }
   }
-}
 </script>
 
 <style scoped>
-.test-container {
-  height: calc(100vh - 155px);
-  min-height: 600px;
-}
+  .test-container {
+    height: calc(100vh - 155px);
+    min-height: 600px;
+  }
 
-.test-name {
-  width: 600px;
-  margin-left: -20px;
-  margin-right: 20px;
-}
+  .test-name {
+    width: 600px;
+    margin-left: -20px;
+    margin-right: 20px;
+  }
 
-.test-project {
-  min-width: 150px;
-}
+  .test-project {
+    min-width: 150px;
+  }
 
-.test-container .more {
-  margin-left: 10px;
-}
+  .test-container .more {
+    margin-left: 10px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index d024dbdca5..7e6c44c8d6 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -1043,11 +1043,8 @@ class JMXGenerator {
         this.addScenarioHeaders(threadGroup, scenario);
 
         this.addScenarioCookieManager(threadGroup, scenario);
-        // 放在计划或线程组中，不建议放具体某个请求中
-        this.addDNSCacheManager(threadGroup, scenario);
 
         this.addJDBCDataSources(threadGroup, scenario);
-
         scenario.requests.forEach(request => {
           if (request.enable) {
             if (!request.isValid()) return;
@@ -1065,6 +1062,8 @@ class JMXGenerator {
               sampler = new JDBCSampler(request.name || "", request);
             }
 
+            this.addDNSCacheManager(sampler, scenario.environment, request.useEnvironment);
+
             this.addRequestExtractor(sampler, request);
 
             this.addRequestAssertion(sampler, request);
@@ -1126,18 +1125,14 @@ class JMXGenerator {
     }
   }
 
-  addDNSCacheManager(threadGroup, scenario) {
-    if (scenario.requests.length < 1) {
-      return
-    }
-    let request = scenario.requests[0];
-    if (request.environment) {
-      let commonConfig = request.environment.config.commonConfig;
+  addDNSCacheManager(httpSamplerProxy, environment, useEnv) {
+    if (environment && useEnv === true) {
+      let commonConfig = environment.config.commonConfig;
       let hosts = commonConfig.hosts;
       if (commonConfig.enableHost && hosts.length > 0) {
-        let name = request.name + " DNSCacheManager";
+        let name = " DNSCacheManager";
         // 强化判断，如果未匹配到合适的host则不开启DNSCache
-        let domain = request.environment.config.httpConfig.domain;
+        let domain = environment.config.httpConfig.domain;
         let validHosts = [];
         hosts.forEach(item => {
           if (item.domain != undefined && domain != undefined) {
@@ -1149,7 +1144,7 @@ class JMXGenerator {
           }
         });
         if (validHosts.length > 0) {
-          threadGroup.put(new DNSCacheManager(name, validHosts));
+          httpSamplerProxy.put(new DNSCacheManager(name, validHosts));
         }
       }
     }

From 827d43c4e5b189152dc2b0a3a309b7e8efbd1bb2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 12 Oct 2020 10:08:47 +0800
Subject: [PATCH 28/36] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20swagger=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/api/parse/Swagger2Parser.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
index a982f5798a..0cd0d62e18 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
@@ -137,8 +137,10 @@ public class Swagger2Parser extends ApiImportAbstractParser {
             Model model = definitions.get(simpleRef);
             HashSet<String> refSet = new HashSet<>();
             refSet.add(simpleRef);
-            JSONObject bodyParameters = getBodyJSONObjectParameters(model.getProperties(), definitions, refSet);
-            body.setRaw(bodyParameters.toJSONString());
+            if (model != null ) {
+                JSONObject bodyParameters = getBodyJSONObjectParameters(model.getProperties(), definitions, refSet);
+                body.setRaw(bodyParameters.toJSONString());
+            }
         } else if (schema instanceof ArrayModel) {
             ArrayModel arrayModel = (ArrayModel) bodyParameter.getSchema();
             Property items = arrayModel.getItems();

From 27e50e9ff0f44f955043a7f06dde83f47870124d Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Mon, 12 Oct 2020 10:15:06 +0800
Subject: [PATCH 29/36] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E8=B7=A8=E5=9C=BA=E6=99=AF=E6=8B=BC?=
 =?UTF-8?q?=E6=8E=A5=E6=97=A0=E6=B3=95=E5=A4=9A=E6=AC=A1=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=9C=BA=E6=99=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #509
---
 .../components/api/test/components/ApiScenarioSelect.vue        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue b/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue
index 434341fac4..7c90de1762 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioSelect.vue
@@ -99,6 +99,8 @@ export default {
     clone(row) {
       let scenarios = [];
       row.selected.forEach(options => {
+        // 去掉ID，创建新的ID
+        options.id = undefined;
         scenarios.push(new Scenario(options));
       })
       this.$emit('select', scenarios);

From 70d677c4fc520e4bc1ac26a2b96d5d0a0a90a717 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 12 Oct 2020 11:34:38 +0800
Subject: [PATCH 30/36] =?UTF-8?q?fit(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E5=AF=BC=E5=85=A5=E6=B5=8B=E8=AF=95=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9C=AA=E5=8B=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/api/dto/scenario/KeyValue.java    | 3 +++
 backend/src/main/java/io/metersphere/xpack                     | 2 +-
 .../business/components/api/test/components/ApiKeyValue.vue    | 2 +-
 .../business/components/api/test/components/ApiVariable.vue    | 2 +-
 frontend/src/business/components/xpack                         | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
index 64ec5780c1..45ab26da49 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
+++ b/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;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index c2dacf960c..cf6b065263 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8
+Subproject commit cf6b06526324326a563d933e07118fac014a63b4
diff --git a/frontend/src/business/components/api/test/components/ApiKeyValue.vue b/frontend/src/business/components/api/test/components/ApiKeyValue.vue
index 5cd862e449..f1362e6322 100644
--- a/frontend/src/business/components/api/test/components/ApiKeyValue.vue
+++ b/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}));
       }
     }
diff --git a/frontend/src/business/components/api/test/components/ApiVariable.vue b/frontend/src/business/components/api/test/components/ApiVariable.vue
index 68d02ab625..cd36f59bf1 100644
--- a/frontend/src/business/components/api/test/components/ApiVariable.vue
+++ b/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'}));
       }
     }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index cc38137a69..06d935cd1d 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1

From a043722a05d047fe88f180a25381450c16326d6f Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 12 Oct 2020 13:05:07 +0800
Subject: [PATCH 31/36] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/service/TestCaseService.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 156dc23ca8..dc827b3246 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/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")) {

From 62a6af8758a8b7c32c55ec55ffa7259b555d25bf Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Mon, 12 Oct 2020 13:09:40 +0800
Subject: [PATCH 32/36] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=9D=A1=E4=BB=B6=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=99=A8=E5=88=A4=E6=96=ADbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/model/ScenarioModel.js        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 7e6c44c8d6..fb32d13cab 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/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 = "";
         }

From 9f2eeda2768f56a19eefacb7e32423c643b47438 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 12 Oct 2020 09:54:28 +0800
Subject: [PATCH 33/36] =?UTF-8?q?refactor:=20=E8=A1=A8=E6=A0=BC=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86hover=E4=B9=8B=E5=90=8E=E7=9A=84=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d524f7654940f5935231c72e78f51f58a0f8490b)
---
 frontend/src/common/css/main.css | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 5a45490239..183089bbd6 100644
--- a/frontend/src/common/css/main.css
+++ b/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;
 }
 
@@ -74,12 +74,18 @@ body {
   width: 3px;
   background-color: #EBEEF5;
 }
+
+.adjust-table tr:hover td {
+  border-color: #f5f7fa;
+}
+
 /* 表格拖拽表头调整宽度 --> */
 
 /* <-- 表格 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 {

From b6a064e5cc66f48ab06f8d70ab109081f57c03fa Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 12 Oct 2020 13:08:19 +0800
Subject: [PATCH 34/36] =?UTF-8?q?refactor:=20=E8=A1=A8=E6=A0=BC=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86hover=E4=B9=8B=E5=90=8E=E7=9A=84=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6d1fb1583f86a00eca06a5705e758bb9ae2e726d)
---
 frontend/src/common/css/main.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 183089bbd6..5733ca60f5 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -50,7 +50,7 @@ body {
 
 /* <-- 表格拖拽表头调整宽度，在 t-bable 上添加 border 属性，并添加 adjust-table 类名*/
 .adjust-table td {
-  border-right-color: white;
+  border: 0;
 }
 
 .adjust-table th {
@@ -76,7 +76,7 @@ body {
 }
 
 .adjust-table tr:hover td {
-  border-color: #f5f7fa;
+  border: 0;
 }
 
 /* 表格拖拽表头调整宽度 --> */

From 00424b0255606ec1a6d2674b156c727b20da4c44 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 12 Oct 2020 13:18:02 +0800
Subject: [PATCH 35/36] =?UTF-8?q?revert:=20=E5=9B=9E=E9=80=80td=E7=9A=84?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8border?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ff7454f6efe13e69d090193c2e8d103a51330936)
---
 frontend/src/common/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 5733ca60f5..47be41d8f7 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -50,7 +50,7 @@ body {
 
 /* <-- 表格拖拽表头调整宽度，在 t-bable 上添加 border 属性，并添加 adjust-table 类名*/
 .adjust-table td {
-  border: 0;
+  border-right-color: white;
 }
 
 .adjust-table th {

From 5803eccc2b41936b425ad7f77007601727734a61 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 12 Oct 2020 13:25:43 +0800
Subject: [PATCH 36/36] =?UTF-8?q?refactor:=20=E8=A1=A8=E6=A0=BC=E5=8F=88?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E8=AE=BE=E7=BD=AE=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit fed5d15589eccd1d035a3d7ddc1f0d25f3a717a0)
---
 frontend/src/common/css/main.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 47be41d8f7..495579dc6a 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -50,7 +50,7 @@ body {
 
 /* <-- 表格拖拽表头调整宽度，在 t-bable 上添加 border 属性，并添加 adjust-table 类名*/
 .adjust-table td {
-  border-right-color: white;
+  border-right: 0;
 }
 
 .adjust-table th {
@@ -76,7 +76,7 @@ body {
 }
 
 .adjust-table tr:hover td {
-  border: 0;
+  border-right: 0;
 }
 
 /* 表格拖拽表头调整宽度 --> */