From 82d7be618c1d3377988615dc7b6b644b9aeb46ac Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 15 Mar 2021 15:26:56 +0800
Subject: [PATCH 01/95] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A2=98=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

---
 backend/pom.xml                               |  5 +++
 .../metersphere/commons/utils/ShiroUtils.java |  2 +
 frontend/src/business/App.vue                 |  6 +--
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/common/css/main.css              |  1 +
 frontend/src/common/js/constants.js           |  1 +
 frontend/src/common/js/utils.js               | 40 +++++++++----------
 frontend/src/login/Login.vue                  | 30 ++++++++------
 8 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index edd70316fa..e3a2c2754e 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -541,6 +541,11 @@
                                         <include name="*.html"/>
                                     </fileset>
                                 </move>
+                                <copy todir="src/main/resources/static/css">
+                                    <fileset dir="../frontend/src/assets/theme">
+                                        <include name="index.css"/>
+                                    </fileset>
+                                </copy>
                             </target>
                         </configuration>
                         <goals>
diff --git a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
index 90c4e26e92..61f73dd9ad 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
@@ -42,6 +42,8 @@ public class ShiroUtils {
         //api-对外文档页面提供的查询接口
         filterChainDefinitionMap.put("/api/document/**", "anon");
 //        filterChainDefinitionMap.put("/document/**", "anon");
+        filterChainDefinitionMap.put("/system/theme", "anon");
+
     }
 
     public static void ignoreCsrfFilter(Map<String, String> filterChainDefinitionMap) {
diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index b2efe68a1b..f279581ae6 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -31,7 +31,7 @@ import MsView from "./components/common/router/View";
 import MsUser from "./components/common/head/HeaderUser";
 import MsHeaderOrgWs from "./components/common/head/HeaderOrgWs";
 import MsLanguageSwitch from "./components/common/head/LanguageSwitch";
-import {hasLicense, saveLocalStorage, setColor, setOriginColor} from "@/common/js/utils";
+import {hasLicense, saveLocalStorage, setColor, setDefaultTheme} from "@/common/js/utils";
 import {registerRequestHeaders} from "@/common/js/ajax";
 import {ORIGIN_COLOR} from "@/common/js/constants";
 
@@ -55,13 +55,13 @@ export default {
   created() {
     registerRequestHeaders();
     if (!hasLicense()) {
-      setOriginColor()
+      setDefaultTheme();
       this.color = ORIGIN_COLOR;
     } else {
       //
       this.$get('/system/theme', res => {
         this.color = res.data ? res.data : ORIGIN_COLOR;
-        setColor(this.color, this.color, this.color, this.color);
+        setColor(this.color, this.color, this.color, this.color, this.color);
         this.$store.commit('setTheme', res.data);
       })
     }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 4c33b9c3b1..b2571e06e8 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819
+Subproject commit b2571e06e8b211821409115cc2c4a7c52cbac1db
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 34a336f689..2595486214 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -17,6 +17,7 @@ body {
   /*--color: #2c2a48;*/
   /*--color_shallow: #595591;*/
   --color: '';
+  --primary_color: '';
   --color_shallow: '';
   --count_number: '';
   --count_number_shallow: '';
diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index cbaf36f974..e8c6de79f3 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -173,3 +173,4 @@ export const ORIGIN_COLOR = '#2c2a48';
 export const ORIGIN_COLOR_SHALLOW = '#595591';
 export const COUNT_NUMBER = '#6C317C';
 export const COUNT_NUMBER_SHALLOW = '#CDB9D2';
+export const PRIMARY_COLOR = '#783887';
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 02822ea8e6..2463cec636 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -1,17 +1,17 @@
 import {
-    COUNT_NUMBER,
-    COUNT_NUMBER_SHALLOW,
-    LicenseKey,
-    ORIGIN_COLOR,
-    ORIGIN_COLOR_SHALLOW,
-    PROJECT_ID,
-    REFRESH_SESSION_USER_URL,
-    ROLE_ADMIN,
-    ROLE_ORG_ADMIN,
-    ROLE_TEST_MANAGER,
-    ROLE_TEST_USER,
-    ROLE_TEST_VIEWER,
-    TokenKey
+  COUNT_NUMBER,
+  COUNT_NUMBER_SHALLOW,
+  LicenseKey,
+  ORIGIN_COLOR,
+  ORIGIN_COLOR_SHALLOW, PRIMARY_COLOR,
+  PROJECT_ID,
+  REFRESH_SESSION_USER_URL,
+  ROLE_ADMIN,
+  ROLE_ORG_ADMIN,
+  ROLE_TEST_MANAGER,
+  ROLE_TEST_USER,
+  ROLE_TEST_VIEWER,
+  TokenKey
 } from "./constants";
 import axios from "axios";
 import {jsPDF} from "jspdf";
@@ -354,19 +354,19 @@ export function objToStrMap(obj) {
     return strMap;
 }
 
-export function getColor() {
-    return localStorage.getItem('color');
-}
-
-export function setColor(a, b, c, d) {
+export function setColor(a, b, c, d, e) {
+    // 顶部菜单背景色
     document.body.style.setProperty('--color', a);
     document.body.style.setProperty('--color_shallow', b);
+    // 首页颜色
     document.body.style.setProperty('--count_number', c);
     document.body.style.setProperty('--count_number_shallow', d);
+    // 主颜色
+    document.body.style.setProperty('--primary_color', e);
 }
 
-export function setOriginColor() {
-    setColor(ORIGIN_COLOR, ORIGIN_COLOR_SHALLOW, COUNT_NUMBER, COUNT_NUMBER_SHALLOW);
+export function setDefaultTheme() {
+    setColor(ORIGIN_COLOR, ORIGIN_COLOR_SHALLOW, COUNT_NUMBER, COUNT_NUMBER_SHALLOW, PRIMARY_COLOR);
 }
 
 export function publicKeyEncrypt(input, publicKey) {
diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 8ca8bc7da5..4ef3406a7b 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -56,7 +56,7 @@
 
 <script>
 import {publicKeyEncrypt, saveLocalStorage} from '@/common/js/utils';
-import {DEFAULT_LANGUAGE} from "@/common/js/constants";
+import {DEFAULT_LANGUAGE, PRIMARY_COLOR} from "@/common/js/constants";
 
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const display = requireComponent.keys().length > 0 ? requireComponent("./display/Display.vue") : {};
@@ -91,6 +91,10 @@ export default {
     }
   },
   beforeCreate() {
+    this.$get('/system/theme', res => {
+      this.color = res.data ? res.data : PRIMARY_COLOR;
+      document.body.style.setProperty('--primary_color', this.color);
+    })
     this.result = this.$get("/isLogin").then(response => {
 
       if (display.default !== undefined) {
@@ -230,7 +234,7 @@ export default {
   margin-top: 12px;
   margin-bottom: 75px;
   font-size: 14px;
-  color: #843697;
+  color: var(--primary_color);
   line-height: 14px;
   text-align: center;
 }
@@ -243,18 +247,18 @@ export default {
 
 .btn > .submit {
   border-radius: 70px;
-  border-color: #8B479B;
-  background-color: #8B479B;
+  border-color: var(--primary_color);
+  background-color: var(--primary_color);
 }
 
 .btn > .submit:hover {
-  border-color: rgba(139, 71, 155, 0.9);
-  background-color: rgba(139, 71, 155, 0.9);
+  border-color: var(--primary_color);
+  background-color: var(--primary_color);
 }
 
 .btn > .submit:active {
-  border-color: rgba(139, 71, 155, 0.8);
-  background-color: rgba(139, 71, 155, 0.8);
+  border-color: var(--primary_color);
+  background-color: var(--primary_color);
 }
 
 .el-form-item:first-child {
@@ -262,13 +266,13 @@ export default {
 }
 
 /deep/ .el-radio__input.is-checked .el-radio__inner {
-  background-color: #783887;
-  background: #783887;
-  border-color: #783887;
+  background-color: var(--primary_color);
+  background: var(--primary_color);
+  border-color: var(--primary_color);
 }
 
 /deep/ .el-radio__input.is-checked + .el-radio__label {
-  color: #783887;
+  color: var(--primary_color);
 }
 
 /deep/ .el-input__inner {
@@ -284,7 +288,7 @@ export default {
 }
 
 /deep/ .el-input__inner:focus {
-  border: 1px solid #783887 !important;
+  border: 1px solid var(--primary_color) !important;
 }
 
 .divider {

From b5709cc9980b6dcc9e911f5621ef913f083d9a74 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Mar 2021 16:20:51 +0800
Subject: [PATCH 02/95] =?UTF-8?q?feat:=20=E8=84=91=E5=9B=BE=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/controller/TestCaseController.java  |  14 ++
 .../testcase/TestCaseMinderEditRequest.java   |  14 ++
 .../track/service/TestCaseService.java        |  20 +++
 .../common/components/MsModuleMinder.vue      |  50 ++++--
 .../components/track/case/TestCase.vue        |  19 ++-
 .../track/case/components/TestCaseEdit.vue    |   4 -
 .../case/components/minder/TestCaseMinder.vue | 148 ++++++++++++++++--
 7 files changed, 226 insertions(+), 43 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/track/request/testcase/TestCaseMinderEditRequest.java

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 51f40d68a6..304733c69e 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -18,6 +18,7 @@ import io.metersphere.track.dto.TestPlanCaseDTO;
 import io.metersphere.track.request.testcase.EditTestCaseRequest;
 import io.metersphere.track.request.testcase.QueryTestCaseRequest;
 import io.metersphere.track.request.testcase.TestCaseBatchRequest;
+import io.metersphere.track.request.testcase.TestCaseMinderEditRequest;
 import io.metersphere.track.request.testplan.FileOperationRequest;
 import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
 import io.metersphere.track.service.TestCaseService;
@@ -59,6 +60,12 @@ public class TestCaseController {
         return testCaseService.listTestCase(request);
     }
 
+    @GetMapping("/list/detail/{projectId}")
+    public List<TestCaseWithBLOBs> listDetail(@PathVariable String projectId) {
+        checkPermissionService.checkProjectOwner(projectId);
+        return testCaseService.listTestCaseDetail(projectId);
+    }
+
    /*jenkins项目下所有接口和性能测试用例*/
     @GetMapping("/list/method/{projectId}")
     public List<TestCaseDTO> listByMethod(@PathVariable String projectId) {
@@ -195,4 +202,11 @@ public class TestCaseController {
         return testCaseService.addTestCase(testCaseWithBLOBs);
     }
 
+    @PostMapping("/minder/edit")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void minderEdit(@RequestBody TestCaseMinderEditRequest request) {
+        testCaseService.minderEdit(request);
+    }
+
+
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseMinderEditRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseMinderEditRequest.java
new file mode 100644
index 0000000000..d3b43a66ae
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseMinderEditRequest.java
@@ -0,0 +1,14 @@
+package io.metersphere.track.request.testcase;
+
+import io.metersphere.base.domain.TestCaseWithBLOBs;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class TestCaseMinderEditRequest {
+    private String projectId;
+    List<TestCaseWithBLOBs> data;
+}
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 4ae0ae598a..ba87ffbfb4 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -32,6 +32,7 @@ import io.metersphere.track.dto.TestCaseDTO;
 import io.metersphere.track.request.testcase.EditTestCaseRequest;
 import io.metersphere.track.request.testcase.QueryTestCaseRequest;
 import io.metersphere.track.request.testcase.TestCaseBatchRequest;
+import io.metersphere.track.request.testcase.TestCaseMinderEditRequest;
 import io.metersphere.xmind.XmindCaseParser;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -705,4 +706,23 @@ public class TestCaseService {
         return extTestCaseMapper.list(request);
     }
 
+    public List<TestCaseWithBLOBs> listTestCaseDetail(String projectId) {
+        TestCaseExample testCaseExample = new TestCaseExample();
+        testCaseExample.createCriteria().andProjectIdEqualTo(projectId);
+        return testCaseMapper.selectByExampleWithBLOBs(testCaseExample);
+    }
+
+    public void minderEdit(TestCaseMinderEditRequest request) {
+        List<TestCaseWithBLOBs> data = request.getData();
+        data.forEach(item -> {
+            item.setProjectId(request.getProjectId());
+            if (StringUtils.isBlank(item.getId()) || item.getId().length() < 20) {
+                item.setId(UUID.randomUUID().toString());
+                item.setMaintainer(SessionUtils.getUserId());
+                addTestCase(item);
+            } else {
+                editTestCase(item);
+            }
+        });
+    }
 }
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index fc3526d8ae..6b5975f838 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="minder">
-    <minder-editor v-if="isActive"
+    <minder-editor
+      v-if="isActive"
       class="minder-container"
       :import-json="importJson"
+      :height="700"
       @save="save"
     />
   </div>
@@ -20,10 +22,10 @@ export default {
         return []
       }
     },
-    data: {
-      type: Array,
+    dataMap: {
+      type: Map,
       default() {
-        return []
+        return new Map();
       }
     }
   },
@@ -52,7 +54,9 @@ export default {
         root: {
           data: {
             text: "全部用例",
-            disable: true
+            disable: true,
+            id: "root",
+            path: ""
           },
           children: []
         },
@@ -62,33 +66,46 @@ export default {
     }
   },
   mounted() {
-    this.$nextTick(() => {
-      this.parse(this.importJson.root, this.treeNodes);
-      this.reload();
-    })
+  },
+  watch: {
+    dataMap() {
+      this.$nextTick(() => {
+        this.parse(this.importJson.root, this.treeNodes);
+        this.reload();
+      })
+    }
   },
   methods: {
     save(data) {
-      console.log(data);
-      // console.log(this.treeNodes);
+      this.$emit('save', data)
     },
     parse(root, children) {
+      root.children = [];
+      // 添加数据节点
+      let dataNodes = this.dataMap.get(root.data.id);
+      if (dataNodes) {
+        dataNodes.forEach((dataNode) => {
+          root.children.push(dataNode);
+        })
+      }
+
       if (children == null || children.length < 1) {
         return;
       }
-      root.children = [];
+
       children.forEach((item) => {
         let node = {
           data: {
             text: item.name,
             id: item.id,
             disable: true,
-            // resource: ['#']
+            path: root.data.path + "/" + item.name,
+            expandState:"collapse"
           },
         }
         root.children.push(node);
         this.parse(node, item.children);
-      })
+      });
     },
     reload() {
       this.isActive = false;
@@ -101,4 +118,9 @@ export default {
 </script>
 
 <style scoped>
+.minder-container >>> .save-btn {
+  right: 30px;
+  bottom: auto;
+  top: 30px;
+}
 </style>
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 97ac158146..890abb27f3 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -39,8 +39,9 @@
             @setCondition="setCondition"
             ref="testCaseList">
           </test-case-list>
-          <testcase-minder
+          <test-case-minder
             :tree-nodes="treeNodes"
+            :project-id="projectId"
             v-if="activeDom === 'right'"
             ref="testCaseList"/>
           </ms-tab-button>
@@ -97,17 +98,17 @@ import SelectMenu from "../common/SelectMenu";
 import MsContainer from "../../common/components/MsContainer";
 import MsAsideContainer from "../../common/components/MsAsideContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
-import {checkoutTestManagerOrTestUser, getCurrentProjectID, getUUID, hasRoles} from "../../../../common/js/utils";
+import {checkoutTestManagerOrTestUser, getCurrentProjectID, getUUID} from "../../../../common/js/utils";
 import TestCaseNodeTree from "../common/TestCaseNodeTree";
-import {TrackEvent,LIST_CHANGE} from "@/business/components/common/head/ListEvent";
-import TestcaseMinder from "@/business/components/common/components/MsModuleMinder";
+
 import MsTabButton from "@/business/components/common/components/MsTabButton";
+import TestCaseMinder from "@/business/components/track/case/components/minder/TestCaseMinder";
 
 export default {
   name: "TestCase",
   components: {
+    TestCaseMinder,
     MsTabButton,
-    TestcaseMinder,
     TestCaseNodeTree,
     MsMainContainer,
     MsAsideContainer, MsContainer, TestCaseList, NodeTree, TestCaseEdit, SelectMenu
@@ -129,11 +130,13 @@ export default {
       renderComponent:true,
       loading: false,
       type:'',
-      activeDom: 'left'
+      activeDom: 'left',
+      projectId: ""
     }
   },
   mounted() {
     this.init(this.$route);
+    this.projectId = getCurrentProjectID();
   },
   watch: {
     redirectID() {
@@ -193,7 +196,7 @@ export default {
       }
     },
     addTab(tab) {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
@@ -253,7 +256,7 @@ export default {
           this.testCaseReadOnly = true;
         }
         let caseId = this.$route.params.caseId;
-        if (!getCurrentProjectID()) {
+        if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));
           return;
         }
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index f9a18890b6..c1800b8268 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -472,7 +472,6 @@ export default {
     reload() {
       this.isStepTableAlive = false;
       this.$nextTick(() => (this.isStepTableAlive = true));
-      console.log(this.form)
     },
     open(testCase) {
       this.projectId = getCurrentProjectID();
@@ -552,9 +551,7 @@ export default {
       let tmp = {};
       Object.assign(tmp, testCase);
       tmp.steps = JSON.parse(testCase.steps);
-      console.log(tmp)
       Object.assign(this.form, tmp);
-      console.log(this.form)
       this.form.module = testCase.nodeId;
       this.getFileMetaData(testCase);
     },
@@ -631,7 +628,6 @@ export default {
           let param = this.buildParam();
           if (this.validate(param)) {
             let option = this.getOption(param);
-            console.log(option)
             this.result = this.$request(option, () => {
               this.$success(this.$t('commons.save_success'));
               if (this.operationType == 'add' && this.isCreateContinue) {
diff --git a/frontend/src/business/components/track/case/components/minder/TestCaseMinder.vue b/frontend/src/business/components/track/case/components/minder/TestCaseMinder.vue
index 6f275d8b30..70950fd491 100644
--- a/frontend/src/business/components/track/case/components/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/case/components/minder/TestCaseMinder.vue
@@ -1,6 +1,10 @@
 <template>
   <ms-module-minder
-    :tree-nodes="treeNodes"/>
+    v-loading="result.loading"
+    :tree-nodes="treeNodes"
+    :data-map="dataMap"
+    @save="save"
+  />
 </template>
 
 <script>
@@ -11,7 +15,8 @@ name: "TestCaseMinder",
   data() {
     return{
       testCase: [],
-      dataMap: new Map()
+      dataMap: new Map(),
+      result: {}
     }
   },
   props: {
@@ -25,38 +30,147 @@ name: "TestCaseMinder",
     projectId: String
   },
   mounted() {
-    // this.getTestCases();
+    this.$nextTick(() => {
+      this.getTestCases();
+    })
   },
   methods: {
     getTestCases() {
       if (this.projectId) {
         this.result = this.$get('/test/case/list/detail/' + this.projectId,response => {
           this.testCase = response.data;
-          console.log(this.testCase)
           this.parse();
         });
       }
     },
-    parse() {
-      this.testCase.forEach(item => {
-        let mapItem = this.dataMap.get(item.moduleId);
-        let nodeItem = {
-          id: item.id,
-          name: item.name,
-
+    save(data) {
+      let saveCases = [];
+      this.buildSaveCase(data.root, saveCases, undefined);
+      console.log(saveCases);
+      let param = {
+        projectId: this.projectId,
+        data: saveCases
+      }
+      this.result = this.$post('/test/case/minder/edit', param, () => {
+        this.$success(this.$t('commons.save_success'));
+      });
+    },
+    buildSaveCase(root, saveCases, parent) {
+      let data = root.data;
+      if (data.resource && data.resource.indexOf("用例") > -1) {
+        this._buildSaveCase(root, saveCases, parent);
+      } else {
+        if (root.children) {
+          root.children.forEach((childNode) => {
+            this.buildSaveCase(childNode, saveCases, root.data);
+          })
         }
+      }
+    },
+    _buildSaveCase(node, saveCases, parent) {
+      let data = node.data;
+      let isChange = false;
+      let testCase = {
+        id: data.id,
+        name: data.text,
+        nodeId: parent ? parent.id : "",
+        nodePath: parent ? parent.path : "",
+        type: data.type ? data.type : 'functional',
+        method: data.method ? data.method: 'manual',
+        maintainer: data.maintainer,
+        priority: 'P' + data.priority,
+      };
+      if (data.changed) isChange = true;
+      let steps = [];
+      let stepNum = 1;
+      if (node.children) {
+        node.children.forEach((childNode) => {
+          let childData = childNode.data;
+          if (childData.resource && childData.resource.indexOf('前置条件') > -1) {
+            testCase.prerequisite = childData.text;
+          } else if (childData.resource && childData.resource.indexOf('备注') > -1) {
+            testCase.remark = childData.text;
+          } else {
+            // 测试步骤
+            let step = {};
+            step.num = stepNum++;
+            step.desc = childData.text;
+            if (childNode.children) {
+              let result = "";
+              childNode.children.forEach((child) => {
+                result += child.data.text;
+                if (child.data.changed) isChange = true;
+              })
+              step.result = result;
+            }
+            steps.push(step);
+          }
+          if (childData.changed) isChange = true;
+        })
+      }
+      testCase.steps = JSON.stringify(steps);
+      if (isChange) {
+        saveCases.push(testCase);
+      }
+    },
+    parse() {
+      let dataMap = new Map();
+      this.testCase.forEach(item => {
+        item.steps = JSON.parse(item.steps);
+        // if (item.tags && item.tags.length > 0) {
+        //   item.tags = JSON.parse(item.tags);
+        // }
+        let mapItem = dataMap.get(item.nodeId);
+        let nodeItem = {
+          data: {
+            id: item.id,
+            text: item.name,
+            priority: Number.parseInt(item.priority.substring(item.priority.length - 1 )),
+            resource: ["用例"],
+            type: item.type,
+            method: item.method,
+            maintainer: item.maintainer
+          }
+        }
+        this.parseChildren(nodeItem, item);
         if (mapItem) {
-          mapItem.push(item);
+          mapItem.push(nodeItem);
         } else {
           mapItem = [];
-          mapItem.push(item);
-        }
-        if (item.tags && item.tags.length > 0) {
-          item.tags = JSON.parse(item.tags);
+          mapItem.push(nodeItem);
+          dataMap.set(item.nodeId, mapItem);
         }
       })
+      this.dataMap = dataMap;
+    },
+    parseChildren(nodeItem, item) {
+      nodeItem.children = [];
+      let children = [];
+      this._parseChildren(children, item.prerequisite, "前置条件");
+      item.steps.forEach((step) => {
+        let descNode = this._parseChildren(children, step.desc, "测试步骤");
+        if (descNode) {
+          descNode.data.num = step.num;
+          descNode.children = [];
+          this._parseChildren(descNode.children, step.result, "预期结果");
+        }
+      });
+      this._parseChildren(children, item.remark, "备注");
+      nodeItem.children = children;
+    },
+    _parseChildren(children, k, v) {
+      if (k) {
+        let node = {
+          data: {
+            text: k,
+            resource: [v]
+          }
+        }
+        children.push(node);
+        return node;
+      }
     }
-  },
+  }
 }
 </script>
 

From c426bb2064d85b475ef1ec06c1916ee7bc8c8afa Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 15 Mar 2021 16:55:33 +0800
Subject: [PATCH 03/95] =?UTF-8?q?feat(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?):=20=E9=85=8D=E7=BD=AE=E5=8E=8B=E6=B5=8B=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/reader/jmx/JmeterDocumentParser.java  | 44 +++++++++++++++++--
 .../components/PerformancePressureConfig.vue  | 35 +++++++++++----
 .../components/PerformanceAdvancedConfig.vue  |  2 +-
 .../components/PerformancePressureConfig.vue  | 41 ++++++++++++-----
 .../performance/test/model/ThreadGroup.js     |  1 +
 frontend/src/i18n/en-US.js                    |  2 +-
 frontend/src/i18n/zh-CN.js                    |  6 +--
 frontend/src/i18n/zh-TW.js                    |  2 +-
 8 files changed, 105 insertions(+), 28 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
index 13ffc9a34e..09fbda18a5 100644
--- a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
@@ -676,6 +676,13 @@ public class JmeterDocumentParser implements DocumentParser {
             ((List<?>) durations).remove(0);
             duration = o.toString();
         }
+        Object units = context.getProperty("unit");
+        String unit = "S";
+        if (units instanceof List) {
+            Object o = ((List<?>) units).get(0);
+            ((List<?>) units).remove(0);
+            unit = o.toString();
+        }
         Object deleteds = context.getProperty("deleted");
         String deleted = "false";
         if (deleteds instanceof List) {
@@ -691,6 +698,17 @@ public class JmeterDocumentParser implements DocumentParser {
             enabled = o.toString();
         }
 
+        switch (unit) {
+            case "M":
+                duration = String.valueOf(Long.parseLong(duration) * 60);
+                break;
+            case "H":
+                duration = String.valueOf(Long.parseLong(duration) * 60 * 60);
+                break;
+            default:
+                break;
+        }
+
         threadGroup.setAttribute("enabled", enabled);
         if (BooleanUtils.toBoolean(deleted)) {
             threadGroup.setAttribute("enabled", "false");
@@ -761,6 +779,13 @@ public class JmeterDocumentParser implements DocumentParser {
             ((List<?>) holds).remove(0);
             hold = o.toString();
         }
+        Object units = context.getProperty("unit");
+        String unit = "S";
+        if (units instanceof List) {
+            Object o = ((List<?>) units).get(0);
+            ((List<?>) units).remove(0);
+            unit = o.toString();
+        }
         Object deleteds = context.getProperty("deleted");
         String deleted = "false";
         if (deleteds instanceof List) {
@@ -776,6 +801,17 @@ public class JmeterDocumentParser implements DocumentParser {
             enabled = o.toString();
         }
 
+        switch (unit) {
+            case "M":
+                hold = String.valueOf(Long.parseLong(hold) * 60);
+                break;
+            case "H":
+                hold = String.valueOf(Long.parseLong(hold) * 60 * 60);
+                break;
+            default:
+                break;
+        }
+
         threadGroup.setAttribute("enabled", enabled);
         if (BooleanUtils.toBoolean(deleted)) {
             threadGroup.setAttribute("enabled", "false");
@@ -928,10 +964,10 @@ public class JmeterDocumentParser implements DocumentParser {
     }
 
     private Element createStringProp(Document document, String name, String value) {
-        Element unit = document.createElement(STRING_PROP);
-        unit.setAttribute("name", name);
-        unit.appendChild(document.createTextNode(value));
-        return unit;
+        Element element = document.createElement(STRING_PROP);
+        element.setAttribute("name", name);
+        element.appendChild(document.createTextNode(value));
+        return element;
     }
 
     private void processThreadGroupName(Element threadGroup) {
diff --git a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
index 2157353b8d..633b28f122 100644
--- a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
@@ -37,6 +37,13 @@
                     @change="calculateChart(threadGroup)"
                     size="mini"/>
                 </el-form-item>
+                <el-form-item>
+                  <el-radio-group v-model="threadGroup.unit" :disabled="true">
+                    <el-radio label="S">{{ $t('schedule.cron.seconds') }}</el-radio>
+                    <el-radio label="M">{{ $t('schedule.cron.minutes') }}</el-radio>
+                    <el-radio label="H">{{ $t('schedule.cron.hours') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit')">
                   <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
@@ -59,7 +66,7 @@
                       @change="calculateChart(threadGroup)"
                       size="mini"/>
                   </el-form-item>
-                  <el-form-item :label="$t('load_test.ramp_up_time_minutes')">
+                  <el-form-item :label="$t('load_test.ramp_up_time_minutes', [getUnitLabel(threadGroup)])">
                     <el-input-number
                       :disabled="true"
                       :min="1"
@@ -79,7 +86,7 @@
                       v-model="threadGroup.rampUpTime"
                       size="mini"/>
                   </el-form-item>
-                  <el-form-item :label="$t('load_test.ramp_up_time_seconds')"/>
+                  <el-form-item :label="$t('load_test.ramp_up_time_seconds', [getUnitLabel(threadGroup)])"/>
                 </div>
 
               </div>
@@ -112,7 +119,7 @@
                     @change="calculateChart(threadGroup)"
                     size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('load_test.ramp_up_time_seconds')"/>
+                <el-form-item :label="$t('load_test.ramp_up_time_seconds', [getUnitLabel(threadGroup)])"/>
               </div>
             </el-form>
           </el-col>
@@ -137,6 +144,7 @@ const TARGET_LEVEL = "TargetLevel";
 const RAMP_UP = "RampUp";
 const STEPS = "Steps";
 const DURATION = "duration";
+const UNIT = "unit";
 const RPS_LIMIT = "rpsLimit";
 const RPS_LIMIT_ENABLE = "rpsLimitEnable";
 const THREAD_TYPE = "threadType";
@@ -196,11 +204,10 @@ export default {
               this.threadGroups[i].iterateRampUp = item.value;
               break;
             case DURATION:
-              if (item.unit) {
-                this.threadGroups[i].duration = item.value;
-              } else {
-                this.threadGroups[i].duration = item.value * 60;
-              }
+              this.threadGroups[i].duration = item.value;
+              break;
+            case UNIT:
+              this.threadGroups[i].unit = item.value;
               break;
             case STEPS:
               this.threadGroups[i].step = item.value;
@@ -506,6 +513,18 @@ export default {
       }
       this.calculateTotalChart();
     },
+    getUnitLabel(tg) {
+      if (tg.unit === 'S') {
+        return this.$t('schedule.cron.seconds');
+      }
+      if (tg.unit === 'M') {
+        return this.$t('schedule.cron.minutes');
+      }
+      if (tg.unit === 'H') {
+        return this.$t('schedule.cron.hours');
+      }
+      return this.$t('schedule.cron.seconds');
+    },
   },
   watch: {
     report: {
diff --git a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
index 5a835228bd..fcacb7434e 100644
--- a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
@@ -130,7 +130,7 @@
                 <el-table :data="granularityData">
                   <el-table-column property="start" :label="$t('load_test.duration')">
                     <template v-slot:default="scope">
-                      <span>{{ scope.row.start }} - {{ scope.row.end }}</span>
+                      <span>{{ scope.row.start }}S - {{ scope.row.end }}S</span>
                     </template>
                   </el-table-column>
                   <el-table-column property="granularity" :label="$t('load_test.granularity')"/>
diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index c800972a24..29df9f4e18 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -47,10 +47,17 @@
                     :disabled="isReadOnly"
                     v-model="threadGroup.duration"
                     :min="1"
-                    :max="172800"
+                    :max="99999"
                     @change="calculateChart(threadGroup)"
                     size="mini"/>
                 </el-form-item>
+                <el-form-item>
+                  <el-radio-group v-model="threadGroup.unit">
+                    <el-radio label="S">{{ $t('schedule.cron.seconds') }}</el-radio>
+                    <el-radio label="M">{{ $t('schedule.cron.minutes') }}</el-radio>
+                    <el-radio label="H">{{ $t('schedule.cron.hours') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit')">
                   <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
@@ -74,7 +81,7 @@
                       @change="calculateChart(threadGroup)"
                       size="mini"/>
                   </el-form-item>
-                  <el-form-item :label="$t('load_test.ramp_up_time_minutes')">
+                  <el-form-item :label="$t('load_test.ramp_up_time_minutes', [getUnitLabel(threadGroup)])">
                     <el-input-number
                       :disabled="isReadOnly"
                       :min="1"
@@ -95,7 +102,7 @@
                       @change="calculateChart(threadGroup)"
                       size="mini"/>
                   </el-form-item>
-                  <el-form-item :label="$t('load_test.ramp_up_time_seconds')"/>
+                  <el-form-item :label="$t('load_test.ramp_up_time_seconds', [getUnitLabel(threadGroup)])"/>
                 </div>
 
               </div>
@@ -128,7 +135,7 @@
                     v-model="threadGroup.iterateRampUp"
                     size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('load_test.ramp_up_time_seconds')"/>
+                <el-form-item :label="$t('load_test.ramp_up_time_seconds', [getUnitLabel(threadGroup)])"/>
               </div>
             </el-form>
           </el-col>
@@ -154,6 +161,7 @@ const RAMP_UP = "RampUp";
 const ITERATE_RAMP_UP = "iterateRampUpTime";
 const STEPS = "Steps";
 const DURATION = "duration";
+const UNIT = "unit";
 const RPS_LIMIT = "rpsLimit";
 const RPS_LIMIT_ENABLE = "rpsLimitEnable";
 const HOLD = "Hold";
@@ -253,11 +261,10 @@ export default {
                   this.threadGroups[i].iterateRampUp = item.value;
                   break;
                 case DURATION:
-                  if (item.unit) {
-                    this.threadGroups[i].duration = item.value;
-                  } else {
-                    this.threadGroups[i].duration = item.value * 60;
-                  }
+                  this.threadGroups[i].duration = item.value;
+                  break;
+                case UNIT:
+                  this.threadGroups[i].unit = item.value;
                   break;
                 case STEPS:
                   this.threadGroups[i].step = item.value;
@@ -290,6 +297,7 @@ export default {
                   break;
               }
               //
+              this.$set(this.threadGroups[i], "unit", this.threadGroups[i].unit || 'S');
               this.$set(this.threadGroups[i], "threadType", this.threadGroups[i].threadType || 'DURATION');
               this.$set(this.threadGroups[i], "iterateNum", this.threadGroups[i].iterateNum || 1);
               this.$set(this.threadGroups[i], "iterateRampUp", this.threadGroups[i].iterateRampUp || 10);
@@ -576,6 +584,18 @@ export default {
 
       return true;
     },
+    getUnitLabel(tg) {
+      if (tg.unit === 'S') {
+        return this.$t('schedule.cron.seconds');
+      }
+      if (tg.unit === 'M') {
+        return this.$t('schedule.cron.minutes');
+      }
+      if (tg.unit === 'H') {
+        return this.$t('schedule.cron.hours');
+      }
+      return this.$t('schedule.cron.seconds');
+    },
     convertProperty() {
       /// todo：下面4个属性是jmeter ConcurrencyThreadGroup plugin的属性，这种硬编码不太好吧，在哪能转换这种属性？
       let result = [];
@@ -585,7 +605,8 @@ export default {
           {key: TARGET_LEVEL, value: this.threadGroups[i].threadNumber},
           {key: RAMP_UP, value: this.threadGroups[i].rampUpTime},
           {key: STEPS, value: this.threadGroups[i].step},
-          {key: DURATION, value: this.threadGroups[i].duration, unit: 'S'},
+          {key: DURATION, value: this.threadGroups[i].duration, unit: this.threadGroups[i].unit},
+          {key: UNIT, value: this.threadGroups[i].unit},
           {key: RPS_LIMIT, value: this.threadGroups[i].rpsLimit},
           {key: RPS_LIMIT_ENABLE, value: this.threadGroups[i].rpsLimitEnable},
           {key: HOLD, value: this.threadGroups[i].duration - this.threadGroups[i].rampUpTime},
diff --git a/frontend/src/business/components/performance/test/model/ThreadGroup.js b/frontend/src/business/components/performance/test/model/ThreadGroup.js
index b4656c8af5..2d44f13c5a 100644
--- a/frontend/src/business/components/performance/test/model/ThreadGroup.js
+++ b/frontend/src/business/components/performance/test/model/ThreadGroup.js
@@ -31,6 +31,7 @@ export function findThreadGroup(jmxContent, handler) {
     tg.enabled = tg.attributes.enabled;
     tg.tgType = tg.name;
     tg.threadType = 'DURATION';
+    tg.unit = 'S';
   })
   return threadGroups;
 }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 91e69c74ce..2e69834217 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -481,7 +481,7 @@ export default {
     delete_file: "The file already exists, please delete the file with the same name first!",
     thread_num: 'Concurrent users:',
     input_thread_num: 'Please enter the number of threads',
-    duration: 'Duration time (seconds)',
+    duration: 'Duration time',
     granularity: 'Aggregation time (seconds)',
     input_duration: 'Please enter a duration',
     rps_limit: 'RPS Limit:',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index db08f19989..232b611f71 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -478,14 +478,14 @@ export default {
     delete_file: "文件已存在，请先删除同名文件！",
     thread_num: '并发用户数：',
     input_thread_num: '请输入线程数',
-    duration: '压测时长（秒）',
+    duration: '压测时长',
     granularity: '聚合时间（秒）',
     input_duration: '请输入时长',
     rps_limit: 'RPS上限：',
     input_rps_limit: '请输入限制',
     ramp_up_time_within: '在',
-    ramp_up_time_minutes: '秒内，分',
-    ramp_up_time_seconds: '秒内增加并发用户',
+    ramp_up_time_minutes: '{0}内，分',
+    ramp_up_time_seconds: '{0}内增加并发用户',
     iterate_num: '迭代次数 (次): ',
     by_iteration: '按迭代次数',
     by_duration: '按持续时间',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index ccbc5805d6..17cd3fb05e 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -478,7 +478,7 @@ export default {
     delete_file: "文件已存在，請先刪除同名文件！",
     thread_num: '並發用戶數：',
     input_thread_num: '請輸入線程數',
-    duration: '壓測時長（秒）',
+    duration: '壓測時長',
     granularity: '聚合時間（秒）',
     input_duration: '請輸入時長',
     rps_limit: 'RPS上限：',

From 45c98ebf5d68adab5c0e0a908b100924777e8335 Mon Sep 17 00:00:00 2001
From: Tester_Z <54057702+EasilyTest@users.noreply.github.com>
Date: Mon, 15 Mar 2021 17:18:53 +0800
Subject: [PATCH 04/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95csrf=20token=E4=B8=8D=E4=B8=BA=E7=A9=BA=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

---
 .../src/main/java/io/metersphere/commons/utils/ShiroUtils.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
index 61f73dd9ad..79ad0b6f70 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
@@ -48,6 +48,7 @@ public class ShiroUtils {
 
     public static void ignoreCsrfFilter(Map<String, String> filterChainDefinitionMap) {
         filterChainDefinitionMap.put("/", "apikey, authc"); // 跳转到 / 不用校验 csrf
+        filterChainDefinitionMap.put("/language", "apikey, authc");// 跳转到 /language 不用校验 csrf
         filterChainDefinitionMap.put("/document", "apikey, authc"); // 跳转到 /document 不用校验 csrf
     }
 

From 19d284a399b4754481d37677a1b8f2b3b2e0df68 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 15 Mar 2021 17:24:14 +0800
Subject: [PATCH 05/95] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E9=A6=96=E9=A1=B5=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.java    |  5 ++
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 49 +++++++++++++++-
 .../track/controller/TrackController.java     |  4 +-
 .../track/response/TestPlanBugCount.java      |  2 +-
 .../track/response/TrackStatisticsDTO.java    |  6 +-
 .../track/service/TrackService.java           | 58 +++++++++----------
 .../track/home/components/BugCountCard.vue    | 18 ++++--
 7 files changed, 101 insertions(+), 41 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 5ed9e3a7fa..17ae2078b3 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
@@ -71,5 +71,10 @@ public interface ExtTestCaseMapper {
 
     List<TrackCountResult> countRelevanceMaintainer(@Param("projectId") String projectId);
 
+    int getTestPlanBug(@Param("planId") String planId);
+    int getTestPlanCase(@Param("planId") String planId);
+    int getTestPlanPassCase(@Param("planId") String planId);
+
+
 
 }
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 17d5c37a6e..72d3a06e38 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
@@ -342,8 +342,9 @@
     </select>
 
     <select id="countCoverage" resultType="io.metersphere.track.response.TrackCountResult">
-        SELECT count(test_case.id) AS countNumber, if(test_case.test_id is null,"uncoverage","coverage") AS groupField
-        FROM test_case WHERE test_case.project_id=#{projectId} GROUP BY groupField
+        SELECT count(test_case.id) AS countNumber,
+               if(test_case.test_id is null,"uncoverage","coverage") AS groupField
+        FROM test_case WHERE test_case.project_id=#{projectId} and test_case.type != 'functional' GROUP BY groupField
     </select>
     <select id="countFuncMaintainer" resultType="io.metersphere.track.response.TrackCountResult">
         select count(tc.id) as countNumber, user.name as groupField from test_case tc right join user on tc.maintainer = user.id
@@ -355,6 +356,50 @@
         where tc.project_id = #{projectId} and tc.test_id is not null
         group by tc.maintainer
     </select>
+    <select id="getTestPlanBug" resultType="int">
+        select count(tci.issues_id) from test_plan_test_case tptc join test_case_issues tci on tptc.case_id = tci.test_case_id
+        where tptc.plan_id = #{planId};
+    </select>
+    <select id="getTestPlanCase" resultType="int">
+        select count(s)
+        from (
+                 select id as s
+                 from test_plan_test_case tptc
+                 where tptc.plan_id = #{planId}
+                 union all
+                 select id as s
+                 from test_plan_api_scenario tpas
+                 where tpas.test_plan_id = #{planId}
+                 union all
+                 select id as s
+                 from test_plan_api_case tpac
+                 where tpac.test_plan_id = #{planId}
+                 union all
+                 select id as s
+                 from test_plan_load_case tplc
+                 where tplc.test_plan_id = #{planId}
+             ) as temp
+    </select>
+    <select id="getTestPlanPassCase" resultType="int">
+        select count(s)
+        from (
+                 select id as s
+                 from test_plan_test_case tptc
+                 where tptc.plan_id = #{planId} and tptc.status = 'Pass'
+                 union all
+                 select id as s
+                 from test_plan_api_scenario tpas
+                 where tpas.test_plan_id = #{planId} and tpas.last_result = 'Success'
+                 union all
+                 select id as s
+                 from test_plan_api_case tpac
+                 where tpac.test_plan_id = #{planId} and tpac.status = 'success'
+                 union all
+                 select id as s
+                 from test_plan_load_case tplc
+                 where tplc.test_plan_id = #{planId} and tplc.status = 'success'
+             ) as temp
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/track/controller/TrackController.java b/backend/src/main/java/io/metersphere/track/controller/TrackController.java
index 2b0d66bfb0..c010d94bc2 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TrackController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TrackController.java
@@ -87,7 +87,7 @@ public class TrackController {
     }
 
     @GetMapping("/bug/count/{projectId}")
-    public BugStatustics getBugStatustics(@PathVariable String projectId) {
-        return trackService.getBugStatustics(projectId);
+    public BugStatustics getBugStatistics(@PathVariable String projectId) {
+        return trackService.getBugStatistics(projectId);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/track/response/TestPlanBugCount.java b/backend/src/main/java/io/metersphere/track/response/TestPlanBugCount.java
index 4c8a75b272..6802673d16 100644
--- a/backend/src/main/java/io/metersphere/track/response/TestPlanBugCount.java
+++ b/backend/src/main/java/io/metersphere/track/response/TestPlanBugCount.java
@@ -8,7 +8,7 @@ import lombok.Setter;
 public class TestPlanBugCount {
     private int index;
     private String planName;
-    private long creatTime;
+    private long createTime;
     private String status;
     private int caseSize;
     private int bugSize;
diff --git a/backend/src/main/java/io/metersphere/track/response/TrackStatisticsDTO.java b/backend/src/main/java/io/metersphere/track/response/TrackStatisticsDTO.java
index cb3aeffc88..264e0cf9cb 100644
--- a/backend/src/main/java/io/metersphere/track/response/TrackStatisticsDTO.java
+++ b/backend/src/main/java/io/metersphere/track/response/TrackStatisticsDTO.java
@@ -144,20 +144,22 @@ public class TrackStatisticsDTO {
 
     public void countRelevance(List<TrackCountResult> relevanceResults) {
         for (TrackCountResult countResult : relevanceResults) {
-            switch (countResult.getGroupField().toUpperCase()){
+            switch (countResult.getGroupField()){
                 case TrackCount.API:
                     this.apiCaseCount += countResult.getCountNumber();
+                    this.allRelevanceCaseCount += countResult.getCountNumber();
                     break;
                 case TrackCount.PERFORMANCE:
                     this.performanceCaseCount += countResult.getCountNumber();
+                    this.allRelevanceCaseCount += countResult.getCountNumber();
                     break;
                 case TrackCount.AUTOMATION:
                     this.scenarioCaseCount += countResult.getCountNumber();
+                    this.allRelevanceCaseCount += countResult.getCountNumber();
                     break;
                 default:
                     break;
             }
-            this.allRelevanceCaseCount += countResult.getCountNumber();
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TrackService.java b/backend/src/main/java/io/metersphere/track/service/TrackService.java
index b2a01371bd..3bcdf1cf79 100644
--- a/backend/src/main/java/io/metersphere/track/service/TrackService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TrackService.java
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -110,59 +111,58 @@ public class TrackService {
         return charts;
     }
 
-    public BugStatustics getBugStatustics(String projectId) {
+    public BugStatustics getBugStatistics(String projectId) {
         TestPlanExample example = new TestPlanExample();
         example.createCriteria().andProjectIdEqualTo(projectId);
         List<TestPlan> plans = testPlanMapper.selectByExample(example);
         List<TestPlanBugCount> list = new ArrayList<>();
         BugStatustics bugStatustics = new BugStatustics();
         int index = 1;
+        int totalBugSize = 0;
+        int totalCaseSize = 0;
         for (TestPlan plan : plans) {
             TestPlanBugCount testPlanBug = new TestPlanBugCount();
             testPlanBug.setIndex(index++);
             testPlanBug.setPlanName(plan.getName());
-            testPlanBug.setCreatTime(plan.getCreateTime());
+            testPlanBug.setCreateTime(plan.getCreateTime());
             testPlanBug.setStatus(plan.getStatus());
-            testPlanBug.setCaseSize(getPlanCaseSize(plan.getId()));
-            testPlanBug.setBugSize(getPlanBugSize(plan.getId()));
-            testPlanBug.setPassRage(getPlanPassRage(plan.getId()));
+
+            int planCaseSize = getPlanCaseSize(plan.getId());
+            testPlanBug.setCaseSize(planCaseSize);
+
+            int planBugSize = getPlanBugSize(plan.getId());
+            testPlanBug.setBugSize(planBugSize);
+            testPlanBug.setPassRage(getPlanPassRage(plan.getId(), planCaseSize));
             list.add(testPlanBug);
+
+            totalBugSize += planBugSize;
+            totalCaseSize += planCaseSize;
         }
 
-        // todo
         bugStatustics.setList(list);
-        bugStatustics.setRage("1");
-        bugStatustics.setBugTotalSize(2);
+        float rage =totalCaseSize == 0 ? 0 : (float) totalBugSize * 100 / totalCaseSize;
+        DecimalFormat df = new DecimalFormat("0.0");
+        bugStatustics.setRage(df.format(rage) + "%");
+        bugStatustics.setBugTotalSize(totalBugSize);
         return bugStatustics;
     }
 
     private int getPlanCaseSize(String planId) {
-        TestPlanTestCaseExample testPlanTestCaseExample = new TestPlanTestCaseExample();
-        testPlanTestCaseExample.createCriteria().andPlanIdEqualTo(planId);
-        List<TestPlanTestCase> testPlanTestCases = testPlanTestCaseMapper.selectByExample(testPlanTestCaseExample);
-
-        TestPlanApiCaseExample testPlanApiCaseExample = new TestPlanApiCaseExample();
-        testPlanApiCaseExample.createCriteria().andTestPlanIdEqualTo(planId);
-        List<TestPlanApiCase> testPlanApiCases = testPlanApiCaseMapper.selectByExample(testPlanApiCaseExample);
-
-        TestPlanLoadCaseExample example = new TestPlanLoadCaseExample();
-        example.createCriteria().andTestPlanIdEqualTo(planId);
-        List<TestPlanLoadCase> testPlanLoadCases = testPlanLoadCaseMapper.selectByExample(example);
-
-        TestPlanApiScenarioExample testPlanApiScenarioExample = new TestPlanApiScenarioExample();
-        testPlanApiCaseExample.createCriteria().andTestPlanIdEqualTo(planId);
-        List<TestPlanApiScenario> testPlanApiScenarios = testPlanApiScenarioMapper.selectByExample(testPlanApiScenarioExample);
-
-
-        return testPlanTestCases.size() + testPlanApiCases.size() + testPlanLoadCases.size() + testPlanApiScenarios.size();
+        return extTestCaseMapper.getTestPlanCase(planId);
 
     }
 
     private int getPlanBugSize(String planId) {
-        return 1;
+        return extTestCaseMapper.getTestPlanBug(planId);
     }
 
-    private String getPlanPassRage(String planId) {
-        return "10%";
+    private String getPlanPassRage(String planId, int totalSize) {
+        if (totalSize == 0) {
+            return "-";
+        }
+        int passSize = extTestCaseMapper.getTestPlanPassCase(planId);
+        float rage = (float) passSize * 100 / totalSize;
+        DecimalFormat df = new DecimalFormat("0.0");
+        return df.format(rage) + "%";
     }
 }
diff --git a/frontend/src/business/components/track/home/components/BugCountCard.vue b/frontend/src/business/components/track/home/components/BugCountCard.vue
index 6f5efb8dd1..d0e09fcbe4 100644
--- a/frontend/src/business/components/track/home/components/BugCountCard.vue
+++ b/frontend/src/business/components/track/home/components/BugCountCard.vue
@@ -15,18 +15,19 @@
             {{ $t('api_test.home_page.unit_of_measurement') }}
           </span>
           <div>
-            占比:
-            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{ rage }}
-            </el-link>
+            占比
+            <span class="rage">
+                {{rage}}
+            </span>
           </div>
         </div>
       </el-aside>
       <el-table border :data="tableData" class="adjust-table table-content" height="300">
         <el-table-column prop="index" label="序号"
-                         width="100" show-overflow-tooltip/>
+                         width="60" show-overflow-tooltip/>
         <el-table-column prop="planName" label="测试计划名称"
                          width="130" show-overflow-tooltip/>
-        <el-table-column prop="createTime" :label="$t('commons.create_time')" width="130">
+        <el-table-column prop="createTime" :label="$t('commons.create_time')" width="180" show-overflow-tooltip>
           <template v-slot:default="scope">
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>
@@ -35,6 +36,7 @@
           prop="status"
           column-key="status"
           :label="$t('test_track.plan.plan_status')"
+          width="100"
           show-overflow-tooltip>
           <template v-slot:default="scope">
           <span @click.stop="clickt = 'stop'">
@@ -106,6 +108,12 @@ export default {
   color: var(--count_number);
 }
 
+.rage {
+  font-family: 'ArialMT', 'Arial', sans-serif;
+  font-size: 18px;
+  color: var(--count_number);
+}
+
 .main-number-show {
   width: 100px;
   height: 100px;

From 1e77dfa1ae3cd481dd07c1cd9d18db4a9912909d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 15 Mar 2021 17:40:37 +0800
Subject: [PATCH 06/95] =?UTF-8?q?feat(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?):=20=E6=8A=A5=E5=91=8A=E5=9B=BE=E8=A1=A8=E9=87=87=E7=94=A8?=
 =?UTF-8?q?=E5=B9=B3=E6=BB=91=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/report/components/TestOverview.vue  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/report/components/TestOverview.vue b/frontend/src/business/components/performance/report/components/TestOverview.vue
index 50574c67d4..f1cd9df364 100644
--- a/frontend/src/business/components/performance/report/components/TestOverview.vue
+++ b/frontend/src/business/components/performance/report/components/TestOverview.vue
@@ -467,7 +467,8 @@ export default {
         let items = {
           name: name,
           type: 'line',
-          data: d
+          data: d,
+          smooth: true
         };
         let seriesArrayNames = seriesArray.map(m => m.name);
         if (seriesArrayNames.includes(name)) {

From 0255bcb5985eba0844e3a93fd1ca22878151ca6e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 15 Mar 2021 19:08:50 +0800
Subject: [PATCH 07/95] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=85=A8=E5=B1=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiDefinitionService.java     |    1 -
 .../automation/scenario/EditApiScenario.vue   |   54 +-
 .../api/automation/scenario/Setting.js        |    3 +
 .../scenario/common/ApiBaseComponent.vue      |   57 +-
 .../scenario/component/ApiComponent.vue       |   22 +
 .../component/ApiScenarioComponent.vue        |   10 +
 .../scenario/component/ComponentConfig.vue    |   11 +-
 .../scenario/component/ConstantTimer.vue      |    9 +
 .../scenario/component/IfController.vue       |   10 +
 .../component/JmeterElementComponent.vue      |   10 +
 .../scenario/component/Jsr233Processor.vue    |   10 +
 .../scenario/component/LoopController.vue     |   12 +-
 .../scenario/component/StepExtendBtns.vue     |   98 ++
 .../scenario/maximize/MaximizeScenario.vue    | 1050 +++++++++++++++++
 .../scenario/maximize/ScenarioHeader.vue      |  146 +++
 .../components/assertion/ApiAssertions.vue    |   10 +
 .../components/extract/ApiExtract.vue         |   50 +-
 17 files changed, 1518 insertions(+), 45 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
 create mode 100644 frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
 create mode 100644 frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index a73d6f1c6c..f75c94201a 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -215,7 +215,6 @@ public class ApiDefinitionService {
         ApiDefinitionExample example = new ApiDefinitionExample();
         if (request.getProtocol().equals(RequestType.HTTP)) {
             example.createCriteria().andMethodEqualTo(request.getMethod()).andStatusNotEqualTo("Trash")
-                    .andProtocolEqualTo(request.getProtocol()).andPathEqualTo(request.getPath())
                     .andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(request.getId());
             return apiDefinitionMapper.selectByExample(example);
         } else {
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index cfebd0feb7..38aaf8c4bb 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -114,12 +114,13 @@
                 <el-col :span="3" class="ms-col-one ms-font">
                   <el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="6">
                   <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
                                :project-list="projectList" ref="envPopover"/>
                 </el-col>
-                <el-col :span="2">
+                <el-col :span="3">
                   <el-button :disabled="scenarioDefinition.length < 1" size="small" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+                  <font-awesome-icon class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="fullScreen"/>
                 </el-col>
               </el-row>
             </div>
@@ -192,6 +193,17 @@
                         class="ms-sc-variable-header"/>
       <!--外部导入-->
       <api-import v-if="type!=='detail'" ref="apiImport" :saved="false" @refresh="apiImport"/>
+
+      <!--步骤最大化-->
+      <ms-drawer :visible="drawer" :size="100" @close="close" direction="right" :show-full-screen="false" :is-show-close="false" style="overflow: hidden">
+        <template v-slot:header>
+          <scenario-header :currentScenario="currentScenario" :projectEnvMap="projectEnvMap" :projectIds="projectIds" :projectList="projectList" :scenarioDefinition="scenarioDefinition" :enableCookieShare="enableCookieShare"
+                           @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @showScenarioParameters="showScenarioParameters" ref="maximizeHeader"/>
+        </template>
+
+        <maximize-scenario :scenario-definition="scenarioDefinition" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario"/>
+      </ms-drawer>
+
     </div>
   </el-card>
 </template>
@@ -224,6 +236,9 @@
   import MsComponentConfig from "./component/ComponentConfig";
   import {handleCtrlSEvent} from "../../../../../common/js/utils";
   import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
+  import MaximizeScenario from "./maximize/MaximizeScenario";
+  import ScenarioHeader from "./maximize/ScenarioHeader";
+  import MsDrawer from "../../../common/components/MsDrawer";
 
   let jsonPath = require('jsonpath');
   export default {
@@ -243,7 +258,10 @@
       MsApiCustomize,
       ApiImport,
       MsComponentConfig,
-      EnvPopover
+      EnvPopover,
+      MaximizeScenario,
+      ScenarioHeader,
+      MsDrawer
     },
     data() {
       return {
@@ -293,6 +311,7 @@
         projectEnvMap: new Map,
         projectList: [],
         debugResult: new Map,
+        drawer: false,
       }
     },
     created() {
@@ -423,6 +442,9 @@
       }
     },
     methods: {
+      showAllBtn() {
+        this.$refs.maximizeScenario.showAll();
+      },
       addListener() {
         document.addEventListener("keydown", this.createCtrlSHandle);
         // document.addEventListener("keydown", (even => handleCtrlSEvent(even, this.$refs.httpApi.saveApi)));
@@ -443,6 +465,7 @@
           // 直接更新场景防止编辑内容丢失
           this.editScenario();
         }
+        this.$refs.maximizeHeader.getVariableSize();
         this.reload();
       },
       showButton(...names) {
@@ -697,8 +720,7 @@
         }
         this.sort();
         this.reload();
-      }
-      ,
+      },
       reload() {
         this.loading = true
         this.$nextTick(() => {
@@ -1046,7 +1068,14 @@
         // 把执行结果分发给各个请求
         this.debugResult = result;
         this.sort()
+      },
+      fullScreen() {
+        this.drawer = true;
+      },
+      close() {
+        this.drawer = false;
       }
+
     }
   }
 </script>
@@ -1112,7 +1141,7 @@
   }
 
   /deep/ .el-card__body {
-    padding: 15px;
+    padding: 10px;
   }
 
   /deep/ .el-drawer__body {
@@ -1182,4 +1211,17 @@
   .ms-sc-variable-header >>> .el-dialog__body {
     padding: 0px 20px;
   }
+
+  .alt-ico {
+    font-size: 15px;
+    margin: 0px 10px 0px;
+    color: #8c939d;
+  }
+
+  .alt-ico:hover {
+    color: black;
+    cursor: pointer;
+    font-size: 18px;
+  }
+
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/Setting.js b/frontend/src/business/components/api/automation/scenario/Setting.js
index 9ddffe168a..28d54980b6 100644
--- a/frontend/src/business/components/api/automation/scenario/Setting.js
+++ b/frontend/src/business/components/api/automation/scenario/Setting.js
@@ -16,6 +16,9 @@ export const ELEMENTS = new Map([
   ['Extract', []],
   ['JmeterElement', []],
   ['CustomizeReq', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['MaxSamplerProxy', ["JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['AllSamplerProxy', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"]],
+
 ])
 
 export const ELEMENT_TYPE = {
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index 1090ac3b5b..dbd1d4102b 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -1,47 +1,46 @@
 <template>
   <el-card class="api-component">
-
     <div class="header" @click="active(data)">
-
       <slot name="beforeHeaderLeft">
         <div v-if="data.index" class="el-step__icon is-text" style="margin-right: 10px;" :style="{'color': color, 'background-color': backgroundColor}">
           <div class="el-step__icon-inner">{{data.index}}</div>
         </div>
-        <el-button class="ms-left-buttion" size="small" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-button>
+        <el-button class="ms-left-buttion" size="mini" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-button>
+        <el-tag size="mini" v-if="data.method">{{data.method}}</el-tag>
       </slot>
 
       <span @click.stop>
         <slot name="headerLeft">
           <i class="icon el-icon-arrow-right" :class="{'is-active': data.active}"
-             @click="active(data)" v-if="data.type!='scenario'"/>
-          <el-input :draggable="draggable" v-if="isShowInput && isShowNameInput" size="small" v-model="data.name" class="name-input"
+             @click="active(data)" v-if="data.type!='scenario'  && !isMax "/>
+          <el-input :draggable="draggable" v-if="isShowInput && isShowNameInput" size="mini" v-model="data.name" class="name-input"
                     @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
+          <span v-else-if="isMax">
+             <el-tooltip :content="data.name" placement="top">
+              <span>{{data.name}}</span>
+            </el-tooltip>
+          </span>
           <span v-else>
             {{data.name}}
             <i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled"/>
           </span>
         </slot>
-        <slot name="behindHeaderLeft"></slot>
+        <slot name="behindHeaderLeft" v-if="!isMax"></slot>
       </span>
 
       <div class="header-right" @click.stop>
         <slot name="message"></slot>
-        <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top">
+        <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="showBtn">
           <el-switch v-model="data.enable" class="enable-switch"/>
         </el-tooltip>
         <slot name="button"></slot>
-        <el-tooltip content="Copy" placement="top">
-          <el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data && data.disabled"/>
-        </el-tooltip>
-        <el-tooltip :content="$t('commons.remove')" placement="top">
-          <el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data && data.disabled"/>
-        </el-tooltip>
+        <step-extend-btns style="display: contents" @copy="copyRow" @remove="remove" v-if="showBtn"/>
       </div>
 
     </div>
-    <div class="header">
+    <div class="header" v-if="!isMax">
       <fieldset :disabled="data.disabled" class="ms-fieldset">
-        <el-collapse-transition>
+        <el-collapse-transition>6.
           <div v-if="data.active && showCollapse" :draggable="draggable">
             <el-divider></el-divider>
             <slot></slot>
@@ -54,8 +53,11 @@
 </template>
 
 <script>
+  import StepExtendBtns from "../component/StepExtendBtns";
+
   export default {
     name: "ApiBaseComponent",
+    components: {StepExtendBtns},
     data() {
       return {
         isShowInput: false
@@ -63,6 +65,14 @@
     },
     props: {
       draggable: Boolean,
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       data: {
         type: Object,
         default() {
@@ -104,6 +114,9 @@
           this.$refs.nameEdit.focus();
         });
       }
+      if (this.data && this.data.type === "JmeterElement") {
+        this.data.active = false;
+      }
     },
     methods: {
       active() {
@@ -146,14 +159,26 @@
   }
 
   .header-right {
-    margin-right: 20px;
+    margin-top: 5px;
     float: right;
+    z-index: 1;
   }
 
   .enable-switch {
     margin-right: 10px;
   }
 
+  .node-title {
+    display: inline-block;
+    margin: 0px;
+    overflow-x: hidden;
+    padding-bottom: 0;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+    white-space: nowrap;
+    width: 100px;
+  }
+
   fieldset {
     padding: 0px;
     margin: 0px;
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 368ef166ae..f0b258f4e0 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -9,6 +9,8 @@
     :draggable="true"
     :color="displayColor.color"
     :background-color="displayColor.backgroundColor"
+    :is-max="isMax"
+    :show-btn="showBtn"
     :title="displayTitle">
 
     <template v-slot:behindHeaderLeft>
@@ -71,6 +73,7 @@
   import ApiBaseComponent from "../common/ApiBaseComponent";
   import ApiResponseComponent from "./ApiResponseComponent";
   import CustomizeReqInfo from "@/business/components/api/automation/scenario/common/CustomizeReqInfo";
+  import {ELEMENTS} from "../Setting";
 
   export default {
     name: "MsApiComponent",
@@ -82,6 +85,14 @@
         type: Boolean,
         default: false,
       },
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       currentEnvironmentId: String,
       projectList: Array,
       envMap: Map
@@ -122,6 +133,11 @@
           }
         }
       }
+      // if (this.isMax && this.request && ELEMENTS.get("AllSamplerProxy").indexOf(this.request.type) != -1
+      //   && this.request.hashTree && this.request.hashTree != null && this.request.hashTree.length > 0) {
+      //   this.request.hashTrees = JSON.parse(JSON.stringify(this.request.hashTree));
+      //   this.request.hashTree = undefined;
+      // }
     },
     computed: {
       displayColor() {
@@ -220,6 +236,12 @@
               if (!this.request.projectId) {
                 this.request.projectId = response.data.projectId;
               }
+              // if (this.isMax && this.request && ELEMENTS.get("AllSamplerProxy").indexOf(this.request.type) != -1) {
+              //   this.request.hashTrees = [];
+              //   Object.assign(this.request.hashTrees, this.request.hashTree);
+              //   this.request.hashTree = [];
+              // }
+
               this.reload();
               this.sort();
             } else {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 10603a5173..529f6909d9 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -8,6 +8,8 @@
     :show-collapse="false"
     :is-show-name-input="!isDeletedOrRef"
     :is-disabled="true"
+    :is-max="isMax"
+    :show-btn="showBtn"
     color="#606266"
     background-color="#F4F4F5"
     :title="$t('api_test.automation.scenario_import')">
@@ -36,6 +38,14 @@
     props: {
       scenario: {},
       node: {},
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       draggable: {
         type: Boolean,
         default: false,
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 4b5d93a5f2..4061381817 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="request-form">
-    <component :is="component" :scenario="scenario" :controller="scenario" :timer="scenario" :assertions="scenario" :extract="scenario" :jsr223-processor="scenario" :request="scenario" :currentScenario="currentScenario" :currentEnvironmentId="currentEnvironmentId" :node="node"
+    <component :is="component" :isMax="isMax" :show-btn="showBtn"
+               :scenario="scenario" :controller="scenario" :timer="scenario" :assertions="scenario" :extract="scenario" :jsr223-processor="scenario" :request="scenario" :currentScenario="currentScenario" :currentEnvironmentId="currentEnvironmentId" :node="node"
                :draggable="true" :title="title" :color="titleColor" :background-color="backgroundColor" @suggestClick="suggestClick(node)" :response="response"
                @remove="remove" @copyRow="copyRow" @refReload="refReload" :project-list="projectList" :env-map="envMap"/>
   </div>
@@ -24,6 +25,14 @@
     props: {
       type: String,
       scenario: {},
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       currentScenario: {},
       currentEnvironmentId: String,
       response: {},
diff --git a/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue b/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
index 48e3a94be4..d70b221e90 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
@@ -5,6 +5,7 @@
     :data="timer"
     :draggable="true"
     :show-collapse="false"
+    :is-max="isMax"
     color="#67C23A"
     background-color="#F2F9EE"
     :title="$t('api_test.automation.wait_controller')">
@@ -26,6 +27,14 @@
     props: {
       timer: {},
       node: {},
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       draggable: {
         type: Boolean,
         default: false,
diff --git a/frontend/src/business/components/api/automation/scenario/component/IfController.vue b/frontend/src/business/components/api/automation/scenario/component/IfController.vue
index f43f375886..866d8fd8d7 100644
--- a/frontend/src/business/components/api/automation/scenario/component/IfController.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/IfController.vue
@@ -5,6 +5,8 @@
     :data="controller"
     :show-collapse="false"
     :draggable="true"
+    :is-max="isMax"
+    :show-btn="showBtn"
     color="#E6A23C"
     background-color="#FCF6EE"
     :title="$t('api_test.automation.if_controller')">
@@ -33,6 +35,14 @@
     props: {
       controller: {},
       node: {},
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       index: Object,
       draggable: {
         type: Boolean,
diff --git a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
index 5a2f0502e1..28cb9a1843 100644
--- a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
@@ -5,6 +5,8 @@
     :data="request"
     :draggable="draggable"
     :color="defColor"
+    :is-max="isMax"
+    :show-btn="showBtn"
     :background-color="defBackgroundColor"
     :title="request.elementType">
 
@@ -31,6 +33,14 @@
         default:
           false
       },
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       request: {
         type: Object,
       },
diff --git a/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue b/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue
index 596be87e76..d5dad36dfd 100644
--- a/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/Jsr233Processor.vue
@@ -6,6 +6,8 @@
     :data="jsr223Processor"
     :draggable="draggable"
     :color="color"
+    :is-max="isMax"
+    :show-btn="showBtn"
     :background-color="backgroundColor"
     :title="title" v-loading="loading">
 
@@ -33,6 +35,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    isMax: {
+      type: Boolean,
+      default: false,
+    },
+    showBtn: {
+      type: Boolean,
+      default: true,
+    },
     isReadOnly: {
       type: Boolean,
       default:
diff --git a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
index 99cf8699fd..ed3c0b7e31 100644
--- a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
@@ -7,12 +7,14 @@
       @remove="remove"
       :data="controller"
       :draggable="true"
+      :is-max="isMax"
+      :show-btn="showBtn"
       color="#02A7F0"
       background-color="#F4F4F5"
       :title="$t('api_test.automation.loop_controller')" v-loading="loading">
 
       <template v-slot:headerLeft>
-        <i class="icon el-icon-arrow-right" :class="{'is-active': controller.active}" @click="active(controller)" style="margin-right: 10px"/>
+        <i class="icon el-icon-arrow-right" :class="{'is-active': controller.active}" @click="active(controller)" style="margin-right: 10px" v-if="!isMax"/>
         <el-radio @change="changeRadio" class="ms-radio" v-model="controller.loopType" label="LOOP_COUNT">{{$t('loop.loops_title')}}</el-radio>
         <el-radio @change="changeRadio" class="ms-radio" v-model="controller.loopType" label="FOREACH">{{$t('loop.foreach')}}</el-radio>
         <el-radio @change="changeRadio" class="ms-radio" v-model="controller.loopType" label="WHILE">{{$t('loop.while')}}</el-radio>
@@ -97,6 +99,14 @@ export default {
     currentEnvironmentId: String,
     currentScenario: {},
     node: {},
+    isMax: {
+      type: Boolean,
+      default: false,
+    },
+    showBtn: {
+      type: Boolean,
+      default: true,
+    },
     index: Object,
     draggable: {
       type: Boolean,
diff --git a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
new file mode 100644
index 0000000000..7b840ba742
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <el-dropdown @command="handleCommand" class="scenario-ext-btn">
+      <el-link type="primary" :underline="false">
+        <el-icon class="el-icon-more"></el-icon>
+      </el-link>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="copy">复制步骤</el-dropdown-item>
+        <el-dropdown-item command="remove" v-tester>删除步骤</el-dropdown-item>
+        <el-dropdown-item command="scenarioVar" v-tester>查看场景变量</el-dropdown-item>
+        <el-dropdown-item command="openScenario" v-tester>打开场景</el-dropdown-item>
+        <el-dropdown-item command="saveAs" v-tester>另存为接口定义</el-dropdown-item>
+        <!--<el-tooltip content="Copy" placement="top">-->
+        <!--<el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data && data.disabled"/>-->
+        <!--</el-tooltip>-->
+        <!--<el-tooltip :content="$t('commons.remove')" placement="top">-->
+        <!--<el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data && data.disabled"/>-->
+        <!--</el-tooltip>-->
+
+      </el-dropdown-menu>
+    </el-dropdown>
+    <ms-reference-view @openScenario="openScenario" ref="viewRef"/>
+    <ms-schedule-maintain ref="scheduleMaintain" @refreshTable="refreshTable"/>
+
+  </div>
+</template>
+
+<script>
+  import MsReferenceView from "@/business/components/api/automation/scenario/ReferenceView";
+  import MsScheduleMaintain from "@/business/components/api/automation/schedule/ScheduleMaintain"
+  import {getCurrentProjectID, getUUID} from "@/common/js/utils";
+
+  export default {
+    name: "StepExtendBtns",
+    components: {MsReferenceView, MsScheduleMaintain},
+    props: {
+      row: Object
+    },
+    methods: {
+      handleCommand(cmd) {
+        switch (cmd) {
+          case  "copy":
+            this.$emit('copy');
+            break;
+          case "remove":
+            this.$emit('remove');
+            break;
+          case "scenarioVar":
+            this.$emit('copy');
+            break;
+          case "openScenario":
+            this.$emit('copy');
+            break;
+          case "saveAs":
+            this.$emit('copy');
+            break;
+        }
+      },
+      createPerformance(row) {
+        this.infoDb = false;
+        let url = "/api/automation/genPerformanceTestJmx";
+        let run = {};
+        let scenarioIds = [];
+        scenarioIds.push(row.id);
+        run.projectId = getCurrentProjectID();
+        run.ids = scenarioIds;
+        run.id = getUUID();
+        run.name = row.name;
+        this.$post(url, run, response => {
+          let jmxObj = {};
+          jmxObj.name = response.data.name;
+          jmxObj.xml = response.data.xml;
+          jmxObj.attachFiles = response.data.attachFiles;
+          jmxObj.attachByteFiles = response.data.attachByteFiles;
+          this.$store.commit('setTest', {
+            name: row.name,
+            jmx: jmxObj
+          })
+          this.$router.push({
+            path: "/performance/test/create"
+          })
+        });
+      },
+      openScenario(item) {
+        this.$emit('openScenario', item)
+      },
+      refreshTable() {
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .scenario-ext-btn {
+    margin-left: 10px;
+  }
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
new file mode 100644
index 0000000000..ea3127afe3
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -0,0 +1,1050 @@
+<template>
+  <div>
+    <!-- 场景步骤-->
+    <ms-container>
+      <ms-aside-container width="600px" class="scenario-aside">
+        <!-- 场景步骤内容 -->
+        <div v-loading="loading">
+          <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition"
+                   :default-expanded-keys="expandedNode"
+                   :expand-on-click-node="false"
+                   highlight-current
+                   @node-expand="nodeExpand"
+                   @node-collapse="nodeCollapse"
+                   :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable>
+                    <span class="custom-tree-node father" slot-scope="{ node, data}">
+                      <!-- 步骤组件-->
+                       <ms-component-config :isMax="true" :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
+                                            :currentEnvironmentId="currentEnvironmentId" :node="node" :project-list="projectList" :env-map="projectEnvMap"
+                                            @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload"/>
+                    </span>
+          </el-tree>
+
+          <div @click="fabClick">
+            <vue-fab id="fab" mainBtnColor="#783887" size="small" :global-options="globalOptions"
+                     :click-auto-close="false">
+              <fab-item
+                v-for="(item, index) in buttons"
+                :key="index"
+                :idx="getIdx(index)"
+                :title="item.title"
+                :title-bg-color="item.titleBgColor"
+                :title-color="item.titleColor"
+                :color="item.titleColor"
+                :icon="item.icon"
+                @clickItem="item.click"/>
+            </vue-fab>
+          </div>
+
+        </div>
+      </ms-aside-container>
+
+      <ms-main-container>
+        <!-- 第一层当前节点内容-->
+        <ms-component-config :isMax="false" :showBtn="false" :type="selectedTreeNode.type" :scenario="selectedTreeNode" :response="response" :currentScenario="currentScenario"
+                             :currentEnvironmentId="currentEnvironmentId" :node="selectedNode" :project-list="projectList" :env-map="projectEnvMap"
+                             @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" v-if="selectedTreeNode && selectedNode"/>
+        <!-- 请求下还有的子步骤-->
+        <div v-if="selectedTreeNode && selectedTreeNode.hashTree && showNode(selectedTreeNode)">
+          <div v-for="item in selectedTreeNode.hashTree" :key="item.id" class="ms-col-one">
+            <ms-component-config :showBtn="false" :isMax="false" :type="item.type" :scenario="item" :response="response" :currentScenario="currentScenario"
+                                 :currentEnvironmentId="currentEnvironmentId" :project-list="projectList" :env-map="projectEnvMap"
+                                 @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" v-if="selectedTreeNode && selectedNode"/>
+
+          </div>
+        </div>
+
+      </ms-main-container>
+    </ms-container>
+
+    <!--接口列表-->
+    <scenario-api-relevance @save="pushApiOrCase" ref="scenarioApiRelevance" v-if="type!=='detail'"/>
+
+    <!--自定义接口-->
+    <el-drawer v-if="type!=='detail'" :visible.sync="customizeVisible" :destroy-on-close="true" direction="ltr"
+               :withHeader="false" :title="$t('api_test.automation.customize_req')" style="overflow: auto"
+               :modal="false" size="90%">
+      <ms-api-customize :request="customizeRequest" @addCustomizeApi="addCustomizeApi"/>
+    </el-drawer>
+    <!--场景导入 -->
+    <scenario-relevance v-if="type!=='detail'" @save="addScenario" ref="scenarioRelevance"/>
+
+    <!-- 环境 -->
+    <api-environment-config v-if="type!=='detail'" ref="environmentConfig" @close="environmentConfigClose"/>
+
+    <!--执行组件-->
+    <ms-run :debug="true" v-if="type!=='detail'" :environment="projectEnvMap" :reportId="reportId"
+            :run-data="debugData"
+            @runRefresh="runRefresh" ref="runTest"/>
+    <!-- 调试结果 -->
+    <el-drawer v-if="type!=='detail'" :visible.sync="debugVisible" :destroy-on-close="true" direction="ltr"
+               :withHeader="true" :modal="false" size="90%">
+      <ms-api-report-detail :report-id="reportId" :debug="true" :currentProjectId="projectId" @refresh="detailRefresh"/>
+    </el-drawer>
+
+    <!--场景公共参数-->
+    <ms-variable-list v-if="type!=='detail'" @setVariables="setVariables" ref="scenarioParameters"
+                      class="ms-sc-variable-header"/>
+    <!--外部导入-->
+    <api-import v-if="type!=='detail'" ref="apiImport" :saved="false" @refresh="apiImport"/>
+  </div>
+</template>
+
+<script>
+  import {API_STATUS, PRIORITY} from "../../../definition/model/JsonData";
+  import {WORKSPACE_ID} from '@/common/js/constants';
+  import {
+    Assertions,
+    ConstantTimer,
+    Extract,
+    IfController,
+    JSR223Processor,
+    LoopController
+  } from "../../../definition/model/ApiTestModel";
+  import {parseEnvironment} from "../../../definition/model/EnvironmentModel";
+  import {ELEMENT_TYPE, ELEMENTS} from "../Setting";
+  import MsApiCustomize from "../ApiCustomize";
+  import {getCurrentProjectID, getUUID, objToStrMap, strMapToObj} from "@/common/js/utils";
+  import ApiEnvironmentConfig from "../../../definition/components/environment/ApiEnvironmentConfig";
+  import MsInputTag from "../MsInputTag";
+  import MsRun from "../DebugRun";
+  import MsApiReportDetail from "../../report/ApiReportDetail";
+  import MsVariableList from "../variable/VariableList";
+  import ApiImport from "../../../definition/components/import/ApiImport";
+  import "@/common/css/material-icons.css"
+  import OutsideClick from "@/common/js/outside-click";
+  import ScenarioApiRelevance from "../api/ApiRelevance";
+  import ScenarioRelevance from "../api/ScenarioRelevance";
+  import MsComponentConfig from "../component/ComponentConfig";
+  import {handleCtrlSEvent} from "../../../../../../common/js/utils";
+  import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
+  import MsContainer from "../../../../common/components/MsContainer";
+  import MsMainContainer from "../../../../common/components/MsMainContainer";
+  import MsAsideContainer from "../../../../common/components/MsAsideContainer";
+
+  let jsonPath = require('jsonpath');
+  export default {
+    name: "MaximizeScenario",
+    props: {
+      moduleOptions: Array,
+      currentScenario: {},
+      type: String,
+      scenarioDefinition: Array,
+    },
+    components: {
+      MsVariableList,
+      ScenarioRelevance,
+      ScenarioApiRelevance,
+      ApiEnvironmentConfig,
+      MsApiReportDetail,
+      MsInputTag, MsRun,
+      MsApiCustomize,
+      ApiImport,
+      MsComponentConfig,
+      EnvPopover,
+      MsContainer,
+      MsMainContainer,
+      MsAsideContainer
+    },
+    data() {
+      return {
+        props: {
+          label: "label",
+          children: "hashTree"
+        },
+        rules: {
+          name: [
+            {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
+            {max: 100, message: this.$t('test_track.length_less_than') + '100', trigger: 'blur'}
+          ],
+          userId: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
+          apiScenarioModuleId: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
+          status: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
+          principal: [{required: true, message: this.$t('api_test.definition.request.responsible'), trigger: 'change'}],
+        },
+        environments: [],
+        currentEnvironmentId: "",
+        maintainerOptions: [],
+        value: API_STATUS[0].id,
+        options: API_STATUS,
+        levels: PRIORITY,
+        scenario: {},
+        loading: false,
+        apiListVisible: false,
+        customizeVisible: false,
+        scenarioVisible: false,
+        debugVisible: false,
+        customizeRequest: {protocol: "HTTP", type: "API", hashTree: [], referenced: 'Created', active: false},
+        operatingElements: [],
+        currentRow: {cases: [], apis: [], referenced: true},
+        selectedTreeNode: undefined,
+        selectedNode: undefined,
+        expandedNode: [],
+        path: "/api/automation/create",
+        debugData: {},
+        reportId: "",
+        projectId: "",
+        enableCookieShare: false,
+        globalOptions: {
+          spacing: 30
+        },
+        response: {},
+        projectIds: new Set,
+        projectEnvMap: new Map,
+        projectList: [],
+        debugResult: new Map,
+      }
+    },
+    created() {
+      if (!this.currentScenario.apiScenarioModuleId) {
+        this.currentScenario.apiScenarioModuleId = "";
+      }
+      this.projectId = getCurrentProjectID();
+      this.operatingElements = ELEMENTS.get("ALL");
+    },
+    directives: {OutsideClick},
+    computed: {
+      buttons() {
+        let buttons = [
+          {
+            title: this.$t('api_test.definition.request.extract_param'),
+            show: this.showButton("Extract"),
+            titleColor: "#015478",
+            titleBgColor: "#E6EEF2",
+            icon: "colorize",
+            click: () => {
+              this.addComponent('Extract')
+            }
+          },
+          {
+            title: this.$t('api_test.definition.request.post_script'),
+            show: this.showButton("JSR223PostProcessor"),
+            titleColor: "#783887",
+            titleBgColor: "#F2ECF3",
+            icon: "skip_next",
+            click: () => {
+              this.addComponent('JSR223PostProcessor')
+            }
+          },
+          {
+            title: this.$t('api_test.definition.request.pre_script'),
+            show: this.showButton("JSR223PreProcessor"),
+            titleColor: "#B8741A",
+            titleBgColor: "#F9F1EA",
+            icon: "skip_previous",
+            click: () => {
+              this.addComponent('JSR223PreProcessor')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.customize_script'),
+            show: this.showButton("JSR223Processor"),
+            titleColor: "#7B4D12",
+            titleBgColor: "#F1EEE9",
+            icon: "code",
+            click: () => {
+              this.addComponent('JSR223Processor')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.if_controller'),
+            show: this.showButton("IfController"),
+            titleColor: "#E6A23C",
+            titleBgColor: "#FCF6EE",
+            icon: "alt_route",
+            click: () => {
+              this.addComponent('IfController')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.loop_controller'),
+            show: this.showButton("LoopController"),
+            titleColor: "#02A7F0",
+            titleBgColor: "#F4F4F5",
+            icon: "next_plan",
+            click: () => {
+              this.addComponent('LoopController')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.wait_controller'),
+            show: this.showButton("ConstantTimer"),
+            titleColor: "#67C23A",
+            titleBgColor: "#F2F9EE",
+            icon: "access_time",
+            click: () => {
+              this.addComponent('ConstantTimer')
+            }
+          },
+          {
+            title: this.$t('api_test.definition.request.assertions_rule'),
+            show: this.showButton("Assertions"),
+            titleColor: "#A30014",
+            titleBgColor: "#F7E6E9",
+            icon: "next_plan",
+            click: () => {
+              this.addComponent('Assertions')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.customize_req'),
+            show: this.showButton("CustomizeReq"),
+            titleColor: "#008080",
+            titleBgColor: "#EBF2F2",
+            icon: "tune",
+            click: () => {
+              this.addComponent('CustomizeReq')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.scenario_import'),
+            show: this.showButton("scenario"),
+            titleColor: "#606266",
+            titleBgColor: "#F4F4F5",
+            icon: "movie",
+            click: () => {
+              this.addComponent('scenario')
+            }
+          },
+          {
+            title: this.$t('api_test.automation.api_list_import'),
+            show: this.showButton("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"),
+            titleColor: "#F56C6C",
+            titleBgColor: "#FCF1F1",
+            icon: "api",
+            click: this.apiListImport
+          }
+        ];
+        return buttons.filter(btn => btn.show);
+      }
+    },
+    methods: {
+      removeListener() {
+        document.removeEventListener("keydown", this.createCtrlSHandle);
+      },
+      createCtrlSHandle(event) {
+        handleCtrlSEvent(event, this.editScenario);
+      },
+      getIdx(index) {
+        return index - 0.33
+      },
+      setVariables(v, headers) {
+        this.currentScenario.variables = v;
+        this.currentScenario.headers = headers;
+        if (this.path.endsWith("/update")) {
+          // 直接更新场景防止编辑内容丢失
+          this.editScenario();
+        }
+        this.reload();
+      },
+      showButton(...names) {
+        for (const name of names) {
+          if (name && this.operatingElements && this.operatingElements.includes(name)) {
+            return true;
+          }
+        }
+        return false;
+      },
+      outsideClick(e) {
+        e.stopPropagation();
+        this.showAll();
+      },
+      fabClick() {
+        if (this.operatingElements.length < 1) {
+          this.$info("引用的场景或接口无法添加配置");
+        }
+      },
+      showNode(node) {
+        node.active = true;
+        if (node && ELEMENTS.get("AllSamplerProxy").indexOf(node.type) != -1) {
+          return true;
+        }
+        return false;
+      },
+      addComponent(type) {
+        switch (type) {
+          case ELEMENT_TYPE.IfController:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new IfController()) :
+              this.scenarioDefinition.push(new IfController());
+            break;
+          case ELEMENT_TYPE.ConstantTimer:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new ConstantTimer()) :
+              this.scenarioDefinition.push(new ConstantTimer());
+            break;
+          case ELEMENT_TYPE.JSR223Processor:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor()) :
+              this.scenarioDefinition.push(new JSR223Processor());
+            break;
+          case ELEMENT_TYPE.JSR223PreProcessor:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor({type: "JSR223PreProcessor"})) :
+              this.scenarioDefinition.push(new JSR223Processor({type: "JSR223PreProcessor"}));
+            break;
+          case ELEMENT_TYPE.JSR223PostProcessor:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor({type: "JSR223PostProcessor"})) :
+              this.scenarioDefinition.push(new JSR223Processor({type: "JSR223PostProcessor"}));
+            break;
+          case ELEMENT_TYPE.Assertions:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new Assertions()) :
+              this.scenarioDefinition.push(new Assertions());
+            break;
+          case ELEMENT_TYPE.Extract:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new Extract()) :
+              this.scenarioDefinition.push(new Extract());
+            break;
+          case ELEMENT_TYPE.CustomizeReq:
+            this.customizeRequest = {protocol: "HTTP", type: "API", hashTree: [], referenced: 'Created', active: false};
+            this.customizeVisible = true;
+            break;
+          case  ELEMENT_TYPE.LoopController:
+            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new LoopController()) :
+              this.scenarioDefinition.push(new LoopController());
+            break;
+          case ELEMENT_TYPE.scenario:
+            this.$refs.scenarioRelevance.open();
+            break;
+          default:
+            this.$refs.apiImport.open();
+            break;
+        }
+        if (this.selectedNode) {
+          this.selectedNode.expanded = true;
+        }
+        this.sort();
+      },
+      nodeClick(data, node) {
+        if (data.referenced != 'REF' && data.referenced != 'Deleted' && !data.disabled) {
+          this.operatingElements = ELEMENTS.get(data.type);
+        } else {
+          this.operatingElements = [];
+        }
+        if (data && data.type != "JmeterElement") {
+          data.active = true;
+          if (data.hashTree) {
+            data.hashTree.forEach(item => {
+              if (item && item.type != "JmeterElement") {
+                item.active = true;
+              }
+            })
+          }
+        } else {
+          data.active = false;
+        }
+        this.selectedTreeNode = data;
+        this.selectedNode = node;
+      },
+      suggestClick(node) {
+        this.response = {};
+        if (node.parent && node.parent.data.requestResult) {
+          this.response = node.parent.data.requestResult;
+        }
+      },
+      showAll() {
+        if (!this.customizeVisible) {
+          this.operatingElements = ELEMENTS.get("ALL");
+          this.selectedTreeNode = undefined;
+        }
+      },
+      apiListImport() {
+        this.$refs.scenarioApiRelevance.open();
+      },
+      recursiveSorting(arr) {
+        for (let i in arr) {
+          arr[i].index = Number(i) + 1;
+          if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].hashTree && arr[i].hashTree.length > 1) {
+            arr[i].countController.proceed = true;
+          }
+          if (!arr[i].projectId) {
+            arr[i].projectId = getCurrentProjectID();
+          }
+          if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
+            this.recursiveSorting(arr[i].hashTree);
+          }
+          // 添加debug结果
+          if (this.debugResult && this.debugResult.get(arr[i].id)) {
+            arr[i].requestResult = this.debugResult.get(arr[i].id);
+          }
+        }
+      },
+      sort() {
+        for (let i in this.scenarioDefinition) {
+          // 排序
+          this.scenarioDefinition[i].index = Number(i) + 1;
+          // 设置循环控制
+          if (this.scenarioDefinition[i].type === ELEMENT_TYPE.LoopController && this.scenarioDefinition[i].hashTree
+            && this.scenarioDefinition[i].hashTree.length > 1) {
+            this.scenarioDefinition[i].countController.proceed = true;
+          }
+          // 设置项目ID
+          if (!this.scenarioDefinition[i].projectId) {
+            this.scenarioDefinition[i].projectId = getCurrentProjectID();
+          }
+          if (this.scenarioDefinition[i].hashTree != undefined && this.scenarioDefinition[i].hashTree.length > 0) {
+            this.recursiveSorting(this.scenarioDefinition[i].hashTree);
+          }
+          // 添加debug结果
+          if (this.debugResult && this.debugResult.get(this.scenarioDefinition[i].id)) {
+            this.scenarioDefinition[i].requestResult = this.debugResult.get(this.scenarioDefinition[i].id);
+          }
+        }
+      },
+      addCustomizeApi(request) {
+        this.customizeVisible = false;
+        request.enable === undefined ? request.enable = true : request.enable;
+        if (this.selectedTreeNode != undefined) {
+          this.selectedTreeNode.hashTree.push(request);
+        } else {
+          this.scenarioDefinition.push(request);
+        }
+        this.customizeRequest = {};
+        this.sort();
+        this.reload();
+        this.initProjectIds();
+      },
+      addScenario(arr) {
+        if (arr && arr.length > 0) {
+          arr.forEach(item => {
+            if (item.id === this.currentScenario.id) {
+              this.$error("不能引用或复制自身！");
+              return;
+            }
+            if (!item.hashTree) {
+              item.hashTree = [];
+            }
+            item.enable === undefined ? item.enable = true : item.enable;
+            this.scenarioDefinition.push(item);
+          })
+        }
+        this.sort();
+        this.reload();
+        this.initProjectIds();
+        this.scenarioVisible = false;
+      },
+      setApiParameter(item, refType, referenced) {
+        let request = {};
+        if (Object.prototype.toString.call(item.request).indexOf("String") > 0) {
+          request = JSON.parse(item.request);
+        } else {
+          request = item.request;
+        }
+        if (item.protocol) {
+          request.protocol = item.protocol;
+        }
+        if (request.protocol === "DUBBO") {
+          request.protocol = "dubbo://";
+        }
+        request.id = item.id;
+        request.name = item.name;
+        request.refType = refType;
+        request.referenced = referenced;
+        request.enable === undefined ? request.enable = true : request.enable;
+        request.active = false;
+        request.resourceId = getUUID();
+        request.projectId = item.projectId;
+        if (!request.url) {
+          request.url = "";
+        }
+        if (referenced === 'REF' || !request.hashTree) {
+          request.hashTree = [];
+        }
+        if (this.selectedTreeNode != undefined) {
+          this.selectedTreeNode.hashTree.push(request);
+        } else {
+          this.scenarioDefinition.push(request);
+        }
+      },
+      pushApiOrCase(data, refType, referenced) {
+        data.forEach(item => {
+          this.setApiParameter(item, refType, referenced);
+        });
+        this.sort();
+        this.reload();
+        this.initProjectIds();
+      },
+      openTagConfig() {
+        if (!this.projectId) {
+          this.$error(this.$t('api_test.select_project'));
+          return;
+        }
+        this.$refs.tag.open();
+      },
+      remove(row, node) {
+        let name = row === undefined || row.name === undefined ? "" : row.name;
+        this.$alert(this.$t('api_test.definition.request.delete_confirm_step') + ' ' + name + " ？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
+              const parent = node.parent
+              const hashTree = parent.data.hashTree || parent.data;
+              const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId)
+              hashTree.splice(index, 1);
+              this.sort();
+              this.reload();
+              this.initProjectIds();
+            }
+          }
+        });
+      },
+      copyRow(row, node) {
+        if (!row || !node) {
+          return;
+        }
+        const parent = node.parent
+        const hashTree = parent.data.hashTree || parent.data;
+        // 深度复制
+        let obj = JSON.parse(JSON.stringify(row));
+        obj.resourceId = getUUID();
+        if (obj.name) {
+          obj.name = obj.name + '_copy';
+        }
+        const index = hashTree.findIndex(d => d.resourceId === row.resourceId);
+        if (index != -1) {
+          hashTree.splice(index + 1, 0, obj);
+        } else {
+          hashTree.push(obj);
+        }
+        this.sort();
+        this.reload();
+      }
+      ,
+      reload() {
+        this.loading = true
+        this.$nextTick(() => {
+          this.loading = false
+        })
+      },
+      runDebug() {
+        /*触发执行操作*/
+        let sign = this.$refs.envPopover.checkEnv();
+        if (!sign) {
+          return;
+        }
+        this.$refs['currentScenario'].validate((valid) => {
+          if (valid) {
+            Promise.all([
+              this.editScenario()]).then(val => {
+              if (val) {
+                this.debugData = {
+                  id: this.currentScenario.id,
+                  name: this.currentScenario.name,
+                  type: "scenario",
+                  variables: this.currentScenario.variables,
+                  referenced: 'Created',
+                  enableCookieShare: this.enableCookieShare,
+                  headers: this.currentScenario.headers,
+                  environmentMap: this.projectEnvMap,
+                  hashTree: this.scenarioDefinition
+                };
+                this.reportId = getUUID().substring(0, 8);
+              }
+            });
+          }
+        })
+      },
+      getEnvironments() {
+        if (this.projectId) {
+          this.$get('/api/environment/list/' + this.projectId, response => {
+            this.environments = response.data;
+            this.environments.forEach(environment => {
+              parseEnvironment(environment);
+            });
+            let hasEnvironment = false;
+            for (let i in this.environments) {
+              if (this.environments[i].id === this.currentEnvironmentId) {
+                hasEnvironment = true;
+                break;
+              }
+            }
+            if (!hasEnvironment) {
+              this.currentEnvironmentId = '';
+            }
+            //检查场景是否需要先进行保存
+            this.checkDataIsCopy();
+          });
+        }
+      },
+
+      checkDataIsCopy() {
+        //  如果是复制按钮创建的场景，直接进行保存
+        if (this.currentScenario.copy) {
+          this.editScenario(false);
+        }
+      },
+
+      openEnvironmentConfig() {
+        if (!this.projectId) {
+          this.$error(this.$t('api_test.select_project'));
+          return;
+        }
+        this.$refs.environmentConfig.open(this.projectId);
+      },
+      environmentConfigClose() {
+        this.getEnvironments();
+      },
+      allowDrop(draggingNode, dropNode, dropType) {
+        if (dropType != "inner") {
+          return true;
+        }
+        else if (dropType === "inner" && dropNode.data.referenced != 'REF' && dropNode.data.referenced != 'Deleted'
+          && ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
+          return true;
+        }
+        return false;
+      },
+      allowDrag(draggingNode, dropNode, dropType) {
+        if (dropNode && draggingNode && dropType) {
+          this.sort();
+          this.reload();
+        }
+      },
+      nodeExpand(data) {
+        if (data.resourceId) {
+          this.expandedNode.push(data.resourceId);
+        }
+      },
+      nodeCollapse(data) {
+        if (data.resourceId) {
+          this.expandedNode.splice(this.expandedNode.indexOf(data.resourceId), 1);
+        }
+      },
+      getPath(id) {
+        if (id === null) {
+          return null;
+        }
+        let path = this.moduleOptions.filter(function (item) {
+          return item.id === id ? item.path : "";
+        });
+        return path[0].path;
+      },
+      setFiles(item, bodyUploadFiles, obj) {
+        if (item.body) {
+          if (item.body.kvs) {
+            item.body.kvs.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    if (!item.id) {
+                      let fileId = getUUID().substring(0, 12);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                    }
+                    obj.bodyUploadIds.push(item.id);
+                    bodyUploadFiles.push(item.file);
+                  }
+                });
+              }
+            });
+          }
+          if (item.body.binary) {
+            item.body.binary.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    if (!item.id) {
+                      let fileId = getUUID().substring(0, 12);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                    }
+                    obj.bodyUploadIds.push(item.id);
+                    bodyUploadFiles.push(item.file);
+                  }
+                });
+              }
+            });
+          }
+        }
+      },
+      recursiveFile(arr, bodyUploadFiles, obj) {
+        arr.forEach(item => {
+          this.setFiles(item, bodyUploadFiles, obj);
+          if (item.hashTree != undefined && item.hashTree.length > 0) {
+            this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
+          }
+        });
+      },
+      getBodyUploadFiles(obj) {
+        let bodyUploadFiles = [];
+        obj.bodyUploadIds = [];
+        this.scenarioDefinition.forEach(item => {
+          this.setFiles(item, bodyUploadFiles, obj);
+          if (item.hashTree != undefined && item.hashTree.length > 0) {
+            this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
+          }
+        })
+        // 场景变量csv 文件
+        if (this.currentScenario.variables) {
+          this.currentScenario.variables.forEach(param => {
+            if (param.type === 'CSV' && param.files) {
+              param.files.forEach(item => {
+                if (item.file) {
+                  if (!item.id) {
+                    let fileId = getUUID().substring(0, 12);
+                    item.name = item.file.name;
+                    item.id = fileId;
+                  }
+                  obj.bodyUploadIds.push(item.id);
+                  bodyUploadFiles.push(item.file);
+                }
+              })
+            }
+          })
+        }
+        return bodyUploadFiles;
+      },
+      editScenario() {
+        return new Promise((resolve, reject) => {
+          document.getElementById("inputDelay").focus();  //  保存前在input框自动失焦，以免保存失败
+          this.$refs['currentScenario'].validate((valid) => {
+            if (valid) {
+              this.setParameter();
+              let bodyFiles = this.getBodyUploadFiles(this.currentScenario);
+              this.$fileUpload(this.path, null, bodyFiles, this.currentScenario, response => {
+                this.$success(this.$t('commons.save_success'));
+                this.path = "/api/automation/update";
+                if (response.data) {
+                  this.currentScenario.id = response.data.id;
+                }
+                if (this.currentScenario.tags instanceof String) {
+                  this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
+                }
+                this.$emit('refresh', this.currentScenario);
+                resolve();
+              })
+            }
+          })
+        });
+      },
+
+      setParameter() {
+        this.currentScenario.stepTotal = this.scenarioDefinition.length;
+        this.currentScenario.projectId = getCurrentProjectID();
+        this.currentScenario.modulePath = this.getPath(this.currentScenario.apiScenarioModuleId);
+        // 构建一个场景对象 方便引用处理
+        let scenario = {
+          id: this.currentScenario.id,
+          enableCookieShare: this.enableCookieShare,
+          name: this.currentScenario.name,
+          type: "scenario",
+          variables: this.currentScenario.variables,
+          headers: this.currentScenario.headers,
+          referenced: 'Created',
+          environmentMap: strMapToObj(this.projectEnvMap),
+          hashTree: this.scenarioDefinition,
+          projectId: this.projectId,
+        };
+        this.currentScenario.scenarioDefinition = scenario;
+        if (this.currentScenario.tags instanceof Array) {
+          this.currentScenario.tags = JSON.stringify(this.currentScenario.tags);
+        }
+        if (this.currentModule != null) {
+          this.currentScenario.modulePath = this.currentModule.method !== undefined ? this.currentModule.method : null;
+          this.currentScenario.apiScenarioModuleId = this.currentModule.id;
+        }
+        this.currentScenario.projectId = this.projectId;
+      }
+      ,
+      runRefresh() {
+        this.debugVisible = true;
+        this.loading = false;
+      },
+      showScenarioParameters() {
+        this.$refs.scenarioParameters.open(this.currentScenario.variables, this.currentScenario.headers);
+      },
+      apiImport(importData) {
+        if (importData && importData.data) {
+          importData.data.forEach(item => {
+            this.setApiParameter(item, "API", "OT_IMPORT");
+          })
+          this.sort();
+          this.reload();
+        }
+      },
+      getVariableSize() {
+        let size = 0;
+        if (this.currentScenario.variables) {
+          size += this.currentScenario.variables.length;
+        }
+        if (this.currentScenario.headers && this.currentScenario.headers.length > 1) {
+          size += this.currentScenario.headers.length - 1;
+        }
+        return size;
+      },
+      handleEnv() {
+        this.$refs.apiScenarioEnv.open();
+      },
+      setProjectEnvMap(projectEnvMap) {
+        this.projectEnvMap = projectEnvMap;
+      },
+      refReload() {
+        this.initProjectIds();
+        this.reload();
+      },
+      initProjectIds() {
+        // 加载环境配置
+        this.$nextTick(() => {
+          this.projectIds.clear();
+          this.scenarioDefinition.forEach(data => {
+            let arr = jsonPath.query(data, "$..projectId");
+            arr.forEach(a => this.projectIds.add(a));
+          })
+        })
+      },
+      detailRefresh(result) {
+        // 把执行结果分发给各个请求
+        this.debugResult = result;
+        this.sort()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .card-content {
+    height: calc(100vh - 196px);
+    overflow-y: auto;
+  }
+
+  .ms-scenario-input {
+    width: 100%;
+  }
+
+  .ms-main-div {
+    background-color: white;
+  }
+
+  .ms-debug-div {
+    border: 1px #DCDFE6 solid;
+    border-radius: 4px;
+    margin-right: 20px;
+  }
+
+  .ms-scenario-button {
+    margin-left: 20px;
+    padding: 7px;
+  }
+
+  .tip {
+    padding: 3px 5px;
+    font-size: 16px;
+    border-radius: 4px;
+    border-left: 4px solid #783887;
+  }
+
+  .ms-api-col {
+    background-color: #7C3985;
+    border-color: #7C3985;
+    margin-right: 10px;
+    color: white;
+  }
+
+  .ms-font {
+    color: #303133;
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+    font-size: 13px;
+  }
+
+  .ms-col-one {
+    margin-top: 10px;
+  }
+
+  #fab {
+    left: 100px;
+    z-index: 5;
+  }
+
+  /deep/ .el-tree-node__content {
+    height: 100%;
+    margin-top: 8px;
+    vertical-align: center;
+  }
+
+  /deep/ .el-card__body {
+    padding: 5px;
+  }
+
+  /deep/ .el-drawer__body {
+    overflow: auto;
+  }
+
+  /deep/ .el-step__icon.is-text {
+    border: 1px solid;
+  }
+
+  /deep/ .el-drawer__header {
+    margin-bottom: 0px;
+  }
+
+  /deep/ .el-link {
+    font-weight: normal;
+  }
+
+  /deep/ .el-checkbox {
+    color: #303133;
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+    font-size: 13px;
+    font-weight: normal;
+  }
+
+  /deep/ .el-checkbox__label {
+    padding-left: 5px;
+  }
+
+  .head {
+    border-bottom: 1px solid #303133;
+    color: #303133;
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+    font-size: 13px;
+  }
+
+  .ms-opt-btn {
+    position: fixed;
+    right: 50px;
+    z-index: 1;
+  }
+
+  .ms-tree >>> .el-tree-node__expand-icon.expanded {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  .ms-tree >>> .el-icon-caret-right:before {
+    content: '\e723';
+    font-size: 20px;
+  }
+
+  .ms-tree >>> .el-tree-node__expand-icon.is-leaf {
+    color: transparent;
+  }
+
+  .ms-tree >>> .el-tree-node__expand-icon {
+    color: #7C3985;
+  }
+
+  .ms-tree >>> .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+    color: #7C3985;
+    content: "\e722";
+    font-size: 20px;
+  }
+
+  .ms-sc-variable-header >>> .el-dialog__body {
+    padding: 0px 20px;
+  }
+
+  .custom-tree-node {
+    width: 1000px;
+  }
+
+  .father .child {
+    display: none;
+  }
+
+  .scenario-aside {
+    position: relative;
+    border-radius: 4px;
+    border: 1px solid #EBEEF5;
+    box-sizing: border-box;
+  }
+
+  .father:hover .child {
+    display: block;
+  }
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
new file mode 100644
index 0000000000..d957231385
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="ms-header" @click="showAll">
+    <el-row>
+      <div class="ms-div" v-loading="loading">
+        <!-- 调试部分 -->
+        <el-row style="margin: 5px">
+          <el-col :span="6" class="ms-col-one ms-font">
+            {{$t('api_test.automation.step_total')}}：{{scenarioDefinition.length}}
+          </el-col>
+          <el-col :span="6" class="ms-col-one ms-font">
+            <el-link class="head" @click="showScenarioParameters">{{$t('api_test.automation.scenario_total')}}</el-link>
+            ：{{varSize }}
+          </el-col>
+          <el-col :span="5" class="ms-col-one ms-font">
+            <el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
+          </el-col>
+          <el-col :span="7">
+            <env-popover :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                         :project-list="projectList" ref="envPopover" style="margin-top: 0px"/>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="ms-header-right">
+        <el-button :disabled="scenarioDefinition.length < 1" size="small" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+        ｜
+        <i class="el-icon-close alt-ico" @click="close"/>
+      </div>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import {checkoutTestManagerOrTestUser, exportPdf} from "@/common/js/utils";
+  import html2canvas from 'html2canvas';
+  import EnvPopover from "../../scenario/EnvPopover";
+
+  export default {
+    name: "ScenarioHeader",
+    components: {EnvPopover},
+    props: {currentScenario: {}, scenarioDefinition: Array, enableCookieShare: Boolean, projectEnvMap: Map, projectIds: Set, projectList: Array},
+    data() {
+      return {
+        envMap: new Map,
+        loading: false,
+        varSize: 0,
+      }
+    },
+    mounted() {
+      this.envMap = this.projectEnvMap;
+      this.getVariableSize();
+    },
+    methods: {
+      handleExport() {
+        let name = this.$t('commons.report_statistics.test_case_analysis');
+        this.$nextTick(function () {
+          setTimeout(() => {
+            html2canvas(document.getElementById('reportAnalysis'), {
+              scale: 2
+            }).then(function (canvas) {
+              exportPdf(name, [canvas]);
+            });
+          }, 1000);
+        });
+      },
+      showAll() {
+        this.$emit('showAllBtn');
+      },
+      close() {
+        this.$emit('closePage');
+      },
+      runDebug() {
+        this.$emit('runDebug');
+      },
+      showScenarioParameters() {
+        this.$emit('showScenarioParameters');
+      },
+      getVariableSize() {
+        let size = 0;
+        if (this.currentScenario.variables) {
+          size += this.currentScenario.variables.length;
+        }
+        if (this.currentScenario.headers && this.currentScenario.headers.length > 1) {
+          size += this.currentScenario.headers.length - 1;
+        }
+        this.varSize = size;
+        this.reload();
+      },
+      reload() {
+        this.loading = true
+        this.$nextTick(() => {
+          this.loading = false
+        })
+      },
+      setProjectEnvMap(projectEnvMap) {
+        this.envMap = projectEnvMap;
+      }
+    },
+  }
+</script>
+
+<style scoped>
+  .ms-header {
+    border-bottom: 1px solid #E6E6E6;
+    height: 65px;
+    background-color: #FFF;
+  }
+
+  .ms-div {
+    float: left;
+    width: 80%;
+    margin-left: 20px;
+    margin-top: 12px;
+  }
+
+  .ms-span {
+    margin: 0px 10px 10px;
+  }
+
+  .ms-header-right {
+    float: right;
+    margin-bottom: 10px;
+    margin-top: 10px;
+    margin-right: 20px;
+  }
+
+  .alt-ico {
+    font-size: 18px;
+    margin: 10px 0px 0px;
+  }
+
+  .alt-ico:hover {
+    color: black;
+    cursor: pointer;
+    font-size: 18px;
+  }
+
+  .ms-font {
+    color: #303133;
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+    font-size: 13px;
+  }
+
+  .ms-col-one {
+    margin-top: 5px;
+  }
+</style>
diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue b/frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue
index 17a7d5d5a2..190d4bdc9e 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue
@@ -6,6 +6,8 @@
     @active="active"
     :data="assertions"
     :draggable="draggable"
+    :is-max="isMax"
+    :show-btn="showBtn"
     color="#A30014"
     background-color="#F7E6E9"
     :title="$t('api_test.definition.request.assertions_rule')">
@@ -87,6 +89,14 @@
         type: Boolean,
         default: false,
       },
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
       assertions: {},
       node: {},
       request: {},
diff --git a/frontend/src/business/components/api/definition/components/extract/ApiExtract.vue b/frontend/src/business/components/api/definition/components/extract/ApiExtract.vue
index edd56731f9..3b8fab00a6 100644
--- a/frontend/src/business/components/api/definition/components/extract/ApiExtract.vue
+++ b/frontend/src/business/components/api/definition/components/extract/ApiExtract.vue
@@ -5,6 +5,8 @@
     @active="active"
     :data="extract"
     :draggable="draggable"
+    :is-max="isMax"
+    :show-btn="showBtn"
     color="#015478"
     background-color="#E6EEF2"
     :title="$t('api_test.definition.request.extract_param')">
@@ -41,26 +43,26 @@
 </template>
 
 <script>
-import {EXTRACT_TYPE} from "../../model/ApiTestModel";
-import MsApiExtractEdit from "./ApiExtractEdit";
-import MsApiExtractCommon from "./ApiExtractCommon";
-import {getUUID} from "@/common/js/utils";
-import ApiJsonPathSuggestButton from "../assertion/ApiJsonPathSuggestButton";
-import MsApiJsonpathSuggest from "../assertion/ApiJsonpathSuggest";
-import {ExtractJSONPath} from "../../../test/model/ScenarioModel";
-import ApiBaseComponent from "../../../automation/scenario/common/ApiBaseComponent";
+  import {EXTRACT_TYPE} from "../../model/ApiTestModel";
+  import MsApiExtractEdit from "./ApiExtractEdit";
+  import MsApiExtractCommon from "./ApiExtractCommon";
+  import {getUUID} from "@/common/js/utils";
+  import ApiJsonPathSuggestButton from "../assertion/ApiJsonPathSuggestButton";
+  import MsApiJsonpathSuggest from "../assertion/ApiJsonpathSuggest";
+  import {ExtractJSONPath} from "../../../test/model/ScenarioModel";
+  import ApiBaseComponent from "../../../automation/scenario/common/ApiBaseComponent";
 
-export default {
-  name: "MsApiExtract",
-  components: {
-    ApiBaseComponent,
-    MsApiJsonpathSuggest,
-    ApiJsonPathSuggestButton,
-    MsApiExtractCommon,
-    MsApiExtractEdit,
-  },
-  props: {
-    extract: {},
+  export default {
+    name: "MsApiExtract",
+    components: {
+      ApiBaseComponent,
+      MsApiJsonpathSuggest,
+      ApiJsonPathSuggestButton,
+      MsApiExtractCommon,
+      MsApiExtractEdit,
+    },
+    props: {
+      extract: {},
       response: {},
       node: {},
       customizeStyle: {
@@ -74,7 +76,15 @@ export default {
       draggable: {
         type: Boolean,
         default: false,
-      }
+      },
+      isMax: {
+        type: Boolean,
+        default: false,
+      },
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
     },
     data() {
       return {

From c3d1c454b545fb3278065aa04021cbcd43d35b9b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Mar 2021 20:39:09 +0800
Subject: [PATCH 08/95] =?UTF-8?q?refactor:=20=E7=94=A8=E4=BE=8B=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=B7=BB=E5=8A=A0=E8=84=91=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestReviewCaseMapper.xml    |  13 +-
 .../track/service/TestCaseNodeService.java    |  13 +-
 .../common/components/MsModuleMinder.vue      |   1 +
 .../common/components/MsTableHeader.vue       |   2 +-
 .../components/track/case/TestCase.vue        |   2 +-
 .../minder/TestCaseMinder.vue                 |  61 +--------
 .../track/common/minder/TestReviewMinder.vue  | 128 ++++++++++++++++++
 .../track/common/minder/minderUtils.js        |  59 ++++++++
 .../review/components/TestCaseReviewList.vue  |   8 +-
 .../view/components/TestReviewFunction.vue    |  47 +++++--
 .../components/TestReviewTestCaseList.vue     |   8 +-
 11 files changed, 250 insertions(+), 92 deletions(-)
 rename frontend/src/business/components/track/{case/components => common}/minder/TestCaseMinder.vue (65%)
 create mode 100644 frontend/src/business/components/track/common/minder/TestReviewMinder.vue
 create mode 100644 frontend/src/business/components/track/common/minder/minderUtils.js

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 00f773ad2b..a520d29d33 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
@@ -97,10 +97,13 @@
     </sql>
 
     <select id="list" resultType="io.metersphere.track.dto.TestReviewCaseDTO">
-        select test_case_review_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
-        test_case.type, test_case.node_path, test_case.method, test_case.num, test_case_review_test_case.reviewer,
-        test_case.review_status, test_case_review_test_case.update_time, test_case_node.name as model,
-        project.name as projectName, test_case_review_test_case.review_id as reviewId,test_case.test_id as testId
+        select test_case_review_test_case.id as id, test_case_review_test_case.reviewer,
+        test_case_review_test_case.update_time, test_case_review_test_case.review_id as reviewId,
+        test_case.id as caseId, test_case.name, test_case.priority,  test_case.test_id as testId,
+        test_case.type, test_case.node_path, test_case.method, test_case.num, test_case.review_status,
+        test_case.remark as remark,  test_case.steps as steps, test_case.node_id as nodeId,
+        test_case_node.name as model,
+        project.name as projectName
         from test_case_review_test_case
         inner join test_case on test_case_review_test_case.case_id = test_case.id
         left join test_case_node on test_case_node.id=test_case.node_id
@@ -215,4 +218,4 @@
             #{id}
         </foreach>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
index 6322147321..ee74a265d0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
@@ -212,11 +212,14 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
             List<String> caseIds = testCaseReviewTestCases.stream().map(TestCaseReviewTestCase::getCaseId).collect(Collectors.toList());
 
             List<TestCaseNodeDTO> nodeList = getReviewNodeDTO(id, caseIds);
-            TestCaseNodeDTO testCaseNodeDTO = new TestCaseNodeDTO();
-            testCaseNodeDTO.setName(name);
-            testCaseNodeDTO.setLabel(name);
-            testCaseNodeDTO.setChildren(nodeList);
-            list.add(testCaseNodeDTO);
+            if (!CollectionUtils.isEmpty(nodeList)) {
+                TestCaseNodeDTO testCaseNodeDTO = new TestCaseNodeDTO();
+                testCaseNodeDTO.setName(name);
+                testCaseNodeDTO.setLabel(name);
+                testCaseNodeDTO.setChildren(nodeList);
+                testCaseNodeDTO.setProjectId(id);
+                list.add(testCaseNodeDTO);
+            }
         });
         return list;
 
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index 6b5975f838..d8ceb1aa5c 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -5,6 +5,7 @@
       class="minder-container"
       :import-json="importJson"
       :height="700"
+      :progress-enable="false"
       @save="save"
     />
   </div>
diff --git a/frontend/src/business/components/common/components/MsTableHeader.vue b/frontend/src/business/components/common/components/MsTableHeader.vue
index 2a9918eae9..3cf7c5c6d3 100644
--- a/frontend/src/business/components/common/components/MsTableHeader.vue
+++ b/frontend/src/business/components/common/components/MsTableHeader.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <div>
+  <div class="ms-table-header">
     <el-row v-if="title" class="table-title" type="flex" justify="space-between" align="middle">
       <slot name="title">
         {{title}}
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 890abb27f3..9bc3ed09d0 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -102,7 +102,7 @@ import {checkoutTestManagerOrTestUser, getCurrentProjectID, getUUID} from "../..
 import TestCaseNodeTree from "../common/TestCaseNodeTree";
 
 import MsTabButton from "@/business/components/common/components/MsTabButton";
-import TestCaseMinder from "@/business/components/track/case/components/minder/TestCaseMinder";
+import TestCaseMinder from "@/business/components/track/common/minder/TestCaseMinder";
 
 export default {
   name: "TestCase",
diff --git a/frontend/src/business/components/track/case/components/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
similarity index 65%
rename from frontend/src/business/components/track/case/components/minder/TestCaseMinder.vue
rename to frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 70950fd491..85340c98f2 100644
--- a/frontend/src/business/components/track/case/components/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -9,6 +9,7 @@
 
 <script>
 import MsModuleMinder from "@/business/components/common/components/MsModuleMinder";
+import {getTestCaseDataMap} from "@/business/components/track/common/minder/minderUtils";
 export default {
 name: "TestCaseMinder",
   components: {MsModuleMinder},
@@ -39,7 +40,7 @@ name: "TestCaseMinder",
       if (this.projectId) {
         this.result = this.$get('/test/case/list/detail/' + this.projectId,response => {
           this.testCase = response.data;
-          this.parse();
+          this.dataMap = getTestCaseDataMap(this.testCase);
         });
       }
     },
@@ -113,63 +114,7 @@ name: "TestCaseMinder",
         saveCases.push(testCase);
       }
     },
-    parse() {
-      let dataMap = new Map();
-      this.testCase.forEach(item => {
-        item.steps = JSON.parse(item.steps);
-        // if (item.tags && item.tags.length > 0) {
-        //   item.tags = JSON.parse(item.tags);
-        // }
-        let mapItem = dataMap.get(item.nodeId);
-        let nodeItem = {
-          data: {
-            id: item.id,
-            text: item.name,
-            priority: Number.parseInt(item.priority.substring(item.priority.length - 1 )),
-            resource: ["用例"],
-            type: item.type,
-            method: item.method,
-            maintainer: item.maintainer
-          }
-        }
-        this.parseChildren(nodeItem, item);
-        if (mapItem) {
-          mapItem.push(nodeItem);
-        } else {
-          mapItem = [];
-          mapItem.push(nodeItem);
-          dataMap.set(item.nodeId, mapItem);
-        }
-      })
-      this.dataMap = dataMap;
-    },
-    parseChildren(nodeItem, item) {
-      nodeItem.children = [];
-      let children = [];
-      this._parseChildren(children, item.prerequisite, "前置条件");
-      item.steps.forEach((step) => {
-        let descNode = this._parseChildren(children, step.desc, "测试步骤");
-        if (descNode) {
-          descNode.data.num = step.num;
-          descNode.children = [];
-          this._parseChildren(descNode.children, step.result, "预期结果");
-        }
-      });
-      this._parseChildren(children, item.remark, "备注");
-      nodeItem.children = children;
-    },
-    _parseChildren(children, k, v) {
-      if (k) {
-        let node = {
-          data: {
-            text: k,
-            resource: [v]
-          }
-        }
-        children.push(node);
-        return node;
-      }
-    }
+
   }
 }
 </script>
diff --git a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
new file mode 100644
index 0000000000..d85d5c1309
--- /dev/null
+++ b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
@@ -0,0 +1,128 @@
+<template>
+  <ms-module-minder
+    v-loading="result.loading"
+    :tree-nodes="treeNodes"
+    :data-map="dataMap"
+    @save="save"
+  />
+</template>
+
+<script>
+import MsModuleMinder from "@/business/components/common/components/MsModuleMinder";
+import {getTestCaseDataMap} from "@/business/components/track/common/minder/minderUtils";
+export default {
+name: "TestReviewMinder",
+  components: {MsModuleMinder},
+  data() {
+    return{
+      testCase: [],
+      dataMap: new Map(),
+      result: {}
+    }
+  },
+  props: {
+    treeNodes: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    selectNodeIds: {
+      type: Array
+    },
+    reviewId: {
+      type: String
+    },
+    projectId: String
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.getTestCases();
+    })
+  },
+  methods: {
+    getTestCases() {
+      if (this.projectId) {
+        this.result = this.$post('/test/review/case/list/all', {reviewId: this.reviewId}, response => {
+          this.testCase = response.data;
+          this.dataMap = getTestCaseDataMap(this.testCase);
+        });
+      }
+    },
+    save(data) {
+      // let saveCases = [];
+      // this.buildSaveCase(data.root, saveCases, undefined);
+      // console.log(saveCases);
+      // let param = {
+      //   projectId: this.projectId,
+      //   data: saveCases
+      // }
+      // this.result = this.$post('/test/case/minder/edit', param, () => {
+      //   this.$success(this.$t('commons.save_success'));
+      // });
+    },
+    buildSaveCase(root, saveCases, parent) {
+      let data = root.data;
+      if (data.resource && data.resource.indexOf("用例") > -1) {
+        this._buildSaveCase(root, saveCases, parent);
+      } else {
+        if (root.children) {
+          root.children.forEach((childNode) => {
+            this.buildSaveCase(childNode, saveCases, root.data);
+          })
+        }
+      }
+    },
+    _buildSaveCase(node, saveCases, parent) {
+      let data = node.data;
+      let isChange = false;
+      let testCase = {
+        id: data.id,
+        name: data.text,
+        nodeId: parent ? parent.id : "",
+        nodePath: parent ? parent.path : "",
+        type: data.type ? data.type : 'functional',
+        method: data.method ? data.method : 'manual',
+        maintainer: data.maintainer,
+        priority: 'P' + data.priority,
+      };
+      if (data.changed) isChange = true;
+      let steps = [];
+      let stepNum = 1;
+      if (node.children) {
+        node.children.forEach((childNode) => {
+          let childData = childNode.data;
+          if (childData.resource && childData.resource.indexOf('前置条件') > -1) {
+            testCase.prerequisite = childData.text;
+          } else if (childData.resource && childData.resource.indexOf('备注') > -1) {
+            testCase.remark = childData.text;
+          } else {
+            // 测试步骤
+            let step = {};
+            step.num = stepNum++;
+            step.desc = childData.text;
+            if (childNode.children) {
+              let result = "";
+              childNode.children.forEach((child) => {
+                result += child.data.text;
+                if (child.data.changed) isChange = true;
+              })
+              step.result = result;
+            }
+            steps.push(step);
+          }
+          if (childData.changed) isChange = true;
+        })
+      }
+      testCase.steps = JSON.stringify(steps);
+      if (isChange) {
+        saveCases.push(testCase);
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
new file mode 100644
index 0000000000..e5f171d903
--- /dev/null
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -0,0 +1,59 @@
+export function getTestCaseDataMap(testCase) {
+  let dataMap = new Map();
+  testCase.forEach(item => {
+    item.steps = JSON.parse(item.steps);
+    // if (item.tags && item.tags.length > 0) {
+    //   item.tags = JSON.parse(item.tags);
+    // }
+    let mapItem = dataMap.get(item.nodeId);
+    let nodeItem = {
+      data: {
+        id: item.id,
+        text: item.name,
+        priority: Number.parseInt(item.priority.substring(item.priority.length - 1 )),
+        resource: ["用例"],
+        type: item.type,
+        method: item.method,
+        maintainer: item.maintainer
+      }
+    }
+    parseChildren(nodeItem, item);
+    if (mapItem) {
+      mapItem.push(nodeItem);
+    } else {
+      mapItem = [];
+      mapItem.push(nodeItem);
+      dataMap.set(item.nodeId, mapItem);
+    }
+  })
+  return dataMap;
+}
+
+function parseChildren(nodeItem, item) {
+  nodeItem.children = [];
+  let children = [];
+  _parseChildren(children, item.prerequisite, "前置条件");
+  item.steps.forEach((step) => {
+    let descNode = _parseChildren(children, step.desc, "测试步骤");
+    if (descNode) {
+      descNode.data.num = step.num;
+      descNode.children = [];
+      _parseChildren(descNode.children, step.result, "预期结果");
+    }
+  });
+  _parseChildren(children, item.remark, "备注");
+  nodeItem.children = children;
+}
+
+function _parseChildren(children, k, v) {
+  if (k) {
+    let node = {
+      data: {
+        text: k,
+        resource: [v]
+      }
+    }
+    children.push(node);
+    return node;
+  }
+}
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 4824621c36..8341430029 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -1,12 +1,9 @@
 <template>
-  <el-card class="table-card" v-loading="result.loading">
-    <template v-slot:header>
+  <div class="table-card" v-loading="result.loading">
       <ms-table-header :is-tester-permission="true" :condition.sync="condition"
                        @search="initTableData" @create="testCaseReviewCreate"
                        :create-tip="$t('test_track.review.create_review')"
                        :title="$t('test_track.review.test_review')"/>
-    </template>
-
     <el-table
       border
       class="adjust-table"
@@ -106,8 +103,7 @@
     <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
                          :total="total"/>
     <ms-delete-confirm :title="$t('test_track.review.delete')" @delete="_handleDelete" ref="deleteConfirm"/>
-
-  </el-card>
+  </div>
 </template>
 
 <script>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
index 2d0015cf89..b1bc061add 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
@@ -10,15 +10,30 @@
         ref="nodeTree"/>
     </template>
     <template v-slot:main>
-      <test-review-test-case-list
-        class="table-list"
-        @openTestReviewRelevanceDialog="openTestReviewRelevanceDialog"
-        @refresh="refresh"
-        :review-id="reviewId"
-        :select-node-ids="selectNodeIds"
-        :select-parent-nodes="selectParentNodes"
-        :clickType="clickType"
-        ref="testPlanTestCaseList"/>
+      <ms-tab-button
+        :active-dom.sync="activeDom"
+        :left-tip="'用例列表'"
+        :left-content="'CASE'"
+        :right-tip="'脑图'"
+        :right-content="'脑图'"
+        :middle-button-enable="false">
+        <test-review-test-case-list
+          class="table-list"
+          v-if="activeDom === 'left'"
+          @openTestReviewRelevanceDialog="openTestReviewRelevanceDialog"
+          @refresh="refresh"
+          :review-id="reviewId"
+          :select-node-ids="selectNodeIds"
+          :select-parent-nodes="selectParentNodes"
+          :clickType="clickType"
+          ref="testPlanTestCaseList"/>
+        <test-review-minder
+          :tree-nodes="treeNodes"
+          :project-id="projectId"
+          :review-id="reviewId"
+          v-if="activeDom === 'right'"
+        />
+      </ms-tab-button>
     </template>
     <test-review-relevance
       @refresh="refresh"
@@ -33,10 +48,15 @@ import FunctionalTestCaseList from "@/business/components/track/plan/view/comone
 import MsNodeTree from "@/business/components/track/common/NodeTree";
 import TestReviewRelevance from "@/business/components/track/review/view/components/TestReviewRelevance";
 import TestReviewTestCaseList from "@/business/components/track/review/view/components/TestReviewTestCaseList";
+import MsTabButton from "@/business/components/common/components/MsTabButton";
+import TestReviewMinder from "@/business/components/track/common/minder/TestReviewMinder";
+import {getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "TestReviewFunction",
   components: {
+    TestReviewMinder,
+    MsTabButton,
     TestReviewTestCaseList,
     TestReviewRelevance, MsNodeTree, FunctionalTestCaseList, MsTestPlanCommonComponent
   },
@@ -49,15 +69,18 @@ export default {
       selectParentNodes: [],
       treeNodes: [],
       isMenuShow: true,
+      activeDom: 'left',
+      projectId: ""
     }
   },
   props: [
     'reviewId',
     'redirectCharType',
-    'clickType'
+    'clickType',
   ],
   mounted() {
     this.getNodeTreeByReviewId()
+    this.projectId = getCurrentProjectID();
   },
   activated() {
     this.getNodeTreeByReviewId()
@@ -89,5 +112,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .el-button-group>.el-button:first-child {
+  padding: 4px 1px !important;
+}
 </style>
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 213b447120..33432539b0 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="card-container">
-    <el-card class="card-content" v-loading="result.loading">
-      <template v-slot:header>
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :show-create="false" :tip="$t('commons.search_by_name_or_id')">
           <template v-slot:title>
@@ -16,7 +14,6 @@
                              @click="$emit('openTestReviewRelevanceDialog')"/>
           </template>
         </ms-table-header>
-      </template>
 
       <executor-edit ref="executorEdit" :select-ids="new Set(Array.from(this.selectRows).map(row => row.id))"
                      @refresh="initTableData"/>
@@ -176,7 +173,6 @@
         :is-read-only="isReadOnly"
         @refreshTable="search"/>
 
-    </el-card>
 
     <batch-edit ref="batchEdit" @batchEdit="batchEdit"
                 :type-arr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/>
@@ -472,6 +468,8 @@ export default {
 </script>
 
 <style scoped>
-
+.ms-table-header {
+  margin: 20px;
+}
 </style>
 

From 0a192044186bcd2a174b2ecaecaf6f0d0c46752f Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Mon, 15 Mar 2021 20:42:38 +0800
Subject: [PATCH 09/95] =?UTF-8?q?feat(=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?):=20=E4=BF=AE=E6=94=B9schedule=E8=A1=A8=E5=92=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8Cswagger=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B9=9F=E6=98=BE=E7=A4=BA=E5=9C=A8=E9=A6=96=E9=A1=B5=20(#1627?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* feat(定时任务): 修改schedule表和查询，swagger定时任务也显示在首页

增加了schedule表的project ID、name字段，重写了首页定时任务列表的查询语句
---
 .../api/controller/APITestController.java     |  14 +-
 .../controller/ApiDefinitionController.java   |   3 +-
 .../datacount/response/TaskInfoResult.java    |   2 +
 .../api/service/APITestService.java           |   2 +
 .../api/service/ApiAutomationService.java     |  11 +-
 .../api/service/ApiDefinitionService.java     |   6 +-
 .../io/metersphere/base/domain/Schedule.java  |   7 +-
 .../base/domain/ScheduleExample.java          | 140 ++++++++++++++++++
 .../base/domain/TestCaseExample.java          | 140 +++++++++---------
 .../base/mapper/ScheduleMapper.java           |   6 -
 .../base/mapper/ScheduleMapper.xml            | 105 ++++---------
 .../base/mapper/ext/ExtScheduleMapper.java    |   4 +-
 .../base/mapper/ext/ExtScheduleMapper.xml     |  50 +++----
 .../metersphere/service/ScheduleService.java  |  20 ++-
 .../track/service/TestPlanService.java        |   3 +
 .../db/migration/V78__v1.8_release.sql        |  43 +++++-
 .../homepage/components/RunningTaskList.vue   |   5 +-
 frontend/src/i18n/en-US.js                    |   1 +
 frontend/src/i18n/zh-CN.js                    |   1 +
 frontend/src/i18n/zh-TW.js                    |   1 +
 20 files changed, 364 insertions(+), 200 deletions(-)

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 5cedaab099..36becbff0b 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -15,6 +15,7 @@ import io.metersphere.api.service.*;
 import io.metersphere.base.domain.ApiTest;
 import io.metersphere.base.domain.Schedule;
 import io.metersphere.commons.constants.RoleConstants;
+import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.utils.CronUtils;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
@@ -28,15 +29,13 @@ import io.metersphere.service.ScheduleService;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.python.core.AstList;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 import static io.metersphere.commons.utils.JsonPathUtils.getListJson;
 
@@ -345,8 +344,11 @@ public class APITestController {
 
     @GetMapping("/runningTask/{projectID}")
     public List<TaskInfoResult> runningTask(@PathVariable String projectID) {
-
-        List<TaskInfoResult> resultList = scheduleService.findRunningTaskInfoByProjectID(projectID);
+        List<String> typeFilter = Arrays.asList(   //  首页显示的运行中定时任务，只要这3种，不需要 性能测试、api_test(旧版)
+                ScheduleGroup.API_SCENARIO_TEST.name(),
+                ScheduleGroup.SWAGGER_IMPORT.name(),
+                ScheduleGroup.TEST_PLAN_TEST.name());
+        List<TaskInfoResult> resultList = scheduleService.findRunningTaskInfoByProjectID(projectID, typeFilter);
         int dataIndex = 1;
         for (TaskInfoResult taskInfo :
                 resultList) {
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
index 11be08adc6..2e971f4121 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.net.MalformedURLException;
 import java.util.Date;
 import java.util.List;
 
@@ -157,7 +158,7 @@ public class ApiDefinitionController {
 
     //定时任务创建
     @PostMapping(value = "/schedule/create")
-    public void createSchedule(@RequestBody ScheduleRequest request) {
+    public void createSchedule(@RequestBody ScheduleRequest request) throws MalformedURLException {
         apiDefinitionService.createSchedule(request);
     }
     @PostMapping(value = "/schedule/update")
diff --git a/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java b/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
index 6c90913005..ec52e140a4 100644
--- a/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
+++ b/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
@@ -29,5 +29,7 @@ public class TaskInfoResult {
     private Long updateTime;
     //定时任务类型  情景定时任务/范围计划任务
     private String taskType;
+    //定时任务组别  swagger/scenario/testPlan 等
+    private String taskGroup;
 
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index e1534ac3ff..659bcef3ba 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -339,6 +339,8 @@ public class APITestService {
         schedule.setJob(ApiTestJob.class.getName());
         schedule.setGroup(ScheduleGroup.API_TEST.name());
         schedule.setType(ScheduleType.CRON.name());
+        schedule.setProjectId(request.getProjectId());
+        schedule.setName(request.getName());
         return schedule;
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index a620aef449..917ba0216b 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -24,10 +24,7 @@ import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiScenarioMapper;
 import io.metersphere.base.mapper.ApiScenarioReportMapper;
 import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
-import io.metersphere.base.mapper.ext.ExtApiScenarioMapper;
-import io.metersphere.base.mapper.ext.ExtTestPlanApiCaseMapper;
-import io.metersphere.base.mapper.ext.ExtTestPlanMapper;
-import io.metersphere.base.mapper.ext.ExtTestPlanScenarioCaseMapper;
+import io.metersphere.base.mapper.ext.*;
 import io.metersphere.commons.constants.*;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
@@ -63,6 +60,8 @@ import java.util.stream.Collectors;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class ApiAutomationService {
+    @Resource
+    private ExtScheduleMapper extScheduleMapper;
     @Resource
     private ApiScenarioMapper apiScenarioMapper;
     @Resource
@@ -196,6 +195,7 @@ public class ApiAutomationService {
 
         final ApiScenarioWithBLOBs scenario = buildSaveScenario(request);
         apiScenarioMapper.updateByPrimaryKeySelective(scenario);
+        extScheduleMapper.updateNameByResourceID(request.getId(), request.getName());//  修改场景name，同步到修改首页定时任务
     }
 
     public ApiScenarioWithBLOBs buildSaveScenario(SaveApiScenarioRequest request) {
@@ -720,6 +720,9 @@ public class ApiAutomationService {
 
     public void createSchedule(ScheduleRequest request) {
         Schedule schedule = scheduleService.buildApiTestSchedule(request);
+        ApiScenarioWithBLOBs apiScene = apiScenarioMapper.selectByPrimaryKey(request.getResourceId());
+        schedule.setName(apiScene.getName());   //  add场景定时任务时，设置新增的数据库表字段的值
+        schedule.setProjectId(apiScene.getProjectId());
         schedule.setJob(ApiScenarioTestJob.class.getName());
         schedule.setGroup(ScheduleGroup.API_SCENARIO_TEST.name());
         schedule.setType(ScheduleType.CRON.name());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index f75c94201a..c99ca91602 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -49,6 +49,7 @@ import sun.security.util.Cache;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.net.MalformedURLException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -702,7 +703,7 @@ public class ApiDefinitionService {
     }
 
     /*swagger定时导入*/
-    public void createSchedule(ScheduleRequest request) {
+    public void createSchedule(ScheduleRequest request) throws MalformedURLException {
         /*保存swaggerUrl*/
         SwaggerUrlProject swaggerUrlProject = new SwaggerUrlProject();
         swaggerUrlProject.setId(UUID.randomUUID().toString());
@@ -714,6 +715,9 @@ public class ApiDefinitionService {
         scheduleService.addSwaggerUrlSchedule(swaggerUrlProject);
         request.setResourceId(swaggerUrlProject.getId());
         Schedule schedule = scheduleService.buildApiTestSchedule(request);
+        schedule.setProjectId(swaggerUrlProject.getProjectId());
+        java.net.URL swaggerUrl = new java.net.URL(swaggerUrlProject.getSwaggerUrl());
+        schedule.setName(swaggerUrl.getHost()); //  swagger 定时任务的 name 设置为 swaggerURL 的域名
         schedule.setJob(SwaggerUrlImportJob.class.getName());
         schedule.setGroup(ScheduleGroup.SWAGGER_IMPORT.name());
         schedule.setType(ScheduleType.CRON.name());
diff --git a/backend/src/main/java/io/metersphere/base/domain/Schedule.java b/backend/src/main/java/io/metersphere/base/domain/Schedule.java
index c92c80d081..fb62fa9e24 100644
--- a/backend/src/main/java/io/metersphere/base/domain/Schedule.java
+++ b/backend/src/main/java/io/metersphere/base/domain/Schedule.java
@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class Schedule implements Serializable {
@@ -30,7 +29,9 @@ public class Schedule implements Serializable {
 
     private Long updateTime;
 
-    private String customData;
+    private String projectId;
+
+    private String name;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ScheduleExample.java b/backend/src/main/java/io/metersphere/base/domain/ScheduleExample.java
index 88a8639e63..2a5c4e6fe6 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ScheduleExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ScheduleExample.java
@@ -913,6 +913,146 @@ public class ScheduleExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("project_id like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("project_id not like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("`name` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("`name` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("`name` =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("`name` <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("`name` >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("`name` >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("`name` <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("`name` <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("`name` like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("`name` not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("`name` in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("`name` not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("`name` between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("`name` not between", value1, value2, "name");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
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 96daffcbf2..9b80e197b0 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
@@ -244,6 +244,76 @@ public class TestCaseExample {
             return (Criteria) this;
         }
 
+        public Criteria andTestIdIsNull() {
+            addCriterion("test_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdIsNotNull() {
+            addCriterion("test_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdEqualTo(String value) {
+            addCriterion("test_id =", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotEqualTo(String value) {
+            addCriterion("test_id <>", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdGreaterThan(String value) {
+            addCriterion("test_id >", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdGreaterThanOrEqualTo(String value) {
+            addCriterion("test_id >=", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLessThan(String value) {
+            addCriterion("test_id <", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLessThanOrEqualTo(String value) {
+            addCriterion("test_id <=", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLike(String value) {
+            addCriterion("test_id like", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotLike(String value) {
+            addCriterion("test_id not like", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdIn(List<String> values) {
+            addCriterion("test_id in", values, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotIn(List<String> values) {
+            addCriterion("test_id not in", values, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdBetween(String value1, String value2) {
+            addCriterion("test_id between", value1, value2, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotBetween(String value1, String value2) {
+            addCriterion("test_id not between", value1, value2, "testId");
+            return (Criteria) this;
+        }
+
         public Criteria andNodePathIsNull() {
             addCriterion("node_path is null");
             return (Criteria) this;
@@ -924,76 +994,6 @@ public class TestCaseExample {
             return (Criteria) this;
         }
 
-        public Criteria andTestIdIsNull() {
-            addCriterion("test_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdIsNotNull() {
-            addCriterion("test_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdEqualTo(String value) {
-            addCriterion("test_id =", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotEqualTo(String value) {
-            addCriterion("test_id <>", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdGreaterThan(String value) {
-            addCriterion("test_id >", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdGreaterThanOrEqualTo(String value) {
-            addCriterion("test_id >=", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdLessThan(String value) {
-            addCriterion("test_id <", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdLessThanOrEqualTo(String value) {
-            addCriterion("test_id <=", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdLike(String value) {
-            addCriterion("test_id like", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotLike(String value) {
-            addCriterion("test_id not like", value, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdIn(List<String> values) {
-            addCriterion("test_id in", values, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotIn(List<String> values) {
-            addCriterion("test_id not in", values, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdBetween(String value1, String value2) {
-            addCriterion("test_id between", value1, value2, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotBetween(String value1, String value2) {
-            addCriterion("test_id not between", value1, value2, "testId");
-            return (Criteria) this;
-        }
-
         public Criteria andSortIsNull() {
             addCriterion("sort is null");
             return (Criteria) this;
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.java
index 264e2f2e58..99139e6746 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.java
@@ -16,21 +16,15 @@ public interface ScheduleMapper {
 
     int insertSelective(Schedule record);
 
-    List<Schedule> selectByExampleWithBLOBs(ScheduleExample example);
-
     List<Schedule> selectByExample(ScheduleExample example);
 
     Schedule selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") Schedule record, @Param("example") ScheduleExample example);
 
-    int updateByExampleWithBLOBs(@Param("record") Schedule record, @Param("example") ScheduleExample example);
-
     int updateByExample(@Param("record") Schedule record, @Param("example") ScheduleExample example);
 
     int updateByPrimaryKeySelective(Schedule record);
 
-    int updateByPrimaryKeyWithBLOBs(Schedule record);
-
     int updateByPrimaryKey(Schedule record);
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.xml
index 8718a9b47f..44b9d2f35c 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ScheduleMapper.xml
@@ -14,9 +14,8 @@
     <result column="workspace_id" jdbcType="VARCHAR" property="workspaceId" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.Schedule">
-    <result column="custom_data" jdbcType="LONGVARCHAR" property="customData" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -78,27 +77,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, `key`, `type`, `value`, `group`, job, `enable`, resource_id, user_id, workspace_id, 
-    create_time, update_time
+    create_time, update_time, project_id, `name`
   </sql>
-  <sql id="Blob_Column_List">
-    custom_data
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.ScheduleExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from schedule
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.ScheduleExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -113,11 +93,9 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from schedule
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -136,12 +114,12 @@
       `value`, `group`, job, 
       `enable`, resource_id, user_id, 
       workspace_id, create_time, update_time, 
-      custom_data)
+      project_id, `name`)
     values (#{id,jdbcType=VARCHAR}, #{key,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
       #{value,jdbcType=VARCHAR}, #{group,jdbcType=VARCHAR}, #{job,jdbcType=VARCHAR}, 
       #{enable,jdbcType=BIT}, #{resourceId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
       #{workspaceId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{customData,jdbcType=LONGVARCHAR})
+      #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.Schedule">
     insert into schedule
@@ -182,8 +160,11 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="customData != null">
-        custom_data,
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="name != null">
+        `name`,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -223,8 +204,11 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=BIGINT},
       </if>
-      <if test="customData != null">
-        #{customData,jdbcType=LONGVARCHAR},
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -273,33 +257,17 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=BIGINT},
       </if>
-      <if test="record.customData != null">
-        custom_data = #{record.customData,jdbcType=LONGVARCHAR},
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        `name` = #{record.name,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update schedule
-    set id = #{record.id,jdbcType=VARCHAR},
-      `key` = #{record.key,jdbcType=VARCHAR},
-      `type` = #{record.type,jdbcType=VARCHAR},
-      `value` = #{record.value,jdbcType=VARCHAR},
-      `group` = #{record.group,jdbcType=VARCHAR},
-      job = #{record.job,jdbcType=VARCHAR},
-      `enable` = #{record.enable,jdbcType=BIT},
-      resource_id = #{record.resourceId,jdbcType=VARCHAR},
-      user_id = #{record.userId,jdbcType=VARCHAR},
-      workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT},
-      custom_data = #{record.customData,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByExample" parameterType="map">
     update schedule
     set id = #{record.id,jdbcType=VARCHAR},
@@ -313,7 +281,9 @@
       user_id = #{record.userId,jdbcType=VARCHAR},
       workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT}
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      `name` = #{record.name,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -354,28 +324,15 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=BIGINT},
       </if>
-      <if test="customData != null">
-        custom_data = #{customData,jdbcType=LONGVARCHAR},
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.Schedule">
-    update schedule
-    set `key` = #{key,jdbcType=VARCHAR},
-      `type` = #{type,jdbcType=VARCHAR},
-      `value` = #{value,jdbcType=VARCHAR},
-      `group` = #{group,jdbcType=VARCHAR},
-      job = #{job,jdbcType=VARCHAR},
-      `enable` = #{enable,jdbcType=BIT},
-      resource_id = #{resourceId,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=VARCHAR},
-      workspace_id = #{workspaceId,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT},
-      custom_data = #{customData,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.Schedule">
     update schedule
     set `key` = #{key,jdbcType=VARCHAR},
@@ -388,7 +345,9 @@
       user_id = #{userId,jdbcType=VARCHAR},
       workspace_id = #{workspaceId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT}
+      update_time = #{updateTime,jdbcType=BIGINT},
+      project_id = #{projectId,jdbcType=VARCHAR},
+      `name` = #{name,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/ExtScheduleMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.java
index 236a0ec067..36857bac0e 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.java
@@ -15,10 +15,12 @@ public interface ExtScheduleMapper {
 
     long countTaskByProjectIdAndCreateTimeRange(@Param("projectId")String projectId, @Param("startTime") long startTime, @Param("endTime") long endTime);
 
-    List<TaskInfoResult> findRunningTaskInfoByProjectID(String workspaceID);
+    List<TaskInfoResult> findRunningTaskInfoByProjectID(@Param("projectId") String workspaceID, @Param("types") List<String> typeFilter);
 
     void insert(@Param("apiSwaggerUrlDTO") ApiSwaggerUrlDTO apiSwaggerUrlDTO);
 
     ApiSwaggerUrlDTO  select(String id);
 
+    int updateNameByResourceID(@Param("resourceId") String resourceId, @Param("name") String name);
+
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
index b7e236df7d..853c7db49b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
@@ -61,35 +61,33 @@
           AND create_time BETWEEN #{startTime} and #{endTime}
     </select>
     <select id="findRunningTaskInfoByProjectID" resultType="io.metersphere.api.dto.datacount.response.TaskInfoResult">
-        SELECT apiScene.id     AS scenarioId,
-               apiScene.`name` AS `name`,
-               sch.id          AS taskID,
-               sch.`value`     AS rule,
-               sch.`enable`    AS `taskStatus`,
-               u.`name`        AS creator,
-               sch.update_time AS updateTime,
-               'scenario'      AS taskType
-        FROM api_scenario apiScene
-                 INNER JOIN `schedule` sch ON apiScene.id = sch.resource_id
-                 INNER JOIN `user` u ON u.id = sch.user_id
+        SELECT sch.id AS taskID,
+           sch.`name` AS `name`,
+           sch.`value`     AS rule,
+           sch.`enable`    AS `taskStatus`,
+           sch.update_time AS updateTime,
+           sch.id          AS taskID,
+           sch.`value`     AS rule,
+           sch.`enable`    AS `taskStatus`,
+           u.name        AS creator,
+           sch.update_time AS updateTime,
+           sch.type      AS taskType,
+           sch.group    AS taskGroup
+        FROM (
+          schedule sch left join user u
+          ON sch.user_id = u.id
+        )
         WHERE sch.`enable` = true
-          AND apiScene.project_id = #{0,jdbcType=VARCHAR}
-        UNION
-        SELECT testPlan.id     AS scenarioId,
-               testPlan.`name` AS `name`,
-               sch.id          AS taskID,
-               sch.`value`     AS rule,
-               sch.`enable`    AS `taskStatus`,
-               u.`name`        AS creator,
-               sch.update_time AS updateTime,
-               'testPlan'      AS taskType
-        FROM test_plan testPlan
-                 INNER JOIN `schedule` sch ON testPlan.id = sch.resource_id
-                 INNER JOIN `user` u ON u.id = sch.user_id
-        WHERE sch.`enable` = true
-          AND testPlan.project_id = #{0,jdbcType=VARCHAR}
+          AND sch.project_id = #{projectId,jdbcType=VARCHAR}
+          and sch.group in
+            <foreach collection="types" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
     </select>
     <select id="select" resultType="io.metersphere.api.dto.definition.ApiSwaggerUrlDTO">
         select * from swagger_url_project where id=#{id}
     </select>
+    <update id="updateNameByResourceID">
+        update schedule set name = #{name} where resource_id = #{resourceId}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/service/ScheduleService.java b/backend/src/main/java/io/metersphere/service/ScheduleService.java
index 279568b785..04ad49514a 100644
--- a/backend/src/main/java/io/metersphere/service/ScheduleService.java
+++ b/backend/src/main/java/io/metersphere/service/ScheduleService.java
@@ -4,9 +4,7 @@ import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.datacount.response.TaskInfoResult;
 import io.metersphere.api.dto.definition.ApiSwaggerUrlDTO;
 import io.metersphere.base.domain.*;
-import io.metersphere.base.mapper.ScheduleMapper;
-import io.metersphere.base.mapper.SwaggerUrlProjectMapper;
-import io.metersphere.base.mapper.UserMapper;
+import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtScheduleMapper;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.constants.ScheduleType;
@@ -38,6 +36,10 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class ScheduleService {
 
+    @Resource
+    private TestPlanMapper testPlanMapper;
+    @Resource
+    private ApiScenarioMapper apiScenarioMapper;
     @Resource
     private ScheduleMapper scheduleMapper;
     @Resource
@@ -214,8 +216,8 @@ public class ScheduleService {
         }
     }
 
-    public List<TaskInfoResult> findRunningTaskInfoByProjectID(String projectID) {
-        List<TaskInfoResult> runningTaskInfoList = extScheduleMapper.findRunningTaskInfoByProjectID(projectID);
+    public List<TaskInfoResult> findRunningTaskInfoByProjectID(String projectID, List<String> typeFilter) {
+        List<TaskInfoResult> runningTaskInfoList = extScheduleMapper.findRunningTaskInfoByProjectID(projectID, typeFilter);
         return  runningTaskInfoList;
     }
 
@@ -227,13 +229,19 @@ public class ScheduleService {
         TriggerKey triggerKey = null;
         Class clazz = null;
         if("testPlan".equals(request.getScheduleFrom())){
+            TestPlan testPlan = testPlanMapper.selectByPrimaryKey(request.getResourceId());
+            schedule.setName(testPlan.getName());
+            schedule.setProjectId(testPlan.getProjectId());
             schedule.setGroup(ScheduleGroup.TEST_PLAN_TEST.name());
             schedule.setType(ScheduleType.CRON.name());
             jobKey = TestPlanTestJob.getJobKey(request.getResourceId());
             triggerKey = TestPlanTestJob.getTriggerKey(request.getResourceId());
             clazz = TestPlanTestJob.class;
-        }else {
+        }else { //  实际上在场景中添加定时任务并不会执行到这里?
             //默认为情景
+            ApiScenarioWithBLOBs apiScene = apiScenarioMapper.selectByPrimaryKey(request.getResourceId());
+            schedule.setName(apiScene.getName());
+            schedule.setProjectId(apiScene.getProjectId());
             schedule.setGroup(ScheduleGroup.API_SCENARIO_TEST.name());
             schedule.setType(ScheduleType.CRON.name());
             jobKey = ApiScenarioTestJob.getJobKey(request.getResourceId());
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 08b343ee43..2ab2c5a1b0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -57,6 +57,8 @@ import java.util.stream.Collectors;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class TestPlanService {
+    @Resource
+    ExtScheduleMapper extScheduleMapper;
     @Resource
     TestPlanMapper testPlanMapper;
     @Resource
@@ -179,6 +181,7 @@ public class TestPlanService {
                 testPlan.setActualEndTime(System.currentTimeMillis());
             }
         }
+        extScheduleMapper.updateNameByResourceID(testPlan.getId(), testPlan.getName());//   同步更新该测试的定时任务的name
 
         List<String> userIds = new ArrayList<>();
         userIds.add(testPlan.getPrincipal());
diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
index 9c3112ba2a..653d8be041 100644
--- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql
+++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
@@ -96,4 +96,45 @@ alter table file_metadata
 alter table api_definition add original_state varchar(64);
 alter table api_scenario add original_state varchar(64);
 update api_definition set original_state='Underway';
-update api_scenario set original_state='Underway';
\ No newline at end of file
+update api_scenario set original_state='Underway';
+
+-- schedule table add project_id column
+alter table schedule add project_id varchar(50) NULL;
+-- set values for new colums of exitsting data
+update schedule sch inner join test_plan testPlan on
+      testPlan.id = sch.resource_id
+      set sch.project_id = testPlan.project_id where
+            sch.resource_id = testPlan.id;
+update schedule sch inner join swagger_url_project sup on
+      sup.id = sch.resource_id
+      set sch.project_id = sup.project_id where
+            sch.resource_id = sup.id;
+update schedule sch inner join api_scenario apiScene on
+      apiScene.id = sch.resource_id
+      set sch.project_id = apiScene.project_id where
+            sch.resource_id = apiScene.id;
+update schedule sch inner join load_test ldt on
+      ldt.id = sch.resource_id
+      set sch.project_id = ldt.project_id where
+            sch.resource_id = ldt.id;
+update schedule sch inner join api_test apiTest on
+      apiTest.id = sch.resource_id
+      set sch.project_id = apiTest.project_id where
+            sch.resource_id = apiTest.id;
+-- schedule table add name column
+alter table schedule add name varchar(100) NULL;
+-- set values for new colums of exitsting data
+update schedule sch inner join api_scenario apiScene on
+	apiScene.id = sch.resource_id
+	set sch.name = apiScene.name;
+update schedule sch inner join test_plan testPlan on
+	testPlan.id = sch.resource_id
+	set sch.name = testPlan.name;
+update schedule sch inner join load_test ldt on
+	ldt.id = sch.resource_id
+	set sch.name = ldt.name;
+update schedule sch inner join api_test apiTest on
+	apiTest.id = sch.resource_id
+	set sch.name = apiTest.name;
+-- delete an unused colum
+alter table schedule drop column custom_data;
\ No newline at end of file
diff --git a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
index 10838db102..66979a2b06 100644
--- a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
+++ b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
@@ -20,8 +20,9 @@
       </el-table-column>
       <el-table-column prop="taskType"  :label="$t('api_test.home_page.running_task_list.table_coloum.task_type')" width="120" show-overflow-tooltip>
         <template v-slot:default="scope">
-          <ms-tag v-if="scope.row.taskType == 'scenario'" type="success" effect="plain" :content="$t('api_test.home_page.running_task_list.scenario_schedule')"/>
-          <ms-tag v-if="scope.row.taskType == 'testPlan'" type="warning" effect="plain" :content="$t('api_test.home_page.running_task_list.test_plan_schedule')"/>
+          <ms-tag v-if="scope.row.taskGroup == 'API_SCENARIO_TEST'" type="success" effect="plain" :content="$t('api_test.home_page.running_task_list.scenario_schedule')"/>
+          <ms-tag v-if="scope.row.taskGroup == 'TEST_PLAN_TEST'" type="warning" effect="plain" :content="$t('api_test.home_page.running_task_list.test_plan_schedule')"/>
+          <ms-tag v-if="scope.row.taskGroup == 'SWAGGER_IMPORT'" type="danger" effect="plain" :content="$t('api_test.home_page.running_task_list.swagger_schedule')"/>
         </template>
       </el-table-column>
       <el-table-column prop="rule"  :label="$t('api_test.home_page.running_task_list.table_coloum.run_rule')" width="120" show-overflow-tooltip/>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 2e69834217..663306aef7 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1029,6 +1029,7 @@ export default {
         },
         scenario_schedule: "Scenario",
         test_plan_schedule: "Test plan",
+        swagger_schedule: "swagger",
         confirm: {
           close_title: "Do you want to close this scheduled task？",
         }
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 232b611f71..7786e7e492 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1033,6 +1033,7 @@ export default {
         },
         scenario_schedule: "场景",
         test_plan_schedule: "测试计划",
+        swagger_schedule: "swagger",
         confirm: {
           close_title: "要关闭这条定时任务吗？",
         }
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 17cd3fb05e..0707e7a6fa 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1031,6 +1031,7 @@ export default {
         },
         scenario_schedule: "場景",
         test_plan_schedule: "測試計畫",
+        swagger_schedule: "swagger",
         confirm: {
           close_title: "要關閉這條定時任務嗎？",
         }

From 7f8a4530355492c0ac25b0abc438cd4e97588970 Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Mon, 15 Mar 2021 20:43:01 +0800
Subject: [PATCH 10/95] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96=E3=80=81=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E5=AF=BC=E5=85=A5=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=85=A8=E9=80=89=E6=8C=89=E9=92=AE=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E4=B8=8D=E6=98=BE=E7=A4=BA=20(#1635)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: 修改接口自动化、接口定义的导入参数全选按钮，修复选框不显示
---
 .../api/definition/components/ApiKeyValue.vue | 30 ++++++++++---------
 .../api/definition/components/ApiVariable.vue | 28 +++++++++--------
 .../complete/EditCompleteHTTPApi.vue          |  2 +-
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
index 6f9631e8e0..056f5c49d1 100644
--- a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
+++ b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
@@ -3,21 +3,14 @@
     <span class="kv-description" v-if="description">
       {{ description }}
     </span>
-    <el-dropdown>
-      <span class="el-dropdown-link">
-        {{ $t('api_test.select_or_invert') }} <i class="el-icon-arrow-down el-icon--right"></i>
-      </span>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item @click.native="selectAll">{{ $t('api_test.select_all') }}</el-dropdown-item>
-        <el-dropdown-item @click.native="invertSelect">{{ $t('api_test.invert_select') }}</el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
+    <el-row>
+      <el-checkbox v-model="isSelectAll" v-if="items.length > 1"/>
+    </el-row>
     <div class="kv-row item" v-for="(item, index) in items" :key="index">
       <el-row type="flex" :gutter="20" justify="space-between" align="middle">
         <el-col class="kv-checkbox" v-if="isShowEnable">
-          <input type="checkbox" v-if="!isDisable(index)" v-model="item.enable"
+          <el-checkbox v-if="!isDisable(index)" v-model="item.enable"
                  :disabled="isReadOnly"/>
-
         </el-col>
         <span style="margin-left: 10px" v-else></span>
 
@@ -59,7 +52,7 @@
       valuePlaceholder: String,
       isShowEnable: {
         type: Boolean,
-        default: false
+        default: true
       },
       description: String,
       items: Array,
@@ -73,6 +66,7 @@
       return {
         keyValues: [],
         loading: false,
+        isSelectAll: true
       }
     },
     computed: {
@@ -83,7 +77,15 @@
         return this.valuePlaceholder || this.$t("api_test.value");
       }
     },
-
+    watch: {
+      isSelectAll: function(to, from) {
+        if(from == false && to == true) {
+          this.selectAll();
+        } else if(from == true && to == false) {
+          this.invertSelect();
+        }
+      }
+    },
     methods: {
       moveBottom(index) {
         if (this.items.length < 2 || index === this.items.length - 2) {
@@ -154,7 +156,7 @@
       },
       invertSelect() {
         this.items.forEach(item => {
-          item.enable = !item.enable;
+          item.enable = false;
         });
       },
     },
diff --git a/frontend/src/business/components/api/definition/components/ApiVariable.vue b/frontend/src/business/components/api/definition/components/ApiVariable.vue
index ca8cb56669..6ba88c2dbf 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariable.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariable.vue
@@ -3,19 +3,13 @@
     <span class="kv-description" v-if="description">
       {{ description }}
     </span>
-    <el-dropdown>
-      <span class="el-dropdown-link">
-        {{ $t('api_test.select_or_invert') }} <i class="el-icon-arrow-down el-icon--right"></i>
-      </span>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item @click.native="selectAll">{{ $t('api_test.select_all') }}</el-dropdown-item>
-        <el-dropdown-item @click.native="invertSelect">{{ $t('api_test.invert_select') }}</el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
+    <el-row>
+      <el-checkbox v-model="isSelectAll" v-if="parameters.length > 1"/>
+    </el-row>
     <div class="item kv-row" v-for="(item, index) in parameters" :key="index">
       <el-row type="flex" :gutter="20" justify="space-between" align="middle">
         <el-col class="kv-checkbox" v-if="isShowEnable">
-          <input type="checkbox" v-if="!isDisable(index)" v-model="item.enable"
+          <el-checkbox v-if="!isDisable(index)" v-model="item.enable"
                  :disabled="isReadOnly"/>
         </el-col>
         <span style="margin-left: 10px" v-else></span>
@@ -131,8 +125,18 @@
       return {
         currentItem: null,
         requireds: REQUIRED,
+        isSelectAll: true,
       }
     },
+    watch: {
+      isSelectAll: function(to, from) {
+        if(from == false && to == true) {
+          this.selectAll();
+        } else if(from == true && to == false) {
+          this.invertSelect();
+        }
+      },
+    },
     computed: {
       keyText() {
         return this.keyPlaceholder || this.$t("api_test.key");
@@ -191,7 +195,7 @@
         // TODO 检查key重复
       },
       isDisable: function (index) {
-        return this.parameters.length - 1 === index;
+        return this.parameters.length - 1 == index;
       },
       querySearch(queryString, cb) {
         let suggestions = this.suggestions;
@@ -235,7 +239,7 @@
       },
       invertSelect() {
         this.parameters.forEach(item => {
-          item.enable = !item.enable;
+          item.enable = false;
         });
       },
     },
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index 5fac84d2a1..7b4aacf154 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -142,7 +142,7 @@ export default {
           status: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
         },
         httpForm: {environmentId: "", tags: []},
-        isShowEnable: false,
+        isShowEnable: true,
         maintainerOptions: [],
         currentModule: {},
         reqOptions: REQ_METHOD,

From c2af5f66358fe46621488d8979373d749b676368 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 15 Mar 2021 21:22:49 +0800
Subject: [PATCH 11/95] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?):=20=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  9 ++++
 .../testcase/QueryTestCaseRequest.java        |  6 +++
 .../track/service/TestCaseService.java        | 26 +++++++++--
 .../track/case/components/TestCaseList.vue    | 46 +++++++++++++++++++
 .../components/track/home/TrackHome.vue       | 14 ++++--
 .../track/home/components/CaseCountCard.vue   | 14 +++---
 .../home/components/RelevanceCaseCard.vue     |  6 +--
 7 files changed, 102 insertions(+), 19 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 72d3a06e38..edb7e5ec9b 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
@@ -306,6 +306,9 @@
                 or test_case.num like CONCAT('%', #{request.name},'%')
                 or test_case.tags like CONCAT('%', #{request.name},'%'))
             </if>
+            <if test="request.createTime >0">
+                AND test_case.create_time >= #{request.createTime}
+            </if>
             <if test="request.nodeIds != null and request.nodeIds.size() > 0">
                 and test_case.node_id in
                 <foreach collection="request.nodeIds" item="nodeId" separator="," open="(" close=")">
@@ -316,6 +319,12 @@
                 and test_case.project_id = #{request.projectId}
             </if>
             <include refid="filters"/>
+            <if test="request.caseCoverage == 'uncoverage' ">
+                and test_case.test_id is null and test_case.type != 'functional'
+            </if>
+            <if test="request.caseCoverage == 'coverage' ">
+                and test_case.test_id is not null and test_case.type != 'functional'
+            </if>
         </where>
     </sql>
 
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
index e0b265d662..e024a581b0 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
@@ -22,4 +22,10 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
     private String userId;
 
     private String reviewId;
+
+    private boolean isSelectThisWeedData = false;
+
+    private String caseCoverage;
+
+    private long createTime = 0;
 }
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 4ae0ae598a..0a430dfd96 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -5,7 +5,6 @@ import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageHelper;
-import io.metersphere.api.dto.definition.ApiBatchRequest;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
@@ -14,10 +13,7 @@ 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;
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.commons.utils.ServiceUtils;
-import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.OrderRequest;
 import io.metersphere.excel.domain.ExcelErrData;
 import io.metersphere.excel.domain.ExcelResponse;
@@ -188,6 +184,7 @@ public class TestCaseService {
     }
 
     public List<TestCaseDTO> listTestCase(QueryTestCaseRequest request) {
+        this.initRequest(request, true);
         List<OrderRequest> orderList = ServiceUtils.getDefaultOrder(request.getOrders());
         OrderRequest order = new OrderRequest();
         // 对模板导入的测试用例排序
@@ -198,6 +195,25 @@ public class TestCaseService {
         return extTestCaseMapper.list(request);
     }
 
+    /**
+     * 初始化部分参数
+     *
+     * @param request
+     * @param checkThisWeekData
+     * @return
+     */
+    private void initRequest(QueryTestCaseRequest request, boolean checkThisWeekData) {
+        if (checkThisWeekData) {
+            if (request.isSelectThisWeedData()) {
+                Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
+                Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
+                if (weekFirstTime != null) {
+                    request.setCreateTime(weekFirstTime.getTime());
+                }
+            }
+        }
+    }
+
     public List<TestCaseDTO> listTestCaseMthod(QueryTestCaseRequest request) {
         return extTestCaseMapper.listByMethod(request);
     }
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 02cd375d81..13483fd82c 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -312,6 +312,7 @@ export default {
       currentCaseId: null,
       projectId: "",
       selectDataCounts: 0,
+      selectDataRange: "all"
     }
   },
   props: {
@@ -326,10 +327,27 @@ export default {
     },
     moduleOptions: {
       type: Array
+    },
+    trashEnable: {
+      type: Boolean,
+      default: false,
     }
   },
   created: function () {
     this.$emit('setCondition', this.condition);
+    if (this.trashEnable) {
+      this.condition.filters = {status: ["Trash"]};
+    } else {
+      this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]};
+    }
+    this.initTableData();
+  },
+  activated() {
+    if (this.trashEnable) {
+      this.condition.filters = {status: ["Trash"]};
+    } else {
+      this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]};
+    }
     this.initTableData();
   },
   watch: {
@@ -345,6 +363,11 @@ export default {
     customHeader() {
       this.$refs.headerCustom.open(this.tableLabel)
     },
+    getSelectDataRange() {
+      let dataRange = this.$route.params.dataSelectRange;
+      let dataType = this.$route.params.dataType;
+      this.selectDataRange = dataType === 'case' ? dataRange : 'all';
+    },
     initTableData() {
       this.projectId = getCurrentProjectID();
       this.condition.planId = "";
@@ -363,6 +386,29 @@ export default {
       this.getData();
     },
     getData() {
+      this.getSelectDataRange();
+      this.condition.selectThisWeedData = false;
+      this.condition.caseCoverage = null;
+      switch (this.selectDataRange) {
+        case 'thisWeekCount':
+          this.condition.selectThisWeedData = true;
+          break;
+        case 'uncoverage':
+          this.condition.caseCoverage = 'uncoverage';
+          break;
+        case 'coverage':
+          this.condition.caseCoverage = 'coverage';
+          break;
+        case 'Prepare':
+          this.condition.filters.status = [this.selectDataRange];
+          break;
+        case 'Pass':
+          this.condition.filters.status = [this.selectDataRange];
+          break;
+        case 'UnPass':
+          this.condition.filters.status = [this.selectDataRange];
+          break;
+      }
       if (this.projectId) {
         this.condition.projectId = this.projectId;
         this.result = this.$post(this.buildPagePath('/test/case/list'), this.condition, response => {
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index 084aff62dd..4d50ed46c2 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -29,12 +29,12 @@
       <el-row :gutter="10">
         <el-col :span="6">
           <div class="square">
-            <case-count-card :track-count-data="trackCountData" class="track-card"/>
+            <case-count-card :track-count-data="trackCountData" class="track-card" @redirectPage="redirectPage"/>
           </div>
         </el-col>
         <el-col :span="6">
           <div class="square">
-            <relevance-case-card :relevance-count-data="relevanceCountData" class="track-card"/>
+            <relevance-case-card :relevance-count-data="relevanceCountData" class="track-card" @redirectPage="redirectPage"/>
           </div>
         </el-col>
         <el-col :span="12">
@@ -73,7 +73,7 @@ import MsMainContainer from "@/business/components/common/components/MsMainConta
 import MsContainer from "@/business/components/common/components/MsContainer";
 import CaseCountCard from "@/business/components/track/home/components/CaseCountCard";
 import RelevanceCaseCard from "@/business/components/track/home/components/RelevanceCaseCard";
-import {getCurrentProjectID} from "@/common/js/utils";
+import {getCurrentProjectID, getUUID} from "@/common/js/utils";
 import CaseMaintenance from "@/business/components/track/home/components/CaseMaintenance";
 import {COUNT_NUMBER, COUNT_NUMBER_SHALLOW} from "@/common/js/constants";
 import BugCountCard from "@/business/components/track/home/components/BugCountCard";
@@ -185,8 +185,14 @@ export default {
           }]
       };
       this.caseOption = option;
+    },
+    redirectPage(page,dataType,selectType){
+      switch (page){
+        case "case":
+          this.$router.push({name:'testCase',params:{dataType:dataType,dataSelectRange:selectType, projectId: getCurrentProjectID()}});
+          break;
+      }
     }
-
   }
 }
 </script>
diff --git a/frontend/src/business/components/track/home/components/CaseCountCard.vue b/frontend/src/business/components/track/home/components/CaseCountCard.vue
index b1caeed243..fe96b3d429 100644
--- a/frontend/src/business/components/track/home/components/CaseCountCard.vue
+++ b/frontend/src/business/components/track/home/components/CaseCountCard.vue
@@ -83,27 +83,27 @@
                 <el-row>
                   <el-col>
                     <span class="default-property">
-                      {{$t('api_test.home_page.detail_card.running')}}
+                      未评审
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('Underway')" target="_blank" style="color: #000000">
+                      <el-link type="info" @click="redirectPage('Prepare')" target="_blank" style="color: #000000">
                         {{trackCountData.prepareCount}}
                       </el-link>
                     </span>
                   </el-col>
                   <el-col style="margin-top: 5px;">
                     <span class="default-property">
-                      {{$t('api_test.home_page.detail_card.not_started')}}
+                      未通过
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('Prepare')" target="_blank" style="color: #000000">
+                      <el-link type="info" @click="redirectPage('Pass')" target="_blank" style="color: #000000">
                         {{trackCountData.passCount}}
                       </el-link>
                     </span>
                   </el-col>
                   <el-col style="margin-top: 5px;">
                     <span class="main-property">
-                      {{$t('api_test.home_page.detail_card.finished')}}
+                      已通过
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('Completed')" target="_blank" style="color: #000000">
+                      <el-link type="info" @click="redirectPage('UnPass')" target="_blank" style="color: #000000">
                         {{trackCountData.unPassCount}}
                       </el-link>
                     </span>
@@ -133,7 +133,7 @@ export default {
   },
   methods: {
     redirectPage(clickType){
-      this.$emit("redirectPage","api","api",clickType);
+      this.$emit("redirectPage","case", "case",clickType);
     }
   }
 }
diff --git a/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue b/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue
index d82ef603af..be96f80db9 100644
--- a/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue
+++ b/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue
@@ -68,7 +68,7 @@
                     <span class="default-property">
                       未覆盖
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('Underway')" target="_blank" style="color: #000000">
+                      <el-link type="info" @click="redirectPage('uncoverage')" target="_blank" style="color: #000000">
                         {{relevanceCountData.uncoverageCount}}
                       </el-link>
                     </span>
@@ -77,7 +77,7 @@
                     <span class="main-property">
                       已覆盖
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('Prepare')" target="_blank" style="color: #000000">
+                      <el-link type="info" @click="redirectPage('coverage')" target="_blank" style="color: #000000">
                         {{relevanceCountData.coverageCount}}
                       </el-link>
                     </span>
@@ -107,7 +107,7 @@ export default {
   },
   methods: {
     redirectPage(clickType){
-      this.$emit("redirectPage","api","api",clickType);
+      this.$emit("redirectPage","case","case",clickType);
     }
   }
 }

From a2da6ad1759f7e9d0da76630268cf9a64f967163 Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Mon, 15 Mar 2021 21:24:28 +0800
Subject: [PATCH 12/95] =?UTF-8?q?schedule=E8=A1=A8=E5=AF=B9=E6=97=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEname=E5=AD=97=E6=AE=B5=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A5=E5=85=85=20(#1638)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充
---
 backend/src/main/resources/db/migration/V78__v1.8_release.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
index 653d8be041..2b658eae4e 100644
--- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql
+++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
@@ -136,5 +136,8 @@ update schedule sch inner join load_test ldt on
 update schedule sch inner join api_test apiTest on
 	apiTest.id = sch.resource_id
 	set sch.name = apiTest.name;
+update schedule sch inner join swagger_url_project sup on
+	sup.id = sch.resource_id
+	set sch.name = LEFT(SUBSTRING_INDEX(sup.swagger_url, '/', 3), 100);
 -- delete an unused colum
 alter table schedule drop column custom_data;
\ No newline at end of file

From 0ab8899820d9e3f6a5223376d848f0f15743ecef Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 16 Mar 2021 10:04:16 +0800
Subject: [PATCH 13/95] =?UTF-8?q?fix:=20=E7=94=A8=E4=BE=8B=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/review/components/TestCaseReviewList.vue        | 8 ++++++--
 .../track/review/view/components/TestReviewFunction.vue   | 3 +--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 8341430029..4824621c36 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -1,9 +1,12 @@
 <template>
-  <div class="table-card" v-loading="result.loading">
+  <el-card class="table-card" v-loading="result.loading">
+    <template v-slot:header>
       <ms-table-header :is-tester-permission="true" :condition.sync="condition"
                        @search="initTableData" @create="testCaseReviewCreate"
                        :create-tip="$t('test_track.review.create_review')"
                        :title="$t('test_track.review.test_review')"/>
+    </template>
+
     <el-table
       border
       class="adjust-table"
@@ -103,7 +106,8 @@
     <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
                          :total="total"/>
     <ms-delete-confirm :title="$t('test_track.review.delete')" @delete="_handleDelete" ref="deleteConfirm"/>
-  </div>
+
+  </el-card>
 </template>
 
 <script>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
index b1bc061add..d1b58f6d5b 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
@@ -44,7 +44,6 @@
 
 <script>
 import MsTestPlanCommonComponent from "@/business/components/track/plan/view/comonents/base/TestPlanCommonComponent";
-import FunctionalTestCaseList from "@/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList";
 import MsNodeTree from "@/business/components/track/common/NodeTree";
 import TestReviewRelevance from "@/business/components/track/review/view/components/TestReviewRelevance";
 import TestReviewTestCaseList from "@/business/components/track/review/view/components/TestReviewTestCaseList";
@@ -58,7 +57,7 @@ export default {
     TestReviewMinder,
     MsTabButton,
     TestReviewTestCaseList,
-    TestReviewRelevance, MsNodeTree, FunctionalTestCaseList, MsTestPlanCommonComponent
+    TestReviewRelevance, MsNodeTree, MsTestPlanCommonComponent
   },
   data() {
     return {

From 25e2cdc2c9b5cd257b91a16529e2ef4ca32edd85 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 16 Mar 2021 11:01:48 +0800
Subject: [PATCH 14/95] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E5=88=A0=E9=99=A4=E7=BC=BA=E9=99=B7=E6=9C=AA=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TestCaseIssuesController.java     |  6 +++---
 .../track/request/testcase/IssuesRequest.java    |  6 ++++++
 .../metersphere/track/service/IssuesService.java | 16 +++++++++++-----
 .../functional/FunctionalTestCaseEdit.vue        |  5 +++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseIssuesController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseIssuesController.java
index d0b690e94b..72c409936e 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseIssuesController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseIssuesController.java
@@ -37,9 +37,9 @@ public class TestCaseIssuesController {
         issuesService.closeLocalIssue(id);
     }
 
-    @GetMapping("/delete/{id}")
-    public void deleteIssue(@PathVariable String id) {
-        issuesService.deleteIssue(id);
+    @PostMapping("/delete")
+    public void deleteIssue(@RequestBody IssuesRequest request) {
+        issuesService.deleteIssue(request);
     }
 
     @GetMapping("/tapd/user/{caseId}")
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesRequest.java
index a1ea0ad74a..127e18a0d5 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesRequest.java
@@ -21,4 +21,10 @@ public class IssuesRequest {
      * zentao bug 影响版本
      */
     private List<String> zentaoBuilds;
+
+    /**
+     * issues id
+     */
+    private String id;
+    private String caseId;
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index fca1712896..ee737fcf8c 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -1,10 +1,8 @@
 package io.metersphere.track.service;
 
-import io.metersphere.base.domain.Issues;
-import io.metersphere.base.domain.Project;
-import io.metersphere.base.domain.ServiceIntegration;
-import io.metersphere.base.domain.TestCaseWithBLOBs;
+import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.IssuesMapper;
+import io.metersphere.base.mapper.TestCaseIssuesMapper;
 import io.metersphere.commons.constants.IssuesManagePlatform;
 import io.metersphere.commons.constants.NoticeConstants;
 import io.metersphere.commons.user.SessionUser;
@@ -43,6 +41,8 @@ public class IssuesService {
     private IssuesMapper issuesMapper;
     @Resource
     private NoticeSendService noticeSendService;
+    @Resource
+    private TestCaseIssuesMapper testCaseIssuesMapper;
 
     public void testAuth(String platform) {
         AbstractIssuePlatform abstractPlatform = IssueFactory.createPlatform(platform, new IssuesRequest());
@@ -202,8 +202,14 @@ public class IssuesService {
         return platform.getPlatformUser();
     }
 
-    public void deleteIssue(String id) {
+    public void deleteIssue(IssuesRequest request) {
+        String caseId = request.getCaseId();
+        String id = request.getId();
         issuesMapper.deleteByPrimaryKey(id);
+
+        TestCaseIssuesExample example = new TestCaseIssuesExample();
+        example.createCriteria().andTestCaseIdEqualTo(caseId).andIssuesIdEqualTo(id);
+        testCaseIssuesMapper.deleteByExample(example);
     }
 
     private static String getIssuesContext(SessionUser user, IssuesRequest issuesRequest, String type) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index 27afbba563..cfa3aa69c9 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -664,8 +664,9 @@ export default {
       }
     },
     deleteIssue(row) {
-      this.result = this.$get("/issues/delete/" + row.id, () => {
-        this.getIssues(this.testCase.caseId);
+      let caseId = this.testCase.caseId;
+      this.result = this.$post("/issues/delete", {id: row.id, caseId: caseId}, () => {
+        this.getIssues(caseId);
         this.$success(this.$t('commons.delete_success'));
       })
     },

From 916dc27989a3dc3052fb2220750fc83f20e0a7ca Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:38:46 +0800
Subject: [PATCH 15/95] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiAutomationController.java   |   5 +
 .../controller/ApiDefinitionController.java   |  10 +
 .../api/controller/ApiTestCaseController.java |   4 +
 .../automation/TestPlanScenarioRequest.java   |   1 +
 .../dto/definition/ApiDefinitionRequest.java  |   1 +
 .../dto/definition/ApiTestCaseRequest.java    |   1 +
 .../api/service/ApiAutomationService.java     |  35 ++-
 .../api/service/ApiDefinitionService.java     |  10 +
 .../api/service/ApiTestCaseService.java       |  42 ++-
 .../mapper/ext/ExtApiDefinitionMapper.java    |   2 +-
 .../mapper/ext/ExtApiDefinitionMapper.xml     |  80 ++++++
 .../base/mapper/ext/ExtApiTestCaseMapper.java |   2 +
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |   9 +
 .../ext/ExtTestCaseReviewApiCaseMapper.java   |  20 ++
 .../ext/ExtTestCaseReviewApiCaseMapper.xml    | 136 +++++++++
 .../ext/ExtTestCaseReviewLoadMapper.java      |  15 +
 .../ext/ExtTestCaseReviewLoadMapper.xml       |  71 +++++
 .../ExtTestCaseReviewScenarioCaseMapper.java  |  21 ++
 .../ExtTestCaseReviewScenarioCaseMapper.xml   | 114 ++++++++
 .../dto/TestReviewLoadCaseDTO.java            |  15 +
 .../TestCaseReviewApiCaseController.java      |  56 ++++
 .../TestCaseReviewScenarioCaseController.java |  63 +++++
 .../TestReviewLoadCaseController.java         |  65 +++++
 .../testcase/ApiCaseRelevanceRequest.java     |   4 +
 .../request/testplan/LoadCaseRequest.java     |   1 +
 .../TestReviewApiCaseBatchRequest.java        |  23 ++
 .../request/testreview/TestReviewRequest.java |  20 ++
 .../service/TestCaseReviewApiCaseService.java | 104 +++++++
 .../service/TestCaseReviewLoadService.java    | 155 +++++++++++
 .../TestCaseReviewScenarioCaseService.java    | 194 +++++++++++++
 .../db/migration/V78__v1.8_release.sql        |   7 +-
 .../src/main/resources/generatorConfig.xml    |   6 +-
 .../automation/scenario/ApiScenarioList.vue   |   3 -
 .../components/module/ApiModule.vue           |   7 +
 .../business/components/track/TestTrack.vue   |  15 +-
 .../components/track/plan/TestPlan.vue        |   1 +
 .../track/plan/components/TestPlanEdit.vue    |  13 +-
 .../track/plan/components/TestPlanList.vue    |   6 +-
 .../comonents/api/TestCaseApiRelevance.vue    |   2 +
 .../comonents/api/TestPlanApiCaseList.vue     |  86 ++++--
 .../comonents/api/TestPlanApiScenarioList.vue | 138 +++++++---
 .../comonents/base/TestCaseRelevanceBase.vue  |   3 +-
 .../TestCaseFunctionalRelevance.vue           |   7 +-
 .../comonents/load/TestCaseLoadRelevance.vue  |  47 +++-
 .../comonents/load/TestPlanLoadCaseList.vue   |  59 +++-
 .../track/review/view/TestCaseReviewView.vue  |  13 +-
 .../components/ReviewRelevanceApiList.vue     | 258 ++++++++++++++++++
 .../components/ReviewRelevanceCaseList.vue    | 243 +++++++++++++++++
 .../ReviewRelevanceScenarioList.vue           | 178 ++++++++++++
 .../review/view/components/TestReviewApi.vue  |  30 +-
 .../view/components/TestReviewRelevance.vue   |   4 +
 .../components/TestReviewRelevanceApi.vue     | 162 +++++++++++
 .../TestReviewRelevanceScenario.vue           | 125 +++++++++
 53 files changed, 2569 insertions(+), 123 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/dto/TestReviewLoadCaseDTO.java
 create mode 100644 backend/src/main/java/io/metersphere/track/controller/TestCaseReviewApiCaseController.java
 create mode 100644 backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
 create mode 100644 backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java
 create mode 100644 backend/src/main/java/io/metersphere/track/request/testreview/TestReviewApiCaseBatchRequest.java
 create mode 100644 backend/src/main/java/io/metersphere/track/request/testreview/TestReviewRequest.java
 create mode 100644 backend/src/main/java/io/metersphere/track/service/TestCaseReviewApiCaseService.java
 create mode 100644 backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
 create mode 100644 backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
 create mode 100644 frontend/src/business/components/track/review/view/components/ReviewRelevanceApiList.vue
 create mode 100644 frontend/src/business/components/track/review/view/components/ReviewRelevanceCaseList.vue
 create mode 100644 frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue
 create mode 100644 frontend/src/business/components/track/review/view/components/TestReviewRelevanceApi.vue
 create mode 100644 frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index 2ceaf9f5b3..fa4e5d86ef 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -144,6 +144,11 @@ public class ApiAutomationController {
         apiAutomationService.relevance(request);
     }
 
+    @PostMapping("/relevance/review")
+    public  void testCaseReviewRelevance(@RequestBody ApiCaseRelevanceRequest request){
+        apiAutomationService.relevanceReview(request);
+    }
+
     @PostMapping(value = "/schedule/update")
     public void updateSchedule(@RequestBody Schedule request) {
         apiAutomationService.updateSchedule(request);
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
index 11be08adc6..e855bca114 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -58,6 +58,12 @@ public class ApiDefinitionController {
         request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         return PageUtils.setPageInfo(page, apiDefinitionService.listRelevance(request));
     }
+    @PostMapping("/list/relevance/review/{goPage}/{pageSize}")
+    public Pager<List<ApiDefinitionResult>> listRelevanceReview(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiDefinitionRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        return PageUtils.setPageInfo(page, apiDefinitionService.listRelevanceReview(request));
+    }
 
     @PostMapping("/list/all")
     public List<ApiDefinitionResult> list(@RequestBody ApiDefinitionRequest request) {
@@ -217,6 +223,10 @@ public class ApiDefinitionController {
     public void testPlanRelevance(@RequestBody ApiCaseRelevanceRequest request) {
         apiDefinitionService.testPlanRelevance(request);
     }
+    @PostMapping("/relevance/review")
+    public void testCaseReviewRelevance(@RequestBody ApiCaseRelevanceRequest request){
+        apiDefinitionService.testCaseReviewRelevance(request);
+    }
 
     @PostMapping("/preview")
     public String preview(@RequestBody String jsonSchema) {
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
index 01032800e6..4596900ca1 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
@@ -120,6 +120,10 @@ public class ApiTestCaseController {
     public void testPlanRelevance(@RequestBody ApiCaseRelevanceRequest request) {
         apiTestCaseService.relevanceByCase(request);
     }
+    @PostMapping("/relevance/review")
+    public void testCaseReviewRelevance(@RequestBody ApiCaseRelevanceRequest request){
+        apiTestCaseService.relevanceByApiByReview(request);
+    }
 
     @PostMapping(value = "/jenkins/run")
     public String jenkinsRun(@RequestBody RunCaseRequest request) {
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanScenarioRequest.java b/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanScenarioRequest.java
index 6be0492f89..165970fedf 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanScenarioRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanScenarioRequest.java
@@ -25,4 +25,5 @@ public class TestPlanScenarioRequest {
     private Map<String, List<String>> filters;
     private Map<String, Object> combine;
     private List<String> ids;
+    private String reviewId;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java
index f8e4e186fa..e533699e41 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java
@@ -20,4 +20,5 @@ public class ApiDefinitionRequest extends BaseQueryRequest {
     private long createTime = 0;
     private String status;
     private String apiCaseCoverage;
+    private String reviewId;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
index c1ae7c9c5b..f0037ec69e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
@@ -27,4 +27,5 @@ public class ApiTestCaseRequest {
     private Map<String, Object> combine;
     private boolean isSelectThisWeedData;
     private long createTime = 0;
+    private String reviewId;
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index a620aef449..5329c6919a 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -23,6 +23,7 @@ import io.metersphere.api.parse.ApiImportParser;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiScenarioMapper;
 import io.metersphere.base.mapper.ApiScenarioReportMapper;
+import io.metersphere.base.mapper.TestCaseReviewScenarioMapper;
 import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
 import io.metersphere.base.mapper.ext.ExtApiScenarioMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanApiCaseMapper;
@@ -72,6 +73,8 @@ public class ApiAutomationService {
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
     @Resource
+    private TestCaseReviewScenarioMapper  testCaseReviewScenarioMapper;
+    @Resource
     private JMeterService jMeterService;
     @Resource
     private ApiTestEnvironmentService environmentService;
@@ -95,7 +98,12 @@ public class ApiAutomationService {
         setApiScenarioProjectIds(list);
         return list;
     }
-
+    public List<ApiScenarioDTO> listReview(ApiScenarioRequest request) {
+        request = this.initRequest(request, true, true);
+        List<ApiScenarioDTO> list = extApiScenarioMapper.listReview(request);
+        setApiScenarioProjectIds(list);
+        return list;
+    }
     private void setApiScenarioProjectIds(List<ApiScenarioDTO> list) {
         // 如果场景步骤涉及多项目，则把涉及到的项目ID保存在projectIds属性
         list.forEach(data -> {
@@ -705,7 +713,32 @@ public class ApiAutomationService {
             testPlanApiScenarioMapper.insert(testPlanApiScenario);
         });
     }
+    public void relevanceReview(ApiCaseRelevanceRequest request){
+        Map<String, List<String>> mapping = request.getMapping();
+        Map<String, String> envMap = request.getEnvMap();
+        Set<String> set = mapping.keySet();
+        if (set.isEmpty()) {
+            return;
+        }
+        set.forEach(id->{
+            Map<String, String> newEnvMap = new HashMap<>(16);
+            if (envMap != null && !envMap.isEmpty()) {
+                List<String> list = mapping.get(id);
+                list.forEach(l -> {
+                    newEnvMap.put(l, envMap.get(l));
+                });
+            }
+            TestCaseReviewScenario testCaseReviewScenario=new TestCaseReviewScenario();
+            testCaseReviewScenario.setId(UUID.randomUUID().toString());
+            testCaseReviewScenario.setApiScenarioId(id);
+            testCaseReviewScenario.setTestCaseReviewId(request.getReviewId());
+            testCaseReviewScenario.setCreateTime(System.currentTimeMillis());
+            testCaseReviewScenario.setUpdateTime(System.currentTimeMillis());
+            testCaseReviewScenario.setEnvironment(JSON.toJSONString(newEnvMap));
+            testCaseReviewScenarioMapper.insert(testCaseReviewScenario);
 
+        });
+    }
     public List<ApiScenario> selectByIds(List<String> ids) {
         ApiScenarioExample example = new ApiScenarioExample();
         example.createCriteria().andIdIn(ids);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index a73d6f1c6c..9f48e51c0b 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -590,6 +590,10 @@ public class ApiDefinitionService {
         apiTestCaseService.relevanceByApi(request);
     }
 
+    public void testCaseReviewRelevance(ApiCaseRelevanceRequest request) {
+        apiTestCaseService.relevanceByApiByReview(request);
+    }
+
     /**
      * 数据统计-接口类型
      *
@@ -674,6 +678,12 @@ public class ApiDefinitionService {
         calculateResult(resList);
         return resList;
     }
+    public List<ApiDefinitionResult> listRelevanceReview(ApiDefinitionRequest request) {
+        request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+        List<ApiDefinitionResult> resList = extApiDefinitionMapper.listRelevanceReview(request);
+        calculateResult(resList);
+        return resList;
+    }
 
     public void calculateResult(List<ApiDefinitionResult> resList) {
         if (!resList.isEmpty()) {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index 63bcec8ef0..63db472a00 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -18,10 +18,7 @@ import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
-import io.metersphere.base.mapper.ext.ExtApiDefinitionExecResultMapper;
-import io.metersphere.base.mapper.ext.ExtApiTestCaseMapper;
-import io.metersphere.base.mapper.ext.ExtTestPlanApiCaseMapper;
-import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
+import io.metersphere.base.mapper.ext.*;
 import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
@@ -53,6 +50,8 @@ public class ApiTestCaseService {
     @Resource
     TestPlanMapper testPlanMapper;
     @Resource
+    TestCaseReviewMapper  testCaseReviewMapper;
+    @Resource
     private ApiTestCaseMapper apiTestCaseMapper;
     @Resource
     private SqlSessionFactory sqlSessionFactory;
@@ -313,7 +312,16 @@ public class ApiTestCaseService {
         List<ApiTestCase> apiTestCases = apiTestCaseMapper.selectByExample(example);
         relevance(apiTestCases, request);
     }
-
+    public void relevanceByApiByReview(ApiCaseRelevanceRequest request){
+        List<String> ids = request.getSelectIds();
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        ApiTestCaseExample example = new ApiTestCaseExample();
+        example.createCriteria().andIdIn(ids);
+        List<ApiTestCase> apiTestCases = apiTestCaseMapper.selectByExample(example);
+        relevanceByReview(apiTestCases, request);
+    }
     public void relevanceByCase(ApiCaseRelevanceRequest request) {
         List<String> ids = request.getSelectIds();
         if (CollectionUtils.isEmpty(ids)) {
@@ -350,9 +358,33 @@ public class ApiTestCaseService {
         sqlSession.flushStatements();
     }
 
+    private void relevanceByReview(List<ApiTestCase> apiTestCases, ApiCaseRelevanceRequest request) {
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        ExtTestCaseReviewApiCaseMapper batchMapper = sqlSession.getMapper(ExtTestCaseReviewApiCaseMapper.class);
+        apiTestCases.forEach(apiTestCase -> {
+            TestCaseReviewApiCase TestCaseReviewApiCase = new TestCaseReviewApiCase();
+            TestCaseReviewApiCase.setId(UUID.randomUUID().toString());
+            TestCaseReviewApiCase.setApiCaseId(apiTestCase.getId());
+            TestCaseReviewApiCase.setTestCaseReviewId(request.getReviewId());
+            TestCaseReviewApiCase.setEnvironmentId(request.getEnvironmentId());
+            TestCaseReviewApiCase.setCreateTime(System.currentTimeMillis());
+            TestCaseReviewApiCase.setUpdateTime(System.currentTimeMillis());
+            batchMapper.insertIfNotExists(TestCaseReviewApiCase);
+        });
+        TestCaseReview  testCaseReview=testCaseReviewMapper.selectByPrimaryKey(request.getReviewId());
+        if (StringUtils.equals(testCaseReview.getStatus(), TestPlanStatus.Prepare.name())
+                || StringUtils.equals(testCaseReview.getStatus(), TestPlanStatus.Completed.name())) {
+            testCaseReview.setStatus(TestPlanStatus.Underway.name());
+            testCaseReviewMapper.updateByPrimaryKey(testCaseReview);
+        }
+        sqlSession.flushStatements();
+    }
     public List<String> selectIdsNotExistsInPlan(String projectId, String planId) {
         return extApiTestCaseMapper.selectIdsNotExistsInPlan(projectId, planId);
     }
+    public List<String> selectIdsNotExistsInReview(String projectId,String reviewId){
+        return extApiTestCaseMapper.selectIdsNotExistsInReview(projectId,reviewId);
+    }
 
     public List<ApiDataCountResult> countProtocolByProjectID(String projectId) {
         return extApiTestCaseMapper.countProtocolByProjectID(projectId);
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
index d50d4fe3b0..44cf4c6abe 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.java
@@ -36,6 +36,6 @@ public interface ExtApiDefinitionMapper {
     ApiDefinition getNextNum(@Param("projectId") String projectId);
 
     List<ApiDefinitionResult> listRelevance(@Param("request")ApiDefinitionRequest request);
-
+    List<ApiDefinitionResult>  listRelevanceReview(@Param("request")ApiDefinitionRequest request);
     List<String> selectIds(@Param("request") BaseQueryRequest query);
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 179c83c956..bfaa0afcd0 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -363,6 +363,86 @@
             </foreach>
         </if>
     </select>
+    <select id="listRelevanceReview" resultType="io.metersphere.api.dto.definition.ApiDefinitionResult">
+        select
+        <include refid="io.metersphere.base.mapper.ApiDefinitionMapper.Base_Column_List"/>
+        from api_definition
+        <where>
+            <if test="request.combine != null">
+                <include refid="combine">
+                    <property name="condition" value="request.combine"/>
+                    <property name="name" value="request.name"/>
+                    <property name="objectKey" value="request.combine.tags"/>
+                </include>
+            </if>
+
+            <if test="request.name != null">
+                and api_definition.name like CONCAT('%', #{request.name},'%')
+            </if>
+            <if test="request.protocol != null">
+                AND api_definition.protocol = #{request.protocol}
+            </if>
+            <if test="request.id != null">
+                AND api_definition.id = #{request.id}
+            </if>
+            <if test="request.moduleId != null">
+                AND api_definition.module_id = #{request.moduleId}
+            </if>
+            <if test="request.projectId != null">
+                AND api_definition.project_id = #{request.projectId}
+            </if>
+            <if test="request.moduleIds != null and request.moduleIds.size() > 0">
+                AND api_definition.module_id in
+                <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
+                    #{nodeId}
+                </foreach>
+            </if>
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        <choose>
+                            <when test="key=='status'">
+                                and api_definition.status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                            <when test="key=='method'">
+                                and api_definition.method in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                            <when test="key=='user_id'">
+                                and api_definition.user_id in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                        </choose>
+                    </if>
+                </foreach>
+            </if>
+            and exists (
+            select id
+            from api_test_case c
+            where c.api_definition_id = api_definition.id
+            and not exists (
+            select id
+            from test_case_review_api_case t
+            where t.api_case_id = c.id
+            and t.test_case_review_id = #{request.reviewId}
+            )
+            )
+        </where>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                api_definition.${order.name} ${order.type}
+            </foreach>
+        </if>
+    </select>
+
     <select id="selectScheduleList" resultType="io.metersphere.api.dto.definition.ApiSwaggerUrlDTO">
         SELECT apiScene.id     AS scenarioId,
                apiScene.`name` AS `name`,
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
index 88f1298c65..0457a6a710 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
@@ -20,6 +20,8 @@ public interface ExtApiTestCaseMapper {
     List<ApiTestCaseDTO> listSimple(@Param("request") ApiTestCaseRequest request);
 
     List<String> selectIdsNotExistsInPlan(@Param("projectId") String projectId, @Param("planId") String planId);
+    List<String> selectIdsNotExistsInReview(@Param("projectId") String projectId, @Param("reviewId") String reviewId);
+
 
     List<ApiDataCountResult> countProtocolByProjectID(String projectId);
 
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index c082e8a2c3..1c560eb664 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -337,6 +337,15 @@
           where pc.test_plan_id = #{planId}
         )
     </select>
+    <select id="selectIdsNotExistsInReview" resultType="java.lang.String">
+        select c.id
+        from api_test_case c
+        where c.project_id = #{projectId} and c.id not in (
+            select pc.api_case_id
+            from test_case_review_api_case pc
+            where pc.test_case_review_id = #{reviewId}
+        )
+    </select>
 
     <select id="countProtocolByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
         SELECT apiDef.protocol AS groupField,COUNT(testCase.id) AS countNumber FROM api_test_case testCase
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.java
new file mode 100644
index 0000000000..8db8cb0759
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.java
@@ -0,0 +1,20 @@
+package io.metersphere.base.mapper.ext;
+
+import io.metersphere.api.dto.definition.ApiTestCaseRequest;
+import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
+import io.metersphere.base.domain.TestCaseReviewApiCase;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ExtTestCaseReviewApiCaseMapper {
+     void  insertIfNotExists(@Param("request")TestCaseReviewApiCase testCaseReviewApiCase);
+     List<TestPlanApiCaseDTO> list(@Param("request") ApiTestCaseRequest request);
+     List<String> getExecResultByReviewId(String reviewId);
+
+     List<String> getIdsByReviewId(String reviewId);
+
+     List<String> getNotRelevanceCaseIds(@Param("reviewId")String reviewId, @Param("relevanceProjectIds")List<String> relevanceProjectIds);
+
+     List<String> getStatusByTestReviewId(String id);
+}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.xml
new file mode 100644
index 0000000000..5ab081f10c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewApiCaseMapper.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.metersphere.base.mapper.ext.ExtTestCaseReviewApiCaseMapper">
+    <insert id="insertIfNotExists" parameterType="io.metersphere.base.domain.TestCaseReviewApiCase">
+        -- 查询没有数据再插入
+        INSERT INTO test_case_review_api_case(id, test_case_review_id, api_case_id, environment_id, create_time, update_time)
+        SELECT #{request.id}, #{request.testCaseReviewId}, #{request.apiCaseId}, #{request.environmentId}, #{request.createTime}, #{request.updateTime}
+        FROM DUAL
+        WHERE NOT EXISTS(
+                SELECT id FROM
+                    test_case_review_api_case
+                WHERE test_case_review_id = #{request.testCaseReviewId} and api_case_id = #{request.apiCaseId}
+            )
+    </insert>
+    <select id="list" resultType="io.metersphere.api.dto.definition.TestPlanApiCaseDTO">
+        select
+        t.id, t.environment_id, t.create_time, t.update_time,
+        c.id as case_id, c.project_id, c.name, c.api_definition_id, c.priority, c.description, c.create_user_id, c.update_user_id, c.num, c.tags,
+        a.module_id, a.path, a.protocol, t.status execResult
+        from
+        test_case_review_api_case t
+        inner join
+        api_test_case c
+        on t.api_case_id = c.id
+        <if test="request.reviewId != null and request.planId!=''">
+            and t.test_case_review_id = #{request.reviewId}
+        </if>
+        inner join
+        api_definition a
+        on
+        c.api_definition_id = a.id
+        <if test="request.protocol != null and request.protocol!=''">
+            and a.protocol = #{request.protocol}
+        </if>
+        <choose>
+            <when test="request.status == 'Trash'">
+                and a.status = 'Trash'
+            </when>
+            <when test="request.status == null">
+                and a.status != 'Trash'
+            </when>
+            <when test="request.status == ''">
+                and a.status != 'Trash'
+            </when>
+            <when test="request.status == 'running'">
+                and t.status IS NULL
+            </when>
+            <otherwise>
+                and t.status = #{request.status}
+            </otherwise>
+        </choose>
+        where 1
+        <if test="request.ids != null and request.ids.size() > 0">
+            <if test="request.projectId != null and request.projectId!=''">
+                and
+            </if>
+            t.id in
+            <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
+                #{caseId}
+            </foreach>
+        </if>
+        <if test="request.name != null and request.name!=''">
+            and (c.name like CONCAT('%', #{request.name},'%') or c.tags like CONCAT('%', #{request.name},'%'))
+        </if>
+        <if test="request.moduleIds != null and request.moduleIds.size() > 0">
+            and a.module_id in
+            <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
+                #{nodeId}
+            </foreach>
+        </if>
+        <if test="request.filters != null and request.filters.size() > 0">
+            <foreach collection="request.filters.entrySet()" index="key" item="values">
+                <if test="values != null and values.size() > 0">
+                    <choose>
+                        <when test="key == 'priority'">
+                            and c.priority in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                        <when test="key == 'user_id'">
+                            and c.create_user_id in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                    </choose>
+                </if>
+            </foreach>
+        </if>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                <choose>
+                    <when test="order.name == 'update_time'">
+                        t.${order.name} ${order.type}
+                    </when>
+                    <when test="order.name == 'create_user'">
+                        create_user_id ${order.type}
+                    </when>
+                    <otherwise>
+                        ${order.name} ${order.type}
+                    </otherwise>
+                </choose>
+            </foreach>
+        </if>
+    </select>
+    <select id="getExecResultByReviewId" resultType="java.lang.String">
+        select status
+        from
+            test_case_review_api_case
+        where test_case_review_id= #{reviewId}
+    </select>
+    <select id="getIdsByReviewId" resultType="java.lang.String">
+        select id
+        from test_case_review_api_case
+        where id = #{reviewId}
+    </select>
+    <select id="getNotRelevanceCaseIds" resultType="java.lang.String">
+        select t.id
+        from test_case_review_api_case t
+        inner join api_test_case c
+        on c.id = t.api_case_id
+        <if test="relevanceProjectIds != null and relevanceProjectIds.size() > 0">
+            and c.project_id not in
+            <foreach collection="relevanceProjectIds" item="projectId" separator="," open="(" close=")">
+                #{projectId}
+            </foreach>
+        </if>
+        where t.test_case_review_id = #{reviewId}
+    </select>
+    <select id="getStatusByTestReviewId" resultType="java.lang.String">
+        SELECT `status` FROM test_case_review_api_case WHERE test_case_review_id = #{0}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.java
new file mode 100644
index 0000000000..b83cc374dd
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.java
@@ -0,0 +1,15 @@
+package io.metersphere.base.mapper.ext;
+
+import io.metersphere.dto.TestReviewLoadCaseDTO;
+import io.metersphere.track.request.testplan.LoadCaseRequest;
+import io.metersphere.track.request.testreview.TestReviewRequest;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ExtTestCaseReviewLoadMapper {
+    List<String> selectIdsNotInPlan(@Param("projectId") String projectId, @Param("reviewId") String reviewId);
+    List<TestReviewLoadCaseDTO> selectTestReviewLoadCaseList(@Param("request") TestReviewRequest request);
+    void updateCaseStatus(@Param("reportId") String reportId, @Param("status") String status);
+    List<String> getStatusByreviewId(@Param("reviewId") String reviewId);
+}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.xml
new file mode 100644
index 0000000000..f3003670ff
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewLoadMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="io.metersphere.base.mapper.ext.ExtTestCaseReviewLoadMapper">
+    <update id="updateCaseStatus">
+        update test_case_review_load tplc
+        set status = #{status}
+        where tplc.load_report_id = #{reportId}
+    </update>
+
+    <select id="selectIdsNotInPlan" resultType="java.lang.String">
+        select load_test.id
+        from load_test
+        where load_test.project_id = #{projectId}
+          and load_test.id not in (
+            select tplc.load_case_id from test_case_review_load tplc where tplc.test_case_review_id = #{reviewId}
+        )
+    </select>
+    <select id="selectTestReviewLoadCaseList" resultType="io.metersphere.dto.TestReviewLoadCaseDTO">
+        select tplc.id,
+        u.name as userName,
+        tplc.create_time,
+        tplc.update_time,
+        tplc.test_case_review_id,
+        tplc.load_case_id,
+        lt.status,
+        lt.num,
+        tplc.status as caseStatus,
+        lt.name as caseName,
+        tplc.load_report_id,
+        p.name as projectName
+        from test_case_review_load tplc
+        inner join load_test lt on tplc.load_case_id = lt.id
+        inner join user u on lt.user_id = u.id
+        inner join project p on lt.project_id = p.id
+        <where>
+            tplc.test_case_review_id = #{request.testCaseReviewId}
+            <if test="request.projectId != null and request.projectId != ''">
+                and lt.project_id = #{request.projectId}
+            </if>
+            <if test="request.name != null">
+                and (lt.name like CONCAT('%', #{request.name},'%') or lt.num like CONCAT('%', #{request.name},'%'))
+            </if>
+            <if test="request.status != null">
+                and tplc.status like CONCAT('%', #{request.status},'%')
+            </if>
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        <choose>
+                            <when test="key=='status'">
+                                and lt.status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                        </choose>
+                    </if>
+                </foreach>
+            </if>
+        </where>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                tplc.${order.name} ${order.type}
+            </foreach>
+        </if>
+    </select>
+    <select id="getStatusByreviewId" resultType="java.lang.String">
+        select status from test_case_review_load tplc where tplc.test_case_review_id = #{reviewId}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java
new file mode 100644
index 0000000000..8392e5b996
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.java
@@ -0,0 +1,21 @@
+package io.metersphere.base.mapper.ext;
+
+import io.metersphere.api.dto.automation.ApiScenarioDTO;
+import io.metersphere.api.dto.automation.TestPlanScenarioRequest;
+import io.metersphere.base.domain.TestCaseReviewScenario;
+import io.metersphere.base.domain.TestPlanApiScenario;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ExtTestCaseReviewScenarioCaseMapper {
+    void insertIfNotExists(@Param("request") TestCaseReviewScenario request);
+
+    List<ApiScenarioDTO> list(@Param("request") TestPlanScenarioRequest request);
+
+    List<String> getExecResultByReviewId(String reviewId);
+
+    List<String> getIdsByReviewId(String reviewId);
+
+    List<String> getNotRelevanceCaseIds(String planId, List<String> relevanceProjectIds);
+}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml
new file mode 100644
index 0000000000..a806737b74
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewScenarioCaseMapper.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.metersphere.base.mapper.ext.ExtTestCaseReviewScenarioCaseMapper">
+    <insert id="insertIfNotExists" parameterType="io.metersphere.base.domain.TestPlanApiScenario">
+        -- 查询没有数据再插入
+        INSERT INTO test_case_review_scenario(id, test_case_review_id, api_scenario_id, create_time, update_time, environment)
+        SELECT #{request.id}, #{request.reviewId}, #{request.apiScenarioId}, #{request.createTime}, #{request.updateTime}, #{request.environment}
+        FROM DUAL
+        WHERE NOT EXISTS(
+                SELECT id FROM
+                    test_case_review_scenario
+                WHERE test_case_review_id = #{request.reviewId} and api_scenario_id = #{request.apiScenarioId}
+            )
+    </insert>
+
+    <select id="list" resultType="io.metersphere.api.dto.automation.ApiScenarioDTO">
+        select
+        t.id, t.environment, t.create_time, t.update_time, t.last_result, t.pass_rate, t.report_id, c.scenario_definition,
+        c.id as case_id, c.project_id, c.user_id,c.api_scenario_module_id, c.module_path, c.name, c.level,
+        c.status, c.principal, c.step_total, c.follow_people, c.schedule, c.description, c.tags, c.num,
+        p.name as project_name, p.id as project_id, u.name as user_name
+        from
+        test_case_review_scenario t
+        inner join
+        api_scenario c
+        on t.api_scenario_id = c.id and c.status != 'Trash'
+        <if test="request.reviewId != null and request.reviewId!=''">
+            and t.test_case_review_id = #{request.reviewId}
+        </if>
+        left join project p
+        on c.project_id = p.id
+        left join user u
+        on c.user_id = u.id
+        where 1
+        <if test="request.ids != null and request.ids.size() > 0">
+            <if test="request.projectId != null and request.projectId!=''">
+                and
+            </if>
+            t.id in
+            <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
+                #{caseId}
+            </foreach>
+        </if>
+        <if test="request.name != null and request.name!=''">
+            and (c.name like CONCAT('%', #{request.name},'%')
+            or c.num like CONCAT('%', #{request.name},'%')
+            or c.tags like CONCAT('%', #{request.name},'%'))
+        </if>
+        <if test="request.status != null and request.status!=''">
+            and t.last_result like CONCAT('%', #{request.status},'%')
+        </if>
+
+
+        <if test="request.moduleIds != null and request.moduleIds.size() > 0">
+            and c.api_scenario_module_id in
+            <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
+                #{nodeId}
+            </foreach>
+        </if>
+        <if test="request.filters != null and request.filters.size() > 0">
+            <foreach collection="request.filters.entrySet()" index="key" item="values">
+                <if test="values != null and values.size() > 0">
+                    <choose>
+                        <when test="key == 'priority'">
+                            and c.priority in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                    </choose>
+                </if>
+            </foreach>
+        </if>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                <choose>
+                    <when test="order.name == 'update_time'">
+                        t.${order.name} ${order.type}
+                    </when>
+                    <otherwise>
+                        ${order.name} ${order.type}
+                    </otherwise>
+                </choose>
+            </foreach>
+        </if>
+    </select>
+    <select id="getExecResultByReviewId" resultType="java.lang.String">
+        select last_result
+        from
+            test_case_review_scenario
+        where test_case_review_id = #{reviewId}
+    </select>
+    <select id="getIdsByReviewId" resultType="java.lang.String">
+        select id
+        from test_case_review_scenario
+        where test_case_review_id = #{reviewId}
+    </select>
+
+    <select id="getNotRelevanceCaseIds" resultType="java.lang.String">
+        select t.id
+        from test_case_review_scenario t
+        inner join api_scenario c
+        on c.id = t.api_scenario_id
+        <if test="relevanceProjectIds != null and relevanceProjectIds.size() > 0">
+            and c.project_id not in
+            <foreach collection="relevanceProjectIds" item="projectId" separator="," open="(" close=")">
+                #{projectId}
+            </foreach>
+        </if>
+        where t.test_case_review_id = #{reviewId}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/dto/TestReviewLoadCaseDTO.java b/backend/src/main/java/io/metersphere/dto/TestReviewLoadCaseDTO.java
new file mode 100644
index 0000000000..2da27cbc3e
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/dto/TestReviewLoadCaseDTO.java
@@ -0,0 +1,15 @@
+package io.metersphere.dto;
+
+import io.metersphere.base.domain.TestCaseReviewLoad;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TestReviewLoadCaseDTO extends TestCaseReviewLoad {
+    private String userName;
+    private String caseName;
+    private String projectName;
+    private String caseStatus;
+    private String num;
+}
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewApiCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewApiCaseController.java
new file mode 100644
index 0000000000..0d8bf9b36a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewApiCaseController.java
@@ -0,0 +1,56 @@
+package io.metersphere.track.controller;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.metersphere.api.dto.definition.ApiTestCaseDTO;
+import io.metersphere.api.dto.definition.ApiTestCaseRequest;
+import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
+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.track.request.testcase.TestPlanApiCaseBatchRequest;
+import io.metersphere.track.request.testreview.TestReviewApiCaseBatchRequest;
+import io.metersphere.track.service.TestCaseReviewApiCaseService;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/test/case/review/api/case")
+public class TestCaseReviewApiCaseController {
+    @Resource
+    private TestCaseReviewApiCaseService testCaseReviewApiCaseService;
+    @PostMapping("/list/{goPage}/{pageSize}")
+    public Pager<List<TestPlanApiCaseDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiTestCaseRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, testCaseReviewApiCaseService.list(request));
+    }
+    @PostMapping("/relevance/list/{goPage}/{pageSize}")
+    public Pager<List<ApiTestCaseDTO>> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiTestCaseRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        return PageUtils.setPageInfo(page, testCaseReviewApiCaseService.relevanceList(request));
+    }
+
+    @GetMapping("/delete/{id}")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public int deleteTestCase(@PathVariable String id) {
+        return testCaseReviewApiCaseService.delete(id);
+    }
+
+    @PostMapping("/batch/delete")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void deleteApiCaseBath(@RequestBody TestReviewApiCaseBatchRequest request) {
+        testCaseReviewApiCaseService.deleteApiCaseBath(request);
+    }
+
+    @PostMapping("/batch/update/env")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void batchUpdateEnv(@RequestBody TestPlanApiCaseBatchRequest request) {
+        testCaseReviewApiCaseService.batchUpdateEnv(request);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
new file mode 100644
index 0000000000..3b69153905
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
@@ -0,0 +1,63 @@
+package io.metersphere.track.controller;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.metersphere.api.dto.automation.*;
+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.track.dto.RelevanceScenarioRequest;
+import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
+import io.metersphere.track.service.TestCaseReviewScenarioCaseService;
+import io.metersphere.track.service.TestPlanScenarioCaseService;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/test/case/review/scenario/case")
+public class TestCaseReviewScenarioCaseController {
+    @Resource
+    TestCaseReviewScenarioCaseService testCaseReviewScenarioCaseService;
+
+    @PostMapping("/list/{goPage}/{pageSize}")
+    public Pager<List<ApiScenarioDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody TestPlanScenarioRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, testCaseReviewScenarioCaseService.list(request));
+    }
+
+    @PostMapping("/relevance/list/{goPage}/{pageSize}")
+    public Pager<List<ApiScenarioDTO>> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiScenarioRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        return PageUtils.setPageInfo(page, testCaseReviewScenarioCaseService.relevanceList(request));
+    }
+
+    @GetMapping("/delete/{id}")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public int deleteTestCase(@PathVariable String id) {
+        return testCaseReviewScenarioCaseService.delete(id);
+    }
+
+    @PostMapping("/batch/delete")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void deleteApiCaseBath(@RequestBody TestPlanApiCaseBatchRequest request) {
+        testCaseReviewScenarioCaseService.deleteApiCaseBath(request);
+    }
+
+    @PostMapping(value = "/run")
+    public String run(@RequestBody RunScenarioRequest request) {
+        request.setExecuteType(ExecuteType.Completed.name());
+        return testCaseReviewScenarioCaseService.run(request);
+    }
+
+    @PostMapping("/batch/update/env")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void batchUpdateEnv(@RequestBody RelevanceScenarioRequest request) {
+        testCaseReviewScenarioCaseService.batchUpdateEnv(request);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java
new file mode 100644
index 0000000000..1a0cf089ce
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java
@@ -0,0 +1,65 @@
+package io.metersphere.track.controller;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.metersphere.base.domain.LoadTest;
+import io.metersphere.base.domain.TestCaseReviewLoad;
+import io.metersphere.commons.utils.PageUtils;
+import io.metersphere.commons.utils.Pager;
+import io.metersphere.dto.TestReviewLoadCaseDTO;
+import io.metersphere.performance.request.RunTestPlanRequest;
+import io.metersphere.track.request.testplan.LoadCaseReportRequest;
+import io.metersphere.track.request.testplan.LoadCaseRequest;
+import io.metersphere.track.request.testreview.TestReviewRequest;
+import io.metersphere.track.service.TestCaseReviewLoadService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/test/review/load/case")
+public class TestReviewLoadCaseController {
+    @Resource
+    private TestCaseReviewLoadService testCaseReviewLoadService;
+
+    @PostMapping("/relevance/list/{goPage}/{pageSize}")
+    public Pager<List<LoadTest>> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody TestReviewRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, testCaseReviewLoadService.relevanceList(request));
+    }
+
+    @PostMapping("/relevance")
+    public void relevanceCase(@RequestBody TestReviewRequest request) {
+        testCaseReviewLoadService.relevanceCase(request);
+    }
+
+    @PostMapping("/list/{goPage}/{pageSize}")
+    public Pager<List<TestReviewLoadCaseDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody TestReviewRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, testCaseReviewLoadService.list(request));
+    }
+
+    @GetMapping("/delete/{id}")
+    public void delete(@PathVariable String id) {
+        testCaseReviewLoadService.delete(id);
+    }
+
+    @PostMapping("/run")
+    public String run(@RequestBody RunTestPlanRequest request) {
+        return testCaseReviewLoadService.run(request);
+    }
+
+    @PostMapping("/report/exist")
+    public Boolean isExistReport(@RequestBody LoadCaseReportRequest request) {
+        return testCaseReviewLoadService.isExistReport(request);
+    }
+
+    @PostMapping("/batch/delete")
+    public void batchDelete(@RequestBody List<String> ids) {
+        testCaseReviewLoadService.batchDelete(ids);
+    }
+
+    @PostMapping("/update")
+    public void update(@RequestBody TestCaseReviewLoad testCaseReviewLoad) {
+        testCaseReviewLoadService.update(testCaseReviewLoad);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java
index e73396a2c3..3c64b0b91f 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/ApiCaseRelevanceRequest.java
@@ -36,4 +36,8 @@ public class ApiCaseRelevanceRequest {
      * 用例的环境的对应关系
      */
     private Map<String, List<String>> mapping;
+    /**
+     *测试评审ID
+     */
+    private String reviewId;
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java
index 3a8b604d7d..dfda1d6e90 100644
--- a/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java
@@ -17,4 +17,5 @@ public class LoadCaseRequest extends TestPlanLoadCase {
     private String status;
     private Map<String, List<String>> filters;
     private List<OrderRequest> orders;
+
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/testreview/TestReviewApiCaseBatchRequest.java b/backend/src/main/java/io/metersphere/track/request/testreview/TestReviewApiCaseBatchRequest.java
new file mode 100644
index 0000000000..2cf4b7729c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/request/testreview/TestReviewApiCaseBatchRequest.java
@@ -0,0 +1,23 @@
+package io.metersphere.track.request.testreview;
+
+import io.metersphere.base.domain.TestCaseReviewApiCase;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+@Getter
+@Setter
+public class TestReviewApiCaseBatchRequest extends TestCaseReviewApiCase {
+    private List<String> ids;
+
+    /**
+     * 批量修改选中的数据
+     */
+    private Map<String, String> selectRows;
+
+    /**
+     * 项目ID，环境ID对应关系
+     */
+    private Map<String, String> projectEnvMap;
+}
diff --git a/backend/src/main/java/io/metersphere/track/request/testreview/TestReviewRequest.java b/backend/src/main/java/io/metersphere/track/request/testreview/TestReviewRequest.java
new file mode 100644
index 0000000000..59bd2da1fc
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/request/testreview/TestReviewRequest.java
@@ -0,0 +1,20 @@
+package io.metersphere.track.request.testreview;
+
+import io.metersphere.base.domain.TestCaseReviewLoad;
+import io.metersphere.controller.request.OrderRequest;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+@Getter
+@Setter
+public class TestReviewRequest extends TestCaseReviewLoad {
+    private String projectId;
+    private List<String> caseIds;
+    private String name;
+    private String status;
+    private Map<String, List<String>> filters;
+    private List<OrderRequest> orders;
+
+}
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewApiCaseService.java
new file mode 100644
index 0000000000..69cccdc7c0
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewApiCaseService.java
@@ -0,0 +1,104 @@
+package io.metersphere.track.service;
+
+import io.metersphere.api.dto.definition.ApiTestCaseDTO;
+import io.metersphere.api.dto.definition.ApiTestCaseRequest;
+import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
+import io.metersphere.api.service.ApiDefinitionExecResultService;
+import io.metersphere.api.service.ApiTestCaseService;
+import io.metersphere.base.domain.TestCaseReviewApiCase;
+import io.metersphere.base.domain.TestCaseReviewApiCaseExample;
+import io.metersphere.base.domain.TestPlanApiCase;
+import io.metersphere.base.domain.TestPlanApiCaseExample;
+import io.metersphere.base.mapper.TestCaseReviewApiCaseMapper;
+import io.metersphere.base.mapper.ext.ExtTestCaseReviewApiCaseMapper;
+import io.metersphere.commons.utils.ServiceUtils;
+import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
+import io.metersphere.track.request.testreview.TestReviewApiCaseBatchRequest;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TestCaseReviewApiCaseService {
+    @Resource
+    private ExtTestCaseReviewApiCaseMapper extTestCaseReviewApiCaseMapper;
+    @Resource
+    ApiTestCaseService apiTestCaseService;
+    @Resource
+    TestCaseReviewApiCaseMapper  testCaseReviewApiCaseMapper;
+    @Lazy
+    @Resource
+    ApiDefinitionExecResultService apiDefinitionExecResultService;
+    public List<TestPlanApiCaseDTO> list(ApiTestCaseRequest request) {
+        request.setProjectId(null);
+        request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+        List<TestPlanApiCaseDTO> apiTestCases = extTestCaseReviewApiCaseMapper.list(request);
+        if (CollectionUtils.isEmpty(apiTestCases)) {
+            return apiTestCases;
+        }
+        apiTestCaseService.buildUserInfo(apiTestCases);
+        return apiTestCases;
+    }
+    public List<String> getExecResultByReviewId(String reviewId) {
+        return extTestCaseReviewApiCaseMapper.getExecResultByReviewId(reviewId);
+    }
+    public List<ApiTestCaseDTO> relevanceList(ApiTestCaseRequest request) {
+        List<String> ids = apiTestCaseService.selectIdsNotExistsInReview(request.getProjectId(), request.getReviewId());
+        if (CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        request.setIds(ids);
+        return apiTestCaseService.listSimple(request);
+    }
+    public int delete(String id) {
+        apiDefinitionExecResultService.deleteByResourceId(id);
+        TestCaseReviewApiCaseExample  example=new TestCaseReviewApiCaseExample();
+        example.createCriteria()
+                .andIdEqualTo(id);
+
+        return  testCaseReviewApiCaseMapper.deleteByExample(example);
+    }
+    public void deleteApiCaseBath(TestReviewApiCaseBatchRequest request) {
+        if (CollectionUtils.isEmpty(request.getIds())) {
+            return;
+        }
+        apiDefinitionExecResultService.deleteByResourceIds(request.getIds());
+        TestCaseReviewApiCaseExample example=new TestCaseReviewApiCaseExample();
+        example.createCriteria()
+                .andIdIn(request.getIds())
+                .andTestCaseReviewIdEqualTo(request.getTestCaseReviewId());
+        testCaseReviewApiCaseMapper.deleteByExample(example);
+    }
+    public void batchUpdateEnv(TestPlanApiCaseBatchRequest request) {
+        // 批量修改用例环境
+        Map<String, String> rows = request.getSelectRows();
+        Set<String> ids = rows.keySet();
+        Map<String, String> env = request.getProjectEnvMap();
+        if (env != null && !env.isEmpty()) {
+            ids.forEach(id -> {
+                TestCaseReviewApiCase apiCase = new TestCaseReviewApiCase();
+                apiCase.setId(id);
+                apiCase.setEnvironmentId(env.get(rows.get(id)));
+                testCaseReviewApiCaseMapper.updateByPrimaryKeySelective(apiCase);
+            });
+        }
+    }
+    public void setExecResult(String id, String status) {
+        TestCaseReviewApiCase apiCase = new TestCaseReviewApiCase();
+        apiCase.setId(id);
+        apiCase.setStatus(status);
+        apiCase.setUpdateTime(System.currentTimeMillis());
+        testCaseReviewApiCaseMapper.updateByPrimaryKeySelective(apiCase);
+    }
+    public void updateByPrimaryKeySelective(TestCaseReviewApiCase apiCase) {
+        testCaseReviewApiCaseMapper.updateByPrimaryKeySelective(apiCase);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
new file mode 100644
index 0000000000..ff6e712bd9
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
@@ -0,0 +1,155 @@
+package io.metersphere.track.service;
+
+import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.*;
+import io.metersphere.base.mapper.ext.ExtTestCaseReviewLoadMapper;
+import io.metersphere.base.mapper.ext.ExtTestPlanLoadCaseMapper;
+import io.metersphere.commons.constants.TestPlanStatus;
+import io.metersphere.controller.request.OrderRequest;
+import io.metersphere.dto.TestReviewLoadCaseDTO;
+import io.metersphere.performance.request.RunTestPlanRequest;
+import io.metersphere.performance.service.PerformanceTestService;
+import io.metersphere.track.dto.TestPlanLoadCaseDTO;
+import io.metersphere.track.request.testplan.LoadCaseReportRequest;
+import io.metersphere.track.request.testplan.LoadCaseRequest;
+import io.metersphere.track.request.testreview.TestReviewRequest;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TestCaseReviewLoadService {
+    @Resource
+    TestCaseReviewMapper testCaseReviewMapper;
+    @Resource
+    private TestCaseReviewLoadMapper testCaseReviewLoadMapper;
+    @Resource
+    private ExtTestCaseReviewLoadMapper extTestCaseReviewLoadMapper;
+    @Resource
+    private PerformanceTestService performanceTestService;
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private LoadTestReportMapper loadTestReportMapper;
+    @Resource
+    private LoadTestMapper loadTestMapper;
+
+    public List<LoadTest> relevanceList(TestReviewRequest request) {
+        List<String> ids = extTestCaseReviewLoadMapper.selectIdsNotInPlan(request.getProjectId(), request.getTestCaseReviewId());
+        if (CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        return performanceTestService.getLoadTestListByIds(ids);
+    }
+
+    public List<TestReviewLoadCaseDTO> list(TestReviewRequest request) {
+        List<OrderRequest> orders = request.getOrders();
+        if (orders == null || orders.size() < 1) {
+            OrderRequest orderRequest = new OrderRequest();
+            orderRequest.setName("create_time");
+            orderRequest.setType("desc");
+            orders = new ArrayList<>();
+            orders.add(orderRequest);
+        }
+        request.setOrders(orders);
+        return extTestCaseReviewLoadMapper.selectTestReviewLoadCaseList(request);
+    }
+
+    public void relevanceCase(TestReviewRequest request) {
+        List<String> caseIds = request.getCaseIds();
+        String reviewId = request.getTestCaseReviewId();
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+
+        TestCaseReviewLoadMapper testCaseReviewLoadMapper = sqlSession.getMapper(TestCaseReviewLoadMapper.class);
+        caseIds.forEach(id -> {
+            TestCaseReviewLoad t = new TestCaseReviewLoad();
+            t.setId(UUID.randomUUID().toString());
+            t.setTestCaseReviewId(reviewId);
+            t.setLoadCaseId(id);
+            t.setCreateTime(System.currentTimeMillis());
+            t.setUpdateTime(System.currentTimeMillis());
+            testCaseReviewLoadMapper.insert(t);
+        });
+        TestCaseReview testCaseReview = testCaseReviewMapper.selectByPrimaryKey(request.getTestCaseReviewId());
+        if (org.apache.commons.lang3.StringUtils.equals(testCaseReview.getStatus(), TestPlanStatus.Prepare.name())
+                || org.apache.commons.lang3.StringUtils.equals(testCaseReview.getStatus(), TestPlanStatus.Completed.name())) {
+            testCaseReview.setStatus(TestPlanStatus.Underway.name());
+            testCaseReviewMapper.updateByPrimaryKey(testCaseReview);
+        }
+        sqlSession.flushStatements();
+    }
+
+    public void delete(String id) {
+        TestCaseReviewLoadExample example = new TestCaseReviewLoadExample();
+        example.createCriteria().andIdEqualTo(id);
+        testCaseReviewLoadMapper.deleteByExample(example);
+    }
+
+    public String run(RunTestPlanRequest request) {
+        String reportId = performanceTestService.run(request);
+        TestCaseReviewLoad testCaseReviewLoad = new TestCaseReviewLoad();
+        testCaseReviewLoad.setId(request.getTestPlanLoadId());
+        testCaseReviewLoad.setLoadReportId(reportId);
+        testCaseReviewLoadMapper.updateByPrimaryKeySelective(testCaseReviewLoad);
+        return reportId;
+    }
+//???
+    public Boolean isExistReport(LoadCaseReportRequest request) {
+        String reportId = request.getReportId();
+        String testPlanLoadCaseId = request.getTestPlanLoadCaseId();
+        LoadTestReportExample example = new LoadTestReportExample();
+        example.createCriteria().andIdEqualTo(reportId);
+        List<LoadTestReport> loadTestReports = loadTestReportMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(loadTestReports)) {
+            TestCaseReviewLoad testCaseReviewLoad = new TestCaseReviewLoad();
+            testCaseReviewLoad.setId(testPlanLoadCaseId);
+            testCaseReviewLoad.setLoadReportId("");
+            testCaseReviewLoadMapper.updateByPrimaryKeySelective(testCaseReviewLoad);
+            return false;
+        }
+        return true;
+    }
+
+    public void deleteByRelevanceProjectIds(String id, List<String> relevanceProjectIds) {
+        LoadTestExample loadTestExample = new LoadTestExample();
+        loadTestExample.createCriteria().andProjectIdIn(relevanceProjectIds);
+        List<LoadTest> loadTests = loadTestMapper.selectByExample(loadTestExample);
+        TestCaseReviewLoadExample example = new TestCaseReviewLoadExample();
+        TestCaseReviewLoadExample.Criteria criteria = example.createCriteria().andTestCaseReviewIdEqualTo(id);
+        if (!CollectionUtils.isEmpty(loadTests)) {
+            List<String> ids = loadTests.stream().map(LoadTest::getId).collect(Collectors.toList());
+            criteria.andLoadCaseIdNotIn(ids);
+        }
+        testCaseReviewLoadMapper.deleteByExample(example);
+    }
+
+    public void batchDelete(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        TestCaseReviewLoadExample example = new TestCaseReviewLoadExample();
+        example.createCriteria().andIdIn(ids);
+        testCaseReviewLoadMapper.deleteByExample(example);
+    }
+
+    public void update(TestCaseReviewLoad testCaseReviewLoad) {
+        if (!StringUtils.isEmpty(testCaseReviewLoad.getId())) {
+            testCaseReviewLoadMapper.updateByPrimaryKeySelective(testCaseReviewLoad);
+        }
+    }
+
+    public List<String> getStatus(String reviewId) {
+        return extTestCaseReviewLoadMapper.getStatusByreviewId(reviewId);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
new file mode 100644
index 0000000000..76228fef48
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
@@ -0,0 +1,194 @@
+package io.metersphere.track.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONPath;
+import io.metersphere.api.dto.automation.ApiScenarioDTO;
+import io.metersphere.api.dto.automation.ApiScenarioRequest;
+import io.metersphere.api.dto.automation.RunScenarioRequest;
+import io.metersphere.api.dto.automation.TestPlanScenarioRequest;
+import io.metersphere.api.dto.definition.RunDefinitionRequest;
+import io.metersphere.api.service.ApiAutomationService;
+import io.metersphere.api.service.ApiScenarioReportService;
+import io.metersphere.base.domain.TestCaseReviewScenario;
+import io.metersphere.base.domain.TestCaseReviewScenarioExample;
+import io.metersphere.base.domain.TestPlanApiScenario;
+import io.metersphere.base.domain.TestPlanApiScenarioExample;
+import io.metersphere.base.mapper.TestCaseReviewScenarioMapper;
+import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
+import io.metersphere.base.mapper.ext.ExtTestCaseReviewScenarioCaseMapper;
+import io.metersphere.base.mapper.ext.ExtTestPlanScenarioCaseMapper;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.utils.ServiceUtils;
+import io.metersphere.track.dto.RelevanceScenarioRequest;
+import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TestCaseReviewScenarioCaseService {
+    @Resource
+    ApiAutomationService apiAutomationService;
+    @Resource
+    TestCaseReviewScenarioMapper testCaseReviewScenarioMapper;
+    @Resource
+    ExtTestCaseReviewScenarioCaseMapper extTestCaseReviewScenarioCaseMapper;
+    @Resource
+    ApiScenarioReportService apiScenarioReportService;
+    public List<ApiScenarioDTO> list(TestPlanScenarioRequest request) {
+        request.setProjectId(null);
+        request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+        List<ApiScenarioDTO> apiTestCases = extTestCaseReviewScenarioCaseMapper.list(request);
+        setApiScenarioProjectIds(apiTestCases);
+        if (CollectionUtils.isEmpty(apiTestCases)) {
+            return apiTestCases;
+        }
+        return apiTestCases;
+    }
+
+    private void setApiScenarioProjectIds(List<ApiScenarioDTO> list) {
+        // 如果场景步骤涉及多项目，则把涉及到的项目ID保存在projectIds属性
+        list.forEach(data -> {
+            List<String> idList = new ArrayList<>();
+            String definition = data.getScenarioDefinition();
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(definition)) {
+                RunDefinitionRequest d = JSON.parseObject(definition, RunDefinitionRequest.class);
+
+                if (d != null) {
+                    Map<String, String> map = d.getEnvironmentMap();
+                    if (map != null) {
+                        if (map.isEmpty()) {
+                            List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
+                            idList.addAll(new HashSet<>(ids));
+                        } else {
+                            Set<String> set = d.getEnvironmentMap().keySet();
+                            idList = new ArrayList<>(set);
+                        }
+                    } else {
+                        // 兼容历史数据，无EnvironmentMap直接赋值场景所属项目
+                        idList.add(data.getProjectId());
+                    }
+                }
+
+            }
+            data.setProjectIds(idList);
+        });
+    }
+
+    public List<ApiScenarioDTO> relevanceList(ApiScenarioRequest request) {
+        request.setNotInTestPlan(true);
+        List<ApiScenarioDTO> list = apiAutomationService.listReview(request);
+        setApiScenarioProjectIds(list);
+        return list;
+    }
+
+    public int delete(String id) {
+        TestCaseReviewScenario testCaseReviewScenario = testCaseReviewScenarioMapper.selectByPrimaryKey(id);
+        String reportId = testCaseReviewScenario.getReportId();
+        if (!StringUtils.isEmpty(reportId)) {
+            apiScenarioReportService.delete(reportId);
+        }
+       TestCaseReviewScenarioExample example = new TestCaseReviewScenarioExample();
+        example.createCriteria()
+                .andIdEqualTo(id);
+
+        return testCaseReviewScenarioMapper.deleteByExample(example);
+    }
+
+    public void deleteApiCaseBath(TestPlanApiCaseBatchRequest request) {
+        if (CollectionUtils.isEmpty(request.getIds())) {
+            return;
+        }
+        TestCaseReviewScenarioExample example = new TestCaseReviewScenarioExample();
+        example.createCriteria()
+                .andIdIn(request.getIds());
+        List<String> reportIds = testCaseReviewScenarioMapper.selectByExample(example).stream()
+                .map(TestCaseReviewScenario::getReportId).collect(Collectors.toList());
+        apiScenarioReportService.deleteByIds(reportIds);
+        testCaseReviewScenarioMapper.deleteByExample(example);
+    }
+
+    public String run(RunScenarioRequest request) {
+        TestCaseReviewScenarioExample example = new TestCaseReviewScenarioExample();
+        example.createCriteria().andIdIn(request.getPlanCaseIds());
+        List<TestCaseReviewScenario> testPlanApiScenarioList = testCaseReviewScenarioMapper.selectByExample(example);
+
+        List<String> scenarioIds = new ArrayList<>();
+        Map<String,String> scenarioIdApiScarionMap = new HashMap<>();
+        for (TestCaseReviewScenario apiScenario:
+                testPlanApiScenarioList) {
+            scenarioIds.add(apiScenario.getApiScenarioId());
+            scenarioIdApiScarionMap.put(apiScenario.getApiScenarioId(),apiScenario.getId());
+        }
+        request.setIds(scenarioIds);
+        request.setScenarioTestPlanIdMap(scenarioIdApiScarionMap);
+        request.setRunMode(ApiRunMode.SCENARIO_PLAN.name());
+        return apiAutomationService.run(request);
+    }
+
+    public List<TestCaseReviewScenario> getCasesByReviewId(String reviewId) {
+        TestCaseReviewScenarioExample example = new TestCaseReviewScenarioExample();
+        example.createCriteria().andTestCaseReviewIdEqualTo(reviewId);
+        return testCaseReviewScenarioMapper.selectByExample(example);
+    }
+
+    public List<String> getExecResultByReviewId(String reviewId) {
+        return extTestCaseReviewScenarioCaseMapper.getExecResultByReviewId(reviewId);
+    }
+
+    public void deleteByReviewId(String reviewId) {
+        TestPlanApiCaseBatchRequest request = new TestPlanApiCaseBatchRequest();
+        List<String> ids = extTestCaseReviewScenarioCaseMapper.getIdsByReviewId(reviewId);
+        request.setIds(ids);
+        deleteApiCaseBath(request);
+    }
+
+    public void deleteByRelevanceProjectIds(String reviewId, List<String> relevanceProjectIds) {
+        TestPlanApiCaseBatchRequest request = new TestPlanApiCaseBatchRequest();
+        request.setIds(extTestCaseReviewScenarioCaseMapper.getNotRelevanceCaseIds(reviewId, relevanceProjectIds));
+        request.setPlanId(reviewId);
+        deleteApiCaseBath(request);
+    }
+
+    public void bathDeleteByScenarioIds(List<String> ids) {
+        TestCaseReviewScenarioExample example = new TestCaseReviewScenarioExample();
+        example.createCriteria().andApiScenarioIdIn(ids);
+        testCaseReviewScenarioMapper.deleteByExample(example);
+    }
+
+    public void deleteByScenarioId(String id) {
+        TestCaseReviewScenarioExample example = new TestCaseReviewScenarioExample();
+        example.createCriteria().andApiScenarioIdEqualTo(id);
+        testCaseReviewScenarioMapper.deleteByExample(example);
+    }
+
+    public void batchUpdateEnv(RelevanceScenarioRequest request) {
+        Map<String, String> envMap = request.getEnvMap();
+        Map<String, List<String>> mapping = request.getMapping();
+        Set<String> set = mapping.keySet();
+        if (set.isEmpty()) { return; }
+        set.forEach(id -> {
+            Map<String, String> newEnvMap = new HashMap<>(16);
+            if (envMap != null && !envMap.isEmpty()) {
+                List<String> list = mapping.get(id);
+                list.forEach(l -> {
+                    newEnvMap.put(l, envMap.get(l));
+                });
+            }
+            if (!newEnvMap.isEmpty()) {
+                TestCaseReviewScenario scenario = new TestCaseReviewScenario();
+                scenario.setId(id);
+                scenario.setEnvironment(JSON.toJSONString(newEnvMap));
+                testCaseReviewScenarioMapper.updateByPrimaryKeySelective(scenario);
+            }
+        });
+
+
+    }
+}
diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
index 9c3112ba2a..2f60e346bb 100644
--- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql
+++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
@@ -80,6 +80,8 @@ alter table test_case
     add demand_name varchar(999) null;
 alter table test_case
     add follow_people varchar(100) null;
+alter table test_case
+    add status varchar(25) null;
 -- test_case_review add column
 ALTER TABLE test_case_review
     ADD tags VARCHAR(2000) NULL;
@@ -96,4 +98,7 @@ alter table file_metadata
 alter table api_definition add original_state varchar(64);
 alter table api_scenario add original_state varchar(64);
 update api_definition set original_state='Underway';
-update api_scenario set original_state='Underway';
\ No newline at end of file
+update api_scenario set original_state='Underway';
+
+-- alter test_case_review_scenario
+alter table test_case_review_scenario modify environment longtext null;
\ No newline at end of file
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index 5798709de6..c0595762e2 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -71,7 +71,11 @@
         <!--<table tableName="test_plan"/>-->
         <!--<table tableName="api_scenario_report"/>-->
         <!--<table tableName="test_case_review"/>-->
-        <table tableName="test_case"/>
+        <!--<table tableName="test_case"/>-->
+        <table tableName="test_case_review_api_case"/>
+        <table tableName="test_case_review_load"/>
+        <table tableName="test_case_review_scenario"/>
+
 
     </context>
 </generatorConfiguration>
\ No newline at end of file
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 345a94dfb5..c8bade0683 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -765,9 +765,6 @@
     z-index: auto !important;
   }
 
-  /deep/ el-table__fixed-right {
-
-  }
 
   /deep/ .el-table__fixed-right {
     height: 100% !important;
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index f45dea9632..ca7e7691f7 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -74,6 +74,7 @@ export default {
       },
       planId: String,
       relevanceProjectId: String,
+      reviewId: String
     },
     computed: {
       isPlanModel() {
@@ -81,6 +82,9 @@ export default {
       },
       isRelevanceModel() {
         return this.relevanceProjectId ? true : false;
+      },
+      isReviewModel() {
+        return this.reviewId ? true : false;
       }
     },
     mounted() {
@@ -104,6 +108,9 @@ export default {
       },
       relevanceProjectId() {
         this.list();
+      },
+      reviewId() {
+        this.list();
       }
     },
     methods: {
diff --git a/frontend/src/business/components/track/TestTrack.vue b/frontend/src/business/components/track/TestTrack.vue
index 4e63c93777..c251f0ccd4 100644
--- a/frontend/src/business/components/track/TestTrack.vue
+++ b/frontend/src/business/components/track/TestTrack.vue
@@ -16,14 +16,17 @@
   import TrackHeaderMenus from "./head/TrackHeaderMenus";
 
   export default {
-      name: "TrackHome",
-      components: {TrackHeaderMenus},
-      data() {
-        return {
-          baseUrl: "track"
-        }
+    name: "TrackHome",
+    components: {TrackHeaderMenus},
+    data() {
+      return {
+        baseUrl: "track"
       }
+    },
+    activated() {
+      this.$refs.table.doLayout()
     }
+  }
 </script>
 
 
diff --git a/frontend/src/business/components/track/plan/TestPlan.vue b/frontend/src/business/components/track/plan/TestPlan.vue
index a1594962fd..6974f8cead 100644
--- a/frontend/src/business/components/track/plan/TestPlan.vue
+++ b/frontend/src/business/components/track/plan/TestPlan.vue
@@ -6,6 +6,7 @@
         @openTestPlanEditDialog="openTestPlanEditDialog"
         @testPlanEdit="openTestPlanEditDialog"
         ref="testPlanList"/>
+
     </ms-main-container>
 
     <test-plan-edit ref="testPlanEditDialog" @refresh="refreshTestPlanList"/>
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index a767856738..7e9966d138 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -19,6 +19,11 @@
               <el-input v-model="form.name" :placeholder="$t('test_track.plan.input_plan_name')"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item :label="$t('commons.tag')" :label-width="formLabelWidth" prop="tag">
+              <ms-input-tag :currentScenario="form" ref="tag"/>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -93,6 +98,7 @@
       </el-form>
 
       <template v-slot:footer>
+
         <div class="dialog-footer">
           <el-button
             @click="dialogFormVisible = false">
@@ -118,10 +124,11 @@ import {WORKSPACE_ID} from '@/common/js/constants';
 import TestPlanStatusButton from "../common/TestPlanStatusButton";
 import {getCurrentProjectID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
 
 export default {
   name: "TestPlanEdit",
-  components: {TestPlanStatusButton},
+  components: {TestPlanStatusButton, MsInputTag},
   data() {
     return {
       dialogFormVisible: false,
@@ -174,6 +181,10 @@ export default {
             return;
           }
           param.workspaceId = localStorage.getItem(WORKSPACE_ID);
+          if (this.form.tags instanceof Array) {
+            this.form.tags = JSON.stringify(this.form.tags);
+          }
+          param.tags = this.form.tags;
           this.$post('/test/plan/' + this.operationType, param, () => {
             this.$success(this.$t('commons.save_success'));
             this.dialogFormVisible = false;
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 033109e521..70e57c609e 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -3,8 +3,10 @@
     <template v-slot:header>
       <ms-table-header :is-tester-permission="true" :condition.sync="condition"
                        @search="initTableData" @create="testPlanCreate"
-                       :create-tip="$t('test_track.plan.create_plan')"
-                       :title="$t('test_track.plan.test_plan')"/>
+                       :title="$t('test_track.plan.test_plan')"
+                       :show-create="false"/>
+      <el-button type="primary" plain icon="el-icon-plus" size="mini" v-tester @click="testPlanCreate"/>
+
     </template>
 
     <el-table
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue
index 3575efc64a..fb44237498 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue
@@ -8,6 +8,7 @@
 
     <template v-slot:aside>
       <ms-api-module
+        :relevance-project-id="projectId"
         @nodeSelectEvent="nodeChange"
         @protocolChange="handleProtocolChange"
         @refreshTable="refresh"
@@ -132,6 +133,7 @@
           url = '/api/definition/relevance';
           environmentId = this.$refs.apiList.environmentId;
           selectIds = Array.from(this.$refs.apiList.selectRows).map(row => row.id);
+
         } else {
           url = '/api/testcase/relevance';
           environmentId = this.$refs.apiCaseList.environmentId;
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index 73073a8485..6d00c2599d 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -262,6 +262,7 @@ export default {
       }
     },
     planId: String,
+    reviewId: String,
     clickType: String
   },
   created: function () {
@@ -280,6 +281,9 @@ export default {
     },
     planId() {
       this.initTable();
+    },
+    reviewId() {
+      this.initTable();
     }
   },
   computed: {
@@ -317,9 +321,6 @@ export default {
       this.selectRows = new Set();
       this.condition.status = "";
       this.condition.moduleIds = this.selectNodeIds;
-
-      this.condition.planId = this.planId;
-
       if (this.currentProtocol != null) {
         this.condition.protocol = this.currentProtocol;
       }
@@ -331,15 +332,31 @@ export default {
         }
         this.status = 'all';
       }
-      this.result = this.$post('/test/plan/api/case/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
-        this.total = response.data.itemCount;
-        this.tableData = response.data.listObject;
-        this.tableData.forEach(item => {
-          if (item.tags && item.tags.length > 0) {
-            item.tags = JSON.parse(item.tags);
-          }
-        })
-      });
+      if (this.reviewId) {
+        this.condition.reviewId = this.reviewId;
+        this.result = this.$post('/test/case/review/api/case/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          this.total = response.data.itemCount;
+          this.tableData = response.data.listObject;
+          this.tableData.forEach(item => {
+            if (item.tags && item.tags.length > 0) {
+              item.tags = JSON.parse(item.tags);
+            }
+          })
+        });
+      }
+      if (this.planId) {
+        this.condition.planId = this.planId;
+        this.result = this.$post('/test/plan/api/case/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          this.total = response.data.itemCount;
+          this.tableData = response.data.listObject;
+          this.tableData.forEach(item => {
+            if (item.tags && item.tags.length > 0) {
+              item.tags = JSON.parse(item.tags);
+            }
+          })
+        });
+      }
+
     },
     handleSelect(selection, row) {
       row.hashTree = [];
@@ -399,13 +416,25 @@ export default {
           if (action === 'confirm') {
             let param = {};
             param.ids = Array.from(this.selectRows).map(row => row.id);
-            param.planId = this.planId;
-            this.$post('/test/plan/api/case/batch/delete', param, () => {
-              this.selectRows.clear();
-              this.initTable();
-              this.$emit('refresh');
-              this.$success(this.$t('test_track.cancel_relevance_success'));
-            });
+            if (this.reviewId) {
+              param.testCaseReviewId = this.reviewId
+              this.$post('/test/case/review/api/case/batch/delete', param, () => {
+                this.selectRows.clear();
+                this.initTable();
+                this.$emit('refresh');
+                this.$success(this.$t('test_track.cancel_relevance_success'));
+              });
+            }
+            if (this.planId) {
+              param.planId = this.planId;
+              this.$post('/test/plan/api/case/batch/delete', param, () => {
+                this.selectRows.clear();
+                this.initTable();
+                this.$emit('refresh');
+                this.$success(this.$t('test_track.cancel_relevance_success'));
+              });
+            }
+
           }
         }
       });
@@ -494,11 +523,20 @@ export default {
       });
     },
     handleDelete(apiCase) {
-      this.$get('/test/plan/api/case/delete/' + apiCase.id, () => {
-        this.$success(this.$t('test_track.cancel_relevance_success'));
-        this.$emit('refresh');
-        this.initTable();
-      });
+      if (this.planId) {
+        this.$get('/test/plan/api/case/delete/' + apiCase.id, () => {
+          this.$success(this.$t('test_track.cancel_relevance_success'));
+          this.$emit('refresh');
+          this.initTable();
+        });
+      }
+      if (this.reviewId) {
+        this.$get('/test/case/review/api/case/delete/' + apiCase.id, () => {
+          this.$success(this.$t('test_track.cancel_relevance_success'));
+          this.$emit('refresh');
+          this.initTable();
+        });
+      }
       return;
     },
     getProjectId() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index 0142730ff1..5c3612a19e 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -140,6 +140,7 @@ export default {
       default: false,
     },
     selectNodeIds: Array,
+    reviewId: String,
     planId: String,
     clickType: String
   },
@@ -202,7 +203,6 @@ export default {
       this.selectRows = new Set();
       this.loading = true;
       this.condition.moduleIds = this.selectNodeIds;
-      this.condition.planId = this.planId;
       if (this.clickType) {
         if (this.status == 'default') {
           this.condition.status = this.clickType;
@@ -211,18 +211,37 @@ export default {
         }
         this.status = 'all';
       }
-      let url = "/test/plan/scenario/case/list/" + this.currentPage + "/" + this.pageSize;
-      this.$post(url, this.condition, response => {
-        let data = response.data;
-        this.total = data.itemCount;
-        this.tableData = data.listObject;
-        this.tableData.forEach(item => {
-          if (item.tags && item.tags.length > 0) {
-            item.tags = JSON.parse(item.tags);
-          }
+      if (this.planId) {
+        this.condition.planId = this.planId;
+        let url = "/test/plan/scenario/case/list/" + this.currentPage + "/" + this.pageSize;
+        this.$post(url, this.condition, response => {
+          let data = response.data;
+          this.total = data.itemCount;
+          this.tableData = data.listObject;
+          this.tableData.forEach(item => {
+            if (item.tags && item.tags.length > 0) {
+              item.tags = JSON.parse(item.tags);
+            }
+          });
+          this.loading = false;
         });
-        this.loading = false;
-      });
+      }
+      if (this.reviewId) {
+        this.condition.reviewId = this.reviewId;
+        let url = "/test/case/review/scenario/case/list/" + this.currentPage + "/" + this.pageSize;
+        this.$post(url, this.condition, response => {
+          let data = response.data;
+          this.total = data.itemCount;
+          this.tableData = data.listObject;
+          this.tableData.forEach(item => {
+            if (item.tags && item.tags.length > 0) {
+              item.tags = JSON.parse(item.tags);
+            }
+          });
+          this.loading = false;
+        });
+      }
+
     },
     reductionApi(row) {
       row.scenarioDefinition = null;
@@ -233,21 +252,39 @@ export default {
       })
     },
     handleBatchExecute() {
-      this.selectRows.forEach(row => {
-        let param = this.buildExecuteParam(row);
-        this.$post("/test/plan/scenario/case/run", param, response => {
+      if (this.reviewId) {
+        this.selectRows.forEach(row => {
+          let param = this.buildExecuteParam(row);
+          this.$post("/test/case/review/scenario/case/run", param, response => {
+          });
         });
-      });
+      }
+      if (this.planId) {
+        this.selectRows.forEach(row => {
+          let param = this.buildExecuteParam(row);
+          this.$post("/test/plan/scenario/case/run", param, response => {
+          });
+        });
+      }
       this.$message('任务执行中，请稍后刷新查看结果');
       this.search();
     },
     execute(row) {
       this.infoDb = false;
       let param = this.buildExecuteParam(row);
-      this.$post("/test/plan/scenario/case/run", param, response => {
-        this.runVisible = true;
-        this.reportId = response.data;
-      });
+
+      if (this.planId) {
+        this.$post("/test/plan/scenario/case/run", param, response => {
+          this.runVisible = true;
+          this.reportId = response.data;
+        });
+      }
+      if (this.reviewId) {
+        this.$post("/test/case/review/scenario/case/run", param, response => {
+          this.runVisible = true;
+          this.reportId = response.data;
+        });
+      }
     },
     buildExecuteParam(row) {
       let param = {};
@@ -265,11 +302,20 @@ export default {
       this.reportId = row.reportId;
     },
     remove(row) {
-      this.$get('/test/plan/scenario/case/delete/' + row.id, () => {
-        this.$success(this.$t('test_track.cancel_relevance_success'));
-        this.$emit('refresh');
-        this.search();
-      });
+      if (this.planId) {
+        this.$get('/test/plan/scenario/case/delete/' + row.id, () => {
+          this.$success(this.$t('test_track.cancel_relevance_success'));
+          this.$emit('refresh');
+          this.search();
+        });
+      }
+      if (this.reviewId) {
+        this.$get('/test/case/review/scenario/case/delete/' + row.id, () => {
+          this.$success(this.$t('test_track.cancel_relevance_success'));
+          this.$emit('refresh');
+          this.search();
+        });
+      }
       return;
     },
     isSelect(row) {
@@ -288,13 +334,24 @@ export default {
           if (action === 'confirm') {
             let param = {};
             param.ids = Array.from(this.selectRows).map(row => row.id);
-            param.planId = this.planId;
-            this.$post('/test/plan/scenario/case/batch/delete', param, () => {
-              this.selectRows.clear();
-              this.search();
-              this.$success(this.$t('test_track.cancel_relevance_success'));
-              this.$emit('refresh');
-            });
+            if (this.planId) {
+              param.planId = this.planId;
+              this.$post('/test/plan/scenario/case/batch/delete', param, () => {
+                this.selectRows.clear();
+                this.search();
+                this.$success(this.$t('test_track.cancel_relevance_success'));
+                this.$emit('refresh');
+              });
+            }
+            if (this.reviewId) {
+              param.reviewId = this.reviewId;
+              this.$post('/test/case/review/scenario/case/batch/delete', param, () => {
+                this.selectRows.clear();
+                this.search();
+                this.$success(this.$t('test_track.cancel_relevance_success'));
+                this.$emit('refresh');
+              });
+            }
           }
         }
       });
@@ -311,10 +368,19 @@ export default {
       })
       param.mapping = strMapToObj(map);
       param.envMap = strMapToObj(form.projectEnvMap);
-      this.$post('/test/plan/scenario/case/batch/update/env', param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.search();
-      })
+      if (this.planId) {
+        this.$post('/test/plan/scenario/case/batch/update/env', param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        })
+      }
+      if (this.reviewId) {
+        this.$post('/test/case/review/scenario/case/batch/update/env', param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        })
+      }
+
     },
   }
 }
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index f9a6d4eb04..90d64d5d78 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -14,7 +14,8 @@
     <slot></slot>
 
     <template v-slot:footer>
-      <div v-if="$slots.footer">
+
+    <div v-if="$slots.footer">
         <slot name="footer"></slot>
       </div>
       <div v-else>
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
index bae9178cbc..08556d7830 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
@@ -61,8 +61,11 @@
       </el-table-column>
     </el-table>
 
-    <div v-if="!lineStatus" style="text-align: center">{{$t('test_track.review_view.last_page')}}</div>
-    <div style="text-align: center">共 {{total}} 条</div>
+    <div v-if="!lineStatus" style="text-align: center">{{ $t('test_track.review_view.last_page') }}</div>
+    <div style="text-align: center">共 {{ total }} 条</div>
+    <div style="margin-bottom: 15px;margin-right: 0">
+      <el-checkbox v-model="checked">同步添加关联的接口和性能测试</el-checkbox>
+    </div>
 
   </test-case-relevance-base>
 
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
index 83e55af9a2..423c486781 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
@@ -113,6 +113,9 @@ export default {
   props: {
     planId: {
       type: String
+    },
+    reviewId: {
+      type: String
     }
   },
   watch: {
@@ -126,6 +129,9 @@ export default {
       this.condition.projectId = this.projectId;
       this.getProjectNode();
       this.search();
+    },
+    reviewId() {
+      this.condition.reviewId = this.reviewId;
     }
   },
   methods: {
@@ -137,16 +143,30 @@ export default {
     },
     saveCaseRelevance() {
       let param = {};
-      param.testPlanId = this.planId;
       param.caseIds = [...this.selectIds];
-      this.result = this.$post('/test/plan/load/case/relevance', param, () => {
-        this.selectIds.clear();
-        this.$success(this.$t('commons.save_success'));
+      if (this.planId) {
+        param.testPlanId = this.planId;
+        this.result = this.$post('/test/plan/load/case/relevance', param, () => {
+          this.selectIds.clear();
+          this.$success(this.$t('commons.save_success'));
 
-        this.$refs.baseRelevance.close();
+          this.$refs.baseRelevance.close();
+
+          this.$emit('refresh');
+        });
+      }
+      if (this.reviewId) {
+        param.testCaseReviewId = this.reviewId;
+        this.result = this.$post('/test/review/load/case/relevance', param, () => {
+          this.selectIds.clear();
+          this.$success(this.$t('commons.save_success'));
+
+          this.$refs.baseRelevance.close();
+
+          this.$emit('refresh');
+        });
+      }
 
-        this.$emit('refresh');
-      });
     },
     buildPagePath(path) {
       return path + "/" + this.currentPage + "/" + this.pageSize;
@@ -159,8 +179,6 @@ export default {
     getTestCases() {
       if (this.planId) {
         this.condition.testPlanId = this.planId;
-      }
-      if (this.projectId) {
         this.condition.projectId = this.projectId;
         this.result = this.$post(this.buildPagePath('/test/plan/load/case/relevance/list'), this.condition, response => {
           let data = response.data;
@@ -168,6 +186,17 @@ export default {
           this.testCases = data.listObject;
         });
       }
+      if (this.reviewId) {
+        this.condition.testCaseReviewId = this.reviewId;
+        if (this.projectId) {
+          this.condition.projectId = this.projectId;
+          this.result = this.$post(this.buildPagePath('/test/review/load/case/relevance/list'), this.condition, response => {
+            let data = response.data;
+            this.total = data.itemCount;
+            this.testCases = data.listObject;
+          });
+        }
+      }
     },
     handleSelectAll(selection) {
       if (selection.length > 0) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index f379e025e6..c65b22335f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -192,6 +192,7 @@ export default {
       default: false
     },
     planId: String,
+    reviewId: String,
     clickType: String,
   },
   created() {
@@ -225,12 +226,24 @@ export default {
         }
         this.status = 'all';
       }
-      this.$post("/test/plan/load/case/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
-        let data = response.data;
-        let {itemCount, listObject} = data;
-        this.total = itemCount;
-        this.tableData = listObject;
-      })
+      if (this.planId) {
+        this.condition.testPlanId = this.planId;
+        this.$post("/test/plan/load/case/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          let data = response.data;
+          let {itemCount, listObject} = data;
+          this.total = itemCount;
+          this.tableData = listObject;
+        })
+      }
+      if (this.reviewId) {
+        this.condition.testCaseReviewId = this.reviewId;
+        this.$post("/test/review/load/case/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          let data = response.data;
+          let {itemCount, listObject} = data;
+          this.total = itemCount;
+          this.tableData = listObject;
+        })
+      }
     },
     refreshStatus() {
       this.refreshScheduler = setInterval(() => {
@@ -267,11 +280,20 @@ export default {
         callback: (action) => {
           if (action === 'confirm') {
             let ids = Array.from(this.selectRows).map(row => row.id);
-            this.result = this.$post('/test/plan/load/case/batch/delete', ids, () => {
-              this.selectRows.clear();
-              this.initTable();
-              this.$success(this.$t('test_track.cancel_relevance_success'));
-            });
+            if (this.planId) {
+              this.result = this.$post('/test/plan/load/case/batch/delete', ids, () => {
+                this.selectRows.clear();
+                this.initTable();
+                this.$success(this.$t('test_track.cancel_relevance_success'));
+              });
+            }
+            if (this.reviewId) {
+              this.result = this.$post('/test/review/load/case/batch/delete', ids, () => {
+                this.selectRows.clear();
+                this.initTable();
+                this.$success(this.$t('test_track.cancel_relevance_success'));
+              });
+            }
           }
         }
       })
@@ -306,14 +328,21 @@ export default {
       })
     },
     updateStatus(loadCase, status) {
-      this.$post('/test/plan/load/case/update', {id: loadCase.id, status: status}, () => {
-        this.$post('/test/plan/edit/status/' + loadCase.testPlanId, {}, () => {
+      if (this.planId) {
+        this.$post('/test/plan/load/case/update', {id: loadCase.id, status: status}, () => {
+          this.$post('/test/plan/edit/status/' + loadCase.testPlanId, {}, () => {
+            this.initTable();
+          });
+        });
+      }
+      if (this.reviewId) {
+        this.$post('/test/review/load/case/update', {id: loadCase.id, status: status}, () => {
           this.initTable();
         });
-      });
+      }
     },
     handleDelete(loadCase) {
-      this.result = this.$get('/test/plan/load/case/delete/' + loadCase.id, () => {
+      this.result = this.$get('/test/review/load/case/delete/' + loadCase.id, () => {
         this.$success(this.$t('test_track.cancel_relevance_success'));
         this.$emit('refresh');
         this.initTable();
diff --git a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
index fcb68b5b1c..cf722e986c 100644
--- a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
+++ b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
@@ -10,20 +10,19 @@
       </template>
       <template v-slot:menu>
         <el-menu v-if="isMenuShow" active-text-color="#6d317c"
-                 class="el-menu-demo header-menu" mode="horizontal" @select="handleSelect" :default-active="activeIndex">
+                 class="el-menu-demo header-menu" mode="horizontal" @select="handleSelect"
+                 :default-active="activeIndex">
           <el-menu-item index="functional">功能测试用例</el-menu-item>
           <el-menu-item index="api">接口测试用例</el-menu-item>
           <el-menu-item index="load">性能测试用例</el-menu-item>
-<!--          <el-menu-item index="report">报告统计</el-menu-item>-->
+          <!--          <el-menu-item index="report">报告统计</el-menu-item>-->
         </el-menu>
       </template>
     </ms-test-plan-header-bar>
     <test-review-function v-if="activeIndex === 'functional'" :redirectCharType="redirectCharType"
-                          :clickType="clickType" :review-id="reviewId"></test-review-function>
-    <test-review-api v-if="activeIndex === 'api'" :redirectCharType="redirectCharType" :clickType="clickType"
-                     :review-id="reviewId"></test-review-api>
-    <test-review-load v-if="activeIndex === 'load'" :redirectCharType="redirectCharType" :clickType="clickType"
-                      :review-id="reviewId"></test-review-load>
+                          :click Type="clickType" :review-id="reviewId"></test-review-function>
+    <test-review-api v-if="activeIndex === 'api'" :review-id="reviewId"></test-review-api>
+    <test-review-load v-if="activeIndex === 'load'" :review-id="reviewId"></test-review-load>
 
   </div>
 
diff --git a/frontend/src/business/components/track/review/view/components/ReviewRelevanceApiList.vue b/frontend/src/business/components/track/review/view/components/ReviewRelevanceApiList.vue
new file mode 100644
index 0000000000..d637a001a5
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/ReviewRelevanceApiList.vue
@@ -0,0 +1,258 @@
+<template>
+  <div>
+    <api-list-container
+        :is-api-list-enable="isApiListEnable"
+        @isApiListEnableChange="isApiListEnableChange">
+      <ms-environment-select :project-id="projectId" v-if="isTestPlan" :is-read-only="isReadOnly"
+                             @setEnvironment="setEnvironment"/>
+      <el-input :placeholder="$t('api_monitor.please_search')" @blur="initTable" class="search-input" size="small"
+                @keyup.enter.native="initTable" v-model="condition.name"/>
+      <el-table v-loading="result.loading"
+                border
+                :data="tableData" row-key="id" class="test-content adjust-table"
+                @select-all="handleSelectAll"
+                @select="handleSelect" ref="table">
+        <el-table-column reserve-selection type="selection"/>
+
+        <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
+
+        <el-table-column
+            prop="status"
+            column-key="api_status"
+            :label="$t('api_test.definition.api_status')"
+            show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <ms-tag v-if="scope.row.status == 'Prepare'" type="info" effect="plain"
+                    :content="$t('test_track.plan.plan_status_prepare')"/>
+            <ms-tag v-if="scope.row.status == 'Underway'" type="warning" effect="plain"
+                    :content="$t('test_track.plan.plan_status_running')"/>
+            <ms-tag v-if="scope.row.status == 'Completed'" type="success" effect="plain"
+                    :content="$t('test_track.plan.plan_status_completed')"/>
+            <ms-tag v-if="scope.row.status == 'Trash'" type="danger" effect="plain"
+                    :content="$t('test_track.plan.plan_status_trash')"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+            prop="method"
+            :label="$t('api_test.definition.api_type')"
+            show-overflow-tooltip>
+          <template v-slot:default="scope" class="request-method">
+            <el-tag size="mini"
+                    :style="{'background-color': getColor(scope.row.method), border: getColor(true, scope.row.method)}"
+                    class="api-el-tag">
+              {{ scope.row.method }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+            prop="path"
+            :label="$t('api_test.definition.api_path')"
+            show-overflow-tooltip/>
+
+        <el-table-column width="160" :label="$t('api_test.definition.api_last_time')" prop="updateTime">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+            prop="caseTotal"
+            :label="$t('api_test.definition.api_case_number')"
+            show-overflow-tooltip/>
+
+        <el-table-column
+            prop="caseStatus"
+            :label="$t('api_test.definition.api_case_status')"
+            show-overflow-tooltip/>
+
+        <el-table-column
+            prop="casePassingRate"
+            :label="$t('api_test.definition.api_case_passing_rate')"
+            show-overflow-tooltip/>
+      </el-table>
+      <ms-table-pagination :change="initTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                           :total="total"/>
+    </api-list-container>
+    <table-select-count-bar :count="selectRows.size"/>
+  </div>
+</template>
+
+<script>
+import MsTag from "../../../../common/components/MsTag";
+import ApiListContainer from "@/business/components/api/definition/components/list/ApiListContainer";
+import MsEnvironmentSelect from "@/business/components/api/definition/components/case/MsEnvironmentSelect";
+import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+import TableSelectCountBar from "@/business/components/api/automation/scenario/api/TableSelectCountBar";
+import {API_METHOD_COLOUR, CASE_PRIORITY} from "@/business/components/api/definition/model/JsonData";
+import {_filter, _handleSelect, _handleSelectAll, _sort} from "@/common/js/tableUtils";
+
+export default {
+  name: "ReviewRelevanceApiList",
+  components: {TableSelectCountBar, MsTablePagination, MsEnvironmentSelect, ApiListContainer, MsTag},
+  data() {
+    return {
+      condition: {},
+      selectCase: {},
+      result: {},
+      moduleId: "",
+      deletePath: "/test/case/delete",
+      selectRows: new Set(),
+      typeArr: [
+        {id: 'priority', name: this.$t('test_track.case.priority')},
+      ],
+      priorityFilters: [
+        {text: 'P0', value: 'P0'},
+        {text: 'P1', value: 'P1'},
+        {text: 'P2', value: 'P2'},
+        {text: 'P3', value: 'P3'}
+      ],
+      valueArr: {
+        priority: CASE_PRIORITY,
+      },
+      methodColorMap: new Map(API_METHOD_COLOUR),
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      environmentId: ""
+    }
+  },
+  props: {
+    currentProtocol: String,
+    selectNodeIds: Array,
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    isApiListEnable: {
+      type: Boolean,
+      default: false,
+    },
+    isReadOnly: {
+      type: Boolean,
+      default: false
+    },
+    isCaseRelevance: {
+      type: Boolean,
+      default: false,
+    },
+    projectId: String,
+    reviewId: String,
+    isTestPlan: Boolean
+  },
+  created: function () {
+    this.selectRows = new Set();
+    this.initTable();
+  },
+  watch: {
+    selectNodeIds() {
+      this.initTable();
+    },
+    currentProtocol() {
+      this.initTable();
+    },
+    projectId() {
+      this.initTable();
+    }
+  },
+  computed: {},
+  methods: {
+    isApiListEnableChange(data) {
+      this.$emit('isApiListEnableChange', data);
+    },
+    initTable(projectId) {
+      this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+      this.condition.moduleIds = this.selectNodeIds;
+      if (this.trashEnable) {
+        this.condition.filters = {status: ["Trash"]};
+        this.condition.moduleIds = [];
+      }
+      if (projectId != null && typeof projectId === 'string') {
+        this.condition.projectId = projectId;
+      } else if (this.projectId != null) {
+        this.condition.projectId = this.projectId;
+      }
+
+      if (this.currentProtocol != null) {
+        this.condition.protocol = this.currentProtocol;
+      } else {
+        this.condition.protocol = "HTTP";
+      }
+
+      let url = '/api/definition/list/';
+      if (this.isTestPlan) {
+        url = '/api/definition/list/relevance/review/';
+        this.condition.reviewId = this.reviewId;
+      }
+      this.result = this.$post(url + this.currentPage + "/" + this.pageSize, this.condition, response => {
+        this.total = response.data.itemCount;
+        this.tableData = response.data.listObject;
+      });
+    },
+
+    handleSelect(selection, row) {
+      _handleSelect(this, selection, row, this.selectRows);
+    },
+    showExecResult(row) {
+      this.visible = false;
+      this.$emit('showExecResult', row);
+    },
+    filter(filters) {
+      _filter(filters, this.condition);
+      this.initTable();
+    },
+    sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
+      _sort(column, this.condition);
+      this.initTable();
+    },
+    handleSelectAll(selection) {
+      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+    },
+    buildPagePath(path) {
+      return path + "/" + this.currentPage + "/" + this.pageSize;
+    },
+    getColor(method) {
+      return this.methodColorMap.get(method);
+    },
+    setEnvironment(data) {
+      this.environmentId = data.id;
+    },
+    clearSelection() {
+      this.selectRows = new Set();
+      if (this.$refs.table) {
+        this.$refs.table.clearSelection();
+      }
+    }
+  },
+}
+</script>
+
+<style scoped>
+.operate-button > div {
+  display: inline-block;
+  margin-left: 10px;
+}
+
+.request-method {
+  padding: 0 5px;
+  color: #1E90FF;
+}
+
+.api-el-tag {
+  color: white;
+}
+
+.search-input {
+  float: right;
+  width: 30%;
+  margin-bottom: 20px;
+  margin-right: 20px;
+}
+
+</style>
diff --git a/frontend/src/business/components/track/review/view/components/ReviewRelevanceCaseList.vue b/frontend/src/business/components/track/review/view/components/ReviewRelevanceCaseList.vue
new file mode 100644
index 0000000000..07e49da61c
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/ReviewRelevanceCaseList.vue
@@ -0,0 +1,243 @@
+<template>
+  <div>
+    <api-list-container
+      :is-api-list-enable="isApiListEnable"
+      @isApiListEnableChange="isApiListEnableChange">
+      <ms-environment-select :project-id="projectId" v-if="isTestPlan" :is-read-only="isReadOnly"
+                             @setEnvironment="setEnvironment"/>
+      <el-input :placeholder="$t('api_test.definition.request.select_case')" @blur="initTable"
+                @keyup.enter.native="initTable" class="search-input" size="small" v-model="condition.name"/>
+
+      <el-table v-loading="result.loading"
+                border
+                :data="tableData"
+                row-key="id"
+                class="test-content adjust-table"
+                @select-all="handleSelectAll"
+                @filter-change="filter"
+                @sort-change="sort"
+                @select="handleSelect" ref="table">
+        <el-table-column reserve-selection type="selection"/>
+
+        <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
+
+        <el-table-column
+          prop="priority"
+          :filters="priorityFilters"
+          column-key="priority"
+          :label="$t('test_track.case.priority')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <priority-table-item :value="scope.row.priority"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="path"
+          :label="$t('api_test.definition.api_path')"
+          show-overflow-tooltip/>
+
+        <el-table-column
+          prop="createUser"
+          :label="'创建人'"
+          show-overflow-tooltip/>
+
+        <el-table-column
+          sortable="custom"
+          width="160"
+          :label="$t('api_test.definition.api_last_time')"
+          prop="updateTime">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+
+      </el-table>
+      <ms-table-pagination :change="initTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                           :total="total"/>
+    </api-list-container>
+    <table-select-count-bar :count="selectRows.size"/>
+  </div>
+</template>
+
+<script>
+import ApiListContainer from "@/business/components/api/definition/components/list/ApiListContainer";
+import MsEnvironmentSelect from "@/business/components/api/definition/components/case/MsEnvironmentSelect";
+import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+import TableSelectCountBar from "@/business/components/api/automation/scenario/api/TableSelectCountBar";
+import {API_METHOD_COLOUR, CASE_PRIORITY} from "@/business/components/api/definition/model/JsonData";
+import {_filter, _handleSelect, _handleSelectAll, _sort} from "@/common/js/tableUtils";
+import PriorityTableItem from "@/business/components/track/common/tableItems/planview/PriorityTableItem";
+
+export default {
+  name: "ReviewRelevanceCaseList",
+  components: {PriorityTableItem, TableSelectCountBar, MsTablePagination, MsEnvironmentSelect, ApiListContainer},
+  data() {
+    return {
+      condition: {},
+      selectCase: {},
+      result: {},
+      moduleId: "",
+      selectRows: new Set(),
+      typeArr: [
+        {id: 'priority', name: this.$t('test_track.case.priority')},
+      ],
+      priorityFilters: [
+        {text: 'P0', value: 'P0'},
+        {text: 'P1', value: 'P1'},
+        {text: 'P2', value: 'P2'},
+        {text: 'P3', value: 'P3'}
+      ],
+      valueArr: {
+        priority: CASE_PRIORITY,
+      },
+      methodColorMap: new Map(API_METHOD_COLOUR),
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      environmentId: ""
+    }
+  },
+  props: {
+    currentProtocol: String,
+    selectNodeIds: Array,
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    isApiListEnable: {
+      type: Boolean,
+      default: false,
+    },
+    isReadOnly: {
+      type: Boolean,
+      default: false
+    },
+    isCaseRelevance: {
+      type: Boolean,
+      default: false,
+    },
+    projectId: String,
+    reviewId: String,
+    isTestPlan: Boolean
+  },
+  created: function () {
+    this.initTable();
+  },
+  watch: {
+    selectNodeIds() {
+      this.initTable();
+    },
+    currentProtocol() {
+      this.initTable();
+    },
+    projectId() {
+      this.initTable();
+    }
+  },
+  methods: {
+    isApiListEnableChange(data) {
+      this.$emit('isApiListEnableChange', data);
+    },
+    initTable(projectId) {
+      this.condition.status = "";
+      this.condition.moduleIds = this.selectNodeIds;
+      if (projectId != null && typeof projectId === 'string') {
+        this.condition.projectId = projectId;
+      } else if (this.projectId != null) {
+        this.condition.projectId = this.projectId;
+      }
+      if (this.currentProtocol != null) {
+        this.condition.protocol = this.currentProtocol;
+      }
+      let url = '/api/testcase/list/';
+      if (this.isTestPlan) {
+        url = '/test/case/review/api/case/relevance/list/';
+        this.condition.reviewId = this.reviewId;
+      }
+
+      this.result = this.$post(url + this.currentPage + "/" + this.pageSize, this.condition, response => {
+        this.total = response.data.itemCount;
+        this.tableData = response.data.listObject;
+      });
+    },
+
+    handleSelect(selection, row) {
+      _handleSelect(this, selection, row, this.selectRows);
+    },
+    showExecResult(row) {
+      this.visible = false;
+      this.$emit('showExecResult', row);
+    },
+    filter(filters) {
+      _filter(filters, this.condition);
+      this.initTable();
+    },
+    sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
+      _sort(column, this.condition);
+      this.initTable();
+    },
+    handleSelectAll(selection) {
+      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+    },
+    buildPagePath(path) {
+      return path + "/" + this.currentPage + "/" + this.pageSize;
+    },
+    handleTestCase(testCase) {
+      this.$get('/api/definition/get/' + testCase.apiDefinitionId, (response) => {
+        let api = response.data;
+        let selectApi = api;
+        let request = {};
+        if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+          request = api.request;
+        } else {
+          request = JSON.parse(api.request);
+        }
+        if (!request.hashTree) {
+          request.hashTree = [];
+        }
+        selectApi.url = request.path;
+        this.$refs.caseList.open(selectApi, testCase.id);
+      });
+    },
+    setEnvironment(data) {
+      this.environmentId = data.id;
+    },
+    clearSelection() {
+      this.selectRows = new Set();
+      if (this.$refs.table) {
+        this.$refs.table.clearSelection();
+      }
+    }
+  },
+}
+</script>
+
+<style scoped>
+.operate-button > div {
+  display: inline-block;
+  margin-left: 10px;
+}
+
+.request-method {
+  padding: 0 5px;
+  color: #1E90FF;
+}
+
+.api-el-tag {
+  color: white;
+}
+
+.search-input {
+  float: right;
+  width: 300px;
+  /*margin-bottom: 20px;*/
+  margin-right: 20px;
+}
+
+</style>
diff --git a/frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue b/frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue
new file mode 100644
index 0000000000..8dfa06769a
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue
@@ -0,0 +1,178 @@
+<template>
+  <div>
+    <el-card class="table-card" v-loading="result.loading">
+      <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                   :project-list="projectList" ref="envPopover" class="env-popover"/>
+
+      <el-table ref="scenarioTable" border :data="tableData" class="adjust-table" @select-all="handleSelectAll"
+                @select="handleSelect">
+        <el-table-column type="selection"/>
+
+        <el-table-column prop="name" :label="$t('api_test.automation.scenario_name')"
+                         show-overflow-tooltip/>
+        <el-table-column prop="level" :label="$t('api_test.automation.case_level')"
+                         show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <ms-tag v-if="scope.row.level == 'P0'" type="info" effect="plain" content="P0"/>
+            <ms-tag v-if="scope.row.level == 'P1'" type="warning" effect="plain" content="P1"/>
+            <ms-tag v-if="scope.row.level == 'P2'" type="success" effect="plain" content="P2"/>
+            <ms-tag v-if="scope.row.level == 'P3'" type="danger" effect="plain" content="P3"/>
+          </template>
+
+        </el-table-column>
+        <el-table-column prop="tagNames" :label="$t('api_test.automation.tag')" min-width="120">
+          <template v-slot:default="scope">
+            <ms-tag v-for="itemName in scope.row.tags" :key="itemName" type="success" effect="plain" :content="itemName"
+                    style="margin-left: 5px"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="userId" :label="$t('api_test.automation.creator')" show-overflow-tooltip/>
+        <el-table-column prop="updateTime" :label="$t('api_test.automation.update_time')" width="180">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="stepTotal" :label="$t('api_test.automation.step')" show-overflow-tooltip/>
+        <el-table-column prop="lastResult" :label="$t('api_test.automation.last_result')">
+          <template v-slot:default="{row}">
+            <el-link type="success" @click="showReport(row)" v-if="row.lastResult === 'Success'">
+              {{ $t('api_test.automation.success') }}
+            </el-link>
+            <el-link type="danger" @click="showReport(row)" v-if="row.lastResult === 'Fail'">
+              {{ $t('api_test.automation.fail') }}
+            </el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="passRate" :label="$t('api_test.automation.passing_rate')"
+                         show-overflow-tooltip/>
+      </el-table>
+      <ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                           :total="total"/>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {_handleSelect, _handleSelectAll} from "@/common/js/tableUtils";
+import MsTag from "@/business/components/common/components/MsTag";
+import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
+import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+
+export default {
+  name: "ReviewRelevanceScenarioList",
+  components: {MsTablePagination, EnvPopover, MsTag},
+  props: {
+    referenced: {
+      type: Boolean,
+      default: false,
+    },
+    selectNodeIds: Array,
+    projectId: String,
+    reviewId: String,
+  },
+  data() {
+    return {
+      result: {},
+      condition: {},
+      currentScenario: {},
+      schedule: {},
+      selectAll: false,
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      reportId: "",
+      infoDb: false,
+      selectRows: new Set(),
+      projectEnvMap: new Map(),
+      projectList: [],
+      projectIds: new Set(),
+    }
+  },
+  watch: {
+    selectNodeIds() {
+      this.search();
+    },
+    projectId() {
+      this.search();
+    },
+  },
+  created() {
+    this.getWsProjects();
+  },
+  methods: {
+    search() {
+      this.projectEnvMap.clear();
+      this.projectIds.clear();
+      if (!this.projectId) {
+        return;
+      }
+      this.selectRows = new Set();
+      this.loading = true;
+
+      this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+
+      this.condition.moduleIds = this.selectNodeIds;
+
+      if (this.projectId != null) {
+        this.condition.projectId = this.projectId;
+      }
+
+      if (this.reviewId != null) {
+        this.condition.reviewId = this.reviewId;
+      }
+
+      let url = "/test/case/review/scenario/case/relevance/list/" + this.currentPage + "/" + this.pageSize;
+      this.result = this.$post(url, this.condition, response => {
+        let data = response.data;
+        this.total = data.itemCount;
+        this.tableData = data.listObject;
+        this.tableData.forEach(item => {
+          if (item.tags && item.tags.length > 0) {
+            item.tags = JSON.parse(item.tags);
+          }
+        });
+      });
+    },
+    handleSelectAll(selection) {
+      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      this.initProjectIds();
+    },
+    handleSelect(selection, row) {
+      _handleSelect(this, selection, row, this.selectRows);
+      this.initProjectIds();
+    },
+    setProjectEnvMap(projectEnvMap) {
+      this.projectEnvMap = projectEnvMap;
+    },
+    getWsProjects() {
+      this.$get("/project/listAll", res => {
+        this.projectList = res.data;
+      })
+    },
+    initProjectIds() {
+      this.projectIds.clear();
+      this.selectRows.forEach(row => {
+        row.projectIds.forEach(id => {
+          this.projectIds.add(id);
+        })
+      })
+    },
+    checkEnv() {
+      return this.$refs.envPopover.checkEnv();
+    }
+  }
+}
+</script>
+
+<style scoped>
+/deep/ .el-drawer__header {
+  margin-bottom: 0px;
+}
+
+.env-popover {
+  float: right;
+  margin-top: 4px;
+}
+</style>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewApi.vue b/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
index a76d94be32..ae17999ab3 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
@@ -61,39 +61,43 @@
         @relevanceCase="openTestCaseRelevanceDialog"
         ref="apiScenarioList"/>
     </template>
-    <test-case-api-relevance
+    <test-review-relevance-api
       @refresh="refresh"
       :review-id="reviewId"
       :model="model"
-      ref="apiCaseRelevance"/>
-    <test-case-scenario-relevance
+      ref="apiCaseRelevance"
+    />
+    <test-review-relevance-scenario
       @refresh="refresh"
       :review-id="reviewId"
       :model="model"
-      ref="scenarioCaseRelevance"/>
+      ref="scenarioCaseRelevance"
+    />
+
   </ms-test-plan-common-component>
 </template>
 
 <script>
 import MsTestPlanCommonComponent from "@/business/components/track/plan/view/comonents/base/TestPlanCommonComponent";
-import TestCaseScenarioRelevance from "@/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance";
 import MsTestPlanApiScenarioList from "@/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList";
 import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
 import ApiCaseSimpleList from "@/business/components/api/definition/components/list/ApiCaseSimpleList";
-import TestCaseApiRelevance from "@/business/components/track/plan/view/comonents/api/TestCaseApiRelevance";
 import TestPlanApiCaseList from "@/business/components/track/plan/view/comonents/api/TestPlanApiCaseList";
 import TestCaseRelevance from "@/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance";
 import NodeTree from "@/business/components/track/common/NodeTree";
 import MsApiModule from "../../../../api/definition/components/module/ApiModule"
+import TestReviewRelevanceApi from "@/business/components/track/review/view/components/TestReviewRelevanceApi";
+import TestReviewRelevanceScenario
+  from "@/business/components/track/review/view/components/TestReviewRelevanceScenario";
 
 export default {
   name: "TestReviewApi",
   components: {
-    TestCaseScenarioRelevance,
+    TestReviewRelevanceScenario,
+    TestReviewRelevanceApi,
     MsTestPlanApiScenarioList,
     MsApiScenarioModule,
     ApiCaseSimpleList,
-    TestCaseApiRelevance,
     TestPlanApiCaseList,
     MsTestPlanCommonComponent,
     TestCaseRelevance,
@@ -185,5 +189,15 @@ export default {
 </script>
 
 <style scoped>
+.model-change-radio {
+  height: 25px;
+  line-height: 25px;
+  margin: 5px 10px;
+}
+
+/deep/ .run-button {
+  background-color: #409EFF;
+  border-color: #409EFF;
+}
 
 </style>
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 bb4279afc9..fd26bfea02 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -82,6 +82,10 @@
       </el-container>
 
       <template v-slot:footer>
+        <div style="margin-bottom: 15px">
+          <el-checkbox v-model="checked">同步添加关联的接口和性能测试</el-checkbox>
+        </div>
+
         <ms-dialog-footer @cancel="dialogFormVisible = false" @confirm="saveReviewRelevance"/>
       </template>
 
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewRelevanceApi.vue b/frontend/src/business/components/track/review/view/components/TestReviewRelevanceApi.vue
new file mode 100644
index 0000000000..69f6a8b7a6
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevanceApi.vue
@@ -0,0 +1,162 @@
+<template>
+  <test-case-relevance-base
+    @setProject="setProject"
+    @save="saveCaseRelevance"
+    ref="baseRelevance"
+  >
+    <template v-slot:aside>
+      <ms-api-module
+        :relevance-project-id="projectId"
+        @nodeSelectEvent="nodeChange"
+        @protocolChange="handleProtocolChange"
+        @refreshTable="refresh"
+        @setModuleOptions="setModuleOptions"
+        :is-read-only="true"
+        ref="nodeTree"
+      />
+    </template>
+    <review-relevance-api-list
+      v-if="isApiListEnable"
+      :current-protocol="currentProtocol"
+      :select-node-ids="selectNodeIds"
+      :is-api-list-enable="isApiListEnable"
+      :project-id="projectId"
+      :is-test-plan="true"
+      :review_id="reviewId"
+      @isApiListEnableChange="isApiListEnableChange"
+      ref="apiList"/>
+
+    <review-relevance-case-list
+      v-if="!isApiListEnable"
+      :current-protocol="currentProtocol"
+      :select-node-ids="selectNodeIds"
+      :is-api-list-enable="isApiListEnable"
+      :project-id="projectId"
+      :is-test-plan="true"
+      :review-id="reviewId"
+      @isApiListEnableChange="isApiListEnableChange"
+      ref="apiCaseList"/>
+
+
+  </test-case-relevance-base>
+</template>
+
+<script>
+import TestCaseRelevanceBase from "@/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase";
+import MsApiModule from "@/business/components/api/definition/components/module/ApiModule";
+import ReviewRelevanceApiList from "@/business/components/track/review/view/components/ReviewRelevanceApiList";
+import ReviewRelevanceCaseList from "@/business/components/track/review/view/components/ReviewRelevanceCaseList";
+
+export default {
+  name: "TestReviewRelevanceApi",
+  components: {ReviewRelevanceCaseList, ReviewRelevanceApiList, MsApiModule, TestCaseRelevanceBase},
+  data() {
+    return {
+      showCasePage: true,
+      currentProtocol: null,
+      currentModule: null,
+      selectNodeIds: [],
+      moduleOptions: {},
+      trashEnable: false,
+      isApiListEnable: true,
+      condition: {},
+      currentRow: {},
+      projectId: ""
+    };
+  },
+  props: {
+    reviewId: {
+      type: String
+    }
+  },
+  watch: {
+    reviewId() {
+      this.condition.reviewId = this.reviewId;
+    },
+  },
+  methods: {
+    open() {
+      this.init();
+      this.$refs.baseRelevance.open();
+    },
+    init() {
+      if (this.$refs.apiList) {
+        this.$refs.apiList.initTable();
+      }
+      if (this.$refs.apiCaseList) {
+        this.$refs.apiCaseList.initTable();
+      }
+      if (this.$refs.nodeTree) {
+        this.$refs.nodeTree.list();
+      }
+    },
+    setProject(projectId) {
+      this.projectId = projectId;
+    },
+    isApiListEnableChange(data) {
+      this.isApiListEnable = data;
+    },
+
+    refresh(data) {
+      if (this.isApiListEnable) {
+        this.$refs.apiList.initTable(data);
+      } else {
+        this.$refs.apiCaseList.initTable(data);
+      }
+    },
+
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+    },
+    handleProtocolChange(protocol) {
+      this.currentProtocol = protocol;
+    },
+    setModuleOptions(data) {
+      this.moduleOptions = data;
+    },
+    saveCaseRelevance() {
+      let param = {};
+      let url = '';
+      let environmentId = undefined;
+      let selectIds = [];
+      if (this.isApiListEnable) {
+        url = '/api/definition/relevance/review';
+        environmentId = this.$refs.apiList.environmentId;
+        selectIds = Array.from(this.$refs.apiList.selectRows).map(row => row.id);
+      } else {
+        url = '/api/testcase/relevance/review';
+        environmentId = this.$refs.apiCaseList.environmentId;
+        selectIds = Array.from(this.$refs.apiCaseList.selectRows).map(row => row.id);
+      }
+
+      if (!environmentId) {
+        this.$warning(this.$t('api_test.environment.select_environment'));
+        return;
+      }
+
+      param.reviewId = this.reviewId;
+      param.selectIds = selectIds;
+      param.environmentId = environmentId;
+
+      this.result = this.$post(url, param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.$emit('refresh');
+        this.refresh();
+        this.$refs.baseRelevance.close();
+      });
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+/deep/ .select-menu {
+  margin-bottom: 15px;
+}
+
+/deep/ .environment-select {
+  float: right;
+  margin-right: 10px;
+}
+</style>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue b/frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue
new file mode 100644
index 0000000000..1ffb7c16aa
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue
@@ -0,0 +1,125 @@
+<template>
+  <test-case-relevance-base
+    @setProject="setProject"
+    @save="saveCaseRelevance"
+    ref="baseRelevance">
+    <template v-slot:aside>
+      <ms-api-scenario-module
+        @nodeSelectEvent="nodeChange"
+        @refreshTable="refresh"
+        @setModuleOptions="setModuleOptions"
+        :relevance-project-id="projectId"
+        :is-read-only="true"
+        ref="nodeTree"
+      />
+    </template>
+    <review-relevance-scenario-list
+      :select-node-ids="selectNodeIds"
+      :trash-enable="trashEnable"
+      :review-id="reviewId"
+      :project-id="projectId"
+      ref="apiScenarioList"/>
+  </test-case-relevance-base>
+</template>
+<script>
+import TestCaseRelevanceBase from "@/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase";
+import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
+import ReviewRelevanceScenarioList
+  from "@/business/components/track/review/view/components/ReviewRelevanceScenarioList";
+import {strMapToObj} from "@/common/js/utils";
+
+export default {
+  name: "TestReviewRelevanceScenario",
+  components: {ReviewRelevanceScenarioList, MsApiScenarioModule, TestCaseRelevanceBase},
+  data() {
+    return {
+      showCasePage: true,
+      currentProtocol: null,
+      currentModule: null,
+      selectNodeIds: [],
+      moduleOptions: {},
+      trashEnable: false,
+      condition: {},
+      currentRow: {},
+      projectId: ""
+    };
+  },
+  props: {
+    reviewId: {
+      type: String
+    },
+  },
+  watch: {
+    reviewId() {
+      this.condition.reviewId = this.reviewId;
+    },
+  },
+  methods: {
+    open() {
+      this.$refs.baseRelevance.open();
+      if (this.$refs.apiScenarioList) {
+        this.$refs.apiScenarioList.search();
+      }
+    },
+    setProject(projectId) {
+      this.projectId = projectId;
+    },
+
+    refresh(data) {
+      this.$refs.apiScenarioList.search(data);
+    },
+
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+    },
+    handleProtocolChange(protocol) {
+      this.currentProtocol = protocol;
+    },
+    setModuleOptions(data) {
+      this.moduleOptions = data;
+    },
+
+    saveCaseRelevance() {
+      const sign = this.$refs.apiScenarioList.checkEnv();
+      if (!sign) {
+        return false;
+      }
+      let param = {};
+      let url = '/api/automation/relevance/review';
+      let rows = this.$refs.apiScenarioList.selectRows;
+      const envMap = this.$refs.apiScenarioList.projectEnvMap;
+      let map = new Map();
+      rows.forEach(row => {
+        map.set(row.id, row.projectIds);
+      })
+      param.reviewId = this.reviewId;
+      param.mapping = strMapToObj(map);
+      param.envMap = strMapToObj(envMap);
+
+      this.result = this.$post(url, param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.$emit('refresh');
+        this.refresh();
+        this.$refs.baseRelevance.close();
+      });
+    },
+  }
+
+}
+</script>
+
+<style scoped>
+/deep/ .select-menu {
+  margin-bottom: 15px;
+}
+
+/deep/ .environment-select {
+  float: right;
+  margin-right: 10px;
+}
+
+/deep/ .module-input {
+  width: 243px;
+}
+
+</style>

From 9bd26fa22c7381beab7a97601031b635efc84281 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:38:58 +0800
Subject: [PATCH 16/95] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/TestCaseReviewApiCase.java    |  23 +
 .../domain/TestCaseReviewApiCaseExample.java  | 670 +++++++++++++
 .../base/domain/TestCaseReviewLoad.java       |  23 +
 .../domain/TestCaseReviewLoadExample.java     | 670 +++++++++++++
 .../base/domain/TestCaseReviewScenario.java   |  29 +
 .../domain/TestCaseReviewScenarioExample.java | 880 ++++++++++++++++++
 .../mapper/TestCaseReviewApiCaseMapper.java   |  30 +
 .../mapper/TestCaseReviewApiCaseMapper.xml    | 243 +++++
 .../base/mapper/TestCaseReviewLoadMapper.java |  30 +
 .../base/mapper/TestCaseReviewLoadMapper.xml  | 243 +++++
 .../mapper/TestCaseReviewScenarioMapper.java  |  30 +
 .../mapper/TestCaseReviewScenarioMapper.xml   | 291 ++++++
 yarn.lock                                     |   4 +
 13 files changed, 3166 insertions(+)
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCase.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCaseExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoad.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoadExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml
 create mode 100644 yarn.lock

diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCase.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCase.java
new file mode 100644
index 0000000000..2755488e99
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCase.java
@@ -0,0 +1,23 @@
+package io.metersphere.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class TestCaseReviewApiCase implements Serializable {
+    private String id;
+
+    private String testCaseReviewId;
+
+    private String apiCaseId;
+
+    private String status;
+
+    private String environmentId;
+
+    private Long createTime;
+
+    private Long updateTime;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCaseExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCaseExample.java
new file mode 100644
index 0000000000..90bd847731
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewApiCaseExample.java
@@ -0,0 +1,670 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestCaseReviewApiCaseExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TestCaseReviewApiCaseExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIsNull() {
+            addCriterion("test_case_review_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIsNotNull() {
+            addCriterion("test_case_review_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdEqualTo(String value) {
+            addCriterion("test_case_review_id =", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotEqualTo(String value) {
+            addCriterion("test_case_review_id <>", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdGreaterThan(String value) {
+            addCriterion("test_case_review_id >", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdGreaterThanOrEqualTo(String value) {
+            addCriterion("test_case_review_id >=", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLessThan(String value) {
+            addCriterion("test_case_review_id <", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLessThanOrEqualTo(String value) {
+            addCriterion("test_case_review_id <=", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLike(String value) {
+            addCriterion("test_case_review_id like", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotLike(String value) {
+            addCriterion("test_case_review_id not like", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIn(List<String> values) {
+            addCriterion("test_case_review_id in", values, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotIn(List<String> values) {
+            addCriterion("test_case_review_id not in", values, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdBetween(String value1, String value2) {
+            addCriterion("test_case_review_id between", value1, value2, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotBetween(String value1, String value2) {
+            addCriterion("test_case_review_id not between", value1, value2, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdIsNull() {
+            addCriterion("api_case_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdIsNotNull() {
+            addCriterion("api_case_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdEqualTo(String value) {
+            addCriterion("api_case_id =", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdNotEqualTo(String value) {
+            addCriterion("api_case_id <>", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdGreaterThan(String value) {
+            addCriterion("api_case_id >", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdGreaterThanOrEqualTo(String value) {
+            addCriterion("api_case_id >=", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdLessThan(String value) {
+            addCriterion("api_case_id <", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdLessThanOrEqualTo(String value) {
+            addCriterion("api_case_id <=", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdLike(String value) {
+            addCriterion("api_case_id like", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdNotLike(String value) {
+            addCriterion("api_case_id not like", value, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdIn(List<String> values) {
+            addCriterion("api_case_id in", values, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdNotIn(List<String> values) {
+            addCriterion("api_case_id not in", values, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdBetween(String value1, String value2) {
+            addCriterion("api_case_id between", value1, value2, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiCaseIdNotBetween(String value1, String value2) {
+            addCriterion("api_case_id not between", value1, value2, "apiCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("`status` like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("`status` not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdIsNull() {
+            addCriterion("environment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdIsNotNull() {
+            addCriterion("environment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdEqualTo(String value) {
+            addCriterion("environment_id =", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotEqualTo(String value) {
+            addCriterion("environment_id <>", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdGreaterThan(String value) {
+            addCriterion("environment_id >", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("environment_id >=", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdLessThan(String value) {
+            addCriterion("environment_id <", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdLessThanOrEqualTo(String value) {
+            addCriterion("environment_id <=", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdLike(String value) {
+            addCriterion("environment_id like", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotLike(String value) {
+            addCriterion("environment_id not like", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdIn(List<String> values) {
+            addCriterion("environment_id in", values, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotIn(List<String> values) {
+            addCriterion("environment_id not in", values, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdBetween(String value1, String value2) {
+            addCriterion("environment_id between", value1, value2, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotBetween(String value1, String value2) {
+            addCriterion("environment_id not between", value1, value2, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Long value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Long value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Long value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Long value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Long> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Long> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Long value1, Long value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoad.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoad.java
new file mode 100644
index 0000000000..7812df44da
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoad.java
@@ -0,0 +1,23 @@
+package io.metersphere.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class TestCaseReviewLoad implements Serializable {
+    private String id;
+
+    private String testCaseReviewId;
+
+    private String loadCaseId;
+
+    private String status;
+
+    private Long createTime;
+
+    private Long updateTime;
+
+    private String loadReportId;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoadExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoadExample.java
new file mode 100644
index 0000000000..714902099f
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewLoadExample.java
@@ -0,0 +1,670 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestCaseReviewLoadExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TestCaseReviewLoadExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIsNull() {
+            addCriterion("test_case_review_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIsNotNull() {
+            addCriterion("test_case_review_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdEqualTo(String value) {
+            addCriterion("test_case_review_id =", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotEqualTo(String value) {
+            addCriterion("test_case_review_id <>", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdGreaterThan(String value) {
+            addCriterion("test_case_review_id >", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdGreaterThanOrEqualTo(String value) {
+            addCriterion("test_case_review_id >=", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLessThan(String value) {
+            addCriterion("test_case_review_id <", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLessThanOrEqualTo(String value) {
+            addCriterion("test_case_review_id <=", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLike(String value) {
+            addCriterion("test_case_review_id like", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotLike(String value) {
+            addCriterion("test_case_review_id not like", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIn(List<String> values) {
+            addCriterion("test_case_review_id in", values, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotIn(List<String> values) {
+            addCriterion("test_case_review_id not in", values, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdBetween(String value1, String value2) {
+            addCriterion("test_case_review_id between", value1, value2, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotBetween(String value1, String value2) {
+            addCriterion("test_case_review_id not between", value1, value2, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdIsNull() {
+            addCriterion("load_case_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdIsNotNull() {
+            addCriterion("load_case_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdEqualTo(String value) {
+            addCriterion("load_case_id =", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdNotEqualTo(String value) {
+            addCriterion("load_case_id <>", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdGreaterThan(String value) {
+            addCriterion("load_case_id >", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdGreaterThanOrEqualTo(String value) {
+            addCriterion("load_case_id >=", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdLessThan(String value) {
+            addCriterion("load_case_id <", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdLessThanOrEqualTo(String value) {
+            addCriterion("load_case_id <=", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdLike(String value) {
+            addCriterion("load_case_id like", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdNotLike(String value) {
+            addCriterion("load_case_id not like", value, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdIn(List<String> values) {
+            addCriterion("load_case_id in", values, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdNotIn(List<String> values) {
+            addCriterion("load_case_id not in", values, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdBetween(String value1, String value2) {
+            addCriterion("load_case_id between", value1, value2, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadCaseIdNotBetween(String value1, String value2) {
+            addCriterion("load_case_id not between", value1, value2, "loadCaseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("`status` like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("`status` not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Long value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Long value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Long value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Long value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Long> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Long> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Long value1, Long value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdIsNull() {
+            addCriterion("load_report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdIsNotNull() {
+            addCriterion("load_report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdEqualTo(String value) {
+            addCriterion("load_report_id =", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdNotEqualTo(String value) {
+            addCriterion("load_report_id <>", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdGreaterThan(String value) {
+            addCriterion("load_report_id >", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdGreaterThanOrEqualTo(String value) {
+            addCriterion("load_report_id >=", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdLessThan(String value) {
+            addCriterion("load_report_id <", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdLessThanOrEqualTo(String value) {
+            addCriterion("load_report_id <=", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdLike(String value) {
+            addCriterion("load_report_id like", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdNotLike(String value) {
+            addCriterion("load_report_id not like", value, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdIn(List<String> values) {
+            addCriterion("load_report_id in", values, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdNotIn(List<String> values) {
+            addCriterion("load_report_id not in", values, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdBetween(String value1, String value2) {
+            addCriterion("load_report_id between", value1, value2, "loadReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadReportIdNotBetween(String value1, String value2) {
+            addCriterion("load_report_id not between", value1, value2, "loadReportId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java
new file mode 100644
index 0000000000..9040b490a7
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java
@@ -0,0 +1,29 @@
+package io.metersphere.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class TestCaseReviewScenario implements Serializable {
+    private String id;
+
+    private String testCaseReviewId;
+
+    private String apiScenarioId;
+
+    private String status;
+
+    private String environment;
+
+    private Long createTime;
+
+    private Long updateTime;
+
+    private String passRate;
+
+    private String lastResult;
+
+    private String reportId;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java
new file mode 100644
index 0000000000..d83a2b911e
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java
@@ -0,0 +1,880 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestCaseReviewScenarioExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TestCaseReviewScenarioExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIsNull() {
+            addCriterion("test_case_review_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIsNotNull() {
+            addCriterion("test_case_review_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdEqualTo(String value) {
+            addCriterion("test_case_review_id =", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotEqualTo(String value) {
+            addCriterion("test_case_review_id <>", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdGreaterThan(String value) {
+            addCriterion("test_case_review_id >", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdGreaterThanOrEqualTo(String value) {
+            addCriterion("test_case_review_id >=", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLessThan(String value) {
+            addCriterion("test_case_review_id <", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLessThanOrEqualTo(String value) {
+            addCriterion("test_case_review_id <=", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdLike(String value) {
+            addCriterion("test_case_review_id like", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotLike(String value) {
+            addCriterion("test_case_review_id not like", value, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdIn(List<String> values) {
+            addCriterion("test_case_review_id in", values, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotIn(List<String> values) {
+            addCriterion("test_case_review_id not in", values, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdBetween(String value1, String value2) {
+            addCriterion("test_case_review_id between", value1, value2, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestCaseReviewIdNotBetween(String value1, String value2) {
+            addCriterion("test_case_review_id not between", value1, value2, "testCaseReviewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdIsNull() {
+            addCriterion("api_scenario_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdIsNotNull() {
+            addCriterion("api_scenario_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdEqualTo(String value) {
+            addCriterion("api_scenario_id =", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdNotEqualTo(String value) {
+            addCriterion("api_scenario_id <>", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdGreaterThan(String value) {
+            addCriterion("api_scenario_id >", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdGreaterThanOrEqualTo(String value) {
+            addCriterion("api_scenario_id >=", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdLessThan(String value) {
+            addCriterion("api_scenario_id <", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdLessThanOrEqualTo(String value) {
+            addCriterion("api_scenario_id <=", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdLike(String value) {
+            addCriterion("api_scenario_id like", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdNotLike(String value) {
+            addCriterion("api_scenario_id not like", value, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdIn(List<String> values) {
+            addCriterion("api_scenario_id in", values, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdNotIn(List<String> values) {
+            addCriterion("api_scenario_id not in", values, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdBetween(String value1, String value2) {
+            addCriterion("api_scenario_id between", value1, value2, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiScenarioIdNotBetween(String value1, String value2) {
+            addCriterion("api_scenario_id not between", value1, value2, "apiScenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("`status` like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("`status` not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIsNull() {
+            addCriterion("environment is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIsNotNull() {
+            addCriterion("environment is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentEqualTo(String value) {
+            addCriterion("environment =", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentNotEqualTo(String value) {
+            addCriterion("environment <>", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentGreaterThan(String value) {
+            addCriterion("environment >", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentGreaterThanOrEqualTo(String value) {
+            addCriterion("environment >=", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentLessThan(String value) {
+            addCriterion("environment <", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentLessThanOrEqualTo(String value) {
+            addCriterion("environment <=", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentLike(String value) {
+            addCriterion("environment like", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentNotLike(String value) {
+            addCriterion("environment not like", value, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIn(List<String> values) {
+            addCriterion("environment in", values, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentNotIn(List<String> values) {
+            addCriterion("environment not in", values, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentBetween(String value1, String value2) {
+            addCriterion("environment between", value1, value2, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentNotBetween(String value1, String value2) {
+            addCriterion("environment not between", value1, value2, "environment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Long value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Long value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Long value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Long value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Long> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Long> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Long value1, Long value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateIsNull() {
+            addCriterion("pass_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateIsNotNull() {
+            addCriterion("pass_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateEqualTo(String value) {
+            addCriterion("pass_rate =", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateNotEqualTo(String value) {
+            addCriterion("pass_rate <>", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateGreaterThan(String value) {
+            addCriterion("pass_rate >", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateGreaterThanOrEqualTo(String value) {
+            addCriterion("pass_rate >=", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateLessThan(String value) {
+            addCriterion("pass_rate <", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateLessThanOrEqualTo(String value) {
+            addCriterion("pass_rate <=", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateLike(String value) {
+            addCriterion("pass_rate like", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateNotLike(String value) {
+            addCriterion("pass_rate not like", value, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateIn(List<String> values) {
+            addCriterion("pass_rate in", values, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateNotIn(List<String> values) {
+            addCriterion("pass_rate not in", values, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateBetween(String value1, String value2) {
+            addCriterion("pass_rate between", value1, value2, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassRateNotBetween(String value1, String value2) {
+            addCriterion("pass_rate not between", value1, value2, "passRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultIsNull() {
+            addCriterion("last_result is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultIsNotNull() {
+            addCriterion("last_result is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultEqualTo(String value) {
+            addCriterion("last_result =", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultNotEqualTo(String value) {
+            addCriterion("last_result <>", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultGreaterThan(String value) {
+            addCriterion("last_result >", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultGreaterThanOrEqualTo(String value) {
+            addCriterion("last_result >=", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultLessThan(String value) {
+            addCriterion("last_result <", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultLessThanOrEqualTo(String value) {
+            addCriterion("last_result <=", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultLike(String value) {
+            addCriterion("last_result like", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultNotLike(String value) {
+            addCriterion("last_result not like", value, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultIn(List<String> values) {
+            addCriterion("last_result in", values, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultNotIn(List<String> values) {
+            addCriterion("last_result not in", values, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultBetween(String value1, String value2) {
+            addCriterion("last_result between", value1, value2, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastResultNotBetween(String value1, String value2) {
+            addCriterion("last_result not between", value1, value2, "lastResult");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(String value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(String value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(String value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(String value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(String value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(String value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLike(String value) {
+            addCriterion("report_id like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotLike(String value) {
+            addCriterion("report_id not like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<String> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<String> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(String value1, String value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(String value1, String value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.java
new file mode 100644
index 0000000000..ff3bfd9ebc
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.java
@@ -0,0 +1,30 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.TestCaseReviewApiCase;
+import io.metersphere.base.domain.TestCaseReviewApiCaseExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TestCaseReviewApiCaseMapper {
+    long countByExample(TestCaseReviewApiCaseExample example);
+
+    int deleteByExample(TestCaseReviewApiCaseExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(TestCaseReviewApiCase record);
+
+    int insertSelective(TestCaseReviewApiCase record);
+
+    List<TestCaseReviewApiCase> selectByExample(TestCaseReviewApiCaseExample example);
+
+    TestCaseReviewApiCase selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") TestCaseReviewApiCase record, @Param("example") TestCaseReviewApiCaseExample example);
+
+    int updateByExample(@Param("record") TestCaseReviewApiCase record, @Param("example") TestCaseReviewApiCaseExample example);
+
+    int updateByPrimaryKeySelective(TestCaseReviewApiCase record);
+
+    int updateByPrimaryKey(TestCaseReviewApiCase record);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.xml
new file mode 100644
index 0000000000..5fc3b30ee2
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewApiCaseMapper.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.metersphere.base.mapper.TestCaseReviewApiCaseMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.TestCaseReviewApiCase">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="test_case_review_id" jdbcType="VARCHAR" property="testCaseReviewId" />
+    <result column="api_case_id" jdbcType="VARCHAR" property="apiCaseId" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="environment_id" jdbcType="VARCHAR" property="environmentId" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, test_case_review_id, api_case_id, `status`, environment_id, create_time, update_time
+  </sql>
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.TestCaseReviewApiCaseExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from test_case_review_api_case
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from test_case_review_api_case
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from test_case_review_api_case
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.TestCaseReviewApiCaseExample">
+    delete from test_case_review_api_case
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.TestCaseReviewApiCase">
+    insert into test_case_review_api_case (id, test_case_review_id, api_case_id, 
+      `status`, environment_id, create_time, 
+      update_time)
+    values (#{id,jdbcType=VARCHAR}, #{testCaseReviewId,jdbcType=VARCHAR}, #{apiCaseId,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{environmentId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseReviewApiCase">
+    insert into test_case_review_api_case
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="testCaseReviewId != null">
+        test_case_review_id,
+      </if>
+      <if test="apiCaseId != null">
+        api_case_id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="environmentId != null">
+        environment_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="testCaseReviewId != null">
+        #{testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="apiCaseId != null">
+        #{apiCaseId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="environmentId != null">
+        #{environmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.TestCaseReviewApiCaseExample" resultType="java.lang.Long">
+    select count(*) from test_case_review_api_case
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update test_case_review_api_case
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.testCaseReviewId != null">
+        test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.apiCaseId != null">
+        api_case_id = #{record.apiCaseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.environmentId != null">
+        environment_id = #{record.environmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update test_case_review_api_case
+    set id = #{record.id,jdbcType=VARCHAR},
+      test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+      api_case_id = #{record.apiCaseId,jdbcType=VARCHAR},
+      `status` = #{record.status,jdbcType=VARCHAR},
+      environment_id = #{record.environmentId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.TestCaseReviewApiCase">
+    update test_case_review_api_case
+    <set>
+      <if test="testCaseReviewId != null">
+        test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="apiCaseId != null">
+        api_case_id = #{apiCaseId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="environmentId != null">
+        environment_id = #{environmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.TestCaseReviewApiCase">
+    update test_case_review_api_case
+    set test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
+      api_case_id = #{apiCaseId,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=VARCHAR},
+      environment_id = #{environmentId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.java b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.java
new file mode 100644
index 0000000000..379df4d99a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.java
@@ -0,0 +1,30 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.TestCaseReviewLoad;
+import io.metersphere.base.domain.TestCaseReviewLoadExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TestCaseReviewLoadMapper {
+    long countByExample(TestCaseReviewLoadExample example);
+
+    int deleteByExample(TestCaseReviewLoadExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(TestCaseReviewLoad record);
+
+    int insertSelective(TestCaseReviewLoad record);
+
+    List<TestCaseReviewLoad> selectByExample(TestCaseReviewLoadExample example);
+
+    TestCaseReviewLoad selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") TestCaseReviewLoad record, @Param("example") TestCaseReviewLoadExample example);
+
+    int updateByExample(@Param("record") TestCaseReviewLoad record, @Param("example") TestCaseReviewLoadExample example);
+
+    int updateByPrimaryKeySelective(TestCaseReviewLoad record);
+
+    int updateByPrimaryKey(TestCaseReviewLoad record);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.xml
new file mode 100644
index 0000000000..791e6dc0b8
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewLoadMapper.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.metersphere.base.mapper.TestCaseReviewLoadMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.TestCaseReviewLoad">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="test_case_review_id" jdbcType="VARCHAR" property="testCaseReviewId" />
+    <result column="load_case_id" jdbcType="VARCHAR" property="loadCaseId" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+    <result column="load_report_id" jdbcType="VARCHAR" property="loadReportId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, test_case_review_id, load_case_id, `status`, create_time, update_time, load_report_id
+  </sql>
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.TestCaseReviewLoadExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from test_case_review_load
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from test_case_review_load
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from test_case_review_load
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.TestCaseReviewLoadExample">
+    delete from test_case_review_load
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.TestCaseReviewLoad">
+    insert into test_case_review_load (id, test_case_review_id, load_case_id, 
+      `status`, create_time, update_time, 
+      load_report_id)
+    values (#{id,jdbcType=VARCHAR}, #{testCaseReviewId,jdbcType=VARCHAR}, #{loadCaseId,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
+      #{loadReportId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseReviewLoad">
+    insert into test_case_review_load
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="testCaseReviewId != null">
+        test_case_review_id,
+      </if>
+      <if test="loadCaseId != null">
+        load_case_id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="loadReportId != null">
+        load_report_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="testCaseReviewId != null">
+        #{testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="loadCaseId != null">
+        #{loadCaseId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="loadReportId != null">
+        #{loadReportId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.TestCaseReviewLoadExample" resultType="java.lang.Long">
+    select count(*) from test_case_review_load
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update test_case_review_load
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.testCaseReviewId != null">
+        test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.loadCaseId != null">
+        load_case_id = #{record.loadCaseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.loadReportId != null">
+        load_report_id = #{record.loadReportId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update test_case_review_load
+    set id = #{record.id,jdbcType=VARCHAR},
+      test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+      load_case_id = #{record.loadCaseId,jdbcType=VARCHAR},
+      `status` = #{record.status,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      load_report_id = #{record.loadReportId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.TestCaseReviewLoad">
+    update test_case_review_load
+    <set>
+      <if test="testCaseReviewId != null">
+        test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="loadCaseId != null">
+        load_case_id = #{loadCaseId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="loadReportId != null">
+        load_report_id = #{loadReportId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.TestCaseReviewLoad">
+    update test_case_review_load
+    set test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
+      load_case_id = #{loadCaseId,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT},
+      load_report_id = #{loadReportId,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/TestCaseReviewScenarioMapper.java b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.java
new file mode 100644
index 0000000000..3e458cef66
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.java
@@ -0,0 +1,30 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.TestCaseReviewScenario;
+import io.metersphere.base.domain.TestCaseReviewScenarioExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TestCaseReviewScenarioMapper {
+    long countByExample(TestCaseReviewScenarioExample example);
+
+    int deleteByExample(TestCaseReviewScenarioExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(TestCaseReviewScenario record);
+
+    int insertSelective(TestCaseReviewScenario record);
+
+    List<TestCaseReviewScenario> selectByExample(TestCaseReviewScenarioExample example);
+
+    TestCaseReviewScenario selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") TestCaseReviewScenario record, @Param("example") TestCaseReviewScenarioExample example);
+
+    int updateByExample(@Param("record") TestCaseReviewScenario record, @Param("example") TestCaseReviewScenarioExample example);
+
+    int updateByPrimaryKeySelective(TestCaseReviewScenario record);
+
+    int updateByPrimaryKey(TestCaseReviewScenario record);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml
new file mode 100644
index 0000000000..07929624e8
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.metersphere.base.mapper.TestCaseReviewScenarioMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.TestCaseReviewScenario">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="test_case_review_id" jdbcType="VARCHAR" property="testCaseReviewId" />
+    <result column="api_scenario_id" jdbcType="VARCHAR" property="apiScenarioId" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="environment" jdbcType="VARCHAR" property="environment" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+    <result column="pass_rate" jdbcType="VARCHAR" property="passRate" />
+    <result column="last_result" jdbcType="VARCHAR" property="lastResult" />
+    <result column="report_id" jdbcType="VARCHAR" property="reportId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, test_case_review_id, api_scenario_id, `status`, environment, create_time, update_time, 
+    pass_rate, last_result, report_id
+  </sql>
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.TestCaseReviewScenarioExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from test_case_review_scenario
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from test_case_review_scenario
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from test_case_review_scenario
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.TestCaseReviewScenarioExample">
+    delete from test_case_review_scenario
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
+    insert into test_case_review_scenario (id, test_case_review_id, api_scenario_id, 
+      `status`, environment, create_time, 
+      update_time, pass_rate, last_result, 
+      report_id)
+    values (#{id,jdbcType=VARCHAR}, #{testCaseReviewId,jdbcType=VARCHAR}, #{apiScenarioId,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{environment,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=BIGINT}, #{passRate,jdbcType=VARCHAR}, #{lastResult,jdbcType=VARCHAR}, 
+      #{reportId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
+    insert into test_case_review_scenario
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="testCaseReviewId != null">
+        test_case_review_id,
+      </if>
+      <if test="apiScenarioId != null">
+        api_scenario_id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="environment != null">
+        environment,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="passRate != null">
+        pass_rate,
+      </if>
+      <if test="lastResult != null">
+        last_result,
+      </if>
+      <if test="reportId != null">
+        report_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="testCaseReviewId != null">
+        #{testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="apiScenarioId != null">
+        #{apiScenarioId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="environment != null">
+        #{environment,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="passRate != null">
+        #{passRate,jdbcType=VARCHAR},
+      </if>
+      <if test="lastResult != null">
+        #{lastResult,jdbcType=VARCHAR},
+      </if>
+      <if test="reportId != null">
+        #{reportId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.TestCaseReviewScenarioExample" resultType="java.lang.Long">
+    select count(*) from test_case_review_scenario
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update test_case_review_scenario
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.testCaseReviewId != null">
+        test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.apiScenarioId != null">
+        api_scenario_id = #{record.apiScenarioId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.environment != null">
+        environment = #{record.environment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.passRate != null">
+        pass_rate = #{record.passRate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lastResult != null">
+        last_result = #{record.lastResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportId != null">
+        report_id = #{record.reportId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update test_case_review_scenario
+    set id = #{record.id,jdbcType=VARCHAR},
+      test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+      api_scenario_id = #{record.apiScenarioId,jdbcType=VARCHAR},
+      `status` = #{record.status,jdbcType=VARCHAR},
+      environment = #{record.environment,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      pass_rate = #{record.passRate,jdbcType=VARCHAR},
+      last_result = #{record.lastResult,jdbcType=VARCHAR},
+      report_id = #{record.reportId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
+    update test_case_review_scenario
+    <set>
+      <if test="testCaseReviewId != null">
+        test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
+      </if>
+      <if test="apiScenarioId != null">
+        api_scenario_id = #{apiScenarioId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="environment != null">
+        environment = #{environment,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="passRate != null">
+        pass_rate = #{passRate,jdbcType=VARCHAR},
+      </if>
+      <if test="lastResult != null">
+        last_result = #{lastResult,jdbcType=VARCHAR},
+      </if>
+      <if test="reportId != null">
+        report_id = #{reportId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
+    update test_case_review_scenario
+    set test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
+      api_scenario_id = #{apiScenarioId,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=VARCHAR},
+      environment = #{environment,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT},
+      pass_rate = #{passRate,jdbcType=VARCHAR},
+      last_result = #{lastResult,jdbcType=VARCHAR},
+      report_id = #{reportId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000000..fb57ccd13a
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

From cf64497b70043594ca43ed54942bc41ad4f80ba6 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:39:07 +0800
Subject: [PATCH 17/95] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/ApiScenarioRequest.java    |   1 +
 .../ApiDefinitionExecResultService.java       |   6 +
 .../base/mapper/ext/ExtApiScenarioMapper.java |   2 +-
 .../base/mapper/ext/ExtApiScenarioMapper.xml  | 113 ++++++++++++++++++
 4 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java
index 8034b6a573..4e288f06d6 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java
@@ -22,4 +22,5 @@ public class ApiScenarioRequest extends BaseQueryRequest {
     private long createTime = 0;
     private String executeStatus;
     private boolean notInTestPlan;
+    private String reviewId;
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index adb1757e92..91b3da86e7 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -15,6 +15,7 @@ import io.metersphere.commons.utils.DateUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.request.testcase.QueryTestPlanRequest;
+import io.metersphere.track.service.TestCaseReviewApiCaseService;
 import io.metersphere.track.service.TestPlanApiCaseService;
 import io.metersphere.track.service.TestPlanService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -41,6 +42,8 @@ public class ApiDefinitionExecResultService {
     private TestPlanService testPlanService;
     @Resource
     private ApiTestCaseMapper apiTestCaseMapper;
+    @Resource
+    private TestCaseReviewApiCaseService  testCaseReviewApiCaseService;
 
     @Resource
     SqlSessionFactory sqlSessionFactory;
@@ -67,6 +70,8 @@ public class ApiDefinitionExecResultService {
                 saveResult.setStatus(status);
                 if (StringUtils.equals(type, ApiRunMode.API_PLAN.name())) {
                     testPlanApiCaseService.setExecResult(item.getName(), status);
+                    testCaseReviewApiCaseService.setExecResult(item.getName(), status);
+
                 }
                 // 更新用例最后执行结果
                 ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = new ApiTestCaseWithBLOBs();
@@ -118,6 +123,7 @@ public class ApiDefinitionExecResultService {
             } else {
                 userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
                 testPlanApiCaseService.setExecResult(item.getName(), status);
+                testCaseReviewApiCaseService.setExecResult(item.getName(), status);
             }
 
             saveResult.setUserId(userID);
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
index 258706df46..6bd9153db2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 public interface ExtApiScenarioMapper {
     List<ApiScenarioDTO> list(@Param("request") ApiScenarioRequest request);
-
+    List<ApiScenarioDTO> listReview(@Param("request") ApiScenarioRequest request);
     List<ApiScenarioWithBLOBs> selectByTagId(@Param("id") String id);
 
     List<ApiScenarioWithBLOBs> selectIds(@Param("ids") List<String> ids);
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index d9eb034876..033111900a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -337,5 +337,118 @@
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
+    <select id="listReview" resultMap="BaseResultMap">
+        select api_scenario.id, api_scenario.project_id, api_scenario.tags, api_scenario.user_id, api_scenario.num,
+        api_scenario.scenario_definition,
+        api_scenario.api_scenario_module_id,api_scenario.module_path, api_scenario.name, api_scenario.level,
+        api_scenario.status, api_scenario.principal, api_scenario.step_total, api_scenario.follow_people,
+        api_scenario.last_result,api_scenario.pass_rate,api_scenario.report_id,
+        api_scenario.schedule, api_scenario.description, api_scenario.create_time, api_scenario.update_time,
+        project.name as project_name, user.name as user_name
+        from api_scenario
+        left join project on api_scenario.project_id = project.id
+        left join user on api_scenario.user_id = user.id
+        <include refid="queryWhereConditionReview"/>
+        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
+    </select>
+
+    <sql id="queryWhereConditionReview">
+        <where>
+            <if test="request.combine != null">
+                <include refid="combine">
+                    <property name="condition" value="request.combine"/>
+                    <property name="name" value="request.name"/>
+                    <property name="objectKey" value="request.combine.tags"/>
+                </include>
+            </if>
+
+            <if test="request.name != null">
+                and (api_scenario.name like CONCAT('%', #{request.name},'%')
+                or api_scenario.tags like CONCAT('%', #{request.name},'%')
+                or api_scenario.num like CONCAT('%', #{request.name},'%'))
+            </if>
+            <if test="request.workspaceId != null">
+                AND project.workspace_id = #{request.workspaceId}
+            </if>
+            <if test="request.projectId != null">
+                AND project.id = #{request.projectId}
+            </if>
+            <if test="request.id != null">
+                AND api_scenario.id = #{request.id}
+            </if>
+            <if test="request.userId != null">
+                AND api_scenario.user_id = #{request.userId}
+            </if>
+            <if test="request.moduleId != null">
+                AND api_scenario.api_scenario_module_id = #{request.moduleId}
+            </if>
+            <if test="request.projectId != null">
+                AND api_scenario.project_id = #{request.projectId}
+            </if>
+            <if test="request.createTime >0 ">
+                AND api_scenario.create_time >= #{request.createTime}
+            </if>
+            <if test="request.ids != null and request.ids.size() > 0">
+                AND api_scenario.id in
+                <foreach collection="request.ids" item="itemId" separator="," open="(" close=")">
+                    #{itemId}
+                </foreach>
+            </if>
+            <if test="request.moduleIds != null and request.moduleIds.size() > 0">
+                AND api_scenario.api_scenario_module_id in
+                <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
+                    #{nodeId}
+                </foreach>
+            </if>
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        <choose>
+                            <when test="key=='status'">
+                                and api_scenario.status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                            <when test="key=='user_id'">
+                                and api_scenario.user_id in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                            <when test="key=='level'">
+                                and api_scenario.level in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                            <when test="key=='last_result'">
+                                and api_scenario.last_result in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                        </choose>
+                    </if>
+                </foreach>
+            </if>
+            <if test="request.executeStatus == 'unExecute'">
+                and api_scenario.last_result IS NULL
+            </if>
+            <if test="request.executeStatus == 'executeFailed'">
+                and api_scenario.last_result = 'Fail'
+            </if>
+            <if test="request.executeStatus == 'executePass'">
+                and api_scenario.last_result = 'Success'
+            </if>
+            <if test="request.notInTestPlan == true ">
+                and api_scenario.id not in (
+                select pc.api_scenario_id
+                from test_case_review_scenario pc
+                where pc.test_case_review_id = #{request.reviewId}
+                )
+            </if>
+        </where>
+    </sql>
 
 </mapper>
\ No newline at end of file

From 0edc4d136f1b76d93a80633d285175c6b4af1ee1 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 16 Mar 2021 12:55:56 +0800
Subject: [PATCH 18/95] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=B7=BB=E5=8A=A0=E8=84=91=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiModuleService.java         |   4 +-
 .../api/service/ApiScenarioModuleService.java |   4 +-
 .../mapper/ext/ExtTestPlanTestCaseMapper.java |   2 +
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  19 ++-
 .../TestPlanTestCaseController.java           |   7 +
 .../track/service/TestCaseNodeService.java    |   4 +-
 .../service/TestPlanTestCaseService.java      |   4 +
 .../track/common/minder/TestPlanMinder.vue    | 128 ++++++++++++++++++
 .../functional/FunctionalTestCaseList.vue     |  11 +-
 .../functional/TestPlanFunctional.vue         |  27 +++-
 10 files changed, 201 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/business/components/track/common/minder/TestPlanMinder.vue

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
index d207ca7912..a0eddeeca5 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
@@ -112,7 +112,9 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
             apiModuleDTO.setName(name);
             apiModuleDTO.setLabel(name);
             apiModuleDTO.setChildren(nodeList);
-            list.add(apiModuleDTO);
+            if (!org.springframework.util.CollectionUtils.isEmpty(nodeList)) {
+                list.add(apiModuleDTO);
+            }
         });
         return list;
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
index ab6ebab28a..23493f60c5 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
@@ -100,7 +100,9 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
             scenarioModuleDTO.setName(name);
             scenarioModuleDTO.setLabel(name);
             scenarioModuleDTO.setChildren(nodeList);
-            list.add(scenarioModuleDTO);
+            if (!org.springframework.util.CollectionUtils.isEmpty(nodeList)) {
+                list.add(scenarioModuleDTO);
+            }
         });
         return list;
     }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index 77a8904d1e..d196782bf1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -45,4 +45,6 @@ public interface ExtTestPlanTestCaseMapper {
     void deleteByTestCaseID(String id);
 
     List<String> getExecResultByPlanId(String planId);
+
+    List<TestPlanCaseDTO> listForMinder(@Param("planId") String planId);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 1e132017fd..80c68f3fbc 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -405,6 +405,23 @@
         </where>
     </select>
 
+    <select id="listForMinder" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
+        select pc.id as id,
+               pc.executor, pc.status,
+               pc.update_time,
+               pc.plan_id as planId,
+               t.name, t.priority,
+               t.type, t.node_id,
+               t.steps, t.prerequisite,
+               t.remark,
+               t.node_path, t.method, t.num
+        from test_plan_test_case pc
+        inner join test_case t on pc.case_id = t.id
+        <where>
+            pc.plan_id = #{planId}
+        </where>
+    </select>
+
     <update id="updateTestCaseStates" parameterType="java.lang.String">
         update test_plan_test_case
         <set>
@@ -423,4 +440,4 @@
         from test_plan_api_case
         where api_case_id = #{id,jdbcType=VARCHAR}
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
index 0d2d38cbad..f3362abbd0 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
@@ -39,6 +39,13 @@ public class TestPlanTestCaseController {
         return testPlanTestCaseService.listByPlanId(request);
     }
 
+    @GetMapping("/list/minder/{planId}")
+    public List<TestPlanCaseDTO> listForMinder(@PathVariable String planId) {
+        QueryTestPlanCaseRequest request = new QueryTestPlanCaseRequest();
+        request.setPlanId(planId);
+        return testPlanTestCaseService.listForMinder(planId);
+    }
+
     @GetMapping("/list/node/{planId}/{nodePaths}")
     public List<TestPlanCaseDTO> getTestPlanCasesByNodePath(@PathVariable String planId, @PathVariable String nodePaths) {
         String nodePath = nodePaths.replace("f", "/");
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
index ee74a265d0..2e6658799e 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
@@ -189,7 +189,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
                 testCaseNodeDTO.setName(name);
                 testCaseNodeDTO.setLabel(name);
                 testCaseNodeDTO.setChildren(nodeList);
-                list.add(testCaseNodeDTO);
+                if (!CollectionUtils.isEmpty(nodeList)) {
+                    list.add(testCaseNodeDTO);
+                }
             }
         });
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index 8de4cdbcab..7617f37d07 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -150,4 +150,8 @@ public class TestPlanTestCaseService {
     public int updateTestCaseStates(List<String> ids, String reportStatus) {
         return extTestPlanTestCaseMapper.updateTestCaseStates(ids, reportStatus);
     }
+
+    public List<TestPlanCaseDTO> listForMinder(String planId) {
+        return extTestPlanTestCaseMapper.listForMinder(planId);
+    }
 }
diff --git a/frontend/src/business/components/track/common/minder/TestPlanMinder.vue b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
new file mode 100644
index 0000000000..f15a0c0ecd
--- /dev/null
+++ b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
@@ -0,0 +1,128 @@
+<template>
+  <ms-module-minder
+    v-loading="result.loading"
+    :tree-nodes="treeNodes"
+    :data-map="dataMap"
+    @save="save"
+  />
+</template>
+
+<script>
+import MsModuleMinder from "@/business/components/common/components/MsModuleMinder";
+import {getTestCaseDataMap} from "@/business/components/track/common/minder/minderUtils";
+export default {
+name: "TestPlanMinder",
+  components: {MsModuleMinder},
+  data() {
+    return{
+      testCase: [],
+      dataMap: new Map(),
+      result: {}
+    }
+  },
+  props: {
+    treeNodes: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    selectNodeIds: {
+      type: Array
+    },
+    planId: {
+      type: String
+    },
+    projectId: String
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.getTestCases();
+    })
+  },
+  methods: {
+    getTestCases() {
+      if (this.projectId) {
+        this.result = this.$get('/test/plan/case/list/minder/' + this.planId, response => {
+          this.testCase = response.data;
+          this.dataMap = getTestCaseDataMap(this.testCase);
+        });
+      }
+    },
+    save(data) {
+      // let saveCases = [];
+      // this.buildSaveCase(data.root, saveCases, undefined);
+      // console.log(saveCases);
+      // let param = {
+      //   projectId: this.projectId,
+      //   data: saveCases
+      // }
+      // this.result = this.$post('/test/case/minder/edit', param, () => {
+      //   this.$success(this.$t('commons.save_success'));
+      // });
+    },
+    buildSaveCase(root, saveCases, parent) {
+      let data = root.data;
+      if (data.resource && data.resource.indexOf("用例") > -1) {
+        this._buildSaveCase(root, saveCases, parent);
+      } else {
+        if (root.children) {
+          root.children.forEach((childNode) => {
+            this.buildSaveCase(childNode, saveCases, root.data);
+          })
+        }
+      }
+    },
+    _buildSaveCase(node, saveCases, parent) {
+      let data = node.data;
+      let isChange = false;
+      let testCase = {
+        id: data.id,
+        name: data.text,
+        nodeId: parent ? parent.id : "",
+        nodePath: parent ? parent.path : "",
+        type: data.type ? data.type : 'functional',
+        method: data.method ? data.method : 'manual',
+        maintainer: data.maintainer,
+        priority: 'P' + data.priority,
+      };
+      if (data.changed) isChange = true;
+      let steps = [];
+      let stepNum = 1;
+      if (node.children) {
+        node.children.forEach((childNode) => {
+          let childData = childNode.data;
+          if (childData.resource && childData.resource.indexOf('前置条件') > -1) {
+            testCase.prerequisite = childData.text;
+          } else if (childData.resource && childData.resource.indexOf('备注') > -1) {
+            testCase.remark = childData.text;
+          } else {
+            // 测试步骤
+            let step = {};
+            step.num = stepNum++;
+            step.desc = childData.text;
+            if (childNode.children) {
+              let result = "";
+              childNode.children.forEach((child) => {
+                result += child.data.text;
+                if (child.data.changed) isChange = true;
+              })
+              step.result = result;
+            }
+            steps.push(step);
+          }
+          if (childData.changed) isChange = true;
+        })
+      }
+      testCase.steps = JSON.stringify(steps);
+      if (isChange) {
+        saveCases.push(testCase);
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 31a32b357a..93ebabd7ae 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="card-container">
-    <el-card class="card-content" v-loading="result.loading">
-      <template v-slot:header>
+<!--    <el-card class="card-content" v-loading="result.loading">-->
+<!--      <template v-slot:header>-->
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :show-create="false" :tip="$t('commons.search_by_id_name_tag')">
           <template v-slot:title>
@@ -19,7 +19,7 @@
                              :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>
           </template>
         </ms-table-header>
-      </template>
+<!--      </template>-->
 
       <executor-edit ref="executorEdit" :select-ids="new Set(Array.from(this.selectRows).map(row => row.id))"
                      @refresh="initTableData"/>
@@ -250,7 +250,7 @@
         :is-read-only="isReadOnly"
         @refreshTable="search"/>
 
-    </el-card>
+<!--    </el-card>-->
     <batch-edit ref="batchEdit" @batchEdit="batchEdit"
                 :type-arr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/>
   </div>
@@ -671,6 +671,9 @@ export default {
 </script>
 
 <style scoped>
+.ms-table-header {
+  margin: 20px;
+}
 
 .search {
   margin-left: 10px;
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
index fdca4113f2..a4c154d3c6 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
@@ -9,8 +9,16 @@
                  ref="nodeTree"/>
     </template>
     <template v-slot:main>
+      <ms-tab-button
+        :active-dom.sync="activeDom"
+        :left-tip="'用例列表'"
+        :left-content="'CASE'"
+        :right-tip="'脑图'"
+        :right-content="'脑图'"
+        :middle-button-enable="false">
       <functional-test-case-list
         class="table-list"
+        v-if="activeDom === 'left'"
         @openTestCaseRelevanceDialog="openTestCaseRelevanceDialog"
         @refresh="refresh"
         :plan-id="planId"
@@ -18,6 +26,13 @@
         :select-node-ids="selectNodeIds"
         :select-parent-nodes="selectParentNodes"
         ref="testPlanTestCaseList"/>
+        <test-plan-minder
+          :tree-nodes="treeNodes"
+          :project-id="projectId"
+          :plan-id="planId"
+          v-if="activeDom === 'right'"
+        />
+      </ms-tab-button>
     </template>
 
     <test-case-functional-relevance
@@ -34,10 +49,15 @@
     import MsTestPlanCommonComponent from "../base/TestPlanCommonComponent";
     import TestCaseFunctionalRelevance from "./TestCaseFunctionalRelevance";
     import FunctionalTestCaseList from "./FunctionalTestCaseList";
+    import MsTabButton from "@/business/components/common/components/MsTabButton";
+    import TestPlanMinder from "@/business/components/track/common/minder/TestPlanMinder";
+    import {getCurrentProjectID} from "@/common/js/utils";
 
     export default {
       name: "TestPlanFunctional",
       components: {
+        TestPlanMinder,
+        MsTabButton,
         FunctionalTestCaseList,
         TestCaseFunctionalRelevance,
         MsTestPlanCommonComponent,
@@ -50,6 +70,8 @@
           selectNodeIds: [],
           selectParentNodes: [],
           treeNodes: [],
+          activeDom: 'left',
+          projectId: ""
         }
       },
       props: [
@@ -58,6 +80,7 @@
         'clickType'
       ],
       mounted() {
+        this.projectId = getCurrentProjectID();
         this.initData();
       },
       activated(){
@@ -121,5 +144,7 @@
 </script>
 
 <style scoped>
-
+/deep/ .el-button-group>.el-button:first-child {
+  padding: 4px 1px !important;
+}
 </style>

From 80dfe489686954c69357d8b7bcdfc916c0b232c6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 16 Mar 2021 13:01:15 +0800
Subject: [PATCH 19/95] =?UTF-8?q?fix:=20=E9=A1=B5=E9=9D=A2=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/track/review/view/TestCaseReviewView.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
index cf722e986c..51b982123f 100644
--- a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
+++ b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
@@ -20,7 +20,7 @@
       </template>
     </ms-test-plan-header-bar>
     <test-review-function v-if="activeIndex === 'functional'" :redirectCharType="redirectCharType"
-                          :click Type="clickType" :review-id="reviewId"></test-review-function>
+                          :clickType="clickType" :review-id="reviewId"></test-review-function>
     <test-review-api v-if="activeIndex === 'api'" :review-id="reviewId"></test-review-api>
     <test-review-load v-if="activeIndex === 'load'" :review-id="reviewId"></test-review-load>
 

From d43f867e9773f793c9cde3e32b18e62867f5d903 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 16 Mar 2021 13:16:59 +0800
Subject: [PATCH 20/95] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=9F=A5=E7=9C=8B=E5=BC=95=E7=94=A8=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/ApiAutomation.vue          |   2 +-
 .../automation/scenario/EditApiScenario.vue   |  18 +-
 .../scenario/api/ScenarioRelevance.vue        |   3 +-
 .../scenario/common/ApiBaseComponent.vue      |  11 +-
 .../component/ApiScenarioComponent.vue        |  12 +-
 .../scenario/component/ComponentConfig.vue    |   5 +-
 .../scenario/component/StepExtendBtns.vue     |  64 ++-----
 .../scenario/maximize/ScenarioHeader.vue      |  78 ++++----
 .../scenario/variable/VariableList.vue        | 178 ++++++++++--------
 frontend/src/business/components/xpack        |   2 +-
 10 files changed, 187 insertions(+), 186 deletions(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 921ab5f536..bba45cd049 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -39,7 +39,7 @@
           :name="item.name"
           closable>
           <div class="ms-api-scenario-div">
-            <ms-edit-api-scenario @refresh="refresh" :currentScenario="item.currentScenario"
+            <ms-edit-api-scenario @refresh="refresh" @openScenario="editScenario" :currentScenario="item.currentScenario"
                                   :moduleOptions="moduleOptions" ref="autoScenarioConfig"/>
           </div>
         </el-tab-pane>
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 38aaf8c4bb..9f76c1edb4 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -137,7 +137,7 @@
                       <!-- 步骤组件-->
                        <ms-component-config :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
                                             :currentEnvironmentId="currentEnvironmentId" :node="node" :project-list="projectList" :env-map="projectEnvMap"
-                                            @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload"/>
+                                            @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" @openScenario="openScenario"/>
                     </span>
               </el-tree>
             </div>
@@ -198,7 +198,7 @@
       <ms-drawer :visible="drawer" :size="100" @close="close" direction="right" :show-full-screen="false" :is-show-close="false" style="overflow: hidden">
         <template v-slot:header>
           <scenario-header :currentScenario="currentScenario" :projectEnvMap="projectEnvMap" :projectIds="projectIds" :projectList="projectList" :scenarioDefinition="scenarioDefinition" :enableCookieShare="enableCookieShare"
-                           @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @showScenarioParameters="showScenarioParameters" ref="maximizeHeader"/>
+                           @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" ref="maximizeHeader"/>
         </template>
 
         <maximize-scenario :scenario-definition="scenarioDefinition" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario"/>
@@ -222,7 +222,7 @@
   import {parseEnvironment} from "../../definition/model/EnvironmentModel";
   import {ELEMENT_TYPE, ELEMENTS} from "./Setting";
   import MsApiCustomize from "./ApiCustomize";
-  import {getCurrentProjectID, getUUID, objToStrMap, strMapToObj} from "@/common/js/utils";
+  import {getCurrentProjectID, getUUID, objToStrMap, strMapToObj, handleCtrlSEvent} from "@/common/js/utils";
   import ApiEnvironmentConfig from "../../definition/components/environment/ApiEnvironmentConfig";
   import MsInputTag from "./MsInputTag";
   import MsRun from "./DebugRun";
@@ -234,7 +234,6 @@
   import ScenarioApiRelevance from "./api/ApiRelevance";
   import ScenarioRelevance from "./api/ScenarioRelevance";
   import MsComponentConfig from "./component/ComponentConfig";
-  import {handleCtrlSEvent} from "../../../../../common/js/utils";
   import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
   import MaximizeScenario from "./maximize/MaximizeScenario";
   import ScenarioHeader from "./maximize/ScenarioHeader";
@@ -442,6 +441,10 @@
       }
     },
     methods: {
+      // 打开引用的场景
+      openScenario(data) {
+        this.$emit('openScenario', data);
+      },
       showAllBtn() {
         this.$refs.maximizeScenario.showAll();
       },
@@ -465,7 +468,9 @@
           // 直接更新场景防止编辑内容丢失
           this.editScenario();
         }
-        this.$refs.maximizeHeader.getVariableSize();
+        if (this.$refs.maximizeHeader) {
+          this.$refs.maximizeHeader.getVariableSize();
+        }
         this.reload();
       },
       showButton(...names) {
@@ -727,6 +732,9 @@
           this.loading = false
         })
       },
+      runDebugMax() {
+        this.$refs.maximizeScenario.runDebug();
+      },
       runDebug() {
         /*触发执行操作*/
         let sign = this.$refs.envPopover.checkEnv();
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index 5f089a65b7..e73d8b202a 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -90,7 +90,8 @@
             response.data.forEach(item => {
               let scenarioDefinition = JSON.parse(item.scenarioDefinition);
               if (scenarioDefinition && scenarioDefinition.hashTree) {
-                let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'Copy', resourceId: getUUID(), hashTree: scenarioDefinition.hashTree, projectId: item.projectId};
+                let obj = {id: item.id, name: item.name, type: "scenario", headers: scenarioDefinition.headers, variables: scenarioDefinition.variables, environmentMap: scenarioDefinition.environmentMap,
+                  referenced: 'Copy', resourceId: getUUID(), hashTree: scenarioDefinition.hashTree, projectId: item.projectId};
                 scenarios.push(obj);
               }
             });
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index dbd1d4102b..ec877c34f5 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -15,6 +15,7 @@
              @click="active(data)" v-if="data.type!='scenario'  && !isMax "/>
           <el-input :draggable="draggable" v-if="isShowInput && isShowNameInput" size="mini" v-model="data.name" class="name-input"
                     @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
+          <!--最大化显示-->
           <span v-else-if="isMax">
              <el-tooltip :content="data.name" placement="top">
               <span>{{data.name}}</span>
@@ -34,13 +35,14 @@
           <el-switch v-model="data.enable" class="enable-switch"/>
         </el-tooltip>
         <slot name="button"></slot>
-        <step-extend-btns style="display: contents" @copy="copyRow" @remove="remove" v-if="showBtn"/>
+        <step-extend-btns style="display: contents" :data="data" @copy="copyRow" @remove="remove" @openScenario="openScenario" v-if="showBtn"/>
       </div>
 
     </div>
+    <!--最大化不显示具体内容-->
     <div class="header" v-if="!isMax">
       <fieldset :disabled="data.disabled" class="ms-fieldset">
-        <el-collapse-transition>6.
+        <el-collapse-transition>
           <div v-if="data.active && showCollapse" :draggable="draggable">
             <el-divider></el-divider>
             <slot></slot>
@@ -130,6 +132,9 @@
       remove() {
         this.$emit('remove');
       },
+      openScenario(data) {
+        this.$emit('openScenario', data);
+      },
       editName() {
         this.isShowInput = true;
         this.$nextTick(() => {
@@ -159,7 +164,7 @@
   }
 
   .header-right {
-    margin-top: 5px;
+    margin-top: 0px;
     float: right;
     z-index: 1;
   }
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 529f6909d9..b74f2da85a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -4,6 +4,7 @@
     @copy="copyRow"
     @remove="remove"
     @active="active"
+    @openScenario="openScenario"
     :data="scenario"
     :show-collapse="false"
     :is-show-name-input="!isDeletedOrRef"
@@ -62,8 +63,10 @@
         this.result = this.$get("/api/automation/getApiScenario/" + this.scenario.id, response => {
           if (response.data) {
             this.scenario.loaded = true;
+            let obj = {};
             if (response.data.scenarioDefinition) {
-              this.scenario.hashTree = JSON.parse(response.data.scenarioDefinition).hashTree;
+              obj = JSON.parse(response.data.scenarioDefinition);
+              this.scenario.hashTree = obj.hashTree;
             }
             if (this.scenario.hashTree) {
               this.setDisabled(this.scenario.hashTree);
@@ -73,7 +76,9 @@
             if (!this.scenario.projectId) {
               this.scenario.projectId = response.data.projectId;
             }
-
+            this.scenario.headers = obj.headers;
+            this.scenario.variables = obj.variables;
+            this.scenario.environmentMap = obj.environmentMap;
             this.$emit('refReload');
           } else {
             this.scenario.referenced = "Deleted";
@@ -109,6 +114,9 @@
       copyRow() {
         this.$emit('copyRow', this.scenario, this.node);
       },
+      openScenario(data){
+        this.$emit('openScenario', data);
+      },
       reload() {
         this.loading = true
         this.$nextTick(() => {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 4061381817..0e20a0b68e 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -3,7 +3,7 @@
     <component :is="component" :isMax="isMax" :show-btn="showBtn"
                :scenario="scenario" :controller="scenario" :timer="scenario" :assertions="scenario" :extract="scenario" :jsr223-processor="scenario" :request="scenario" :currentScenario="currentScenario" :currentEnvironmentId="currentEnvironmentId" :node="node"
                :draggable="true" :title="title" :color="titleColor" :background-color="backgroundColor" @suggestClick="suggestClick(node)" :response="response"
-               @remove="remove" @copyRow="copyRow" @refReload="refReload" :project-list="projectList" :env-map="envMap"/>
+               @remove="remove" @copyRow="copyRow" @refReload="refReload" @openScenario="openScenario" :project-list="projectList" :env-map="envMap"/>
   </div>
 </template>
 
@@ -120,6 +120,9 @@
         this.$emit('copyRow', row, node);
 
       },
+      openScenario(data){
+        this.$emit('openScenario', data);
+      },
       suggestClick(node) {
         this.$emit('suggestClick', node);
       },
diff --git a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
index 7b840ba742..7e692824e1 100644
--- a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
@@ -7,34 +7,31 @@
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="copy">复制步骤</el-dropdown-item>
         <el-dropdown-item command="remove" v-tester>删除步骤</el-dropdown-item>
-        <el-dropdown-item command="scenarioVar" v-tester>查看场景变量</el-dropdown-item>
-        <el-dropdown-item command="openScenario" v-tester>打开场景</el-dropdown-item>
-        <el-dropdown-item command="saveAs" v-tester>另存为接口定义</el-dropdown-item>
-        <!--<el-tooltip content="Copy" placement="top">-->
-        <!--<el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data && data.disabled"/>-->
-        <!--</el-tooltip>-->
-        <!--<el-tooltip :content="$t('commons.remove')" placement="top">-->
-        <!--<el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data && data.disabled"/>-->
-        <!--</el-tooltip>-->
-
+        <el-dropdown-item command="scenarioVar" v-tester v-if="data.type==='scenario'">查看场景变量</el-dropdown-item>
+        <el-dropdown-item command="openScenario" v-tester v-if="data.type==='scenario' && data.referenced==='REF'">打开场景</el-dropdown-item>
+        <el-dropdown-item command="saveAs" v-tester v-if="allSamplers.indexOf(data.type)!=-1">另存为接口定义</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <ms-reference-view @openScenario="openScenario" ref="viewRef"/>
-    <ms-schedule-maintain ref="scheduleMaintain" @refreshTable="refreshTable"/>
+    <ms-variable-list ref="scenarioParameters"/>
 
   </div>
 </template>
 
 <script>
-  import MsReferenceView from "@/business/components/api/automation/scenario/ReferenceView";
-  import MsScheduleMaintain from "@/business/components/api/automation/schedule/ScheduleMaintain"
   import {getCurrentProjectID, getUUID} from "@/common/js/utils";
+  import {ELEMENTS} from "../Setting";
+  import MsVariableList from "../variable/VariableList";
 
   export default {
     name: "StepExtendBtns",
-    components: {MsReferenceView, MsScheduleMaintain},
+    components: {ELEMENTS, MsVariableList},
     props: {
-      row: Object
+      data: Object,
+    },
+    data() {
+      return {
+        allSamplers: ELEMENTS.get('AllSamplerProxy'),
+      }
     },
     methods: {
       handleCommand(cmd) {
@@ -46,47 +43,16 @@
             this.$emit('remove');
             break;
           case "scenarioVar":
-            this.$emit('copy');
+            this.$refs.scenarioParameters.open(this.data.variables, this.data.headers, true);
             break;
           case "openScenario":
-            this.$emit('copy');
+            this.$emit('openScenario', this.data);
             break;
           case "saveAs":
             this.$emit('copy');
             break;
         }
       },
-      createPerformance(row) {
-        this.infoDb = false;
-        let url = "/api/automation/genPerformanceTestJmx";
-        let run = {};
-        let scenarioIds = [];
-        scenarioIds.push(row.id);
-        run.projectId = getCurrentProjectID();
-        run.ids = scenarioIds;
-        run.id = getUUID();
-        run.name = row.name;
-        this.$post(url, run, response => {
-          let jmxObj = {};
-          jmxObj.name = response.data.name;
-          jmxObj.xml = response.data.xml;
-          jmxObj.attachFiles = response.data.attachFiles;
-          jmxObj.attachByteFiles = response.data.attachByteFiles;
-          this.$store.commit('setTest', {
-            name: row.name,
-            jmx: jmxObj
-          })
-          this.$router.push({
-            path: "/performance/test/create"
-          })
-        });
-      },
-      openScenario(item) {
-        this.$emit('openScenario', item)
-      },
-      refreshTable() {
-
-      }
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
index d957231385..5fbad83245 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -1,31 +1,28 @@
 <template>
-  <div class="ms-header" @click="showAll">
-    <el-row>
-      <div class="ms-div" v-loading="loading">
-        <!-- 调试部分 -->
-        <el-row style="margin: 5px">
-          <el-col :span="6" class="ms-col-one ms-font">
-            {{$t('api_test.automation.step_total')}}：{{scenarioDefinition.length}}
-          </el-col>
-          <el-col :span="6" class="ms-col-one ms-font">
-            <el-link class="head" @click="showScenarioParameters">{{$t('api_test.automation.scenario_total')}}</el-link>
-            ：{{varSize }}
-          </el-col>
-          <el-col :span="5" class="ms-col-one ms-font">
-            <el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
-          </el-col>
-          <el-col :span="7">
-            <env-popover :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
-                         :project-list="projectList" ref="envPopover" style="margin-top: 0px"/>
-          </el-col>
-        </el-row>
-      </div>
-      <div class="ms-header-right">
-        <el-button :disabled="scenarioDefinition.length < 1" size="small" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
-        ｜
-        <i class="el-icon-close alt-ico" @click="close"/>
-      </div>
-    </el-row>
+  <div class="ms-header">
+    <div class="ms-div" v-loading="loading" @click="showAll">
+      <!-- 调试部分 -->
+      <el-row class="ms-header-margin">
+        <el-col :span="8">
+          {{currentScenario.name}}
+        </el-col>
+        <el-col :span="8">
+          {{$t('api_test.automation.step_total')}}：{{scenarioDefinition.length}}
+        </el-col>
+        <el-col :span="8">
+          <el-link class="head" @click="showScenarioParameters">{{$t('api_test.automation.scenario_total')}}</el-link>
+          ：{{varSize }}
+        </el-col>
+      </el-row>
+    </div>
+    <div class="ms-header-right">
+      <el-checkbox v-model="cookieShare" class="ms-right">共享cookie</el-checkbox>
+      <env-popover :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                   :project-list="projectList" ref="envPopover" class="ms-right"/>
+      <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+      ｜
+      <i class="el-icon-close alt-ico" @click="close"/>
+    </div>
   </div>
 </template>
 
@@ -43,11 +40,13 @@
         envMap: new Map,
         loading: false,
         varSize: 0,
+        cookieShare: false,
       }
     },
     mounted() {
       this.envMap = this.projectEnvMap;
       this.getVariableSize();
+      this.cookieShare = this.enableCookieShare;
     },
     methods: {
       handleExport() {
@@ -92,6 +91,7 @@
         })
       },
       setProjectEnvMap(projectEnvMap) {
+        this.$emit('setProjectEnvMap',projectEnvMap);
         this.envMap = projectEnvMap;
       }
     },
@@ -101,7 +101,7 @@
 <style scoped>
   .ms-header {
     border-bottom: 1px solid #E6E6E6;
-    height: 65px;
+    height: 50px;
     background-color: #FFF;
   }
 
@@ -112,15 +112,13 @@
     margin-top: 12px;
   }
 
-  .ms-span {
-    margin: 0px 10px 10px;
-  }
-
   .ms-header-right {
     float: right;
-    margin-bottom: 10px;
-    margin-top: 10px;
-    margin-right: 20px;
+    margin-top: 2px;
+    position: fixed;
+    right: 40px;
+    z-index: 1;
+
   }
 
   .alt-ico {
@@ -134,13 +132,11 @@
     font-size: 18px;
   }
 
-  .ms-font {
-    color: #303133;
-    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
-    font-size: 13px;
+  .ms-header-margin {
+    margin-top: 3px;
   }
 
-  .ms-col-one {
-    margin-top: 5px;
+  .ms-right {
+    margin-right: 40px;
   }
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
index 47503cd137..5b00d2fc71 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
@@ -1,96 +1,101 @@
 <template>
   <el-dialog title="场景变量" :close-on-click-modal="false"
              :visible.sync="visible" class="visible-dialog" width="60%"
-             @close="close" v-loading="loading">
-    <el-tabs v-model="activeName">
-      <el-tab-pane :label="$t('api_test.scenario.variables')" name="variable">
-        <div style="margin-top: 10px">
-          <el-row style="margin-bottom: 10px">
-            <el-col :span="8">
-              <el-input placeholder="变量名称搜索" v-model="selectVariable" size="small" @change="filter"
-                        @keyup.enter="filter">
-                <el-select v-model="searchType" slot="prepend" placeholder="类型" style="width: 90px" @change="filter">
-                  <el-option value="CONSTANT" label="常量"></el-option>
-                  <el-option value="LIST" label="列表"></el-option>
-                  <el-option value="CSV" label="CSV"></el-option>
-                  <el-option value="COUNTER" label="计数器"></el-option>
-                  <el-option value="RANDOM" label="随机数"></el-option>
-                </el-select>
-              </el-input>
-            </el-col>
+             @close="close" v-loading="loading" append-to-body>
+    <fieldset :disabled="disabled" class="ms-fieldset">
+      <el-collapse-transition>
 
-            <el-col :span="6">
-              <el-dropdown split-button type="primary" @command="handleClick" @click="handleClick('CONSTANT')"
-                           size="small" style="margin-left: 10px">
-                {{ $t('commons.add') }}
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="CONSTANT">常量</el-dropdown-item>
-                  <el-dropdown-item command="LIST">列表</el-dropdown-item>
-                  <el-dropdown-item command="CSV">CSV</el-dropdown-item>
-                  <el-dropdown-item command="COUNTER">计数器</el-dropdown-item>
-                  <el-dropdown-item command="RANDOM">随机数</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-              <el-button size="small" style="margin-left: 10px" @click="deleteVariable">{{ $t('commons.delete') }}
-              </el-button>
+        <el-tabs v-model="activeName">
+          <el-tab-pane :label="$t('api_test.scenario.variables')" name="variable">
+            <div style="margin-top: 10px">
+              <el-row style="margin-bottom: 10px">
+                <el-col :span="8">
+                  <el-input placeholder="变量名称搜索" v-model="selectVariable" size="small" @change="filter"
+                            @keyup.enter="filter">
+                    <el-select v-model="searchType" slot="prepend" placeholder="类型" style="width: 90px" @change="filter">
+                      <el-option value="CONSTANT" label="常量"></el-option>
+                      <el-option value="LIST" label="列表"></el-option>
+                      <el-option value="CSV" label="CSV"></el-option>
+                      <el-option value="COUNTER" label="计数器"></el-option>
+                      <el-option value="RANDOM" label="随机数"></el-option>
+                    </el-select>
+                  </el-input>
+                </el-col>
 
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div style="border:1px #DCDFE6 solid; min-height: 400px;border-radius: 4px ;width: 100% ;">
-                <el-table ref="table" border :data="variables" class="adjust-table" @select-all="select"
-                          @select="select"
-                          v-loading="loading" @row-click="edit" height="400px" :row-class-name="tableRowClassName">
-                  <el-table-column type="selection" width="38"/>
-                  <el-table-column prop="num" label="ID" sortable/>
-                  <el-table-column prop="name" :label="$t('api_test.variable_name')" sortable show-overflow-tooltip/>
-                  <el-table-column prop="type" :label="$t('test_track.case.type')">
-                    <template v-slot:default="scope">
-                      <span>{{ types.get(scope.row.type) }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="value" :label="$t('api_test.value')" show-overflow-tooltip/>
-                </el-table>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <ms-edit-constant v-if="editData.type=='CONSTANT'" ref="parameters" :editData.sync="editData"/>
-              <ms-edit-counter v-if="editData.type=='COUNTER'" ref="counter" :editData.sync="editData"/>
-              <ms-edit-random v-if="editData.type=='RANDOM'" ref="random" :editData.sync="editData"/>
-              <ms-edit-list-value v-if="editData.type=='LIST'" ref="listValue" :editData="editData"/>
-              <ms-edit-csv v-if="editData.type=='CSV'" ref="csv" :editData.sync="editData"/>
-            </el-col>
-          </el-row>
-        </div>
+                <el-col :span="6">
+                  <el-dropdown split-button type="primary" @command="handleClick" @click="handleClick('CONSTANT')"
+                               size="small" style="margin-left: 10px">
+                    {{ $t('commons.add') }}
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="CONSTANT">常量</el-dropdown-item>
+                      <el-dropdown-item command="LIST">列表</el-dropdown-item>
+                      <el-dropdown-item command="CSV">CSV</el-dropdown-item>
+                      <el-dropdown-item command="COUNTER">计数器</el-dropdown-item>
+                      <el-dropdown-item command="RANDOM">随机数</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                  <el-button size="small" style="margin-left: 10px" @click="deleteVariable">{{ $t('commons.delete') }}
+                  </el-button>
+
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <div style="border:1px #DCDFE6 solid; min-height: 400px;border-radius: 4px ;width: 100% ;">
+                    <el-table ref="table" border :data="variables" class="adjust-table" @select-all="select"
+                              @select="select"
+                              v-loading="loading" @row-click="edit" height="400px" :row-class-name="tableRowClassName">
+                      <el-table-column type="selection" width="38"/>
+                      <el-table-column prop="num" label="ID" sortable/>
+                      <el-table-column prop="name" :label="$t('api_test.variable_name')" sortable show-overflow-tooltip/>
+                      <el-table-column prop="type" :label="$t('test_track.case.type')">
+                        <template v-slot:default="scope">
+                          <span>{{ types.get(scope.row.type) }}</span>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="value" :label="$t('api_test.value')" show-overflow-tooltip/>
+                    </el-table>
+                  </div>
+                </el-col>
+                <el-col :span="12">
+                  <ms-edit-constant v-if="editData.type=='CONSTANT'" ref="parameters" :editData.sync="editData"/>
+                  <ms-edit-counter v-if="editData.type=='COUNTER'" ref="counter" :editData.sync="editData"/>
+                  <ms-edit-random v-if="editData.type=='RANDOM'" ref="random" :editData.sync="editData"/>
+                  <ms-edit-list-value v-if="editData.type=='LIST'" ref="listValue" :editData="editData"/>
+                  <ms-edit-csv v-if="editData.type=='CSV'" ref="csv" :editData.sync="editData"/>
+                </el-col>
+              </el-row>
+            </div>
 
 
-      </el-tab-pane>
-      <el-tab-pane :label="$t('api_test.scenario.headers')" name="headers">
-        <!-- 请求头-->
-        <el-tooltip class="item-tabs" effect="dark" :content="$t('api_test.request.headers')" placement="top-start"
-                    slot="label">
+          </el-tab-pane>
+          <el-tab-pane :label="$t('api_test.scenario.headers')" name="headers">
+            <!-- 请求头-->
+            <el-tooltip class="item-tabs" effect="dark" :content="$t('api_test.request.headers')" placement="top-start"
+                        slot="label">
           <span>{{ $t('api_test.request.headers') }}
             <div class="el-step__icon is-text ms-api-col ms-variable-header" v-if="headers.length>1">
               <div class="el-step__icon-inner">{{ headers.length - 1 }}</div>
             </div>
           </span>
-        </el-tooltip>
-        <el-row>
-          <el-link class="ms-variable-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}
-          </el-link>
-        </el-row>
-        <div style="min-height: 400px">
-          <ms-api-key-value :items="headers" :suggestions="headerSuggestions"/>
-          <batch-add-parameter @batchSave="batchSave" ref="batchAddParameter"/>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-    <template v-slot:footer>
-      <div>
-        <el-button type="primary" @click="save">{{ $t('commons.confirm') }}</el-button>
-      </div>
-    </template>
+            </el-tooltip>
+            <el-row>
+              <el-link class="ms-variable-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}
+              </el-link>
+            </el-row>
+            <div style="min-height: 400px">
+              <ms-api-key-value :items="headers" :suggestions="headerSuggestions"/>
+              <batch-add-parameter @batchSave="batchSave" ref="batchAddParameter"/>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+        <template v-slot:footer>
+          <div>
+            <el-button type="primary" @click="save">{{ $t('commons.confirm') }}</el-button>
+          </div>
+        </template>
+      </el-collapse-transition>
+    </fieldset>
   </el-dialog>
 </template>
 
@@ -146,6 +151,7 @@
         pageSize: 10,
         total: 0,
         headerSuggestions: REQUEST_HEADERS,
+        disabled: false,
       }
     },
     methods: {
@@ -212,12 +218,13 @@
       isSelect(row) {
         return this.selection.includes(row.id)
       },
-      open: function (variables, headers) {
+      open: function (variables, headers, disabled) {
         this.variables = variables;
         this.headers = headers;
         this.visible = true;
         this.editData = {type: "CONSTANT"};
         this.addParameters(this.editData);
+        this.disabled = disabled;
       },
       save() {
         this.visible = false;
@@ -302,4 +309,11 @@
     float: right;
     margin-right: 45px;
   }
+  fieldset {
+    padding: 0px;
+    margin: 0px;
+    min-width: 100%;
+    min-inline-size: 0px;
+    border: 0px;
+  }
 </style>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index b2571e06e8..4c33b9c3b1 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit b2571e06e8b211821409115cc2c4a7c52cbac1db
+Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819

From 475440ccd4900d5590040c4eba6ea31f3422ef98 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Mar 2021 12:08:58 +0800
Subject: [PATCH 21/95] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/APITestService.java           |  14 +-
 .../metersphere/base/domain/FileMetadata.java |   5 +-
 .../base/domain/FileMetadataExample.java      |  58 ++--
 .../metersphere/base/domain/LoadTestFile.java |   5 +-
 .../base/domain/LoadTestFileExample.java      |  60 ++++
 .../base/mapper/FileMetadataMapper.xml        |  28 +-
 .../base/mapper/LoadTestFileMapper.xml        |  21 +-
 .../base/mapper/ext/ExtLoadTestMapper.java    |   4 +-
 .../base/mapper/ext/ExtLoadTestMapper.xml     |   8 +-
 .../controller/ProjectController.java         |  10 +
 .../controller/PerformanceTestController.java |  10 +-
 .../performance/dto/LoadTestFileDTO.java      |  12 -
 .../performance/engine/EngineFactory.java     |   9 +-
 .../request/QueryProjectFileRequest.java      |   8 +
 .../service/PerformanceTestService.java       |  73 ++--
 .../io/metersphere/service/FileService.java   |  65 ++--
 .../metersphere/service/ProjectService.java   |  70 +++-
 .../track/service/TestCaseService.java        |   4 +-
 .../db/migration/V78__v1.8_release.sql        |  19 +-
 .../resources/i18n/messages_en_US.properties  |   3 +
 .../resources/i18n/messages_zh_CN.properties  |   3 +
 .../resources/i18n/messages_zh_TW.properties  |   3 +
 .../test/components/ExistFiles.vue            | 110 +++++-
 .../components/PerformanceBasicConfig.vue     |  99 +-----
 .../test/components/ResourceFiles.vue         | 154 +++++++++
 .../components/settings/project/MsProject.vue | 318 +++++++++---------
 frontend/src/i18n/en-US.js                    |   2 +
 frontend/src/i18n/zh-CN.js                    |   6 +-
 frontend/src/i18n/zh-TW.js                    |   6 +-
 29 files changed, 768 insertions(+), 419 deletions(-)
 delete mode 100644 backend/src/main/java/io/metersphere/performance/dto/LoadTestFileDTO.java
 create mode 100644 backend/src/main/java/io/metersphere/performance/request/QueryProjectFileRequest.java
 create mode 100644 frontend/src/business/components/performance/test/components/ResourceFiles.vue

diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 659bcef3ba..ea7521209b 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -98,7 +98,7 @@ public class APITestService {
         checkQuota();
         request.setBodyUploadIds(null);
         ApiTest test = createTest(request);
-        saveFile(test.getId(), file);
+        saveFile(test, file);
         return test;
     }
 
@@ -112,7 +112,7 @@ public class APITestService {
         request.setBodyUploadIds(null);
         ApiTest test = updateTest(request);
         createBodyFiles(test, bodyUploadIds, bodyFiles);
-        saveFile(test.getId(), file);
+        saveFile(test, file);
     }
 
     private void createBodyFiles(ApiTest test, List<String> bodyUploadIds, List<MultipartFile> bodyFiles) {
@@ -292,10 +292,10 @@ public class APITestService {
         return test;
     }
 
-    private void saveFile(String testId, MultipartFile file) {
-        final FileMetadata fileMetadata = fileService.saveFile(file);
+    private void saveFile(ApiTest apiTest, MultipartFile file) {
+        final FileMetadata fileMetadata = fileService.saveFile(file, apiTest.getProjectId());
         ApiTestFile apiTestFile = new ApiTestFile();
-        apiTestFile.setTestId(testId);
+        apiTestFile.setTestId(apiTest.getId());
         apiTestFile.setFileId(fileMetadata.getId());
         apiTestFileMapper.insert(apiTestFile);
     }
@@ -532,12 +532,12 @@ public class APITestService {
 
         //处理附件
         Map<String, String> attachmentFiles = new HashMap<>();
-        int fileIndex = 0;
+
         for (String filePath: attachmentFilePathList) {
             File file  = new File(filePath);
             if(file.exists() && file.isFile()){
                 try{
-                    FileMetadata fileMetadata = fileService.saveFile(file,FileUtil.readAsByteArray(file),fileIndex++);
+                    FileMetadata fileMetadata = fileService.saveFile(file,FileUtil.readAsByteArray(file));
                     attachmentFiles.put(fileMetadata.getId(),fileMetadata.getName());
                 }catch (Exception e){
                     e.printStackTrace();
diff --git a/backend/src/main/java/io/metersphere/base/domain/FileMetadata.java b/backend/src/main/java/io/metersphere/base/domain/FileMetadata.java
index 4dd64f1051..8b07d2fbd5 100644
--- a/backend/src/main/java/io/metersphere/base/domain/FileMetadata.java
+++ b/backend/src/main/java/io/metersphere/base/domain/FileMetadata.java
@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class FileMetadata implements Serializable {
@@ -18,7 +17,7 @@ public class FileMetadata implements Serializable {
 
     private Long size;
 
-    private Integer sort;
+    private String projectId;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/FileMetadataExample.java b/backend/src/main/java/io/metersphere/base/domain/FileMetadataExample.java
index c7a308d6a0..ca7c180f56 100644
--- a/backend/src/main/java/io/metersphere/base/domain/FileMetadataExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/FileMetadataExample.java
@@ -494,63 +494,73 @@ public class FileMetadataExample {
             return (Criteria) this;
         }
 
-        public Criteria andSortIsNull() {
-            addCriterion("sort is null");
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andSortIsNotNull() {
-            addCriterion("sort is not null");
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSortEqualTo(Integer value) {
-            addCriterion("sort =", value, "sort");
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("project_id =", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortNotEqualTo(Integer value) {
-            addCriterion("sort <>", value, "sort");
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("project_id <>", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortGreaterThan(Integer value) {
-            addCriterion("sort >", value, "sort");
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("project_id >", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sort >=", value, "sort");
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("project_id >=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortLessThan(Integer value) {
-            addCriterion("sort <", value, "sort");
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("project_id <", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortLessThanOrEqualTo(Integer value) {
-            addCriterion("sort <=", value, "sort");
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("project_id <=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortIn(List<Integer> values) {
-            addCriterion("sort in", values, "sort");
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("project_id like", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortNotIn(List<Integer> values) {
-            addCriterion("sort not in", values, "sort");
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("project_id not like", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortBetween(Integer value1, Integer value2) {
-            addCriterion("sort between", value1, value2, "sort");
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("project_id in", values, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andSortNotBetween(Integer value1, Integer value2) {
-            addCriterion("sort not between", value1, value2, "sort");
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
             return (Criteria) this;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestFile.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestFile.java
index 0fc212656e..98a8d47466 100644
--- a/backend/src/main/java/io/metersphere/base/domain/LoadTestFile.java
+++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestFile.java
@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class LoadTestFile implements Serializable {
@@ -10,5 +9,7 @@ public class LoadTestFile implements Serializable {
 
     private String fileId;
 
+    private Integer sort;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestFileExample.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestFileExample.java
index 1386bb4661..38dca4c4c0 100644
--- a/backend/src/main/java/io/metersphere/base/domain/LoadTestFileExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestFileExample.java
@@ -243,6 +243,66 @@ public class LoadTestFileExample {
             addCriterion("file_id not between", value1, value2, "fileId");
             return (Criteria) this;
         }
+
+        public Criteria andSortIsNull() {
+            addCriterion("sort is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIsNotNull() {
+            addCriterion("sort is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortEqualTo(Integer value) {
+            addCriterion("sort =", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotEqualTo(Integer value) {
+            addCriterion("sort <>", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThan(Integer value) {
+            addCriterion("sort >", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sort >=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThan(Integer value) {
+            addCriterion("sort <", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThanOrEqualTo(Integer value) {
+            addCriterion("sort <=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIn(List<Integer> values) {
+            addCriterion("sort in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotIn(List<Integer> values) {
+            addCriterion("sort not in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortBetween(Integer value1, Integer value2) {
+            addCriterion("sort between", value1, value2, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotBetween(Integer value1, Integer value2) {
+            addCriterion("sort not between", value1, value2, "sort");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/FileMetadataMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/FileMetadataMapper.xml
index c123e5cc0a..e4624e049d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/FileMetadataMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/FileMetadataMapper.xml
@@ -8,7 +8,7 @@
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="size" jdbcType="BIGINT" property="size" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, `type`, create_time, update_time, `size`, sort
+    id, `name`, `type`, create_time, update_time, `size`, project_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.FileMetadataExample" resultMap="BaseResultMap">
     select
@@ -104,10 +104,10 @@
   <insert id="insert" parameterType="io.metersphere.base.domain.FileMetadata">
     insert into file_metadata (id, `name`, `type`, 
       create_time, update_time, `size`, 
-      sort)
+      project_id)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{size,jdbcType=BIGINT}, 
-      #{sort,jdbcType=INTEGER})
+      #{projectId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.FileMetadata">
     insert into file_metadata
@@ -130,8 +130,8 @@
       <if test="size != null">
         `size`,
       </if>
-      <if test="sort != null">
-        sort,
+      <if test="projectId != null">
+        project_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -153,8 +153,8 @@
       <if test="size != null">
         #{size,jdbcType=BIGINT},
       </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -185,8 +185,8 @@
       <if test="record.size != null">
         `size` = #{record.size,jdbcType=BIGINT},
       </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -201,7 +201,7 @@
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       `size` = #{record.size,jdbcType=BIGINT},
-      sort = #{record.sort,jdbcType=INTEGER}
+      project_id = #{record.projectId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -224,8 +224,8 @@
       <if test="size != null">
         `size` = #{size,jdbcType=BIGINT},
       </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -237,7 +237,7 @@
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       `size` = #{size,jdbcType=BIGINT},
-      sort = #{sort,jdbcType=INTEGER}
+      project_id = #{projectId,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/LoadTestFileMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/LoadTestFileMapper.xml
index cd2defde05..0904ceabb4 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestFileMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestFileMapper.xml
@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.LoadTestFile">
     <result column="test_id" jdbcType="VARCHAR" property="testId" />
     <result column="file_id" jdbcType="VARCHAR" property="fileId" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -64,7 +65,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    test_id, file_id
+    test_id, file_id, sort
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.LoadTestFileExample" resultMap="BaseResultMap">
     select
@@ -87,8 +88,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.LoadTestFile">
-    insert into load_test_file (test_id, file_id)
-    values (#{testId,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR})
+    insert into load_test_file (test_id, file_id, sort
+      )
+    values (#{testId,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestFile">
     insert into load_test_file
@@ -99,6 +102,9 @@
       <if test="fileId != null">
         file_id,
       </if>
+      <if test="sort != null">
+        sort,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="testId != null">
@@ -107,6 +113,9 @@
       <if test="fileId != null">
         #{fileId,jdbcType=VARCHAR},
       </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.LoadTestFileExample" resultType="java.lang.Long">
@@ -124,6 +133,9 @@
       <if test="record.fileId != null">
         file_id = #{record.fileId,jdbcType=VARCHAR},
       </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -132,7 +144,8 @@
   <update id="updateByExample" parameterType="map">
     update load_test_file
     set test_id = #{record.testId,jdbcType=VARCHAR},
-      file_id = #{record.fileId,jdbcType=VARCHAR}
+      file_id = #{record.fileId,jdbcType=VARCHAR},
+      sort = #{record.sort,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.java
index de2abdabae..c95006f3b8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.java
@@ -1,8 +1,8 @@
 package io.metersphere.base.mapper.ext;
 
+import io.metersphere.base.domain.FileMetadata;
 import io.metersphere.base.domain.LoadTest;
 import io.metersphere.dto.LoadTestDTO;
-import io.metersphere.performance.dto.LoadTestFileDTO;
 import io.metersphere.performance.request.QueryTestPlanRequest;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,6 +18,6 @@ public interface ExtLoadTestMapper {
 
     LoadTest getNextNum(@Param("projectId") String projectId);
 
-    List<LoadTestFileDTO> getProjectFiles(@Param("projectId") String projectId, @Param("loadTypes") List<String> loadType);
+    List<FileMetadata> getProjectFiles(@Param("projectId") String projectId, @Param("loadTypes") List<String> loadType);
 
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 1dc5666c16..88afae483d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -132,11 +132,9 @@
         select * from load_test lt where lt.project_id = #{projectId} ORDER BY num DESC LIMIT 1;
     </select>
 
-    <select id="getProjectFiles" resultType="io.metersphere.performance.dto.LoadTestFileDTO">
-        SELECT file_metadata.*, load_test.id as testId, load_test.name as testName
-        FROM load_test
-                     JOIN load_test_file ON load_test.id = load_test_file.test_id
-                     JOIN file_metadata ON load_test_file.file_id = file_metadata.id
+    <select id="getProjectFiles" resultType="io.metersphere.base.domain.FileMetadata">
+        SELECT file_metadata.*
+        FROM file_metadata
         WHERE file_metadata.type IN
         <foreach collection="loadTypes" item="id" separator="," open="(" close=")">
             #{id}
diff --git a/backend/src/main/java/io/metersphere/controller/ProjectController.java b/backend/src/main/java/io/metersphere/controller/ProjectController.java
index edf0d20024..790bb76b50 100644
--- a/backend/src/main/java/io/metersphere/controller/ProjectController.java
+++ b/backend/src/main/java/io/metersphere/controller/ProjectController.java
@@ -14,6 +14,7 @@ import io.metersphere.service.ProjectService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -84,4 +85,13 @@ public class ProjectController {
         projectService.updateProject(Project);
     }
 
+    @PostMapping(value = "upload/files/{projectId}", consumes = {"multipart/form-data"})
+    public void uploadFiles(@PathVariable String projectId, @RequestPart(value = "file") List<MultipartFile> files) {
+        projectService.uploadFiles(projectId, files);
+    }
+
+    @GetMapping(value = "delete/file/{fileId}")
+    public void deleteFile(@PathVariable String fileId) {
+        projectService.deleteFile(fileId);
+    }
 }
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 213f4b43d9..da19e2da3c 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
@@ -15,7 +15,6 @@ import io.metersphere.dto.DashboardTestDTO;
 import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.dto.ScheduleDao;
 import io.metersphere.performance.dto.LoadTestExportJmx;
-import io.metersphere.performance.dto.LoadTestFileDTO;
 import io.metersphere.performance.request.*;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.service.CheckPermissionService;
@@ -122,7 +121,7 @@ public class PerformanceTestController {
     }
 
     @GetMapping("/project/{loadType}/{projectId}/{goPage}/{pageSize}")
-    public Pager<List<LoadTestFileDTO>> getProjectFiles(@PathVariable String projectId, @PathVariable String loadType,
+    public Pager<List<FileMetadata>> getProjectFiles(@PathVariable String projectId, @PathVariable String loadType,
                                                         @PathVariable int goPage, @PathVariable int pageSize) {
         checkPermissionService.checkProjectOwner(projectId);
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
@@ -148,7 +147,7 @@ public class PerformanceTestController {
     @GetMapping("/file/metadata/{testId}")
     public List<FileMetadata> getFileMetadata(@PathVariable String testId) {
         checkPermissionService.checkPerformanceTestOwner(testId);
-        return fileService.getFileMetadataByTestId(testId);
+        return performanceTestService.getFileMetadataByTestId(testId);
     }
 
     @GetMapping("/file/getMetadataById/{metadataId}")
@@ -156,6 +155,11 @@ public class PerformanceTestController {
         return fileService.getFileMetadataById(metadataId);
     }
 
+    @PostMapping("/file/{projectId}/getMetadataByName")
+    public List<FileMetadata> getProjectMetadataByName(@PathVariable String projectId, @RequestBody QueryProjectFileRequest request) {
+        return fileService.getProjectFiles(projectId, request);
+    }
+
     @PostMapping("/file/download")
     public ResponseEntity<byte[]> downloadJmx(@RequestBody FileOperationRequest fileOperationRequest) {
         byte[] bytes = fileService.loadFileAsBytes(fileOperationRequest.getId());
diff --git a/backend/src/main/java/io/metersphere/performance/dto/LoadTestFileDTO.java b/backend/src/main/java/io/metersphere/performance/dto/LoadTestFileDTO.java
deleted file mode 100644
index 56b4f2c07e..0000000000
--- a/backend/src/main/java/io/metersphere/performance/dto/LoadTestFileDTO.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.metersphere.performance.dto;
-
-import io.metersphere.base.domain.FileMetadata;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class LoadTestFileDTO extends FileMetadata {
-    private String testId;
-    private String testName;
-}
diff --git a/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
index bfc2d9461f..29edf085eb 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
@@ -15,6 +15,7 @@ import io.metersphere.i18n.Translator;
 import io.metersphere.performance.engine.docker.DockerTestEngine;
 import io.metersphere.performance.parse.EngineSourceParser;
 import io.metersphere.performance.parse.EngineSourceParserFactory;
+import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.service.FileService;
 import io.metersphere.service.KubernetesTestEngine;
 import io.metersphere.service.TestResourcePoolService;
@@ -46,6 +47,7 @@ import java.util.stream.Collectors;
 @Service
 public class EngineFactory {
     private static FileService fileService;
+    private static PerformanceTestService performanceTestService;
     private static TestResourcePoolService testResourcePoolService;
     private static Class<? extends KubernetesTestEngine> kubernetesTestEngineClass;
 
@@ -87,7 +89,7 @@ public class EngineFactory {
     }
 
     public static EngineContext createContext(LoadTestWithBLOBs loadTest, String resourceId, double ratio, long startTime, String reportId, int resourceIndex) {
-        final List<FileMetadata> fileMetadataList = fileService.getFileMetadataByTestId(loadTest.getId());
+        final List<FileMetadata> fileMetadataList = performanceTestService.getFileMetadataByTestId(loadTest.getId());
         if (org.springframework.util.CollectionUtils.isEmpty(fileMetadataList)) {
             MSException.throwException(Translator.get("run_load_test_file_not_found") + loadTest.getId());
         }
@@ -235,4 +237,9 @@ public class EngineFactory {
     public void setTestResourcePoolService(TestResourcePoolService testResourcePoolService) {
         EngineFactory.testResourcePoolService = testResourcePoolService;
     }
+
+    @Resource
+    public void setPerformanceTestService(PerformanceTestService performanceTestService) {
+        EngineFactory.performanceTestService = performanceTestService;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/performance/request/QueryProjectFileRequest.java b/backend/src/main/java/io/metersphere/performance/request/QueryProjectFileRequest.java
new file mode 100644
index 0000000000..90c71dcb8a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/performance/request/QueryProjectFileRequest.java
@@ -0,0 +1,8 @@
+package io.metersphere.performance.request;
+
+import lombok.Data;
+
+@Data
+public class QueryProjectFileRequest {
+    private String filename;
+}
diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
index b5e2209e5c..1100f9dba3 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -21,7 +21,6 @@ import io.metersphere.dto.ScheduleDao;
 import io.metersphere.i18n.Translator;
 import io.metersphere.job.sechedule.PerformanceTestJob;
 import io.metersphere.performance.dto.LoadTestExportJmx;
-import io.metersphere.performance.dto.LoadTestFileDTO;
 import io.metersphere.performance.engine.Engine;
 import io.metersphere.performance.engine.EngineFactory;
 import io.metersphere.performance.engine.producer.LoadTestProducer;
@@ -124,8 +123,10 @@ public class PerformanceTestService {
         loadTestFileMapper.deleteByExample(loadTestFileExample);
 
         if (!CollectionUtils.isEmpty(loadTestFiles)) {
-            final List<String> fileIds = loadTestFiles.stream().map(LoadTestFile::getFileId).collect(Collectors.toList());
-            fileService.deleteFileByIds(fileIds);
+            List<String> fileIds = loadTestFiles.stream().map(LoadTestFile::getFileId).collect(Collectors.toList());
+            LoadTestFileExample example3 = new LoadTestFileExample();
+            example3.createCriteria().andFileIdIn(fileIds);
+            loadTestFileMapper.deleteByExample(example3);
         }
     }
 
@@ -138,15 +139,15 @@ public class PerformanceTestService {
         // 导入项目里其他的文件
         this.importFiles(importFileIds, loadTest.getId(), request.getFileSorts());
         // 保存上传的文件
-        this.saveUploadFiles(files, loadTest.getId(), request.getFileSorts());
+        this.saveUploadFiles(files, loadTest, request.getFileSorts());
         //关联转化的文件
-        this.conversionFiles(loadTest.getId(),request.getConversionFileIdList());
+        this.conversionFiles(loadTest.getId(), request.getConversionFileIdList());
         return loadTest.getId();
     }
 
     private void conversionFiles(String id, List<String> conversionFileIdList) {
         for (String metaFileId : conversionFileIdList) {
-            if(!this.loadTestFileExsits(id,metaFileId)){
+            if (!this.loadTestFileExsits(id, metaFileId)) {
                 LoadTestFile loadTestFile = new LoadTestFile();
                 loadTestFile.setTestId(id);
                 loadTestFile.setFileId(metaFileId);
@@ -161,21 +162,22 @@ public class PerformanceTestService {
         example.createCriteria().andTestIdEqualTo(testId).andFileIdEqualTo(metaFileId);
         long loadTestFiles = loadTestFileMapper.countByExample(example);
 
-        if(!fileExsits && loadTestFiles>0){
+        if (!fileExsits && loadTestFiles > 0) {
             return false;
-        }else {
-            return  true;
+        } else {
+            return true;
         }
     }
 
-    private void saveUploadFiles(List<MultipartFile> files, String testId, Map<String, Integer> fileSorts) {
+    private void saveUploadFiles(List<MultipartFile> files, LoadTest loadTest, Map<String, Integer> fileSorts) {
         if (files != null) {
             for (int i = 0; i < files.size(); i++) {
                 MultipartFile file = files.get(i);
-                final FileMetadata fileMetadata = fileService.saveFile(file, fileSorts.getOrDefault(file.getOriginalFilename(), i));
+                FileMetadata fileMetadata = fileService.saveFile(file, loadTest.getProjectId());
                 LoadTestFile loadTestFile = new LoadTestFile();
-                loadTestFile.setTestId(testId);
+                loadTestFile.setTestId(loadTest.getId());
                 loadTestFile.setFileId(fileMetadata.getId());
+                loadTestFile.setSort(fileSorts.getOrDefault(file.getOriginalFilename(), i));
                 loadTestFileMapper.insert(loadTestFile);
             }
         }
@@ -184,12 +186,11 @@ public class PerformanceTestService {
     private void importFiles(List<String> importFileIds, String testId, Map<String, Integer> fileSorts) {
         for (int i = 0; i < importFileIds.size(); i++) {
             String fileId = importFileIds.get(i);
-            FileMetadata fileMetadata = fileService.copyFile(fileId);
-            fileMetadata.setSort(fileSorts.getOrDefault(fileMetadata.getName(), i));
-            fileService.updateFileMetadata(fileMetadata);
+            FileMetadata fileMetadata = fileService.getFileMetadataById(fileId);
             LoadTestFile loadTestFile = new LoadTestFile();
             loadTestFile.setTestId(testId);
-            loadTestFile.setFileId(fileMetadata.getId());
+            loadTestFile.setFileId(fileId);
+            loadTestFile.setSort(fileSorts.getOrDefault(fileMetadata.getName(), i));
             loadTestFileMapper.insert(loadTestFile);
         }
     }
@@ -230,16 +231,23 @@ public class PerformanceTestService {
         }
         // 新选择了一个文件，删除原来的文件
         List<FileMetadata> updatedFiles = request.getUpdatedFileList();
-        List<FileMetadata> originFiles = fileService.getFileMetadataByTestId(request.getId());
+        List<FileMetadata> originFiles = getFileMetadataByTestId(request.getId());
         List<String> updatedFileIds = updatedFiles.stream().map(FileMetadata::getId).collect(Collectors.toList());
         List<String> originFileIds = originFiles.stream().map(FileMetadata::getId).collect(Collectors.toList());
+
         // 相减
         List<String> deleteFileIds = ListUtils.subtract(originFileIds, updatedFileIds);
-        fileService.deleteFileByIds(deleteFileIds);
+        // 删除已经不相关的文件
+        LoadTestFileExample example3 = new LoadTestFileExample();
+        example3.createCriteria().andFileIdIn(deleteFileIds);
+        loadTestFileMapper.deleteByExample(example3);
+
         // 导入项目里其他的文件
         List<String> addFileIds = ListUtils.subtract(updatedFileIds, originFileIds);
         this.importFiles(addFileIds, request.getId(), request.getFileSorts());
-        this.saveUploadFiles(files, request.getId(), request.getFileSorts());
+
+        // 处理新上传的文件
+        this.saveUploadFiles(files, loadTest, request.getFileSorts());
 
         loadTest.setName(request.getName());
         loadTest.setProjectId(request.getProjectId());
@@ -400,7 +408,7 @@ public class PerformanceTestService {
     }
 
     public List<LoadTestExportJmx> getJmxContent(String testId) {
-        List<FileMetadata> fileMetadataList = fileService.getFileMetadataByTestId(testId);
+        List<FileMetadata> fileMetadataList = getFileMetadataByTestId(testId);
         List<LoadTestExportJmx> results = new ArrayList<>();
         for (FileMetadata metadata : fileMetadataList) {
             if (FileType.JMX.name().equals(metadata.getType())) {
@@ -449,13 +457,7 @@ public class PerformanceTestService {
         List<LoadTestFile> loadTestFiles = loadTestFileMapper.selectByExample(loadTestFileExample);
         if (!CollectionUtils.isEmpty(loadTestFiles)) {
             loadTestFiles.forEach(loadTestFile -> {
-                FileMetadata fileMetadata = fileService.copyFile(loadTestFile.getFileId());
-                if (fileMetadata == null) {
-                    // 如果性能测试出现文件变更，这里会有 null
-                    return;
-                }
                 loadTestFile.setTestId(copy.getId());
-                loadTestFile.setFileId(fileMetadata.getId());
                 loadTestFileMapper.insert(loadTestFile);
             });
         }
@@ -557,13 +559,18 @@ public class PerformanceTestService {
         }
     }
 
-    public List<LoadTestFileDTO> getProjectFiles(String projectId, String loadType) {
+    public List<FileMetadata> getProjectFiles(String projectId, String loadType) {
         List<String> loadTypes = new ArrayList<>();
         loadTypes.add(StringUtils.upperCase(loadType));
         if (StringUtils.equalsIgnoreCase(loadType, "resource")) {
             loadTypes.add(FileType.CSV.name());
             loadTypes.add(FileType.JAR.name());
         }
+        if (StringUtils.equalsIgnoreCase(loadType, "all")) {
+            loadTypes.add(FileType.CSV.name());
+            loadTypes.add(FileType.JAR.name());
+            loadTypes.add(FileType.JMX.name());
+        }
         return extLoadTestMapper.getProjectFiles(projectId, loadTypes);
     }
 
@@ -580,4 +587,16 @@ public class PerformanceTestService {
 
         return results;
     }
+
+    public List<FileMetadata> getFileMetadataByTestId(String testId) {
+        LoadTestFileExample loadTestFileExample = new LoadTestFileExample();
+        loadTestFileExample.createCriteria().andTestIdEqualTo(testId);
+        loadTestFileExample.setOrderByClause("sort asc");
+        List<LoadTestFile> loadTestFiles = loadTestFileMapper.selectByExample(loadTestFileExample);
+
+        List<String> fileIds = loadTestFiles.stream().map(LoadTestFile::getFileId).collect(Collectors.toList());
+        FileMetadataExample example = new FileMetadataExample();
+        example.createCriteria().andIdIn(fileIds);
+        return fileService.getFileMetadataByIds(fileIds);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/service/FileService.java b/backend/src/main/java/io/metersphere/service/FileService.java
index 328b427ee5..e1d7b3ffd1 100644
--- a/backend/src/main/java/io/metersphere/service/FileService.java
+++ b/backend/src/main/java/io/metersphere/service/FileService.java
@@ -7,8 +7,10 @@ import io.metersphere.base.mapper.LoadTestFileMapper;
 import io.metersphere.base.mapper.TestCaseFileMapper;
 import io.metersphere.commons.constants.FileType;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.performance.request.QueryProjectFileRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -37,21 +39,6 @@ public class FileService {
         return fileContent.getFile();
     }
 
-    public List<FileMetadata> getFileMetadataByTestId(String testId) {
-        LoadTestFileExample loadTestFileExample = new LoadTestFileExample();
-        loadTestFileExample.createCriteria().andTestIdEqualTo(testId);
-        final List<LoadTestFile> loadTestFiles = loadTestFileMapper.selectByExample(loadTestFileExample);
-
-        if (CollectionUtils.isEmpty(loadTestFiles)) {
-            return new ArrayList<>();
-        }
-        List<String> fileIds = loadTestFiles.stream().map(LoadTestFile::getFileId).collect(Collectors.toList());
-        FileMetadataExample example = new FileMetadataExample();
-        example.createCriteria().andIdIn(fileIds);
-        example.setOrderByClause("sort asc"); // 安装顺序排序
-        return fileMetadataMapper.selectByExample(example);
-    }
-
     public FileContent getFileContent(String fileId) {
         return fileContentMapper.selectByPrimaryKey(fileId);
     }
@@ -86,20 +73,16 @@ public class FileService {
         fileContentMapper.deleteByExample(example2);
     }
 
-    public FileMetadata saveFile(MultipartFile file) {
-        return saveFile(file, 0);
-    }
-
-    public FileMetadata saveFile(MultipartFile file, Integer sort) {
+    public FileMetadata saveFile(MultipartFile file, String projectId) {
         final FileMetadata fileMetadata = new FileMetadata();
         fileMetadata.setId(UUID.randomUUID().toString());
         fileMetadata.setName(file.getOriginalFilename());
         fileMetadata.setSize(file.getSize());
+        fileMetadata.setProjectId(projectId);
         fileMetadata.setCreateTime(System.currentTimeMillis());
         fileMetadata.setUpdateTime(System.currentTimeMillis());
         FileType fileType = getFileType(fileMetadata.getName());
         fileMetadata.setType(fileType.name());
-        fileMetadata.setSort(sort);
         fileMetadataMapper.insert(fileMetadata);
 
         FileContent fileContent = new FileContent();
@@ -114,7 +97,11 @@ public class FileService {
         return fileMetadata;
     }
 
-    public FileMetadata saveFile(File file, byte[] fileByte, Integer sort) {
+    public FileMetadata saveFile(MultipartFile file) {
+        return saveFile(file, null);
+    }
+
+    public FileMetadata saveFile(File file, byte[] fileByte) {
         final FileMetadata fileMetadata = new FileMetadata();
         fileMetadata.setId(UUID.randomUUID().toString());
         fileMetadata.setName(file.getName());
@@ -123,7 +110,6 @@ public class FileService {
         fileMetadata.setUpdateTime(System.currentTimeMillis());
         FileType fileType = getFileType(fileMetadata.getName());
         fileMetadata.setType(fileType.name());
-        fileMetadata.setSort(sort);
         fileMetadataMapper.insert(fileMetadata);
 
         FileContent fileContent = new FileContent();
@@ -197,12 +183,6 @@ public class FileService {
         return fileMetadataMapper.selectByPrimaryKey(fileId);
     }
 
-    public List<FileMetadata> getProjectJMXs(String projectId) {
-        FileMetadataExample example = new FileMetadataExample();
-        fileMetadataMapper.selectByExample(example);
-        return null;
-    }
-
     public void updateFileMetadata(FileMetadata fileMetadata) {
         fileMetadataMapper.updateByPrimaryKeySelective(fileMetadata);
     }
@@ -211,10 +191,29 @@ public class FileService {
         FileMetadataExample example = new FileMetadataExample();
         example.createCriteria().andIdEqualTo(fileId);
         long fileCount = fileMetadataMapper.countByExample(example);
-        if(fileCount>0){
-            return  true;
-        }else {
-            return  false;
+        if (fileCount > 0) {
+            return true;
+        } else {
+            return false;
         }
     }
+
+    public List<FileMetadata> getProjectFiles(String projectId, QueryProjectFileRequest request) {
+        FileMetadataExample example = new FileMetadataExample();
+        FileMetadataExample.Criteria criteria = example.createCriteria();
+        criteria.andProjectIdEqualTo(projectId);
+        if (!StringUtils.isEmpty(request.getFilename())) {
+            criteria.andNameEqualTo(request.getFilename());
+        }
+       return fileMetadataMapper.selectByExample(example);
+    }
+
+    public List<FileMetadata> getFileMetadataByIds(List<String> fileIds) {
+        if (CollectionUtils.isEmpty(fileIds)) {
+            return new ArrayList<>();
+        }
+        FileMetadataExample example = new FileMetadataExample();
+        example.createCriteria().andIdIn(fileIds);
+        return fileMetadataMapper.selectByExample(example);
+    }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index 5dcf0d730c..77a218d37e 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -3,13 +3,12 @@ package io.metersphere.service;
 import io.metersphere.api.dto.DeleteAPITestRequest;
 import io.metersphere.api.dto.QueryAPITestRequest;
 import io.metersphere.api.service.APITestService;
-import io.metersphere.base.domain.LoadTest;
-import io.metersphere.base.domain.LoadTestExample;
-import io.metersphere.base.domain.Project;
-import io.metersphere.base.domain.ProjectExample;
+import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.ApiTestFileMapper;
+import io.metersphere.base.mapper.LoadTestFileMapper;
 import io.metersphere.base.mapper.LoadTestMapper;
 import io.metersphere.base.mapper.ProjectMapper;
-import io.metersphere.base.mapper.ext.*;
+import io.metersphere.base.mapper.ext.ExtProjectMapper;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
@@ -17,6 +16,7 @@ import io.metersphere.controller.request.ProjectRequest;
 import io.metersphere.dto.ProjectDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.performance.request.DeleteTestPlanRequest;
+import io.metersphere.performance.request.QueryProjectFileRequest;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.track.service.TestCaseService;
 import io.metersphere.track.service.TestPlanProjectService;
@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -43,14 +44,6 @@ public class ProjectService {
     @Resource
     private LoadTestMapper loadTestMapper;
     @Resource
-    private ExtTestCaseMapper extTestCaseMapper;
-    @Resource
-    private ExtTestPlanMapper extTestPlanMapper;
-    @Resource
-    private ExtLoadTestMapper extLoadTestMapperMapper;
-    @Resource
-    private ExtApiTestMapper extApiTestMapper;
-    @Resource
     private TestPlanService testPlanService;
     @Resource
     private TestCaseService testCaseService;
@@ -58,6 +51,12 @@ public class ProjectService {
     private APITestService apiTestService;
     @Resource
     private TestPlanProjectService testPlanProjectService;
+    @Resource
+    private FileService fileService;
+    @Resource
+    private LoadTestFileMapper loadTestFileMapper;
+    @Resource
+    private ApiTestFileMapper apiTestFileMapper;
 
     public Project addProject(Project project) {
         if (StringUtils.isBlank(project.getName())) {
@@ -169,4 +168,49 @@ public class ProjectService {
     public Project getProjectById(String id) {
         return projectMapper.selectByPrimaryKey(id);
     }
+
+    public void uploadFiles(String projectId, List<MultipartFile> files) {
+        if (files != null) {
+            for (MultipartFile file : files) {
+                QueryProjectFileRequest request = new QueryProjectFileRequest();
+                request.setFilename(file.getOriginalFilename());
+                if (CollectionUtils.isEmpty(fileService.getProjectFiles(projectId, request))) {
+                    fileService.saveFile(file, projectId);
+                } else {
+                    MSException.throwException(Translator.get("project_file_already_exists"));
+                }
+            }
+        }
+    }
+
+    public void deleteFile(String fileId) {
+        LoadTestFileExample example1 = new LoadTestFileExample();
+        example1.createCriteria().andFileIdEqualTo(fileId);
+        List<LoadTestFile> loadTestFiles = loadTestFileMapper.selectByExample(example1);
+        String errorMessage = "";
+        if (loadTestFiles.size() > 0) {
+            List<String> testIds = loadTestFiles.stream().map(LoadTestFile::getTestId).distinct().collect(Collectors.toList());
+            LoadTestExample example = new LoadTestExample();
+            example.createCriteria().andIdIn(testIds);
+            List<LoadTest> loadTests = loadTestMapper.selectByExample(example);
+            errorMessage += Translator.get("load_test") + ": " + StringUtils.join(loadTests.stream().map(LoadTest::getName).toArray(), ",");
+            errorMessage += "\n";
+        }
+        ApiTestFileExample example2 = new ApiTestFileExample();
+        example2.createCriteria().andFileIdEqualTo(fileId);
+        List<ApiTestFile> apiTestFiles = apiTestFileMapper.selectByExample(example2);
+        if (apiTestFiles.size() > 0) {
+            List<String> testIds = apiTestFiles.stream().map(ApiTestFile::getTestId).distinct().collect(Collectors.toList());
+            LoadTestExample example = new LoadTestExample();
+            example.createCriteria().andIdIn(testIds);
+            QueryAPITestRequest request = new QueryAPITestRequest();
+            request.setIds(testIds);
+            List<ApiTest> apiTests = apiTestService.listByIds(request);
+            errorMessage += Translator.get("api_test") + ": " + StringUtils.join(apiTests.stream().map(ApiTest::getName).toArray(), ",");
+        }
+        if (StringUtils.isNotBlank(errorMessage)) {
+            MSException.throwException(errorMessage + Translator.get("project_file_in_use"));
+        }
+        fileService.deleteFileById(fileId);
+    }
 }
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 42db5f06e8..9deb78377d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -662,7 +662,7 @@ public class TestCaseService {
         }
 
         files.forEach(file -> {
-            final FileMetadata fileMetadata = fileService.saveFile(file);
+            final FileMetadata fileMetadata = fileService.saveFile(file, testCaseWithBLOBs.getProjectId());
             TestCaseFile testCaseFile = new TestCaseFile();
             testCaseFile.setCaseId(testCaseWithBLOBs.getId());
             testCaseFile.setFileId(fileMetadata.getId());
@@ -695,7 +695,7 @@ public class TestCaseService {
 
         if (files != null) {
             files.forEach(file -> {
-                final FileMetadata fileMetadata = fileService.saveFile(file);
+                final FileMetadata fileMetadata = fileService.saveFile(file,testCaseWithBLOBs.getProjectId());
                 TestCaseFile testCaseFile = new TestCaseFile();
                 testCaseFile.setFileId(fileMetadata.getId());
                 testCaseFile.setCaseId(request.getId());
diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
index 2b658eae4e..c1f35cfdab 100644
--- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql
+++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
@@ -88,10 +88,6 @@ ALTER TABLE test_case_review
 alter table test_plan_api_scenario
     change environment_id environment longtext null comment 'Relevance environment';
 
--- file add sort column
-alter table file_metadata
-    add sort int default 0;
-
 -- add Original state
 alter table api_definition add original_state varchar(64);
 alter table api_scenario add original_state varchar(64);
@@ -140,4 +136,17 @@ update schedule sch inner join swagger_url_project sup on
 	sup.id = sch.resource_id
 	set sch.name = LEFT(SUBSTRING_INDEX(sup.swagger_url, '/', 3), 100);
 -- delete an unused colum
-alter table schedule drop column custom_data;
\ No newline at end of file
+alter table schedule drop column custom_data;
+
+-- add sort column
+alter table load_test_file add sort int default 0;
+
+UPDATE file_metadata JOIN (SELECT file_id, project_id
+                           FROM load_test_file
+                                    JOIN load_test ON test_id = load_test.id) temp ON file_id = file_metadata.id
+SET file_metadata.project_id = temp.project_id;
+
+UPDATE file_metadata JOIN (SELECT file_id, project_id
+                           FROM api_test_file
+                                    JOIN api_test ON test_id = api_test.id) temp ON file_id = file_metadata.id
+SET file_metadata.project_id = temp.project_id;
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index f6edc5e762..5c066f75fd 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -66,6 +66,8 @@ only_one_k8s=Only one K8S can be added
 #project
 project_name_is_null=Project name cannot be null
 project_name_already_exists=The project name already exists
+project_file_already_exists=The file already exists
+project_file_in_use=use this file and cannot be deleted.
 #organization
 organization_name_is_null=organization name cannot be null
 organization_name_already_exists=The organization name already exists
@@ -75,6 +77,7 @@ organization_id_is_null=Organization ID cannot be null
 api_load_script_error=Load script error
 api_report_is_null="Report is null, can't update"
 api_test_environment_already_exists="Api test environment already exists"
+api_test=API Test
 #test case
 test_case_node_level=level
 test_case_node_level_tip=The node tree maximum depth is
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 3746f89597..e0f23126e3 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -66,6 +66,8 @@ only_one_k8s=只能添加一个 K8S
 #project
 project_name_is_null=项目名称不能为空
 project_name_already_exists=项目名称已存在
+project_file_already_exists=项目下该文件已经存在
+project_file_in_use=占用文件，无法删除。
 #organization
 organization_name_is_null=组织名不能为空
 organization_name_already_exists=组织名已存在
@@ -75,6 +77,7 @@ organization_id_is_null=组织 ID 不能为空
 api_load_script_error=读取脚本失败
 api_report_is_null="测试报告是未生成，无法更新"
 api_test_environment_already_exists="已存在该名称的环境配置"
+api_test=接口测试
 #test case
 test_case_node_level=层
 test_case_node_level_tip=模块树最大深度为
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 419afc2025..88ed5da387 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -66,6 +66,8 @@ only_one_k8s=只能添加一個 K8S
 #project
 project_name_is_null=項目名稱不能為空
 project_name_already_exists=項目名稱已存在
+project_file_already_exists=項目下文件已存在
+project_file_in_use=佔用文件，無法刪除。
 #organization
 organization_name_is_null=組織名不能為空
 organization_name_already_exists=組織名已存在
@@ -75,6 +77,7 @@ organization_id_is_null=組織 ID 不能為空
 api_load_script_error=讀取腳本失敗
 api_report_is_null="測試報告是未生成，無法更新"
 api_test_environment_already_exists="已存在該名稱的環境配置"
+api_test=接口測試
 #test case
 test_case_node_level=層
 test_case_node_level_tip=模塊樹最大深度為
diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue
index 5a8ea694be..1551584f95 100644
--- a/frontend/src/business/components/performance/test/components/ExistFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue
@@ -3,6 +3,41 @@
              :destroy-on-close="true"
              :title="$t('load_test.exist_jmx')" width="70%"
              :visible.sync="loadFileVisible">
+    <el-row>
+
+      <el-upload
+        v-if="loadType === 'jmx'"
+        style="padding-right: 10px;"
+        accept=".jmx"
+        action=""
+        multiple
+        :limit="fileNumLimit"
+        :show-file-list="false"
+        :before-upload="beforeUploadFile"
+        :http-request="handleUpload"
+        :on-exceed="handleExceed"
+        :disabled="isReadOnly"
+        :file-list="fileList">
+        <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
+                         :content="$t('load_test.upload_jmx')"/>
+      </el-upload>
+      <el-upload
+        v-else
+        style="padding-right: 10px;"
+        accept=".jar,.csv,.json,.pdf,.jpg,.png,.jpeg,.doc,.docx,.xlsx"
+        action=""
+        :limit="fileNumLimit"
+        multiple
+        :show-file-list="false"
+        :before-upload="beforeUploadFile"
+        :http-request="handleUpload"
+        :on-exceed="handleExceed"
+        :disabled="isReadOnly"
+        :file-list="fileList">
+        <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
+                         :content="$t('load_test.upload_file')"/>
+      </el-upload>
+    </el-row>
 
     <el-table v-loading="projectLoadingResult.loading"
               class="basic-config"
@@ -11,10 +46,6 @@
               @select="handleSelectionChange">
 
       <el-table-column type="selection"/>
-      <el-table-column
-        prop="testName"
-        :label="$t('load_test.test')">
-      </el-table-column>
       <el-table-column
         prop="name"
         :label="$t('load_test.file_name')">
@@ -45,15 +76,18 @@ import MsDialogFooter from "@/business/components/common/components/MsDialogFoot
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import {getCurrentProjectID} from "@/common/js/utils";
 import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
+import MsTableButton from "@/business/components/common/components/MsTableButton";
+import axios from "axios";
 
 export default {
   name: "ExistFiles",
-  components: {MsTablePagination, MsDialogFooter},
+  components: {MsTableButton, MsTablePagination, MsDialogFooter},
   props: {
     fileList: Array,
     tableData: Array,
     uploadList: Array,
-    scenarios: Array
+    scenarios: Array,
+    isReadOnly: Boolean,
   },
   data() {
     return {
@@ -65,6 +99,7 @@ export default {
       loadType: 'jmx',
       existFiles: [],
       selectIds: new Set,
+      fileNumLimit: 10,
     }
   },
   methods: {
@@ -106,6 +141,7 @@ export default {
     },
     handleImport() {
       if (this.selectIds.size === 0) {
+        this.loadFileVisible = false;
         return;
       }
 
@@ -163,6 +199,68 @@ export default {
       });
 
     },
+    beforeUploadFile(file) {
+      if (!this.fileValidator(file)) {
+        /// todo: 显示错误信息
+        return false;
+      }
+
+      if (this.tableData.filter(f => f.name === file.name).length > 0) {
+        this.$error(this.$t('load_test.delete_file'));
+        return false;
+      }
+      let valid = false;
+
+      // 检查数据库是否存在同名文件
+      async function f() {
+        return await axios.post('/performance/file/' + getCurrentProjectID() + '/getMetadataByName', {filename: file.name})
+      }
+      f().then(res => {
+        let response = res.data;
+        if (response.data.length === 0) {
+          let type = file.name.substring(file.name.lastIndexOf(".") + 1);
+
+          this.tableData.push({
+            name: file.name,
+            size: (file.size / 1024).toFixed(2) + ' KB',
+            type: type.toUpperCase(),
+            updateTime: file.lastModified,
+          });
+          valid = true;
+        } else {
+          this.$error(this.$t('load_test.project_file_exist'));
+        }
+      });
+
+
+      return valid;
+    },
+    handleUpload(uploadResources) {
+      let self = this;
+      let file = uploadResources.file;
+      self.uploadList.push(file);
+      let type = file.name.substring(file.name.lastIndexOf(".") + 1);
+      if (type.toLowerCase() !== 'jmx') {
+        return;
+      }
+      let jmxReader = new FileReader();
+      jmxReader.onload = (event) => {
+        let threadGroups = findThreadGroup(event.target.result, file.name);
+        threadGroups.forEach(tg => {
+          tg.options = {};
+          this.scenarios.push(tg);
+        });
+        self.$emit('fileChange', self.scenarios);
+      };
+      jmxReader.readAsText(file);
+    },
+    handleExceed() {
+      this.$error(this.$t('load_test.file_size_limit'));
+    },
+    fileValidator(file) {
+      /// todo: 是否需要对文件内容和大小做限制
+      return file.size > 0;
+    },
   }
 }
 </script>
diff --git a/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
index 44bcc186a9..9b45a65725 100644
--- a/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
@@ -4,21 +4,6 @@
       <h4>{{ $t('load_test.scenario_list') }}</h4>
     </el-row>
     <el-row type="flex" justify="start" align="middle">
-      <el-upload
-        style="padding-right: 10px;"
-        accept=".jmx"
-        action=""
-        multiple
-        :limit="fileNumLimit"
-        :show-file-list="false"
-        :before-upload="beforeUploadJmx"
-        :http-request="handleUpload"
-        :on-exceed="handleExceed"
-        :disabled="isReadOnly"
-        :file-list="fileList">
-        <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
-                         :content="$t('load_test.upload_jmx')"/>
-      </el-upload>
       <ms-table-button :is-tester-permission="true" icon="el-icon-circle-plus-outline"
                        :content="$t('load_test.load_exist_jmx')" @click="loadJMX()"/>
       <ms-table-button :is-tester-permission="true" icon="el-icon-share"
@@ -68,21 +53,6 @@
       <h4>{{ $t('load_test.other_resource') }}</h4>
     </el-row>
     <el-row type="flex" justify="start" align="middle">
-      <el-upload
-        style="padding-right: 10px;"
-        accept=".jar,.csv,.json,.pdf,.jpg,.png,.jpeg,.doc,.docx,.xlsx"
-        action=""
-        :limit="fileNumLimit"
-        multiple
-        :show-file-list="false"
-        :before-upload="beforeUploadFile"
-        :http-request="handleUpload"
-        :on-exceed="handleExceed"
-        :disabled="isReadOnly"
-        :file-list="fileList">
-        <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
-                         :content="$t('load_test.upload_file')"/>
-      </el-upload>
 
       <ms-table-button :is-tester-permission="true" icon="el-icon-circle-plus-outline"
                        :content="$t('load_test.load_exist_file')" @click="loadFile()"/>
@@ -125,6 +95,7 @@
                  :file-list="fileList"
                  :table-data="tableData"
                  :upload-list="uploadList"
+                 :is-read-only="isReadOnly"
                  :scenarios="threadGroups"/>
 
     <exist-scenarios ref="existScenarios"
@@ -139,7 +110,6 @@
 
 <script>
 import {Message} from "element-ui";
-import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
 import MsTableButton from "@/business/components/common/components/MsTableButton";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
@@ -229,64 +199,6 @@ export default {
         });
       })
     },
-
-    beforeUploadJmx(file) {
-      if (!this.fileValidator(file)) {
-        /// todo: 显示错误信息
-        return false;
-      }
-      if (this.tableData.filter(f => f.name === file.name).length > 0) {
-        this.$error(this.$t('load_test.delete_file'));
-        return false;
-      }
-
-      let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-
-      this.tableData.push({
-        name: file.name,
-        size: (file.size / 1024).toFixed(2) + ' KB',
-        type: type.toUpperCase(),
-        updateTime: file.lastModified,
-      });
-
-      return true;
-    },
-    beforeUploadFile(file) {
-      if (!this.fileValidator(file)) {
-        /// todo: 显示错误信息
-        return false;
-      }
-      if (this.tableData.filter(f => f.name === file.name).length > 0) {
-        this.$error(this.$t('load_test.delete_file'));
-        return false;
-      }
-
-      let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-
-      this.tableData.push({
-        name: file.name,
-        size: (file.size / 1024).toFixed(2) + ' KB',
-        type: type.toUpperCase(),
-        updateTime: file.lastModified,
-      });
-
-      return true;
-    },
-    handleUpload(uploadResources) {
-      let self = this;
-      let file = uploadResources.file;
-      self.uploadList.push(file);
-      let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-      if (type.toLowerCase() !== 'jmx') {
-        return;
-      }
-      let jmxReader = new FileReader();
-      jmxReader.onload = (event) => {
-        self.threadGroups = self.threadGroups.concat(findThreadGroup(event.target.result, file.name));
-        self.$emit('fileChange', self.threadGroups);
-      };
-      jmxReader.readAsText(file);
-    },
     selectAttachFileById(metadataIdArr) {
       this.metadataIdList = metadataIdArr;
       for (let i = 0; i < metadataIdArr.length; i++) {
@@ -380,13 +292,6 @@ export default {
     tgTypeChange(row) {
       this.$emit("tgTypeChange", row);
     },
-    handleExceed() {
-      this.$error(this.$t('load_test.file_size_limit'));
-    },
-    fileValidator(file) {
-      /// todo: 是否需要对文件内容和大小做限制
-      return file.size > 0;
-    },
     updatedFileList() {
       return this.fileList;// 表示修改了已经上传的文件列表
     },
@@ -414,7 +319,7 @@ export default {
     },
     validConfig() {
       if (this.uploadList.length + this.fileList.length > this.fileNumLimit) {
-        this.handleExceed();
+        this.$refs.existFiles.handleExceed();
         return false;
       }
 
diff --git a/frontend/src/business/components/performance/test/components/ResourceFiles.vue b/frontend/src/business/components/performance/test/components/ResourceFiles.vue
new file mode 100644
index 0000000000..a54952cfc5
--- /dev/null
+++ b/frontend/src/business/components/performance/test/components/ResourceFiles.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-dialog :close-on-click-modal="false"
+             :destroy-on-close="true"
+             :title="$t('load_test.exist_jmx')" width="70%"
+             :visible.sync="loadFileVisible">
+    <el-row>
+      <el-upload
+        style="padding-right: 10px;"
+        accept=".jmx,.jar,.csv,.json,.pdf,.jpg,.png,.jpeg,.doc,.docx,.xlsx"
+        action=""
+        :limit="fileNumLimit"
+        multiple
+        :show-file-list="false"
+        :before-upload="beforeUploadFile"
+        :http-request="handleUpload"
+        :on-exceed="handleExceed"
+        :file-list="fileList">
+        <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
+                         :content="$t('load_test.upload_file')"/>
+      </el-upload>
+    </el-row>
+
+    <el-table v-loading="projectLoadingResult.loading"
+              class="basic-config"
+              :data="existFiles">
+
+      <el-table-column type="selection"/>
+      <el-table-column
+        prop="name"
+        :label="$t('load_test.file_name')">
+      </el-table-column>
+      <el-table-column
+        prop="type"
+        :label="$t('load_test.file_type')">
+      </el-table-column>
+      <el-table-column
+        :label="$t('load_test.last_modify_time')">
+        <template v-slot:default="scope">
+          <i class="el-icon-time"/>
+          <span class="last-modified">{{ scope.row.updateTime | timestampFormatDate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('commons.operating')">
+        <template v-slot:default="scope">
+          <ms-table-operator-button :is-tester-permission="true"
+                                    icon="el-icon-delete"
+                                    type="danger"
+                                    :tip="$t('commons.delete')"
+                                    @exec="handleDelete(scope.row)">
+          </ms-table-operator-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <ms-table-pagination :change="getProjectFiles" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                         :total="total"/>
+
+  </el-dialog>
+</template>
+
+<script>
+import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+import MsTableButton from "@/business/components/common/components/MsTableButton";
+import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+import {getCurrentProjectID} from "@/common/js/utils";
+import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
+import {Message} from "element-ui";
+
+export default {
+  name: "MsResourceFiles",
+  components: {MsTableOperatorButton, MsDialogFooter, MsTableButton, MsTablePagination},
+  data() {
+    return {
+      loadFileVisible: false,
+      projectLoadingResult: {},
+      currentPage: 1,
+      pageSize: 5,
+      total: 0,
+      existFiles: [],
+      fileList: [],
+      uploadList: [],
+      fileNumLimit: 10,
+    }
+  },
+  methods: {
+    open() {
+      this.loadFileVisible = true;
+      this.getProjectFiles();
+    },
+    close() {
+      this.loadFileVisible = false;
+      this.selectIds.clear();
+    },
+    getProjectFiles() {
+      this.projectLoadingResult = this.$get('/performance/project/all/' + getCurrentProjectID() + "/" + this.currentPage + "/" + this.pageSize, res => {
+        let data = res.data;
+        this.total = data.itemCount;
+        this.existFiles = data.listObject;
+      })
+    },
+    fileValidator(file) {
+      /// todo: 是否需要对文件内容和大小做限制
+      return file.size > 0;
+    },
+    beforeUploadFile(file) {
+      if (!this.fileValidator(file)) {
+        /// todo: 显示错误信息
+        return false;
+      }
+
+      return true;
+    },
+    handleUpload(uploadResources) {
+      let file = uploadResources.file;
+      let formData = new FormData();
+      let url = '/project/upload/files/' + getCurrentProjectID()
+      formData.append("file", file);
+      let options = {
+        method: 'POST',
+        url: url,
+        data: formData,
+        headers: {
+          'Content-Type': undefined
+        }
+      }
+      this.$request(options, (response) => {
+        this.$success(this.$t('commons.save_success'));
+        this.getProjectFiles();
+      });
+    },
+    handleExceed() {
+      this.$error(this.$t('load_test.file_size_limit'));
+    },
+    handleDelete(row) {
+      console.log(row);
+      this.$confirm(this.$t('project.file_delete_tip', [row.name]), '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        cancelButtonText: this.$t('commons.cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$get('/project/delete/file/' + row.id, response => {
+          Message.success(this.$t('commons.delete_success'));
+        });
+        this.getProjectFiles();
+      }).catch(() => {
+
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/settings/project/MsProject.vue b/frontend/src/business/components/settings/project/MsProject.vue
index 1f111a35cc..d07125ca22 100644
--- a/frontend/src/business/components/settings/project/MsProject.vue
+++ b/frontend/src/business/components/settings/project/MsProject.vue
@@ -7,6 +7,8 @@
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" icon="el-icon-box"
                              :content="$t('api_test.jar_config.title')" @click="openJarConfig"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-files"
+                             :content="$t('load_test.other_resource')" @click="openFiles"/>
           </template>
         </ms-table-header>
       </template>
@@ -88,6 +90,7 @@
 
     <ms-jar-config ref="jarConfig"/>
 
+    <ms-resource-files ref="resourceFiles"/>
   </div>
 </template>
 
@@ -109,10 +112,12 @@ import {PROJECT_ID} from "@/common/js/constants";
 import MsJarConfig from "../../api/test/components/jar/JarConfig";
 import MsTableButton from "../../common/components/MsTableButton";
 import {_sort} from "@/common/js/tableUtils";
+import MsResourceFiles from "@/business/components/performance/test/components/ResourceFiles";
 
 export default {
   name: "MsProject",
   components: {
+    MsResourceFiles,
     MsTableButton,
     MsJarConfig,
     TemplateComponent,
@@ -121,170 +126,173 @@ export default {
     MsDeleteConfirm,
     MsMainContainer,
     MsContainer, MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader, MsDialogFooter
-    },
-    data() {
-      return {
-        createVisible: false,
-        result: {},
-        btnTips: this.$t('project.create'),
-        title: this.$t('project.create'),
-        condition: {},
-        items: [],
-        tapd: false,
-        jira: false,
-        zentao: false,
-        form: {},
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        rules: {
-          name: [
-            {required: true, message: this.$t('project.input_name'), trigger: 'blur'},
-            {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}
-          ],
-          description: [
-            {max: 250, message: this.$t('commons.input_limit', [0, 250]), trigger: 'blur'}
-          ],
-        },
+  },
+  data() {
+    return {
+      createVisible: false,
+      result: {},
+      btnTips: this.$t('project.create'),
+      title: this.$t('project.create'),
+      condition: {},
+      items: [],
+      tapd: false,
+      jira: false,
+      zentao: false,
+      form: {},
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      rules: {
+        name: [
+          {required: true, message: this.$t('project.input_name'), trigger: 'blur'},
+          {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}
+        ],
+        description: [
+          {max: 250, message: this.$t('commons.input_limit', [0, 250]), trigger: 'blur'}
+        ],
+      },
+    }
+  },
+  props: {
+    baseUrl: {
+      type: String
+    }
+  },
+  mounted() {
+    if (this.$route.path.split('/')[2] === 'project' &&
+      this.$route.path.split('/')[3] === 'create') {
+      this.create();
+      this.$router.replace('/setting/project/all');
+    }
+    this.list();
+  },
+  activated() {
+    this.list();
+  },
+  computed: {
+    currentUser: () => {
+      return getCurrentUser();
+    }
+  },
+  destroyed() {
+    this.createVisible = false;
+  },
+  methods: {
+    create() {
+      let workspaceId = this.currentUser.lastWorkspaceId;
+      if (!workspaceId) {
+        this.$warning(this.$t('project.please_choose_workspace'));
+        return false;
       }
+      this.title = this.$t('project.create');
+      // listenGoBack(this.handleClose);
+      this.createVisible = true;
+      this.form = {};
     },
-    props: {
-      baseUrl: {
-        type: String
-      }
+    edit(row) {
+      this.title = this.$t('project.edit');
+      this.createVisible = true;
+      listenGoBack(this.handleClose);
+      this.form = Object.assign({}, row);
+      this.$get("/service/integration/all/" + getCurrentUser().lastOrganizationId, response => {
+        let data = response.data;
+        let platforms = data.map(d => d.platform);
+        if (platforms.indexOf("Tapd") !== -1) {
+          this.tapd = true;
+        }
+        if (platforms.indexOf("Jira") !== -1) {
+          this.jira = true;
+        }
+        if (platforms.indexOf("Zentao") !== -1) {
+          this.zentao = true;
+        }
+      });
     },
-    mounted() {
-      if (this.$route.path.split('/')[2] === 'project' &&
-        this.$route.path.split('/')[3] === 'create') {
-        this.create();
-        this.$router.replace('/setting/project/all');
-      }
-      this.list();
-    },
-    activated() {
-      this.list();
-    },
-    computed: {
-      currentUser: () => {
-        return getCurrentUser();
-      }
-    },
-    destroyed() {
-      this.createVisible = false;
-    },
-    methods: {
-      create() {
-        let workspaceId = this.currentUser.lastWorkspaceId;
-        if (!workspaceId) {
-          this.$warning(this.$t('project.please_choose_workspace'));
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let saveType = "add";
+          if (this.form.id) {
+            saveType = "update"
+          }
+          this.result = this.$post("/project/" + saveType, this.form, () => {
+            this.createVisible = false;
+            this.list();
+            Message.success(this.$t('commons.save_success'));
+          });
+        } else {
           return false;
         }
-        this.title = this.$t('project.create');
-        // listenGoBack(this.handleClose);
-        this.createVisible = true;
-        this.form = {};
-      },
-      edit(row) {
-        this.title = this.$t('project.edit');
-        this.createVisible = true;
-        listenGoBack(this.handleClose);
-        this.form = Object.assign({}, row);
-        this.$get("/service/integration/all/" + getCurrentUser().lastOrganizationId, response => {
-          let data = response.data;
-          let platforms = data.map(d => d.platform);
-          if (platforms.indexOf("Tapd") !== -1) {
-            this.tapd = true;
-          }
-          if (platforms.indexOf("Jira") !== -1) {
-            this.jira = true;
-          }
-          if (platforms.indexOf("Zentao") !== -1) {
-            this.zentao = true;
-          }
-        });
-      },
-      submit(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            let saveType = "add";
-            if (this.form.id) {
-              saveType = "update"
-            }
-            this.result = this.$post("/project/" + saveType, this.form, () => {
-              this.createVisible = false;
-              this.list();
-              Message.success(this.$t('commons.save_success'));
-            });
-          } else {
-            return false;
-          }
-        });
-      },
-      openJarConfig() {
-        this.$refs.jarConfig.open();
-      },
-      handleDelete(project) {
-        this.$refs.deleteConfirm.open(project);
-      },
-      _handleDelete(project) {
-        this.$confirm(this.$t('project.delete_tip'), '', {
-          confirmButtonText: this.$t('commons.confirm'),
-          cancelButtonText: this.$t('commons.cancel'),
-          type: 'warning'
-        }).then(() => {
-          this.$get('/project/delete/' + project.id, () => {
-            if (project.id === getCurrentProjectID()) {
-              localStorage.removeItem(PROJECT_ID);
-              this.$post("/user/update/current", {id: getCurrentUser().id, lastProjectId: ''});
-            }
-            Message.success(this.$t('commons.delete_success'));
-            this.list();
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: this.$t('commons.delete_cancelled')
-          });
-        });
-      },
-      handleClose() {
-        removeGoBackListener(this.handleClose);
-        this.createVisible = false;
-        this.tapd = false;
-        this.jira = false;
-        this.zentao = false;
-      },
-      search() {
-        this.list();
-      },
-      list() {
-        let url = "/project/list/" + this.currentPage + '/' + this.pageSize;
-        this.result = this.$post(url, this.condition, (response) => {
-          let data = response.data;
-          this.items = data.listObject;
-          this.total = data.itemCount;
-        })
-      },
-      sort(column) {
-        _sort(column, this.condition);
-        this.list();
-      },
-      openEnvironmentConfig(project) {
-        this.$refs.environmentConfig.open(project.id);
-      },
+      });
     },
-    created() {
-      document.addEventListener('keydown', this.handleEvent)
+    openJarConfig() {
+      this.$refs.jarConfig.open();
     },
-    beforeDestroy() {
-      document.removeEventListener('keydown', this.handleEvent);
-    }
+    openFiles() {
+      this.$refs.resourceFiles.open();
+    },
+    handleDelete(project) {
+      this.$refs.deleteConfirm.open(project);
+    },
+    _handleDelete(project) {
+      this.$confirm(this.$t('project.delete_tip'), '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        cancelButtonText: this.$t('commons.cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$get('/project/delete/' + project.id, () => {
+          if (project.id === getCurrentProjectID()) {
+            localStorage.removeItem(PROJECT_ID);
+            this.$post("/user/update/current", {id: getCurrentUser().id, lastProjectId: ''});
+          }
+          Message.success(this.$t('commons.delete_success'));
+          this.list();
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: this.$t('commons.delete_cancelled')
+        });
+      });
+    },
+    handleClose() {
+      removeGoBackListener(this.handleClose);
+      this.createVisible = false;
+      this.tapd = false;
+      this.jira = false;
+      this.zentao = false;
+    },
+    search() {
+      this.list();
+    },
+    list() {
+      let url = "/project/list/" + this.currentPage + '/' + this.pageSize;
+      this.result = this.$post(url, this.condition, (response) => {
+        let data = response.data;
+        this.items = data.listObject;
+        this.total = data.itemCount;
+      })
+    },
+    sort(column) {
+      _sort(column, this.condition);
+      this.list();
+    },
+    openEnvironmentConfig(project) {
+      this.$refs.environmentConfig.open(project.id);
+    },
+  },
+  created() {
+    document.addEventListener('keydown', this.handleEvent)
+  },
+  beforeDestroy() {
+    document.removeEventListener('keydown', this.handleEvent);
   }
+}
 </script>
 
 <style scoped>
-  pre {
-    margin: 0 0;
-    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
-  }
+pre {
+  margin: 0 0;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+}
 </style>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 663306aef7..cee8d7f0e9 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -338,6 +338,7 @@ export default {
     delete: 'Delete project',
     delete_confirm: 'Deleting this project will delete all test resources under this project. Are you sure you want to delete?',
     delete_tip: 'Deleting this project will delete all test resources under this project. Are you sure you want to delete?',
+    file_delete_tip: 'Deleting this project file: {0}？',
     search_by_name: 'Search by name',
     search_by_name_jar: 'Search by name/jar',
     input_name: 'Please enter a workspace name',
@@ -530,6 +531,7 @@ export default {
     load_exist_jmx: 'Load Project JMX',
     threadgroup_at_least_one: 'At least one ThreadGroup is enabled',
     load_api_automation_jmx: 'Import API automation scenario',
+    project_file_exist: "The file already exists in the project, please import it directly"
   },
   api_test: {
     creator: "Creator",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 7786e7e492..cf744e4cf7 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -335,6 +335,7 @@ export default {
     delete: '删除项目',
     delete_confirm: '确定要删除这个项目吗?',
     delete_tip: '删除该项目，会删除该项目下所有测试资源，确定要删除吗?',
+    file_delete_tip: '删除该项目的文件: {0}？',
     search_by_name: '根据名称搜索',
     search_by_name_jar: '根据 名称 / jar包 搜索',
     input_name: '请输入项目名称',
@@ -525,10 +526,11 @@ export default {
     exist_jmx: '已存在的文件',
     other_resource: '资源文件',
     upload_file: '上传新文件',
-    load_exist_file: '加载已有文件',
-    load_exist_jmx: '加载已有 JMX 文件',
+    load_exist_file: '加载文件',
+    load_exist_jmx: '加载 JMX 文件',
     threadgroup_at_least_one: '至少启用一个线程组',
     load_api_automation_jmx: '引用接口自动化场景',
+    project_file_exist: "项目中已存在该文件，请直接引用"
   },
   api_test: {
     creator: "创建人",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 0707e7a6fa..0cbee14b76 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -335,6 +335,7 @@ export default {
     delete: '刪除項目',
     delete_confirm: '確定要刪除這個項目嗎?',
     delete_tip: '刪除該項目，會刪除該項目下所有測試資源，確定要刪除嗎?',
+    file_delete_tip: '刪除該項目的文件: {0}？',
     search_by_name: '根據名稱搜索',
     search_by_name_jar: '根據名稱/jar包搜索',
     input_name: '請輸入項目名稱',
@@ -525,10 +526,11 @@ export default {
     exist_jmx: '已存在的文件',
     other_resource: '資源文件',
     upload_file: '上傳新文件',
-    load_exist_file: '加載已有文件',
-    load_exist_jmx: '加載已有 JMX 文件',
+    load_exist_file: '加載文件',
+    load_exist_jmx: '加載 JMX 文件',
     threadgroup_at_least_one: '至少啟用一個線程組',
     load_api_automation_jmx: '引用接口自動化場景',
+    project_file_exist: "項目中已存在該文件，請直接引用"
   },
   api_test: {
     creator: "創建人",

From 7fe6b3660de7d5a7e0e6f8fce319083e73538444 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Mar 2021 13:47:56 +0800
Subject: [PATCH 22/95] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/test/components/ResourceFiles.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/test/components/ResourceFiles.vue b/frontend/src/business/components/performance/test/components/ResourceFiles.vue
index a54952cfc5..f2989ce4e0 100644
--- a/frontend/src/business/components/performance/test/components/ResourceFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ResourceFiles.vue
@@ -139,8 +139,8 @@ export default {
       }).then(() => {
         this.$get('/project/delete/file/' + row.id, response => {
           Message.success(this.$t('commons.delete_success'));
+          this.getProjectFiles();
         });
-        this.getProjectFiles();
       }).catch(() => {
 
       });

From d35d135478b0bf63689946acfa3b37b793f571ad Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Mar 2021 13:53:48 +0800
Subject: [PATCH 23/95] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=E4=B8=8D=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/service/PerformanceTestService.java       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
index 1100f9dba3..6a73af82b5 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -238,9 +238,11 @@ public class PerformanceTestService {
         // 相减
         List<String> deleteFileIds = ListUtils.subtract(originFileIds, updatedFileIds);
         // 删除已经不相关的文件
-        LoadTestFileExample example3 = new LoadTestFileExample();
-        example3.createCriteria().andFileIdIn(deleteFileIds);
-        loadTestFileMapper.deleteByExample(example3);
+        if (!CollectionUtils.isEmpty(deleteFileIds)) {
+            LoadTestFileExample example3 = new LoadTestFileExample();
+            example3.createCriteria().andFileIdIn(deleteFileIds);
+            loadTestFileMapper.deleteByExample(example3);
+        }
 
         // 导入项目里其他的文件
         List<String> addFileIds = ListUtils.subtract(updatedFileIds, originFileIds);

From 93dc64b11a67de3c44fd5e8a3926e4d337a11f49 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:41:21 +0800
Subject: [PATCH 24/95] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E5=85=B3=E8=81=94=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/view/comonents/base/TestCaseRelevanceBase.vue  | 4 ++++
 .../view/comonents/functional/TestCaseFunctionalRelevance.vue | 4 ----
 .../track/review/view/components/TestReviewRelevance.vue      | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 90d64d5d78..3f8f26c215 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -19,6 +19,9 @@
         <slot name="footer"></slot>
       </div>
       <div v-else>
+        <div style="margin-bottom: 15px;margin-right: 0">
+          <el-checkbox v-model="checked">同步添加关联的接口和性能测试</el-checkbox>
+        </div>
         <ms-dialog-footer @cancel="close" @confirm="save"/>
       </div>
     </template>
@@ -41,6 +44,7 @@
     },
     data() {
       return {
+        checked: true,
         result: {},
         currentProject: {},
         projectId: '',
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
index 08556d7830..cd929ced3e 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
@@ -63,10 +63,6 @@
 
     <div v-if="!lineStatus" style="text-align: center">{{ $t('test_track.review_view.last_page') }}</div>
     <div style="text-align: center">共 {{ total }} 条</div>
-    <div style="margin-bottom: 15px;margin-right: 0">
-      <el-checkbox v-model="checked">同步添加关联的接口和性能测试</el-checkbox>
-    </div>
-
   </test-case-relevance-base>
 
 </template>
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 fd26bfea02..3bb34e2570 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -133,6 +133,7 @@ export default {
     },
     data() {
       return {
+        checked: true,
         result: {},
         currentProject: {},
         dialogFormVisible: false,

From 15feda52f6052a5278062ba195e68a642a82909c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Mar 2021 16:41:38 +0800
Subject: [PATCH 25/95] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E7=BC=BA=E5=B0=91sql=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/db/migration/V78__v1.8_release.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
index c18df38be6..eb9441699c 100644
--- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql
+++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
@@ -147,6 +147,9 @@ alter table schedule drop column custom_data;
 -- add sort column
 alter table load_test_file add sort int default 0;
 
+alter table file_metadata
+    add project_id VARCHAR(50) null;
+
 UPDATE file_metadata JOIN (SELECT file_id, project_id
                            FROM load_test_file
                                     JOIN load_test ON test_id = load_test.id) temp ON file_id = file_metadata.id

From f74bf38052ea591c8af2e2198e8553781a6032bf Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:48:26 +0800
Subject: [PATCH 26/95] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=92=8C=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanLoadCaseMapper.java |  1 +
 .../commons/constants/TestCaseStatus.java     |  5 ++
 .../testcase/PlanCaseRelevanceRequest.java    |  2 +
 .../testreview/ReviewRelevanceRequest.java    |  2 +
 .../track/service/TestCaseReviewService.java  | 76 ++++++++++++++++++-
 .../track/service/TestPlanService.java        | 70 +++++++++++++++++
 .../comonents/base/TestCaseRelevanceBase.vue  |  2 +-
 .../TestCaseFunctionalRelevance.vue           |  3 +-
 .../view/components/TestReviewRelevance.vue   |  1 +
 9 files changed, 156 insertions(+), 6 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/TestCaseStatus.java

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
index 2cb340e72f..f0698d3fc2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
@@ -12,4 +12,5 @@ public interface ExtTestPlanLoadCaseMapper {
     List<TestPlanLoadCaseDTO> selectTestPlanLoadCaseList(@Param("request") LoadCaseRequest request);
     void updateCaseStatus(@Param("reportId") String reportId, @Param("status") String status);
     List<String> getStatusByTestPlanId(@Param("planId") String planId);
+
 }
diff --git a/backend/src/main/java/io/metersphere/commons/constants/TestCaseStatus.java b/backend/src/main/java/io/metersphere/commons/constants/TestCaseStatus.java
new file mode 100644
index 0000000000..9b14b52f92
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/TestCaseStatus.java
@@ -0,0 +1,5 @@
+package io.metersphere.commons.constants;
+
+public enum TestCaseStatus {
+    performance,api,testcase,automation
+}
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java
index 7689ebf5e0..adc3db14a3 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java
@@ -23,4 +23,6 @@ public class PlanCaseRelevanceRequest {
      * 具体要关联的用例
      */
     private List<String> testCaseIds = new ArrayList<>();
+
+    private Boolean checked;
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java b/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java
index 3d1fbf5aac..cc9bdfe534 100644
--- a/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java
@@ -24,4 +24,6 @@ public class ReviewRelevanceRequest {
      * 具体选择要关联的用例
      */
     private List<String> testCaseIds = new ArrayList<>();
+
+    private  Boolean checked;
 }
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 948ae0af0f..3cff08ec4e 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -6,10 +6,7 @@ import io.metersphere.base.mapper.ext.ExtProjectMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseReviewMapper;
 import io.metersphere.base.mapper.ext.ExtTestReviewCaseMapper;
-import io.metersphere.commons.constants.NoticeConstants;
-import io.metersphere.commons.constants.TestCaseReviewStatus;
-import io.metersphere.commons.constants.TestPlanStatus;
-import io.metersphere.commons.constants.TestReviewCaseStatus;
+import io.metersphere.commons.constants.*;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.LogUtil;
@@ -77,6 +74,19 @@ public class TestCaseReviewService {
     private NoticeSendService noticeSendService;
     @Resource
     private SystemParameterService systemParameterService;
+    @Resource
+    private TestCaseReviewLoadMapper testCaseReviewLoadMapper;
+    @Resource
+    private TestCaseReviewApiCaseMapper testCaseReviewApiCaseMapper;
+    @Resource
+    private TestCaseReviewScenarioMapper testCaseReviewScenarioMapper;
+    @Resource
+    private ApiTestCaseMapper apiTestCaseMapper;
+    @Resource
+    private ApiScenarioMapper apiScenarioMapper;
+    @Resource
+    private ApiDefinitionMapper apiDefinitionMapper;
+
 
     public String saveTestCaseReview(SaveTestCaseReviewRequest reviewRequest) {
         checkCaseReviewExist(reviewRequest);
@@ -366,7 +376,65 @@ public class TestCaseReviewService {
         }
 
         sqlSession.flushStatements();
+        //同步添加关联的接口和测试用例
+        if(request.getChecked()){
+            if (!testCaseIds.isEmpty()) {
+                testCaseIds.forEach(caseId -> {
+                    TestCaseWithBLOBs testDtail=testCaseMapper.selectByPrimaryKey(caseId);
+                    if(StringUtils.equals(testDtail.getType(), TestCaseStatus.performance.name())){
+                        TestCaseReviewLoad t=new TestCaseReviewLoad();
+                        t.setId(UUID.randomUUID().toString());
+                        t.setTestCaseReviewId(request.getReviewId());
+                        t.setLoadCaseId(testDtail.getTestId());
+                        t.setCreateTime(System.currentTimeMillis());
+                        t.setUpdateTime(System.currentTimeMillis());
+                        TestCaseReviewLoadExample example=new TestCaseReviewLoadExample();
+                        example.createCriteria().andTestCaseReviewIdEqualTo(request.getReviewId()).andLoadCaseIdEqualTo(t.getLoadCaseId());
+                        if (testCaseReviewLoadMapper.countByExample(example) <=0) {
+                            testCaseReviewLoadMapper.insert(t);
+                        }
 
+                    }
+                    if(StringUtils.equals(testDtail.getType(),TestCaseStatus.testcase.name())){
+                        TestCaseReviewApiCase t=new TestCaseReviewApiCase();
+                        ApiTestCaseWithBLOBs apitest=apiTestCaseMapper.selectByPrimaryKey(testDtail.getTestId());
+                        ApiDefinitionWithBLOBs apidefinition=apiDefinitionMapper.selectByPrimaryKey(apitest.getApiDefinitionId());
+                        t.setId(UUID.randomUUID().toString());
+                        t.setTestCaseReviewId(request.getReviewId());
+                        t.setApiCaseId(testDtail.getTestId());
+                        t.setEnvironmentId(apidefinition.getEnvironmentId());
+                        t.setCreateTime(System.currentTimeMillis());
+                        t.setUpdateTime(System.currentTimeMillis());
+                        TestCaseReviewApiCaseExample example=new TestCaseReviewApiCaseExample();
+                        example.createCriteria().andTestCaseReviewIdEqualTo(request.getReviewId()).andApiCaseIdEqualTo(t.getApiCaseId());
+                        if(testCaseReviewApiCaseMapper.countByExample(example)<=0){
+                            testCaseReviewApiCaseMapper.insert(t);
+                        }
+
+                    }
+                    if(StringUtils.equals(testDtail.getType(),TestCaseStatus.automation.name())){
+                        TestCaseReviewScenario t=new TestCaseReviewScenario();
+                        ApiScenarioWithBLOBs testPlanApiScenario=apiScenarioMapper.selectByPrimaryKey(testDtail.getTestId());
+                        t.setId(UUID.randomUUID().toString());
+                        t.setTestCaseReviewId(request.getReviewId());
+                        t.setApiScenarioId(testDtail.getTestId());
+                        t.setLastResult(testPlanApiScenario.getLastResult());
+                        t.setPassRate(testPlanApiScenario.getPassRate());
+                        t.setReportId(testPlanApiScenario.getReportId());
+                        t.setStatus(testPlanApiScenario.getStatus());
+                        t.setCreateTime(System.currentTimeMillis());
+                        t.setUpdateTime(System.currentTimeMillis());
+                        TestCaseReviewScenarioExample example=new TestCaseReviewScenarioExample();
+                        example.createCriteria().andTestCaseReviewIdEqualTo(request.getReviewId()).andApiScenarioIdEqualTo(t.getApiScenarioId());
+                        if(testCaseReviewScenarioMapper.countByExample(example)<=0){
+                            testCaseReviewScenarioMapper.insert(t);
+                        }
+
+                    }
+
+                });
+            }
+        }
         TestCaseReview testCaseReview = testCaseReviewMapper.selectByPrimaryKey(request.getReviewId());
         if (StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Prepare.name())
                 || StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Completed.name())) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 2ab2c5a1b0..9961681125 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -114,6 +114,18 @@ public class TestPlanService {
     private ApiTestCaseService apiTestCaseService;
     @Resource
     private PerformanceTestService performanceTestService;
+    @Resource
+    private TestPlanLoadCaseMapper testPlanLoadCaseMapper;
+    @Resource
+    private ApiTestCaseMapper  apiTestCaseMapper;
+    @Resource
+    private ApiDefinitionMapper  apiDefinitionMapper;
+    @Resource
+    private TestPlanApiCaseMapper  testPlanApiCaseMapper;
+    @Resource
+    private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
+    @Resource
+    private ApiScenarioMapper apiScenarioMapper;
 
     public synchronized void addTestPlan(AddTestPlanRequest testPlan) {
         if (getTestPlanByName(testPlan.getName()).size() > 0) {
@@ -416,7 +428,65 @@ public class TestPlanService {
         }
 
         sqlSession.flushStatements();
+        //同步添加关联的接口和测试用例
+        if(request.getChecked()){
+            if (!testCaseIds.isEmpty()) {
+                testCaseIds.forEach(caseId -> {
+                    TestCaseWithBLOBs testDtail=testCaseMapper.selectByPrimaryKey(caseId);
+                    if(StringUtils.equals(testDtail.getType(),TestCaseStatus.performance.name())){
+                        TestPlanLoadCase t = new TestPlanLoadCase();
+                        t.setId(UUID.randomUUID().toString());
+                        t.setTestPlanId(request.getPlanId());
+                        t.setLoadCaseId(testDtail.getTestId());
+                        t.setCreateTime(System.currentTimeMillis());
+                        t.setUpdateTime(System.currentTimeMillis());
+                        TestPlanLoadCaseExample testPlanLoadCaseExample=new TestPlanLoadCaseExample();
+                        testPlanLoadCaseExample.createCriteria().andTestPlanIdEqualTo(request.getPlanId()).andLoadCaseIdEqualTo(t.getLoadCaseId());
+                        if (testPlanLoadCaseMapper.countByExample(testPlanLoadCaseExample) <=0) {
+                            testPlanLoadCaseMapper.insert(t);
+                        }
 
+                    }
+                    if(StringUtils.equals(testDtail.getType(),TestCaseStatus.testcase.name())){
+                        TestPlanApiCase t=new TestPlanApiCase();
+                        ApiTestCaseWithBLOBs apitest=apiTestCaseMapper.selectByPrimaryKey(testDtail.getTestId());
+                        ApiDefinitionWithBLOBs apidefinition=apiDefinitionMapper.selectByPrimaryKey(apitest.getApiDefinitionId());
+                        t.setId(UUID.randomUUID().toString());
+                        t.setTestPlanId(request.getPlanId());
+                        t.setApiCaseId(testDtail.getTestId());
+                        t.setEnvironmentId(apidefinition.getEnvironmentId());
+                        t.setCreateTime(System.currentTimeMillis());
+                        t.setUpdateTime(System.currentTimeMillis());
+                        TestPlanApiCaseExample example=new TestPlanApiCaseExample();
+                        example.createCriteria().andTestPlanIdEqualTo(request.getPlanId()).andApiCaseIdEqualTo(t.getApiCaseId());
+                        if(testPlanApiCaseMapper.countByExample(example)<=0){
+                            testPlanApiCaseMapper.insert(t);
+                        }
+
+                    }
+                    if(StringUtils.equals(testDtail.getType(),TestCaseStatus.automation.name())){
+                        TestPlanApiScenario t=new TestPlanApiScenario();
+                        ApiScenarioWithBLOBs testPlanApiScenario=apiScenarioMapper.selectByPrimaryKey(testDtail.getTestId());
+                        t.setId(UUID.randomUUID().toString());
+                        t.setTestPlanId(request.getPlanId());
+                        t.setApiScenarioId(testDtail.getTestId());
+                        t.setLastResult(testPlanApiScenario.getLastResult());
+                        t.setPassRate(testPlanApiScenario.getPassRate());
+                        t.setReportId(testPlanApiScenario.getReportId());
+                        t.setStatus(testPlanApiScenario.getStatus());
+                        t.setCreateTime(System.currentTimeMillis());
+                        t.setUpdateTime(System.currentTimeMillis());
+                        TestPlanApiScenarioExample example=new TestPlanApiScenarioExample();
+                        example.createCriteria().andTestPlanIdEqualTo(request.getPlanId()).andApiScenarioIdEqualTo(t.getApiScenarioId());
+                       if(testPlanApiScenarioMapper.countByExample(example)<=0){
+                           testPlanApiScenarioMapper.insert(t);
+                       }
+
+                    }
+
+                });
+            }
+        }
         TestPlan testPlan = testPlanMapper.selectByPrimaryKey(request.getPlanId());
         if (StringUtils.equals(testPlan.getStatus(), TestPlanStatus.Prepare.name())
                 || StringUtils.equals(testPlan.getStatus(), TestPlanStatus.Completed.name())) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 3f8f26c215..0794a6e846 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -74,7 +74,7 @@
       },
 
       save() {
-        this.$emit('save');
+        this.$emit('save', this.checked);
       },
 
       close() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
index cd929ced3e..9d05b3afee 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
@@ -158,11 +158,12 @@ export default {
         this.projectId = projectId;
       },
 
-      saveCaseRelevance() {
+      saveCaseRelevance(item) {
         let param = {};
         param.planId = this.planId;
         param.testCaseIds = [...this.selectIds];
         param.request = this.condition;
+        param.checked = item
         // 选择全选则全部加入到评审，无论是否加载完全部
         if (this.testCases.length === param.testCaseIds.length) {
           param.testCaseIds = ['all'];
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 3bb34e2570..bf36f685a0 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -203,6 +203,7 @@ export default {
         param.reviewId = this.reviewId;
         param.testCaseIds = [...this.selectIds];
         param.request = this.condition;
+        param.checked = this.checked;
         // 选择全选则全部加入到评审，无论是否加载完全部
         if (this.testReviews.length === param.testCaseIds.length) {
           param.testCaseIds = ['all'];

From e88f467105267e458dc3013ce85a96c20626aa75 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 16 Mar 2021 18:03:33 +0800
Subject: [PATCH 27/95] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4=E5=8F=A6?=
 =?UTF-8?q?=E5=AD=98=E6=96=B0=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=8F=8A=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |   7 +-
 .../automation/scenario/api/AddBasisApi.vue   | 284 +++++++++++++
 .../scenario/common/ApiBaseComponent.vue      |  22 +-
 .../scenario/component/ApiComponent.vue       |  12 +-
 .../scenario/component/ComponentConfig.vue    |   6 +-
 .../scenario/component/ConstantTimer.vue      |   4 +-
 .../scenario/component/IfController.vue       |   8 +-
 .../scenario/component/LoopController.vue     |  63 +--
 .../scenario/component/StepExtendBtns.vue     |  21 +-
 .../scenario/maximize/MaximizeScenario.vue    |  59 ++-
 .../scenario/maximize/MsLeftContainer.vue     |  55 +++
 .../components/common/head/HeaderTopMenus.vue |   6 +
 .../common/select-tree/SelectTree.vue         | 390 ++++++++++++++++++
 .../view/comonents/base/RelevanceDialog.vue   |   2 +-
 frontend/src/business/components/xpack        |   2 +-
 15 files changed, 865 insertions(+), 76 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
 create mode 100644 frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue
 create mode 100644 frontend/src/business/components/common/select-tree/SelectTree.vue

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 9f76c1edb4..23f99d87fa 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -119,7 +119,7 @@
                                :project-list="projectList" ref="envPopover"/>
                 </el-col>
                 <el-col :span="3">
-                  <el-button :disabled="scenarioDefinition.length < 1" size="small" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+                  <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
                   <font-awesome-icon class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="fullScreen"/>
                 </el-col>
               </el-row>
@@ -201,7 +201,7 @@
                            @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" ref="maximizeHeader"/>
         </template>
 
-        <maximize-scenario :scenario-definition="scenarioDefinition" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario"/>
+        <maximize-scenario :scenario-definition="scenarioDefinition" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario" @openScenario="openScenario"/>
       </ms-drawer>
 
     </div>
@@ -732,9 +732,6 @@
           this.loading = false
         })
       },
-      runDebugMax() {
-        this.$refs.maximizeScenario.runDebug();
-      },
       runDebug() {
         /*触发执行操作*/
         let sign = this.$refs.envPopover.checkEnv();
diff --git a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
new file mode 100644
index 0000000000..60ef124715
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
@@ -0,0 +1,284 @@
+<template>
+  <el-dialog :close-on-click-modal="false" :title="$t('api_test.definition.request.title')" :visible.sync="httpVisible"
+             width="45%"
+             :destroy-on-close="true" append-to-body>
+    <el-form :model="httpForm" label-position="right" label-width="80px" size="small" :rules="rule" ref="httpForm" v-if="!loading">
+      <el-form-item :label="$t('commons.name')" prop="name">
+        <el-input v-model="httpForm.name" autocomplete="off" :placeholder="$t('commons.name')"/>
+      </el-form-item>
+
+      <!--HTTP 协议特有参数-->
+      <el-form-item :label="$t('api_report.request')" prop="path" v-if="currentProtocol==='HTTP'">
+        <el-input :placeholder="$t('api_test.definition.request.path_info')" v-model="httpForm.path"
+                  class="ms-http-input" size="small">
+          <el-select v-model="httpForm.method" slot="prepend" style="width: 100px" size="small">
+            <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id"/>
+          </el-select>
+        </el-input>
+      </el-form-item>
+
+      <el-form-item :label="$t('api_test.definition.request.responsible')" prop="userId">
+        <el-select v-model="httpForm.userId"
+                   :placeholder="$t('api_test.definition.request.responsible')" filterable size="small"
+                   style="width: 100%">
+          <el-option
+            v-for="item in maintainerOptions"
+            :key="item.id"
+            :label="item.id + ' (' + item.name + ')'"
+            :value="item.id">
+          </el-option>
+        </el-select>
+
+      </el-form-item>
+      <el-form-item :label="$t('test_track.module.module')" prop="moduleId">
+        <ms-select-tree size="small" :data="moduleOptions" @getValue="setModule" :obj="moduleObj" clearable checkStrictly/>
+      </el-form-item>
+
+      <el-form-item :label="$t('commons.description')" prop="description" style="margin-bottom: 29px">
+        <el-input class="ms-http-textarea" v-model="httpForm.description"
+                  type="textarea"
+                  :autosize="{ minRows: 2, maxRows: 10}"
+                  :rows="2" size="small"/>
+      </el-form-item>
+      <el-form-item class="create-tip">
+        {{$t('api_test.definition.create_tip')}}
+      </el-form-item>
+    </el-form>
+
+    <template v-slot:footer>
+      <ms-dialog-footer
+        @cancel="httpVisible = false"
+        @confirm="saveApi" v-prevent-re-click>
+      </ms-dialog-footer>
+
+    </template>
+
+  </el-dialog>
+</template>
+
+<script>
+  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+  import {WORKSPACE_ID} from '../../../../../../common/js/constants';
+  import {REQ_METHOD} from "../../../definition/model/JsonData";
+  import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
+  import {createComponent, Request} from "../../../definition/components/jmeter/components";
+  import {getUUID} from "@/common/js/utils";
+  import MsSelectTree from "@/business/components/common/select-tree/SelectTree";
+
+
+  export default {
+    name: "MsAddBasisApi",
+    components: {MsDialogFooter, MsSelectTree},
+    props: {
+      currentProtocol: {
+        type: String,
+        default: "HTTP"
+      },
+    },
+    data() {
+      let validateURL = (rule, value, callback) => {
+        if (!this.httpForm.path.startsWith("/") || this.httpForm.path.match(/\s/) != null) {
+          callback(this.$t('api_test.definition.request.path_valid_info'));
+        }
+        callback();
+      };
+      return {
+        httpForm: {environmentId: ""},
+        moduleOptions: [],
+        httpVisible: false,
+        currentModule: {},
+        maintainerOptions: [],
+        loading: false,
+        moduleObj: {
+          id: 'id',
+          label: 'name',
+        },
+        rule: {
+          name: [
+            {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
+            {max: 100, message: this.$t('test_track.length_less_than') + '100', trigger: 'blur'}
+          ],
+          path: [{required: true, message: this.$t('api_test.definition.request.path_info'), trigger: 'blur'}, {validator: validateURL, trigger: 'blur'}],
+          userId: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
+          // moduleId: [{required: true, message: this.$t('test_track.module.module'), trigger: 'change'}],
+        },
+        value: REQ_METHOD[0].id,
+        options: REQ_METHOD,
+      }
+    }
+    ,
+    methods: {
+      saveApi() {
+        this.$refs['httpForm'].validate((valid) => {
+          if (valid) {
+            if (this.httpForm.path && this.httpForm.path.match(/\s/) != null) {
+              this.$error(this.$t("api_test.definition.request.path_valid_info"));
+              return false;
+            }
+            this.save(this.httpForm);
+          } else {
+            return false;
+          }
+        })
+      },
+      save(data) {
+        this.setParameters(data);
+        let bodyFiles = this.getBodyUploadFiles(data);
+        this.$fileUpload("/api/definition/create", null, bodyFiles, data, () => {
+          this.saveCase(data);
+        });
+      },
+      saveCase(api) {
+        let obj = {apiDefinitionId: api.id, name: api.name, priority: 'P0', active: true, uuid: getUUID(), request: api.request};
+        obj.projectId = getCurrentProjectID();
+        obj.id = obj.uuid;
+        let url = "/api/testcase/create";
+        let bodyFiles = this.getBodyUploadFiles(obj);
+        this.$fileUpload(url, null, bodyFiles, obj, (response) => {
+          this.$success(this.$t('commons.save_success'));
+          this.httpVisible = false;
+        });
+      },
+      setParameters(data) {
+        data.projectId = getCurrentProjectID();
+        data.request.name = data.name;
+        if (data.protocol === "DUBBO" || data.protocol === "dubbo://") {
+          data.request.protocol = "dubbo://";
+        }
+        data.id = data.request.id;
+        if (!data.method) {
+          data.method = data.protocol;
+        }
+      },
+      getBodyUploadFiles(data) {
+        let bodyUploadFiles = [];
+        data.bodyUploadIds = [];
+        let request = data.request;
+        if (request.body) {
+          if (request.body.kvs) {
+            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;
+                    data.bodyUploadIds.push(fileId);
+                    bodyUploadFiles.push(item.file);
+                  }
+                });
+              }
+            });
+          }
+          if (request.body.binary) {
+            request.body.binary.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;
+                    data.bodyUploadIds.push(fileId);
+                    bodyUploadFiles.push(item.file);
+                  }
+                });
+              }
+            });
+          }
+        }
+        return bodyUploadFiles;
+      },
+      setParameter() {
+        switch (this.currentProtocol) {
+          case Request.TYPES.SQL:
+            this.initSQL();
+            break;
+          case Request.TYPES.DUBBO:
+            this.initDUBBO();
+            break;
+          case Request.TYPES.TCP:
+            this.initTCP();
+            break;
+          default:
+            this.initHTTP();
+            break;
+        }
+        this.httpForm.bodyUploadIds = [];
+        this.httpForm.projectId = getCurrentProjectID();
+        this.httpForm.id = this.httpForm.request.id;
+        this.httpForm.protocol = this.currentProtocol;
+
+        this.httpForm.request.name = this.httpForm.name;
+        this.httpForm.request.protocol = this.currentProtocol;
+        if (this.currentProtocol === 'HTTP') {
+          this.httpForm.request.method = this.httpForm.method;
+          this.httpForm.request.path = this.httpForm.path;
+        }
+        if (this.currentModule != null) {
+          this.httpForm.modulePath = this.currentModule.method != undefined ? this.currentModule.method : null;
+          this.httpForm.moduleId = this.currentModule.id;
+        }
+
+      },
+      initHTTP() {
+        let request = createComponent("HTTPSamplerProxy");
+        request.path = this.httpForm.path;
+        this.httpForm.request = request;
+      },
+      initSQL() {
+        this.httpForm.method = Request.TYPES.SQL;
+        this.httpForm.request = createComponent("JDBCSampler");
+      },
+      initTCP() {
+        this.httpForm.method = Request.TYPES.TCP;
+        this.httpForm.request = createComponent("TCPSampler");
+      },
+      initDUBBO() {
+        this.httpForm.method = "dubbo://";
+        this.httpForm.request = createComponent("DubboSampler");
+      },
+      getMaintainerOptions() {
+        let workspaceId = localStorage.getItem(WORKSPACE_ID);
+        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+          this.maintainerOptions = response.data;
+        });
+      },
+      list(data) {
+        let url = "/api/module/list/" + getCurrentProjectID() + "/" + data.protocol;
+        this.result = this.$get(url, response => {
+          if (response.data != undefined && response.data != null) {
+            this.moduleOptions = response.data;
+          }
+        });
+      },
+      setModule(id) {
+        this.httpForm.moduleId = id;
+        //this.reload();
+      },
+      reload() {
+        this.loading = true
+        this.$nextTick(() => {
+          this.loading = false
+        })
+      },
+      open(api) {
+        if (api) {
+          let data = JSON.parse(JSON.stringify(api));
+          data.id = getUUID();
+          this.httpForm = {id: data.id, name: data.name, protocol: data.protocol, path: data.path, method: REQ_METHOD[0].id, userId: getCurrentUser().id, request: data};
+          this.getMaintainerOptions();
+          this.list(data);
+          this.httpVisible = true;
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+  .create-tip {
+    color: #8c939d;
+  }
+
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index ec877c34f5..a2462b7669 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -5,7 +5,7 @@
         <div v-if="data.index" class="el-step__icon is-text" style="margin-right: 10px;" :style="{'color': color, 'background-color': backgroundColor}">
           <div class="el-step__icon-inner">{{data.index}}</div>
         </div>
-        <el-button class="ms-left-buttion" size="mini" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-button>
+        <el-tag class="ms-left-buttion" size="small" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-tag>
         <el-tag size="mini" v-if="data.method">{{data.method}}</el-tag>
       </slot>
 
@@ -15,12 +15,6 @@
              @click="active(data)" v-if="data.type!='scenario'  && !isMax "/>
           <el-input :draggable="draggable" v-if="isShowInput && isShowNameInput" size="mini" v-model="data.name" class="name-input"
                     @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
-          <!--最大化显示-->
-          <span v-else-if="isMax">
-             <el-tooltip :content="data.name" placement="top">
-              <span>{{data.name}}</span>
-            </el-tooltip>
-          </span>
           <span v-else>
             {{data.name}}
             <i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled"/>
@@ -32,7 +26,7 @@
       <div class="header-right" @click.stop>
         <slot name="message"></slot>
         <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="showBtn">
-          <el-switch v-model="data.enable" class="enable-switch"/>
+          <el-switch v-model="data.enable" class="enable-switch" size="mini"/>
         </el-tooltip>
         <slot name="button"></slot>
         <step-extend-btns style="display: contents" :data="data" @copy="copyRow" @remove="remove" @openScenario="openScenario" v-if="showBtn"/>
@@ -56,6 +50,7 @@
 
 <script>
   import StepExtendBtns from "../component/StepExtendBtns";
+  import {ELEMENTS} from "../Setting";
 
   export default {
     name: "ApiBaseComponent",
@@ -119,6 +114,11 @@
       if (this.data && this.data.type === "JmeterElement") {
         this.data.active = false;
       }
+      if (this.data && ELEMENTS.get("AllSamplerProxy").indexOf(this.data.type) != -1) {
+        if (!this.data.method) {
+          this.data.method = this.data.protocol;
+        }
+      }
     },
     methods: {
       active() {
@@ -184,6 +184,12 @@
     width: 100px;
   }
 
+  /deep/ .el-step__icon {
+    width: 20px;
+    height: 20px;
+    font-size: 12px;
+  }
+
   fieldset {
     padding: 0px;
     margin: 0px;
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index f0b258f4e0..9dde84f260 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -6,7 +6,7 @@
     @active="active"
     :is-show-name-input="!isDeletedOrRef"
     :data="request"
-    :draggable="true"
+    :draggable="draggable"
     :color="displayColor.color"
     :background-color="displayColor.backgroundColor"
     :is-max="isMax"
@@ -328,7 +328,7 @@
   }
 
   /deep/ .el-card__body {
-    padding: 15px;
+    padding: 10px;
   }
 
   .tip {
@@ -339,14 +339,6 @@
     margin: 20px 0;
   }
 
-  .name-input {
-    width: 30%;
-  }
-
-  .el-icon-arrow-right {
-    margin-right: 5px;
-  }
-
   .icon.is-active {
     transform: rotate(90deg);
   }
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 0e20a0b68e..40231b855d 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -2,7 +2,7 @@
   <div class="request-form">
     <component :is="component" :isMax="isMax" :show-btn="showBtn"
                :scenario="scenario" :controller="scenario" :timer="scenario" :assertions="scenario" :extract="scenario" :jsr223-processor="scenario" :request="scenario" :currentScenario="currentScenario" :currentEnvironmentId="currentEnvironmentId" :node="node"
-               :draggable="true" :title="title" :color="titleColor" :background-color="backgroundColor" @suggestClick="suggestClick(node)" :response="response"
+               :draggable="draggable" :title="title" :color="titleColor" :background-color="backgroundColor" @suggestClick="suggestClick(node)" :response="response"
                @remove="remove" @copyRow="copyRow" @refReload="refReload" @openScenario="openScenario" :project-list="projectList" :env-map="envMap"/>
   </div>
 </template>
@@ -25,6 +25,10 @@
     props: {
       type: String,
       scenario: {},
+      draggable: {
+        type: Boolean,
+        default: true,
+      },
       isMax: {
         type: Boolean,
         default: false,
diff --git a/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue b/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
index d70b221e90..2e765bcee9 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ConstantTimer.vue
@@ -3,7 +3,7 @@
     @copy="copyRow"
     @remove="remove"
     :data="timer"
-    :draggable="true"
+    :draggable="draggable"
     :show-collapse="false"
     :is-max="isMax"
     color="#67C23A"
@@ -11,7 +11,7 @@
     :title="$t('api_test.automation.wait_controller')">
 
     <template v-slot:headerLeft>
-      <el-input-number class="time-input" size="small" v-model="timer.delay" :min="0" :step="1000" ref="nameInput"/>
+      <el-input-number class="time-input" size="mini" v-model="timer.delay" :min="0" :step="1000" ref="nameInput"/>
       ms
     </template>
 
diff --git a/frontend/src/business/components/api/automation/scenario/component/IfController.vue b/frontend/src/business/components/api/automation/scenario/component/IfController.vue
index 866d8fd8d7..13030d0954 100644
--- a/frontend/src/business/components/api/automation/scenario/component/IfController.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/IfController.vue
@@ -4,7 +4,7 @@
     @remove="remove"
     :data="controller"
     :show-collapse="false"
-    :draggable="true"
+    :draggable="draggable"
     :is-max="isMax"
     :show-btn="showBtn"
     color="#E6A23C"
@@ -13,14 +13,14 @@
 
     <template v-slot:headerLeft>
 
-      <el-input draggable size="small" v-model="controller.variable" style="width: 20%" :placeholder="$t('api_test.request.condition_variable')"/>
+      <el-input draggable size="mini" v-model="controller.variable" style="width: 20%" :placeholder="$t('api_test.request.condition_variable')"/>
 
-      <el-select v-model="controller.operator" :placeholder="$t('commons.please_select')" size="small"
+      <el-select v-model="controller.operator" :placeholder="$t('commons.please_select')" size="mini"
                  @change="change" class="ms-select">
         <el-option v-for="o in operators" :key="o.value" :label="$t(o.label)" :value="o.value"/>
       </el-select>
 
-      <el-input draggable size="small" v-model="controller.value" :placeholder="$t('api_test.value')" v-if="!hasEmptyOperator" class="ms-btn"/>
+      <el-input draggable size="mini" v-model="controller.value" :placeholder="$t('api_test.value')" v-if="!hasEmptyOperator" class="ms-btn"/>
     </template>
 
   </api-base-component>
diff --git a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
index ed3c0b7e31..f279355cf1 100644
--- a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
@@ -6,7 +6,7 @@
       @copy="copyRow"
       @remove="remove"
       :data="controller"
-      :draggable="true"
+      :draggable="draggable"
       :is-max="isMax"
       :show-btn="showBtn"
       color="#02A7F0"
@@ -15,9 +15,9 @@
 
       <template v-slot:headerLeft>
         <i class="icon el-icon-arrow-right" :class="{'is-active': controller.active}" @click="active(controller)" style="margin-right: 10px" v-if="!isMax"/>
-        <el-radio @change="changeRadio" class="ms-radio" v-model="controller.loopType" label="LOOP_COUNT">{{$t('loop.loops_title')}}</el-radio>
-        <el-radio @change="changeRadio" class="ms-radio" v-model="controller.loopType" label="FOREACH">{{$t('loop.foreach')}}</el-radio>
-        <el-radio @change="changeRadio" class="ms-radio" v-model="controller.loopType" label="WHILE">{{$t('loop.while')}}</el-radio>
+        <el-radio @change="changeRadio" class="ms-radio ms-radio-margin" v-model="controller.loopType" label="LOOP_COUNT">{{$t('loop.loops_title')}}</el-radio>
+        <el-radio @change="changeRadio" class="ms-radio ms-radio-margin" v-model="controller.loopType" label="FOREACH">{{$t('loop.foreach')}}</el-radio>
+        <el-radio @change="changeRadio" class="ms-radio ms-radio-margin" v-model="controller.loopType" label="WHILE">{{$t('loop.while')}}</el-radio>
       </template>
 
       <template v-slot:message>
@@ -86,36 +86,33 @@
 </template>
 
 <script>
-import ApiBaseComponent from "../common/ApiBaseComponent";
-import ApiResponseComponent from "./ApiResponseComponent";
-import MsRun from "../DebugRun";
-import {getUUID} from "@/common/js/utils";
+  import ApiBaseComponent from "../common/ApiBaseComponent";
+  import ApiResponseComponent from "./ApiResponseComponent";
+  import MsRun from "../DebugRun";
+  import {getUUID} from "@/common/js/utils";
 
-export default {
-  name: "MsLoopController",
-  components: {ApiBaseComponent, ApiResponseComponent, MsRun},
-  props: {
-    controller: {},
-    currentEnvironmentId: String,
-    currentScenario: {},
-    node: {},
-    isMax: {
-      type: Boolean,
-      default: false,
-    },
-    showBtn: {
-      type: Boolean,
-      default: true,
-    },
-    index: Object,
-    draggable: {
-      type: Boolean,
+  export default {
+    name: "MsLoopController",
+    components: {ApiBaseComponent, ApiResponseComponent, MsRun},
+    props: {
+      controller: {},
+      currentEnvironmentId: String,
+      currentScenario: {},
+      node: {},
+      isMax: {
+        type: Boolean,
         default: false,
       },
-    envMap: Map
-    },
-    created() {
-      // this.initResult();
+      showBtn: {
+        type: Boolean,
+        default: true,
+      },
+      index: Object,
+      draggable: {
+        type: Boolean,
+        default: false,
+      },
+      envMap: Map
     },
     data() {
       return {
@@ -344,4 +341,8 @@ export default {
   .icon.is-active {
     transform: rotate(90deg);
   }
+
+  /deep/ .el-radio {
+    margin-right: 5px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
index 7e692824e1..3e81f770a1 100644
--- a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
@@ -13,7 +13,7 @@
       </el-dropdown-menu>
     </el-dropdown>
     <ms-variable-list ref="scenarioParameters"/>
-
+    <ms-add-basis-api ref="api"/>
   </div>
 </template>
 
@@ -21,10 +21,11 @@
   import {getCurrentProjectID, getUUID} from "@/common/js/utils";
   import {ELEMENTS} from "../Setting";
   import MsVariableList from "../variable/VariableList";
+  import MsAddBasisApi from "../api/AddBasisApi";
 
   export default {
     name: "StepExtendBtns",
-    components: {ELEMENTS, MsVariableList},
+    components: {ELEMENTS, MsVariableList, MsAddBasisApi},
     props: {
       data: Object,
     },
@@ -46,13 +47,25 @@
             this.$refs.scenarioParameters.open(this.data.variables, this.data.headers, true);
             break;
           case "openScenario":
-            this.$emit('openScenario', this.data);
+            this.getScenario();
             break;
           case "saveAs":
-            this.$emit('copy');
+            this.saveAsApi();
             break;
         }
       },
+      getScenario() {
+        this.result = this.$get("/api/automation/getApiScenario/" + this.data.id, response => {
+          if (response.data) {
+            this.$emit('openScenario', response.data);
+          } else {
+            this.$error("引用场景已经被删除");
+          }
+        });
+      },
+      saveAsApi(){
+        this.$refs.api.open(this.data);
+      }
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index ea3127afe3..833562fdc8 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -2,7 +2,7 @@
   <div>
     <!-- 场景步骤-->
     <ms-container>
-      <ms-aside-container width="600px" class="scenario-aside">
+      <ms-aside-container>
         <!-- 场景步骤内容 -->
         <div v-loading="loading">
           <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition"
@@ -16,7 +16,7 @@
                       <!-- 步骤组件-->
                        <ms-component-config :isMax="true" :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
                                             :currentEnvironmentId="currentEnvironmentId" :node="node" :project-list="projectList" :env-map="projectEnvMap"
-                                            @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload"/>
+                                            @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" @openScenario="openScenario"/>
                     </span>
           </el-tree>
 
@@ -41,15 +41,35 @@
 
       <ms-main-container>
         <!-- 第一层当前节点内容-->
-        <ms-component-config :isMax="false" :showBtn="false" :type="selectedTreeNode.type" :scenario="selectedTreeNode" :response="response" :currentScenario="currentScenario"
-                             :currentEnvironmentId="currentEnvironmentId" :node="selectedNode" :project-list="projectList" :env-map="projectEnvMap"
-                             @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" v-if="selectedTreeNode && selectedNode"/>
+        <ms-component-config :isMax="false"
+                             :showBtn="false"
+                             :type="selectedTreeNode.type"
+                             :scenario="selectedTreeNode"
+                             :response="response"
+                             :currentScenario="currentScenario"
+                             :currentEnvironmentId="currentEnvironmentId"
+                             :node="selectedNode"
+                             :project-list="projectList"
+                             :env-map="projectEnvMap"
+                             :draggable="false"
+                             @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" @openScenario="openScenario"
+                             v-if="selectedTreeNode && selectedNode"/>
         <!-- 请求下还有的子步骤-->
         <div v-if="selectedTreeNode && selectedTreeNode.hashTree && showNode(selectedTreeNode)">
           <div v-for="item in selectedTreeNode.hashTree" :key="item.id" class="ms-col-one">
-            <ms-component-config :showBtn="false" :isMax="false" :type="item.type" :scenario="item" :response="response" :currentScenario="currentScenario"
-                                 :currentEnvironmentId="currentEnvironmentId" :project-list="projectList" :env-map="projectEnvMap"
-                                 @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" v-if="selectedTreeNode && selectedNode"/>
+            <ms-component-config :showBtn="false"
+                                 :isMax="false"
+                                 :type="item.type"
+                                 :scenario="item"
+                                 :response="response"
+                                 :currentScenario="currentScenario"
+                                 :currentEnvironmentId="currentEnvironmentId"
+                                 :project-list="projectList"
+                                 :env-map="projectEnvMap"
+                                 :draggable="false"
+                                 @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick"
+                                 @refReload="refReload" @openScenario="openScenario"
+                                 v-if="selectedTreeNode && selectedNode"/>
 
           </div>
         </div>
@@ -120,7 +140,7 @@
   import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
   import MsContainer from "../../../../common/components/MsContainer";
   import MsMainContainer from "../../../../common/components/MsMainContainer";
-  import MsAsideContainer from "../../../../common/components/MsAsideContainer";
+  import MsAsideContainer from "./MsLeftContainer";
 
   let jsonPath = require('jsonpath');
   export default {
@@ -319,6 +339,10 @@
       }
     },
     methods: {
+      // 打开引用的场景
+      openScenario(data) {
+        this.$emit('openScenario', data);
+      },
       removeListener() {
         document.removeEventListener("keydown", this.createCtrlSHandle);
       },
@@ -1038,12 +1062,29 @@
   }
 
   .scenario-aside {
+    min-width: 400px;
     position: relative;
     border-radius: 4px;
     border: 1px solid #EBEEF5;
     box-sizing: border-box;
   }
 
+  .scenario-main {
+    position: relative;
+    margin-left: 20px;
+    border: 1px solid #EBEEF5;
+  }
+  .scenario-list {
+    overflow-y: auto;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 28px;
+  }
+
+
+
   .father:hover .child {
     display: block;
   }
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue b/frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue
new file mode 100644
index 0000000000..7e0d92babd
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue
@@ -0,0 +1,55 @@
+<template>
+  <el-aside class="ms-aside-container">
+    <slot></slot>
+    <ms-horizontal-drag-bar/>
+  </el-aside>
+</template>
+
+<script>
+  import MsHorizontalDragBar from "../../../../../components/common/components/dragbar/MsLeft2RightDragBar";
+
+  export default {
+    name: "MsLeftContainer",
+    components: {MsHorizontalDragBar},
+    props: {
+      width: {
+        type: String,
+        default: '500px'
+      },
+      enableAsideHidden: {
+        type: Boolean,
+        default: true
+      },
+    },
+    data() {
+      return {
+        asideHidden: false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+  .ms-aside-container {
+    border: 1px solid #E6E6E6;
+    padding: 10px;
+    min-width: 600px;
+    border-radius: 2px;
+    box-sizing: border-box;
+    background-color: #FFF;
+    height: calc(100vh - 60px);
+    border-right: 0px;
+    position: relative;
+  }
+
+  .hiddenBottom i {
+    margin-left: -2px;
+  }
+
+  .hiddenBottom:hover i {
+    margin-left: 0;
+    color: white;
+  }
+
+</style>
diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index 9302489710..7f2cc6056c 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -29,6 +29,8 @@
 </template>
 
 <script>
+  import {LicenseKey} from '@/common/js/constants';
+
   const requireContext = require.context('@/business/components/xpack/', true, /router\.js$/)
   const report = requireContext.keys().map(key => requireContext(key).report);
   const isReport = report && report != null && report.length > 0 && report[0] != undefined ? true : false;
@@ -55,6 +57,10 @@
       if (this.$route.matched.length > 0) {
         this.activeIndex = this.$route.matched[0].path;
       }
+      let license = localStorage.getItem(LicenseKey);
+      if (license != "valid") {
+        this.isReport = false;
+      }
     },
     methods: {
       handleSelect(index) {
diff --git a/frontend/src/business/components/common/select-tree/SelectTree.vue b/frontend/src/business/components/common/select-tree/SelectTree.vue
new file mode 100644
index 0000000000..945c3bd35d
--- /dev/null
+++ b/frontend/src/business/components/common/select-tree/SelectTree.vue
@@ -0,0 +1,390 @@
+<template>
+  <div>
+    <div class="mask" v-show="isShowSelect"></div>
+    <el-popover placement="bottom-start" :width="popoverWidth" trigger="manual" v-model="isShowSelect" @hide="popoverHide" v-outside-click="outsideClick">
+      <el-input
+        size="mini"
+        prefix-icon="el-icon-search"
+        v-model="filterText">
+      </el-input>
+      <el-tree class="common-tree" :width="width" ref="tree" :data="treeData" :props="obj"
+               :show-checkbox="multiple"
+               :node-key="obj.id"
+               :check-strictly="checkStrictly"
+               :expand-on-click-node="multiple&&expandClickNode"
+               :check-on-click-node="checkClickNode"
+               :highlight-current="true"
+               @check-change="nodeClick"
+               :filter-node-method="filterNode"
+               @node-click="nodeClick"/>
+      <el-select slot="reference" ref="select" :size="size"
+                 v-model="returnDataKeys"
+                 :multiple="multiple"
+                 :clearable="clearable"
+                 :collapse-tags="collapseTags"
+                 :disabled="disabled"
+                 @click.native="selectClick"
+                 @remove-tag="removeTag"
+                 @clear="clean"
+                 class="ms-tree-select">
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+      </el-select>
+      <el-row>
+        <el-button v-if="multiple" class="ok" @click="isShowSelect=false" size="mini" type="text">{{$t('commons.confirm')}}</el-button>
+      </el-row>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+  import OutsideClick from "@/common/js/outside-click";
+
+  export default {
+    name: 'test-code',
+    directives: {OutsideClick},
+    props: {
+      // 树结构数据
+      data: {
+        type: Array,
+        default() {
+          return [];
+        }
+      },
+      obj: {
+        type: Object,
+        required: false,
+        default: () => {
+          return {
+            id: 'id',// ID
+            label: 'name',// 显示名称
+            children: 'children', //子级字段名
+            path: 'path',//路径
+            content: 'content',//描述
+            pid: 'pid',//父id
+          }
+        }
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      // 配置是否可多选
+      multiple: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
+      // 配置是否可清空选择
+      clearable: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
+      // 配置多选时是否将选中值按文字的形式展示
+      collapseTags: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
+      // 显示复选框情况下，是否严格遵循父子不互相关联
+      checkStrictly: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
+      //多选是设置点击节点是否可以选中
+      checkClickNode: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
+      //多选时：点击节点展开还是点三角标
+      expandClickNode: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
+      // 默认选中的节点key
+      defaultKey: {
+        type: [Number, String, Array, Object],
+        default() {
+          return [];
+        }
+      },
+      size: {
+        type: String,
+        default() {
+          return 'small';
+        }
+      },
+      width: {
+        type: String,
+        default() {
+          return '100%';
+        }
+      },
+      height: {
+        type: String,
+        default() {
+          return '300px';
+        }
+      }
+    },
+    //上面是父组件可传入参数
+    data() {
+      return {
+        popoverWidth: "0px",//下拉框大小
+        isShowSelect: false, // 是否显示树状选择器
+        options: [],//select option选项
+        returnDatas: [],//返回给父组件数组对象
+        returnDataKeys: [],//返回父组件数组主键值
+        filterText: "",
+      };
+    },
+    computed: {
+      treeData() { // 若非树状结构，则转化为树状结构数据
+        return JSON.stringify(this.data).indexOf(this.obj.children) !== -1 ? this.data : this.switchTree();
+      },
+    },
+    methods: {
+      outsideClick(e) {
+        e.stopPropagation();
+        this.isShowSelect=false;
+      },
+      init() {
+        if (this.defaultKey != undefined && this.defaultKey.length > 0) {
+          if (this.multiple) {
+            // 多选
+            if (Object.prototype.toString.call(this.defaultKey).indexOf("Array") != -1) {
+              if (Object.prototype.toString.call(this.defaultKey[0]).indexOf("Object") != -1) {//对象
+                this.setDatas(this.defaultKey);
+              } else if (Object.prototype.toString.call(this.defaultKey[0]).indexOf("Number") != -1
+                || Object.prototype.toString.call(this.defaultKey[0]).indexOf("String") != -1) {
+                this.setKeys(this.defaultKey);
+              } else {
+                console.log("多选：传入参数类型不匹配");
+                return;
+              }
+            } else {
+              console.log("多选：传入参数类型不匹配");
+              return;
+            }
+
+          } else {
+            // 单选
+            if (Object.prototype.toString.call(this.defaultKey).indexOf("Number") != -1
+              || Object.prototype.toString.call(this.defaultKey).indexOf("String") != -1
+              || Object.prototype.toString.call(this.defaultKey).indexOf("Object") != -1) {
+              this.setKey(this.defaultKey);
+            } else {
+              console.log("单选：传入参数类型不匹配");
+              return;
+
+            }
+
+          }
+        }
+      },
+      //下拉框select点击[入口]
+      selectClick() {
+        if (this.disabled) {
+          return;
+        }
+        this.$nextTick(function () {//设置下拉框自适应宽度
+          this.popoverWidth = this.$refs.select.$el.clientWidth - 26;
+        })
+        //显示下拉框
+        return this.isShowSelect = !this.isShowSelect
+      },
+      //单选: 树点击方法
+      nodeClick(data, node) {
+        if (!this.multiple) {//单选
+          this.isShowSelect = false;
+          this.setKey(node.key);
+        } else {//多选
+          let checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+          let t = [];
+          this.options = checkedKeys.map((item) => {//设置option选项
+            let node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
+            t.push(node.data);
+            return {label: node.label, value: node.key};
+          });
+          this.returnDataKeys = this.options.map((item) => {
+            return item.value;
+          });
+          this.returnDatas = t;
+        }
+      },
+      //单选:清空选中
+      clean() {
+        this.$refs.tree.setCurrentKey(null);//清除树选中key
+        this.returnDatas = null;
+        this.returnDataKeys = '';
+        this.popoverHide();
+
+      },
+      //单选:设置、初始化值 key
+      setKey(thisKey) {
+        this.$refs.tree.setCurrentKey(thisKey);
+        let node = this.$refs.tree.getNode(thisKey);
+        this.setData(node.data);
+      },
+      //单选：设置、初始化对象
+      setData(data) {
+        this.options = [];
+        this.options.push({label: data[this.obj.label], value: data[this.obj.id]});
+        this.returnDatas = data;
+        this.returnDataKeys = data[this.obj.id]
+
+      },
+      //多选:设置、初始化值 keys
+      setKeys(thisKeys) {
+        this.$refs.tree.setCheckedKeys(thisKeys);
+        this.returnDataKeys = thisKeys;
+        let t = [];
+        thisKeys.map((item) => {//设置option选项
+          let node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
+          t.push(node.data);
+          return {label: node.label, value: node.key};
+        });
+        this.returnDatas = t;
+        this.popoverHide()
+      },
+      //多选:设置、初始化对象
+      setDatas(data) {
+        this.$refs.tree.setCheckedNodes(data);
+        this.returnDatas = data;
+        let t = [];
+        data.map((item) => {//设置option选项
+          t.push(item[this.obj.id]);
+        });
+        this.returnDataKeys = t;
+        this.popoverHide()
+      },
+      // 多选,删除任一select选项的回调
+      removeTag(val) {
+        this.$refs.tree.setChecked(val, false);//设置为未选中
+        let node = this.$refs.tree.getNode(val);//获取节点
+        if (!this.checkStrictly && node.childNodes.length > 0) {
+          this.treeToList(node).map(item => {
+            if (item.childNodes.length <= 0) {
+              this.$refs.tree.setChecked(item, false);
+            }
+          });
+        }
+        this.nodeClick();
+        this.popoverHide();
+
+      },
+      //下拉框关闭执行
+      popoverHide() {
+        this.$emit('getValue', this.returnDataKeys, this.returnDatas);
+      },
+      // 多选，清空所有勾选
+      clearSelectedNodes() {
+        let checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+        for (let i = 0; i < checkedKeys.length; i++) {
+          this.$refs.tree.setChecked(checkedKeys[i], false);
+        }
+      },
+
+      //树形转为集合
+      treeToList(tree) {
+        let queen = [];
+        let out = [];
+        queen = queen.concat(tree);
+        while (queen.length) {
+          let first = queen.shift();
+          if (first.childNodes) {
+            queen = queen.concat(first.childNodes);
+          }
+          out.push(first);
+        }
+        return out;
+      },
+      switchTree() {
+        return this.buildTree(this.data, this.defaultValue);
+      },
+      // 将一维的扁平数组转换为多层级对象
+      buildTree(data, id) {
+        const fa = (id) => {
+          const temp = [];
+          for (let i = 0; i < data.length; i++) {
+            const n = data[i];
+            if (n[this.obj.pid] === id) {
+              n[this.obj.children] = fa(n[this.obj.id]);
+              temp.push(n);
+            }
+          }
+          return temp;
+        };
+        return fa(id);
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        if (data.label) {
+          return data.label.indexOf(value.toLowerCase()) !== -1;
+        }
+        return false;
+      },
+    },
+    watch: {
+      // eslint-disable-next-line no-unused-vars
+      isShowSelect(val) {
+        // 隐藏select自带的下拉框
+        this.$refs.select.blur();
+      },
+      treeData() {//监听tree数据
+        this.$nextTick(() => {
+          this.init();
+        })
+      },
+      filterText(val) {
+        this.$nextTick(() => {
+          this.$refs.tree.filter(val);
+        });
+      },
+      filter(val) {
+        this.$nextTick(() => {
+          this.$refs.tree.filter(val);
+        });
+      },
+    }
+  };
+</script>
+
+<style scoped>
+  .mask {
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    opacity: 0;
+    z-index: 11;
+  }
+
+  .common-tree {
+    overflow: auto;
+    height: 200px;
+  }
+
+  .ms-tree-select {
+    width: 100%;
+    z-index: 111;
+  }
+
+  .ok {
+    float: right;
+  }
+
+  .el-row {
+    padding-top: 0px !important;
+  }
+
+</style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
index de83468865..c2d49b0f9e 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
@@ -4,7 +4,7 @@
              @close="close"
              width="60%" v-loading="result.loading"
              :close-on-click-modal="false"
-             top="50px">
+             top="50px" append-to-body>
 
     <el-container class="main-content">
 
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 4c33b9c3b1..f278121988 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819
+Subproject commit f2781219889c2f993436bcc3ea90038f588fa73e

From 8730b4be89b4cfe7ff8f1dc297d95a4792690fcb Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:10:15 +0800
Subject: [PATCH 28/95] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestPlanService.java        |  3 +-
 .../track/plan/components/TestPlanEdit.vue    | 30 +++++++++++++++++++
 .../track/plan/components/TestPlanList.vue    |  4 +--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 9961681125..410e2c568c 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -127,7 +127,7 @@ public class TestPlanService {
     @Resource
     private ApiScenarioMapper apiScenarioMapper;
 
-    public synchronized void addTestPlan(AddTestPlanRequest testPlan) {
+    public synchronized String addTestPlan(AddTestPlanRequest testPlan) {
         if (getTestPlanByName(testPlan.getName()).size() > 0) {
             MSException.throwException(Translator.get("plan_name_already_exists"));
         }
@@ -156,6 +156,7 @@ public class TestPlanService {
                 .event(NoticeConstants.Event.CREATE)
                 .build();
         noticeSendService.send(NoticeConstants.TaskType.TEST_PLAN_TASK, noticeModel);
+        return testPlan.getId();
     }
 
     public List<TestPlan> getTestPlanByName(String name) {
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index 7e9966d138..525236deda 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -109,6 +109,9 @@
             @click="savePlan">
             {{ $t('test_track.confirm') }}
           </el-button>
+          <el-button type="primary" @click="testPlanInfo">
+            {{ $t('test_track.planning_execution') }}
+          </el-button>
         </div>
       </template>
     </el-dialog>
@@ -170,6 +173,33 @@ export default {
       listenGoBack(this.close);
       this.dialogFormVisible = true;
     },
+    testPlanInfo() {
+      this.$refs['planFrom'].validate((valid) => {
+        if (valid) {
+          let param = {};
+          Object.assign(param, this.form);
+          param.name = param.name.trim();
+          if (param.name === '') {
+            this.$warning(this.$t('test_track.plan.input_plan_name'));
+            return;
+          }
+          param.workspaceId = localStorage.getItem(WORKSPACE_ID);
+          if (this.form.tags instanceof Array) {
+            this.form.tags = JSON.stringify(this.form.tags);
+          }
+          param.tags = this.form.tags;
+          this.$post('/test/plan/' + this.operationType, param, response => {
+            this.$success(this.$t('commons.save_success'));
+            this.dialogFormVisible = false;
+            this.$router.push('/track/plan/view/' + response.data);
+            // 发送广播，刷新 head 上的最新列表
+            TrackEvent.$emit(LIST_CHANGE);
+          });
+        } else {
+          return false;
+        }
+      });
+    },
     savePlan() {
       this.$refs['planFrom'].validate((valid) => {
         if (valid) {
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 70e57c609e..5848071fb4 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -3,9 +3,9 @@
     <template v-slot:header>
       <ms-table-header :is-tester-permission="true" :condition.sync="condition"
                        @search="initTableData" @create="testPlanCreate"
+                       :create-tip="$t('test_track.plan.create_plan')"
                        :title="$t('test_track.plan.test_plan')"
-                       :show-create="false"/>
-      <el-button type="primary" plain icon="el-icon-plus" size="mini" v-tester @click="testPlanCreate"/>
+      />
 
     </template>
 

From 43e14da7c35fc78dc5d9b4113798b735426f984f Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Mar 2021 18:17:24 +0800
Subject: [PATCH 29/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20LDAP=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=99=BB=E5=BD=95=E6=B2=A1=E6=9C=89=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/system/LdapSetting.vue         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/settings/system/LdapSetting.vue b/frontend/src/business/components/settings/system/LdapSetting.vue
index ab39d7236f..fc9ea67764 100644
--- a/frontend/src/business/components/settings/system/LdapSetting.vue
+++ b/frontend/src/business/components/settings/system/LdapSetting.vue
@@ -60,7 +60,7 @@
 
 <script>
 import MsDialogFooter from "../../common/components/MsDialogFooter";
-import {listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
+import {listenGoBack, publicKeyEncrypt, removeGoBackListener} from "../../../../common/js/utils";
 
 export default {
   name: "LdapSetting",
@@ -204,9 +204,15 @@ export default {
       })
     },
     login(form) {
+      let publicKey = localStorage.getItem("publicKey");
+
       this.$refs[form].validate(valid => {
         if (valid) {
-          this.result = this.$post("/ldap/test/login", this.loginForm, () => {
+          let form = {
+            username: publicKeyEncrypt(this.loginForm.username, publicKey),
+            password: publicKeyEncrypt(this.loginForm.password, publicKey),
+          };
+          this.result = this.$post("/ldap/test/login", form, () => {
             this.$success(this.$t('ldap.login_success'));
           });
         } else {

From 271668a40e5ed88f42a9e7a8746a3bc5f217d1d6 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 16 Mar 2021 18:19:00 +0800
Subject: [PATCH 30/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=9C=80=E5=A4=A7=E5=8C=96cookie=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/scenario/EditApiScenario.vue | 6 ++++--
 .../api/automation/scenario/maximize/ScenarioHeader.vue    | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 23f99d87fa..195b97e6c2 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -198,7 +198,7 @@
       <ms-drawer :visible="drawer" :size="100" @close="close" direction="right" :show-full-screen="false" :is-show-close="false" style="overflow: hidden">
         <template v-slot:header>
           <scenario-header :currentScenario="currentScenario" :projectEnvMap="projectEnvMap" :projectIds="projectIds" :projectList="projectList" :scenarioDefinition="scenarioDefinition" :enableCookieShare="enableCookieShare"
-                           @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" ref="maximizeHeader"/>
+                           @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" @setCookieShare="setCookieShare" ref="maximizeHeader"/>
         </template>
 
         <maximize-scenario :scenario-definition="scenarioDefinition" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario" @openScenario="openScenario"/>
@@ -445,6 +445,9 @@
       openScenario(data) {
         this.$emit('openScenario', data);
       },
+      setCookieShare(cookie) {
+        this.enableCookieShare = cookie;
+      },
       showAllBtn() {
         this.$refs.maximizeScenario.showAll();
       },
@@ -560,7 +563,6 @@
           this.operatingElements = ELEMENTS.get("ALL");
           this.selectedTreeNode = undefined;
         }
-        //this.reload();
       },
       apiListImport() {
         this.$refs.scenarioApiRelevance.open();
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
index 5fbad83245..fb9e29c045 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -16,7 +16,7 @@
       </el-row>
     </div>
     <div class="ms-header-right">
-      <el-checkbox v-model="cookieShare" class="ms-right">共享cookie</el-checkbox>
+      <el-checkbox v-model="cookieShare" class="ms-right" @change="setCookieShare">共享cookie</el-checkbox>
       <env-popover :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
                    :project-list="projectList" ref="envPopover" class="ms-right"/>
       <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
@@ -70,6 +70,9 @@
       runDebug() {
         this.$emit('runDebug');
       },
+      setCookieShare(){
+        this.$emit('setCookieShare',this.cookieShare);
+      },
       showScenarioParameters() {
         this.$emit('showScenarioParameters');
       },
@@ -91,7 +94,7 @@
         })
       },
       setProjectEnvMap(projectEnvMap) {
-        this.$emit('setProjectEnvMap',projectEnvMap);
+        this.$emit('setProjectEnvMap', projectEnvMap);
         this.envMap = projectEnvMap;
       }
     },

From e21f3c8d40c603edff8ff869eeb8476349b92a64 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Mar 2021 19:12:42 +0800
Subject: [PATCH 31/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E6=97=B6=E6=A3=80=E6=9F=A5=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=90=8C=E6=AD=A5=E8=BF=94=E5=9B=9E=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/test/components/ExistFiles.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue
index 1551584f95..b605c0a58e 100644
--- a/frontend/src/business/components/performance/test/components/ExistFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue
@@ -199,7 +199,7 @@ export default {
       });
 
     },
-    beforeUploadFile(file) {
+    async beforeUploadFile(file) {
       if (!this.fileValidator(file)) {
         /// todo: 显示错误信息
         return false;
@@ -215,7 +215,8 @@ export default {
       async function f() {
         return await axios.post('/performance/file/' + getCurrentProjectID() + '/getMetadataByName', {filename: file.name})
       }
-      f().then(res => {
+
+      await f().then(res => {
         let response = res.data;
         if (response.data.length === 0) {
           let type = file.name.substring(file.name.lastIndexOf(".") + 1);

From ae08bd2e42033e1073c402dc8a7c4cb733ba17bd Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Mar 2021 19:29:03 +0800
Subject: [PATCH 32/95] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E4=BA=BA=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 88afae483d..6e77469707 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -102,7 +102,12 @@
         <if test="request.orders != null and request.orders.size() > 0">
             ORDER BY
             <foreach collection="request.orders" separator="," item="order">
-                load_test.${order.name} ${order.type}
+                <if test="order.name == 'user_name'">
+                    user_name ${order.type}
+                </if>
+                <if test="order.name != 'user_name'">
+                    load_test.${order.name} ${order.type}
+                </if>
             </foreach>
         </if>
     </select>

From 24d836d381ec8c02c0c26f164832b08e824c15f5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 17 Mar 2021 10:33:31 +0800
Subject: [PATCH 33/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=9C=80=E5=A4=A7=E5=8C=96=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |   2 +-
 .../scenario/component/ApiComponent.vue       | 122 ++++++++----------
 .../scenario/maximize/MaximizeScenario.vue    |   5 +-
 3 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 195b97e6c2..a8669af8d1 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -201,7 +201,7 @@
                            @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" @setCookieShare="setCookieShare" ref="maximizeHeader"/>
         </template>
 
-        <maximize-scenario :scenario-definition="scenarioDefinition" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario" @openScenario="openScenario"/>
+        <maximize-scenario :scenario-definition="scenarioDefinition" :envMap="projectEnvMap" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario" @openScenario="openScenario"/>
       </ms-drawer>
 
     </div>
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 9dde84f260..cd282e7f81 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -1,65 +1,67 @@
 <template>
-  <api-base-component
-    v-loading="loading"
-    @copy="copyRow"
-    @remove="remove"
-    @active="active"
-    :is-show-name-input="!isDeletedOrRef"
-    :data="request"
-    :draggable="draggable"
-    :color="displayColor.color"
-    :background-color="displayColor.backgroundColor"
-    :is-max="isMax"
-    :show-btn="showBtn"
-    :title="displayTitle">
+  <div>
+    <api-base-component
+      v-loading="loading"
+      @copy="copyRow"
+      @remove="remove"
+      @active="active"
+      :is-show-name-input="!isDeletedOrRef"
+      :data="request"
+      :draggable="draggable"
+      :color="displayColor.color"
+      :background-color="displayColor.backgroundColor"
+      :is-max="isMax"
+      :show-btn="showBtn"
+      :title="displayTitle">
 
-    <template v-slot:behindHeaderLeft>
-      <el-tag size="mini" class="ms-tag" v-if="request.referenced==='Deleted'" type="danger">{{$t('api_test.automation.reference_deleted')}}</el-tag>
-      <el-tag size="mini" class="ms-tag" v-if="request.referenced==='Copy'">{{ $t('commons.copy') }}</el-tag>
-      <el-tag size="mini" class="ms-tag" v-if="request.referenced ==='REF'">{{ $t('api_test.scenario.reference') }}</el-tag>
-      <span class="ms-tag">{{getProjectName(request.projectId)}}</span>
-      <ms-run :debug="true" :reportId="reportId" :run-data="runData" :env-map="envMap"
-              @runRefresh="runRefresh" ref="runTest"/>
+      <template v-slot:behindHeaderLeft>
+        <el-tag size="mini" class="ms-tag" v-if="request.referenced==='Deleted'" type="danger">{{$t('api_test.automation.reference_deleted')}}</el-tag>
+        <el-tag size="mini" class="ms-tag" v-if="request.referenced==='Copy'">{{ $t('commons.copy') }}</el-tag>
+        <el-tag size="mini" class="ms-tag" v-if="request.referenced ==='REF'">{{ $t('api_test.scenario.reference') }}</el-tag>
+        <span class="ms-tag">{{getProjectName(request.projectId)}}</span>
+      </template>
 
-    </template>
+      <template v-slot:button>
+        <el-tooltip :content="$t('api_test.run')" placement="top">
+          <el-button @click="run" icon="el-icon-video-play" class="ms-btn" size="mini" circle/>
+        </el-tooltip>
+      </template>
 
-    <template v-slot:button>
-      <el-tooltip :content="$t('api_test.run')" placement="top">
-        <el-button @click="run" icon="el-icon-video-play" class="ms-btn" size="mini" circle/>
-      </el-tooltip>
-    </template>
+      <customize-req-info :is-customize-req="isCustomizeReq" :request="request"/>
 
-    <customize-req-info :is-customize-req="isCustomizeReq" :request="request"/>
-
-    <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-    <ms-api-request-form :isShowEnable="true" :referenced="true" :headers="request.headers " :request="request"
-                         v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"/>
-    <ms-tcp-basis-parameters :request="request" v-if="request.protocol==='TCP'|| request.type==='TCPSampler'" :showScript="false"/>
-    <ms-sql-basis-parameters :request="request" v-if="request.protocol==='SQL'|| request.type==='JDBCSampler'"
-                             :showScript="false"/>
-    <ms-dubbo-basis-parameters :request="request"
-                               v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'|| request.type==='DubboSampler'"
+      <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
+      <ms-api-request-form :isShowEnable="true" :referenced="true" :headers="request.headers " :request="request"
+                           v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"/>
+      <ms-tcp-basis-parameters :request="request" v-if="request.protocol==='TCP'|| request.type==='TCPSampler'" :showScript="false"/>
+      <ms-sql-basis-parameters :request="request" v-if="request.protocol==='SQL'|| request.type==='JDBCSampler'"
                                :showScript="false"/>
+      <ms-dubbo-basis-parameters :request="request"
+                                 v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'|| request.type==='DubboSampler'"
+                                 :showScript="false"/>
 
-    <p class="tip">{{ $t('api_test.definition.request.res_param') }} </p>
-    <div v-if="request.result">
-      <el-tabs v-model="request.activeName" closable class="ms-tabs">
-        <el-tab-pane :label="item.name" :name="item.name" v-for="(item,index) in request.result.scenarios" :key="index">
-          <div v-for="(result,i) in item.requestResults" :key="i" style="margin-bottom: 5px">
-            <api-response-component v-if="result.name===request.name" :result="result"/>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <api-response-component :currentProtocol="request.protocol" :result="request.requestResult" v-else/>
+      <p class="tip">{{ $t('api_test.definition.request.res_param') }} </p>
+      <div v-if="request.result">
+        <el-tabs v-model="request.activeName" closable class="ms-tabs">
+          <el-tab-pane :label="item.name" :name="item.name" v-for="(item,index) in request.result.scenarios" :key="index">
+            <div v-for="(result,i) in item.requestResults" :key="i" style="margin-bottom: 5px">
+              <api-response-component v-if="result.name===request.name" :result="result"/>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <api-response-component :currentProtocol="request.protocol" :result="request.requestResult" v-else/>
 
-    <!-- 保存操作 -->
-    <el-button type="primary" size="small" class="ms-btn-flot" @click="saveTestCase(item)"
-               v-if="!request.referenced">
-      {{ $t('commons.save') }}
-    </el-button>
+      <!-- 保存操作 -->
+      <el-button type="primary" size="small" class="ms-btn-flot" @click="saveTestCase(item)"
+                 v-if="!request.referenced">
+        {{ $t('commons.save') }}
+      </el-button>
+    </api-base-component>
+    <ms-run :debug="true" :reportId="reportId" :run-data="runData" :env-map="envMap"
+            @runRefresh="runRefresh" ref="runTest"/>
 
-  </api-base-component>
+
+  </div>
 </template>
 
 <script>
@@ -73,7 +75,6 @@
   import ApiBaseComponent from "../common/ApiBaseComponent";
   import ApiResponseComponent from "./ApiResponseComponent";
   import CustomizeReqInfo from "@/business/components/api/automation/scenario/common/CustomizeReqInfo";
-  import {ELEMENTS} from "../Setting";
 
   export default {
     name: "MsApiComponent",
@@ -133,11 +134,6 @@
           }
         }
       }
-      // if (this.isMax && this.request && ELEMENTS.get("AllSamplerProxy").indexOf(this.request.type) != -1
-      //   && this.request.hashTree && this.request.hashTree != null && this.request.hashTree.length > 0) {
-      //   this.request.hashTrees = JSON.parse(JSON.stringify(this.request.hashTree));
-      //   this.request.hashTree = undefined;
-      // }
     },
     computed: {
       displayColor() {
@@ -236,12 +232,6 @@
               if (!this.request.projectId) {
                 this.request.projectId = response.data.projectId;
               }
-              // if (this.isMax && this.request && ELEMENTS.get("AllSamplerProxy").indexOf(this.request.type) != -1) {
-              //   this.request.hashTrees = [];
-              //   Object.assign(this.request.hashTrees, this.request.hashTree);
-              //   this.request.hashTree = [];
-              // }
-
               this.reload();
               this.sort();
             } else {
@@ -299,7 +289,7 @@
         };
         this.runData.push(debugData);
         /*触发执行操作*/
-        this.reportId = getUUID().substring(0, 8);
+        this.reportId = getUUID();
       },
       runRefresh(data) {
         this.request.requestResult = data;
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index 833562fdc8..b1e3c1d553 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -150,6 +150,7 @@
       currentScenario: {},
       type: String,
       scenarioDefinition: Array,
+      envMap: Map,
     },
     components: {
       MsVariableList,
@@ -221,6 +222,7 @@
       }
       this.projectId = getCurrentProjectID();
       this.operatingElements = ELEMENTS.get("ALL");
+      this.projectEnvMap = this.envMap;
     },
     directives: {OutsideClick},
     computed: {
@@ -1074,6 +1076,7 @@
     margin-left: 20px;
     border: 1px solid #EBEEF5;
   }
+
   .scenario-list {
     overflow-y: auto;
     position: absolute;
@@ -1083,8 +1086,6 @@
     bottom: 28px;
   }
 
-
-
   .father:hover .child {
     display: block;
   }

From fc04de09805a2ad3a9cfadd08ba78cda811ab41b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Mar 2021 10:53:53 +0800
Subject: [PATCH 34/95] =?UTF-8?q?feat:=20=E7=94=A8=E4=BE=8B=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E8=84=91=E5=9B=BE=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                         |  2 +-
 .../common/components/MsModuleMinder.vue      |  9 +-
 .../track/common/minder/TestReviewMinder.vue  | 90 ++++++++-----------
 .../track/common/minder/minderUtils.js        | 27 ++++--
 4 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index ee6fce3649..95dc60202e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -49,7 +49,7 @@
     "xml-js": "^1.6.11",
     "yan-progress": "^1.0.3",
     "jsonpath": "^1.1.0",
-    "vue-minder-editor-plus": "^1.0.16",
+    "vue-minder-editor-plus": "^1.0.17",
     "jsencrypt": "^3.1.0"
   },
   "devDependencies": {
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index d8ceb1aa5c..b57b3fe069 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -6,6 +6,7 @@
       :import-json="importJson"
       :height="700"
       :progress-enable="false"
+      :tags="tags"
       @save="save"
     />
   </div>
@@ -28,7 +29,13 @@ export default {
       default() {
         return new Map();
       }
-    }
+    },
+    tags: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
   },
   data() {
     return {
diff --git a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
index d85d5c1309..a6444f3ede 100644
--- a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
@@ -3,6 +3,7 @@
     v-loading="result.loading"
     :tree-nodes="treeNodes"
     :data-map="dataMap"
+    :tags="tags"
     @save="save"
   />
 </template>
@@ -17,6 +18,7 @@ name: "TestReviewMinder",
     return{
       testCase: [],
       dataMap: new Map(),
+      tags: ['通过', '不通过'],
       result: {}
     }
   },
@@ -44,27 +46,32 @@ name: "TestReviewMinder",
     getTestCases() {
       if (this.projectId) {
         this.result = this.$post('/test/review/case/list/all', {reviewId: this.reviewId}, response => {
-          this.testCase = response.data;
-          this.dataMap = getTestCaseDataMap(this.testCase);
+          this.dataMap = getTestCaseDataMap(response.data, true, (data, item) => {
+            if (item.reviewStatus === 'Pass') {
+              data.resource.push("通过");
+            } else if (item.reviewStatus === 'UnPass') {
+              data.resource.push("不通过");
+            } else {
+              data.resource.push("未开始");
+            }
+            data.caseId = item.caseId;
+          });
         });
       }
     },
     save(data) {
-      // let saveCases = [];
-      // this.buildSaveCase(data.root, saveCases, undefined);
-      // console.log(saveCases);
-      // let param = {
-      //   projectId: this.projectId,
-      //   data: saveCases
-      // }
-      // this.result = this.$post('/test/case/minder/edit', param, () => {
-      //   this.$success(this.$t('commons.save_success'));
-      // });
+      console.log(data);
+      let saveCases = [];
+      this.buildSaveCase(data.root, saveCases);
+      console.log(saveCases);
+      this.result = this.$post('/test/review/case/minder/edit', saveCases, () => {
+        this.$success(this.$t('commons.save_success'));
+      });
     },
-    buildSaveCase(root, saveCases, parent) {
+    buildSaveCase(root, saveCases) {
       let data = root.data;
       if (data.resource && data.resource.indexOf("用例") > -1) {
-        this._buildSaveCase(root, saveCases, parent);
+        this._buildSaveCase(root, saveCases);
       } else {
         if (root.children) {
           root.children.forEach((childNode) => {
@@ -73,51 +80,24 @@ name: "TestReviewMinder",
         }
       }
     },
-    _buildSaveCase(node, saveCases, parent) {
+    _buildSaveCase(node, saveCases) {
       let data = node.data;
-      let isChange = false;
+      if (!data.changed) {
+        return;
+      }
       let testCase = {
-        id: data.id,
-        name: data.text,
-        nodeId: parent ? parent.id : "",
-        nodePath: parent ? parent.path : "",
-        type: data.type ? data.type : 'functional',
-        method: data.method ? data.method : 'manual',
-        maintainer: data.maintainer,
-        priority: 'P' + data.priority,
+        caseId: data.caseId,
+        id: data.id
+        // name: data.text,
       };
-      if (data.changed) isChange = true;
-      let steps = [];
-      let stepNum = 1;
-      if (node.children) {
-        node.children.forEach((childNode) => {
-          let childData = childNode.data;
-          if (childData.resource && childData.resource.indexOf('前置条件') > -1) {
-            testCase.prerequisite = childData.text;
-          } else if (childData.resource && childData.resource.indexOf('备注') > -1) {
-            testCase.remark = childData.text;
-          } else {
-            // 测试步骤
-            let step = {};
-            step.num = stepNum++;
-            step.desc = childData.text;
-            if (childNode.children) {
-              let result = "";
-              childNode.children.forEach((child) => {
-                result += child.data.text;
-                if (child.data.changed) isChange = true;
-              })
-              step.result = result;
-            }
-            steps.push(step);
-          }
-          if (childData.changed) isChange = true;
-        })
-      }
-      testCase.steps = JSON.stringify(steps);
-      if (isChange) {
-        saveCases.push(testCase);
+      if (data.resource.length > 1) {
+        if (data.resource.indexOf('不通过')) {
+          testCase.status = 'UnPass';
+        } else if (data.resource.indexOf('通过')) {
+          testCase.status = 'Pass';
+        }
       }
+      saveCases.push(testCase);
     },
   }
 }
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index e5f171d903..bbe404d280 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -1,4 +1,4 @@
-export function getTestCaseDataMap(testCase) {
+export function getTestCaseDataMap(testCase, isDisable, setParamCallback) {
   let dataMap = new Map();
   testCase.forEach(item => {
     item.steps = JSON.parse(item.steps);
@@ -17,7 +17,15 @@ export function getTestCaseDataMap(testCase) {
         maintainer: item.maintainer
       }
     }
-    parseChildren(nodeItem, item);
+    if (setParamCallback) {
+      setParamCallback(nodeItem.data, item);
+    }
+    if (isDisable) {
+      nodeItem.data.disable = true;
+      // 用例节点可以打标签
+      nodeItem.data.allowDisabledTag = true;
+    }
+    parseChildren(nodeItem, item, isDisable);
     if (mapItem) {
       mapItem.push(nodeItem);
     } else {
@@ -29,23 +37,23 @@ export function getTestCaseDataMap(testCase) {
   return dataMap;
 }
 
-function parseChildren(nodeItem, item) {
+function parseChildren(nodeItem, item, isDisable) {
   nodeItem.children = [];
   let children = [];
-  _parseChildren(children, item.prerequisite, "前置条件");
+  _parseChildren(children, item.prerequisite, "前置条件", isDisable);
   item.steps.forEach((step) => {
-    let descNode = _parseChildren(children, step.desc, "测试步骤");
+    let descNode = _parseChildren(children, step.desc, "测试步骤", isDisable);
     if (descNode) {
       descNode.data.num = step.num;
       descNode.children = [];
-      _parseChildren(descNode.children, step.result, "预期结果");
+      _parseChildren(descNode.children, step.result, "预期结果", isDisable);
     }
   });
-  _parseChildren(children, item.remark, "备注");
+  _parseChildren(children, item.remark, "备注", isDisable);
   nodeItem.children = children;
 }
 
-function _parseChildren(children, k, v) {
+function _parseChildren(children, k, v, isDisable) {
   if (k) {
     let node = {
       data: {
@@ -53,6 +61,9 @@ function _parseChildren(children, k, v) {
         resource: [v]
       }
     }
+    if (isDisable) {
+      node.data.disable = true;
+    }
     children.push(node);
     return node;
   }

From caf3f3652c29ec356c2753ea46839abac941afea Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Mar 2021 10:54:31 +0800
Subject: [PATCH 35/95] =?UTF-8?q?fix:=20=E7=94=A8=E4=BE=8B=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E8=84=91=E5=9B=BE=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TestReviewTestCaseController.java   |  6 ++++++
 .../track/service/TestReviewTestCaseService.java   | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
index 58cc38f0f0..8c22d65b08 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
@@ -49,6 +49,12 @@ public class TestReviewTestCaseController {
         testReviewTestCaseService.editTestCaseBatchStatus(request);
     }
 
+    @PostMapping("/minder/edit")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void editTestCaseForMinder(@RequestBody List<TestCaseReviewTestCase> testCases) {
+        testReviewTestCaseService.editTestCaseForMinder(testCases);
+    }
+
     @PostMapping("/list/all")
     public List<TestReviewCaseDTO> getTestReviewCases(@RequestBody QueryCaseReviewRequest request) {
         return testReviewTestCaseService.list(request);
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 067001fbd1..d2576841f5 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -163,4 +163,18 @@ public class TestReviewTestCaseService {
             MSException.throwException("非此用例的评审人员！");
         }
     }
+
+    public void editTestCaseForMinder(List<TestCaseReviewTestCase> testCaseReviewTestCases) {
+        if (!CollectionUtils.isEmpty(testCaseReviewTestCases)) {
+            List<TestCaseWithBLOBs> testCaseList = new ArrayList<>();
+            testCaseReviewTestCases.forEach((item) -> {
+                TestCaseWithBLOBs testCase = new TestCaseWithBLOBs();
+                testCase.setId(item.getCaseId());
+                testCase.setReviewStatus(item.getStatus());
+                testCaseList.add(testCase);
+                testCaseReviewTestCaseMapper.updateByPrimaryKeySelective(item);
+            });
+            testCaseList.forEach(testCaseMapper::updateByPrimaryKeySelective);
+        }
+    }
 }

From eac412baab850aae216e67e25b0f1d0677617aff Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 17 Mar 2021 11:41:38 +0800
Subject: [PATCH 36/95] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E6=AD=A5=E9=AA=A4=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E5=8C=96=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/ApiAutomation.vue          | 15 +++++--
 .../automation/scenario/EditApiScenario.vue   | 12 ++++--
 .../scenario/maximize/ScenarioHeader.vue      | 41 +++++++++++++++----
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index bba45cd049..1422ba243e 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -39,7 +39,7 @@
           :name="item.name"
           closable>
           <div class="ms-api-scenario-div">
-            <ms-edit-api-scenario @refresh="refresh" @openScenario="editScenario" :currentScenario="item.currentScenario"
+            <ms-edit-api-scenario @refresh="refresh" @openScenario="editScenario" @closePage="closePage" :currentScenario="item.currentScenario"
                                   :moduleOptions="moduleOptions" ref="autoScenarioConfig"/>
           </div>
         </el-tab-pane>
@@ -94,7 +94,7 @@
         this.checkRedirectEditPage(redirectParam);
         return redirectParam;
       },
-      isReadOnly(){
+      isReadOnly() {
         return !checkoutTestManagerOrTestUser();
       }
     },
@@ -137,7 +137,7 @@
       exportAPI() {
         this.$refs.apiScenarioList.exportApi();
       },
-      exportJmx(){
+      exportJmx() {
         this.$refs.apiScenarioList.exportJmx();
       },
       checkRedirectEditPage(redirectParam) {
@@ -226,6 +226,15 @@
             break;
         }
       },
+      closePage(targetName) {
+        this.tabs = this.tabs.filter(tab => tab.label !== targetName);
+        if (this.tabs.length > 0) {
+          this.activeName = this.tabs[this.tabs.length - 1].name;
+          this.addListener(); //  自动切换当前标签时，也添加监听
+        } else {
+          this.activeName = "default"
+        }
+      },
       removeTab(targetName) {
         this.tabs = this.tabs.filter(tab => tab.name !== targetName);
         if (this.tabs.length > 0) {
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index a8669af8d1..e2075432d1 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -198,7 +198,7 @@
       <ms-drawer :visible="drawer" :size="100" @close="close" direction="right" :show-full-screen="false" :is-show-close="false" style="overflow: hidden">
         <template v-slot:header>
           <scenario-header :currentScenario="currentScenario" :projectEnvMap="projectEnvMap" :projectIds="projectIds" :projectList="projectList" :scenarioDefinition="scenarioDefinition" :enableCookieShare="enableCookieShare"
-                           @closePage="close" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" @setCookieShare="setCookieShare" ref="maximizeHeader"/>
+                           @closePage="close" @unFullScreen="unFullScreen" @showAllBtn="showAllBtn" @runDebug="runDebug" @setProjectEnvMap="setProjectEnvMap" @showScenarioParameters="showScenarioParameters" @setCookieShare="setCookieShare" ref="maximizeHeader"/>
         </template>
 
         <maximize-scenario :scenario-definition="scenarioDefinition" :envMap="projectEnvMap" :moduleOptions="moduleOptions" :currentScenario="currentScenario" :type="type" ref="maximizeScenario" @openScenario="openScenario"/>
@@ -1079,10 +1079,13 @@
       fullScreen() {
         this.drawer = true;
       },
-      close() {
+      unFullScreen() {
         this.drawer = false;
+      },
+      close(name) {
+        this.drawer = false;
+        this.$emit('closePage', name);
       }
-
     }
   }
 </script>
@@ -1221,7 +1224,8 @@
 
   .alt-ico {
     font-size: 15px;
-    margin: 0px 10px 0px;
+    margin: 5px 10px 0px;
+    float: right;
     color: #8c939d;
   }
 
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
index fb9e29c045..ece7f487cd 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -16,12 +16,16 @@
       </el-row>
     </div>
     <div class="ms-header-right">
-      <el-checkbox v-model="cookieShare" class="ms-right" @change="setCookieShare">共享cookie</el-checkbox>
+      <el-checkbox v-model="cookieShare" @change="setCookieShare" style="margin-right: 20px">共享cookie</el-checkbox>
+
       <env-popover :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
                    :project-list="projectList" ref="envPopover" class="ms-right"/>
+
       <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+
+      <font-awesome-icon class="alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="unFullScreen"/>
       ｜
-      <i class="el-icon-close alt-ico" @click="close"/>
+      <i class="el-icon-close alt-ico-close" @click="close"/>
     </div>
   </div>
 </template>
@@ -65,13 +69,16 @@
         this.$emit('showAllBtn');
       },
       close() {
-        this.$emit('closePage');
+        this.$emit('closePage', this.currentScenario.name);
+      },
+      unFullScreen() {
+        this.$emit('unFullScreen');
       },
       runDebug() {
         this.$emit('runDebug');
       },
-      setCookieShare(){
-        this.$emit('setCookieShare',this.cookieShare);
+      setCookieShare() {
+        this.$emit('setCookieShare', this.cookieShare);
       },
       showScenarioParameters() {
         this.$emit('showScenarioParameters');
@@ -110,7 +117,7 @@
 
   .ms-div {
     float: left;
-    width: 80%;
+    width: 60%;
     margin-left: 20px;
     margin-top: 12px;
   }
@@ -119,20 +126,29 @@
     float: right;
     margin-top: 2px;
     position: fixed;
-    right: 40px;
+    right: 20px;
     z-index: 1;
 
   }
 
   .alt-ico {
+    font-size: 16px;
+    margin: 10px 10px 0px;
+  }
+
+  .alt-ico-close {
     font-size: 18px;
-    margin: 10px 0px 0px;
+    margin: 10px 10px 10px;
+  }
+
+  .alt-ico-close:hover {
+    color: black;
+    cursor: pointer;
   }
 
   .alt-ico:hover {
     color: black;
     cursor: pointer;
-    font-size: 18px;
   }
 
   .ms-header-margin {
@@ -142,4 +158,11 @@
   .ms-right {
     margin-right: 40px;
   }
+
+  .head {
+    border-bottom: 1px solid #303133;
+    color: #303133;
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+    font-size: 13px;
+  }
 </style>

From 492dbb42bd3e454d5888893cec2327eb71631926 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Mar 2021 11:45:49 +0800
Subject: [PATCH 37/95] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=84=91=E5=9B=BE=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestPlanTestCaseController.java           |  6 ++
 .../service/TestPlanTestCaseService.java      |  7 ++
 .../service/TestReviewTestCaseService.java    |  2 +
 .../track/common/minder/TestPlanMinder.vue    | 94 ++++++++-----------
 .../track/common/minder/TestReviewMinder.vue  |  7 +-
 5 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
index f3362abbd0..0082a69169 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
@@ -101,6 +101,12 @@ public class TestPlanTestCaseController {
         testPlanTestCaseService.editTestCase(testPlanTestCase);
     }
 
+    @PostMapping("/minder/edit")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void editTestCaseForMinder(@RequestBody List<TestPlanTestCaseWithBLOBs> testPlanTestCases) {
+        testPlanTestCaseService.editTestCaseForMinder(testPlanTestCases);
+    }
+
     @PostMapping("/batch/edit")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public void editTestCaseBath(@RequestBody TestPlanCaseBatchRequest request) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index 7617f37d07..3b103d1aaf 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -154,4 +154,11 @@ public class TestPlanTestCaseService {
     public List<TestPlanCaseDTO> listForMinder(String planId) {
         return extTestPlanTestCaseMapper.listForMinder(planId);
     }
+
+    public void editTestCaseForMinder(List<TestPlanTestCaseWithBLOBs> testPlanTestCases) {
+        testPlanTestCases.forEach(item -> {
+            item.setUpdateTime(System.currentTimeMillis());
+            testPlanTestCaseMapper.updateByPrimaryKeySelective(item);
+        });
+    }
 }
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 d2576841f5..e77d06373d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -172,6 +172,8 @@ public class TestReviewTestCaseService {
                 testCase.setId(item.getCaseId());
                 testCase.setReviewStatus(item.getStatus());
                 testCaseList.add(testCase);
+                testCase.setUpdateTime(System.currentTimeMillis());
+                item.setUpdateTime(System.currentTimeMillis());
                 testCaseReviewTestCaseMapper.updateByPrimaryKeySelective(item);
             });
             testCaseList.forEach(testCaseMapper::updateByPrimaryKeySelective);
diff --git a/frontend/src/business/components/track/common/minder/TestPlanMinder.vue b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
index f15a0c0ecd..012b08ece6 100644
--- a/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
@@ -3,6 +3,7 @@
     v-loading="result.loading"
     :tree-nodes="treeNodes"
     :data-map="dataMap"
+    :tags="tags"
     @save="save"
   />
 </template>
@@ -15,9 +16,9 @@ name: "TestPlanMinder",
   components: {MsModuleMinder},
   data() {
     return{
-      testCase: [],
       dataMap: new Map(),
-      result: {}
+      result: {},
+      tags: ['通过', '失败', '阻塞', '跳过'],
     }
   },
   props: {
@@ -44,24 +45,30 @@ name: "TestPlanMinder",
     getTestCases() {
       if (this.projectId) {
         this.result = this.$get('/test/plan/case/list/minder/' + this.planId, response => {
-          this.testCase = response.data;
-          this.dataMap = getTestCaseDataMap(this.testCase);
+          this.dataMap = getTestCaseDataMap(response.data, true, (data, item) => {
+            if (item.stats === 'Pass') {
+              data.resource.push("通过");
+            } else if (item.reviewStatus === 'Failure') {
+              data.resource.push("失败");
+            } else if (item.reviewStatus === 'Blocking') {
+              data.resource.push("阻塞");
+            } else if (item.reviewStatus === 'Skip') {
+              data.resource.push("跳过");
+            } else {
+              data.resource.push("未开始");
+            }
+          });
         });
       }
     },
     save(data) {
-      // let saveCases = [];
-      // this.buildSaveCase(data.root, saveCases, undefined);
-      // console.log(saveCases);
-      // let param = {
-      //   projectId: this.projectId,
-      //   data: saveCases
-      // }
-      // this.result = this.$post('/test/case/minder/edit', param, () => {
-      //   this.$success(this.$t('commons.save_success'));
-      // });
+      let saveCases = [];
+      this.buildSaveCase(data.root, saveCases);
+      this.result = this.$post('/test/plan/case/minder/edit', saveCases, () => {
+        this.$success(this.$t('commons.save_success'));
+      });
     },
-    buildSaveCase(root, saveCases, parent) {
+    buildSaveCase(root, saveCases) {
       let data = root.data;
       if (data.resource && data.resource.indexOf("用例") > -1) {
         this._buildSaveCase(root, saveCases, parent);
@@ -73,52 +80,27 @@ name: "TestPlanMinder",
         }
       }
     },
-    _buildSaveCase(node, saveCases, parent) {
+    _buildSaveCase(node, saveCases) {
       let data = node.data;
-      let isChange = false;
+      if (!data.changed) {
+        return;
+      }
       let testCase = {
         id: data.id,
-        name: data.text,
-        nodeId: parent ? parent.id : "",
-        nodePath: parent ? parent.path : "",
-        type: data.type ? data.type : 'functional',
-        method: data.method ? data.method : 'manual',
-        maintainer: data.maintainer,
-        priority: 'P' + data.priority,
       };
-      if (data.changed) isChange = true;
-      let steps = [];
-      let stepNum = 1;
-      if (node.children) {
-        node.children.forEach((childNode) => {
-          let childData = childNode.data;
-          if (childData.resource && childData.resource.indexOf('前置条件') > -1) {
-            testCase.prerequisite = childData.text;
-          } else if (childData.resource && childData.resource.indexOf('备注') > -1) {
-            testCase.remark = childData.text;
-          } else {
-            // 测试步骤
-            let step = {};
-            step.num = stepNum++;
-            step.desc = childData.text;
-            if (childNode.children) {
-              let result = "";
-              childNode.children.forEach((child) => {
-                result += child.data.text;
-                if (child.data.changed) isChange = true;
-              })
-              step.result = result;
-            }
-            steps.push(step);
-          }
-          if (childData.changed) isChange = true;
-        })
+      if (data.resource.length > 1) {
+        if (data.resource.indexOf('失败') > -1) {
+          testCase.status = 'Failure';
+        } else if (data.resource.indexOf('通过') > -1) {
+          testCase.status = 'Pass';
+        } else if (data.resource.indexOf('阻塞') > -1) {
+          testCase.status = 'Blocking';
+        } else if (data.resource.indexOf('跳过') > -1) {
+          testCase.status = 'Skip';
+        }
       }
-      testCase.steps = JSON.stringify(steps);
-      if (isChange) {
-        saveCases.push(testCase);
-      }
-    },
+      saveCases.push(testCase);
+    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
index a6444f3ede..b42b16be99 100644
--- a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
@@ -16,7 +16,6 @@ name: "TestReviewMinder",
   components: {MsModuleMinder},
   data() {
     return{
-      testCase: [],
       dataMap: new Map(),
       tags: ['通过', '不通过'],
       result: {}
@@ -60,10 +59,8 @@ name: "TestReviewMinder",
       }
     },
     save(data) {
-      console.log(data);
       let saveCases = [];
       this.buildSaveCase(data.root, saveCases);
-      console.log(saveCases);
       this.result = this.$post('/test/review/case/minder/edit', saveCases, () => {
         this.$success(this.$t('commons.save_success'));
       });
@@ -91,9 +88,9 @@ name: "TestReviewMinder",
         // name: data.text,
       };
       if (data.resource.length > 1) {
-        if (data.resource.indexOf('不通过')) {
+        if (data.resource.indexOf('不通过') > -1) {
           testCase.status = 'UnPass';
-        } else if (data.resource.indexOf('通过')) {
+        } else if (data.resource.indexOf('通过') > -1) {
           testCase.status = 'Pass';
         }
       }

From e30209e990436d9d57ca834cafb2dda4ee5d3692 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Mar 2021 13:03:59 +0800
Subject: [PATCH 38/95] =?UTF-8?q?refactor:=20=E6=B5=8B=E8=AF=95=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=B8=8E=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E8=84=91?=
 =?UTF-8?q?=E5=9B=BE=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                                      | 2 +-
 .../components/common/components/MsModuleMinder.vue        | 7 +++++++
 .../components/track/common/minder/TestCaseMinder.vue      | 2 ++
 .../components/track/common/minder/TestPlanMinder.vue      | 1 +
 .../components/track/common/minder/TestReviewMinder.vue    | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 95dc60202e..6dc8af31e0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -49,7 +49,7 @@
     "xml-js": "^1.6.11",
     "yan-progress": "^1.0.3",
     "jsonpath": "^1.1.0",
-    "vue-minder-editor-plus": "^1.0.17",
+    "vue-minder-editor-plus": "^1.0.18",
     "jsencrypt": "^3.1.0"
   },
   "devDependencies": {
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index b57b3fe069..f489472ba8 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -7,6 +7,7 @@
       :height="700"
       :progress-enable="false"
       :tags="tags"
+      :distinct-tags="distinctTags"
       @save="save"
     />
   </div>
@@ -36,6 +37,12 @@ export default {
         return []
       }
     },
+    distinctTags: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
   },
   data() {
     return {
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 85340c98f2..e5ddc1fbfe 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -3,6 +3,7 @@
     v-loading="result.loading"
     :tree-nodes="treeNodes"
     :data-map="dataMap"
+    :tags="tags"
     @save="save"
   />
 </template>
@@ -17,6 +18,7 @@ name: "TestCaseMinder",
     return{
       testCase: [],
       dataMap: new Map(),
+      tags: ['用例', '测试步骤', '预期结果', '备注'],
       result: {}
     }
   },
diff --git a/frontend/src/business/components/track/common/minder/TestPlanMinder.vue b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
index 012b08ece6..b9a163da1f 100644
--- a/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
@@ -4,6 +4,7 @@
     :tree-nodes="treeNodes"
     :data-map="dataMap"
     :tags="tags"
+    :distinct-tags="[...tags, '未开始']"
     @save="save"
   />
 </template>
diff --git a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
index b42b16be99..6295625b19 100644
--- a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
@@ -4,6 +4,7 @@
     :tree-nodes="treeNodes"
     :data-map="dataMap"
     :tags="tags"
+    :distinct-tags="[...tags, '未开始']"
     @save="save"
   />
 </template>

From 51e0461dc3754b470e16e3d94ca90b02dad87dd2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Mar 2021 13:17:33 +0800
Subject: [PATCH 39/95] =?UTF-8?q?refactor:=20=E8=84=91=E5=9B=BE=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=AD=A5=E9=AA=A4=E5=92=8C=E9=A2=84=E6=9C=9F=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E5=8A=A0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/common/head/HeaderCustom.vue    | 1 -
 .../components/track/case/components/TestCaseEdit.vue       | 2 --
 .../components/track/common/minder/TestCaseMinder.vue       | 2 +-
 .../business/components/track/common/minder/minderUtils.js  | 6 +++---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index c50d5bb577..c99050641c 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -54,7 +54,6 @@ export default {
       /*this.optionalField = items*/
     },
     saveHeader() {
-      console.log(this.type)
       let param = {
         userId: getCurrentUser().id,
         type: this.type,
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index c1800b8268..4ddd1d4e2a 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -679,8 +679,6 @@ export default {
       return param;
     },
     getOption(param) {
-      console.log(this.type)
-      console.log("3452")
       let formData = new FormData();
       let type = this.type
       if (this.type === 'copy') {
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index e5ddc1fbfe..fd374674d8 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -18,7 +18,7 @@ name: "TestCaseMinder",
     return{
       testCase: [],
       dataMap: new Map(),
-      tags: ['用例', '测试步骤', '预期结果', '备注'],
+      tags: ['用例', '前置条件', '备注'],
       result: {}
     }
   },
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index bbe404d280..29c77aa44c 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -42,11 +42,11 @@ function parseChildren(nodeItem, item, isDisable) {
   let children = [];
   _parseChildren(children, item.prerequisite, "前置条件", isDisable);
   item.steps.forEach((step) => {
-    let descNode = _parseChildren(children, step.desc, "测试步骤", isDisable);
+    let descNode = _parseChildren(children, step.desc, undefined, isDisable);
     if (descNode) {
       descNode.data.num = step.num;
       descNode.children = [];
-      _parseChildren(descNode.children, step.result, "预期结果", isDisable);
+      _parseChildren(descNode.children, step.result, undefined, isDisable);
     }
   });
   _parseChildren(children, item.remark, "备注", isDisable);
@@ -58,7 +58,7 @@ function _parseChildren(children, k, v, isDisable) {
     let node = {
       data: {
         text: k,
-        resource: [v]
+        resource: v ? [v] : []
       }
     }
     if (isDisable) {

From e58dcf4d889c4f6a3c885a2da34b1a753fa9fc20 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 17 Mar 2021 14:05:44 +0800
Subject: [PATCH 40/95] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=89=A7=E8=A1=8C=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiAutomationController.java   |  2 +-
 .../api/dto/automation/ApiScenarioDTO.java    |  2 +
 .../api/service/ApiAutomationService.java     | 50 +++++++++----------
 .../base/mapper/ext/ExtApiScenarioMapper.xml  |  2 -
 .../TestCaseReviewScenarioCaseService.java    | 37 --------------
 .../service/TestPlanScenarioCaseService.java  | 31 ------------
 .../automation/scenario/ApiScenarioList.vue   | 14 ++----
 .../scenario/testplan/TestPlanList.vue        | 11 ++--
 .../track/case/components/BatchEdit.vue       | 25 +++++++---
 .../comonents/api/RelevanceScenarioList.vue   |  7 ++-
 .../api/TestCaseScenarioRelevance.vue         |  6 +--
 .../comonents/api/TestPlanApiScenarioList.vue |  8 +--
 12 files changed, 66 insertions(+), 129 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index fa4e5d86ef..bc38ce887f 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -86,7 +86,7 @@ public class ApiAutomationController {
     }
 
     @GetMapping("/getApiScenario/{id}")
-    public ApiScenario getScenarioDefinition(@PathVariable String id) {
+    public ApiScenarioDTO getScenarioDefinition(@PathVariable String id) {
         return apiAutomationService.getApiScenario(id);
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
index b1f9e6e044..540ee78564 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
@@ -18,4 +18,6 @@ public class ApiScenarioDTO extends ApiScenarioWithBLOBs {
      * 场景跨项目ID
      */
     private List<String> projectIds;
+
+    private String caseId;
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index ebc994c1c4..9da3974953 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -94,42 +94,38 @@ public class ApiAutomationService {
     public List<ApiScenarioDTO> list(ApiScenarioRequest request) {
         request = this.initRequest(request, true, true);
         List<ApiScenarioDTO> list = extApiScenarioMapper.list(request);
-        setApiScenarioProjectIds(list);
         return list;
     }
     public List<ApiScenarioDTO> listReview(ApiScenarioRequest request) {
         request = this.initRequest(request, true, true);
         List<ApiScenarioDTO> list = extApiScenarioMapper.listReview(request);
-        setApiScenarioProjectIds(list);
         return list;
     }
-    private void setApiScenarioProjectIds(List<ApiScenarioDTO> list) {
+    private void setApiScenarioProjectIds(ApiScenarioDTO data) {
         // 如果场景步骤涉及多项目，则把涉及到的项目ID保存在projectIds属性
-        list.forEach(data -> {
-            List<String> idList = new ArrayList<>();
-            String definition = data.getScenarioDefinition();
-            if (StringUtils.isNotBlank(definition)) {
-                RunDefinitionRequest d = JSON.parseObject(definition, RunDefinitionRequest.class);
+        List<String> idList = new ArrayList<>();
+        String definition = data.getScenarioDefinition();
+        if (StringUtils.isNotBlank(definition)) {
+            RunDefinitionRequest d = JSON.parseObject(definition, RunDefinitionRequest.class);
 
-                if (d != null) {
-                    Map<String, String> map = d.getEnvironmentMap();
-                    if (map != null) {
-                        if (map.isEmpty()) {
-                            List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
-                            idList.addAll(new HashSet<>(ids));
-                        } else {
-                            Set<String> set = d.getEnvironmentMap().keySet();
-                            idList = new ArrayList<>(set);
-                        }
+            if (d != null) {
+                Map<String, String> map = d.getEnvironmentMap();
+                if (map != null) {
+                    if (map.isEmpty()) {
+                        List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
+                        idList.addAll(new HashSet<>(ids));
                     } else {
-                        // 兼容历史数据，无EnvironmentMap直接赋值场景所属项目
-                        idList.add(data.getProjectId());
+                        Set<String> set = d.getEnvironmentMap().keySet();
+                        idList = new ArrayList<>(set);
                     }
+                } else {
+                    // 兼容历史数据，无EnvironmentMap直接赋值场景所属项目
+                    idList.add(data.getProjectId());
                 }
-
             }
-            data.setProjectIds(idList);
-        });
+
+        }
+        data.setProjectIds(idList);
     }
 
     /**
@@ -333,8 +329,12 @@ public class ApiAutomationService {
         }
     }
 
-    public ApiScenarioWithBLOBs getApiScenario(String id) {
-        return apiScenarioMapper.selectByPrimaryKey(id);
+    public ApiScenarioDTO getApiScenario(String id) {
+        ApiScenarioDTO apiScenarioDTO = new ApiScenarioDTO();
+        ApiScenarioWithBLOBs scenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(id);
+        BeanUtils.copyBean(apiScenarioDTO, scenarioWithBLOBs);
+        setApiScenarioProjectIds(apiScenarioDTO);
+        return apiScenarioDTO;
     }
 
     public List<ApiScenarioWithBLOBs> getApiScenarios(List<String> ids) {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 033111900a..c7db6225fe 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -134,7 +134,6 @@
     </sql>
     <select id="list" resultMap="BaseResultMap">
         select api_scenario.id, api_scenario.project_id, api_scenario.tags, api_scenario.user_id, api_scenario.num,
-               api_scenario.scenario_definition,
         api_scenario.api_scenario_module_id,api_scenario.module_path, api_scenario.name, api_scenario.level,
         api_scenario.status, api_scenario.principal, api_scenario.step_total, api_scenario.follow_people,
         api_scenario.last_result,api_scenario.pass_rate,api_scenario.report_id,
@@ -339,7 +338,6 @@
     </select>
     <select id="listReview" resultMap="BaseResultMap">
         select api_scenario.id, api_scenario.project_id, api_scenario.tags, api_scenario.user_id, api_scenario.num,
-        api_scenario.scenario_definition,
         api_scenario.api_scenario_module_id,api_scenario.module_path, api_scenario.name, api_scenario.level,
         api_scenario.status, api_scenario.principal, api_scenario.step_total, api_scenario.follow_people,
         api_scenario.last_result,api_scenario.pass_rate,api_scenario.report_id,
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
index 76228fef48..0f3b3bdfb0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
@@ -1,22 +1,16 @@
 package io.metersphere.track.service;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONPath;
 import io.metersphere.api.dto.automation.ApiScenarioDTO;
 import io.metersphere.api.dto.automation.ApiScenarioRequest;
 import io.metersphere.api.dto.automation.RunScenarioRequest;
 import io.metersphere.api.dto.automation.TestPlanScenarioRequest;
-import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.api.service.ApiScenarioReportService;
 import io.metersphere.base.domain.TestCaseReviewScenario;
 import io.metersphere.base.domain.TestCaseReviewScenarioExample;
-import io.metersphere.base.domain.TestPlanApiScenario;
-import io.metersphere.base.domain.TestPlanApiScenarioExample;
 import io.metersphere.base.mapper.TestCaseReviewScenarioMapper;
-import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseReviewScenarioCaseMapper;
-import io.metersphere.base.mapper.ext.ExtTestPlanScenarioCaseMapper;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.track.dto.RelevanceScenarioRequest;
@@ -45,46 +39,15 @@ public class TestCaseReviewScenarioCaseService {
         request.setProjectId(null);
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         List<ApiScenarioDTO> apiTestCases = extTestCaseReviewScenarioCaseMapper.list(request);
-        setApiScenarioProjectIds(apiTestCases);
         if (CollectionUtils.isEmpty(apiTestCases)) {
             return apiTestCases;
         }
         return apiTestCases;
     }
 
-    private void setApiScenarioProjectIds(List<ApiScenarioDTO> list) {
-        // 如果场景步骤涉及多项目，则把涉及到的项目ID保存在projectIds属性
-        list.forEach(data -> {
-            List<String> idList = new ArrayList<>();
-            String definition = data.getScenarioDefinition();
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(definition)) {
-                RunDefinitionRequest d = JSON.parseObject(definition, RunDefinitionRequest.class);
-
-                if (d != null) {
-                    Map<String, String> map = d.getEnvironmentMap();
-                    if (map != null) {
-                        if (map.isEmpty()) {
-                            List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
-                            idList.addAll(new HashSet<>(ids));
-                        } else {
-                            Set<String> set = d.getEnvironmentMap().keySet();
-                            idList = new ArrayList<>(set);
-                        }
-                    } else {
-                        // 兼容历史数据，无EnvironmentMap直接赋值场景所属项目
-                        idList.add(data.getProjectId());
-                    }
-                }
-
-            }
-            data.setProjectIds(idList);
-        });
-    }
-
     public List<ApiScenarioDTO> relevanceList(ApiScenarioRequest request) {
         request.setNotInTestPlan(true);
         List<ApiScenarioDTO> list = apiAutomationService.listReview(request);
-        setApiScenarioProjectIds(list);
         return list;
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
index 37bab71978..6b19732101 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
@@ -42,46 +42,15 @@ public class TestPlanScenarioCaseService {
         request.setProjectId(null);
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         List<ApiScenarioDTO> apiTestCases = extTestPlanScenarioCaseMapper.list(request);
-        setApiScenarioProjectIds(apiTestCases);
         if (CollectionUtils.isEmpty(apiTestCases)) {
             return apiTestCases;
         }
         return apiTestCases;
     }
 
-    private void setApiScenarioProjectIds(List<ApiScenarioDTO> list) {
-        // 如果场景步骤涉及多项目，则把涉及到的项目ID保存在projectIds属性
-        list.forEach(data -> {
-            List<String> idList = new ArrayList<>();
-            String definition = data.getScenarioDefinition();
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(definition)) {
-                RunDefinitionRequest d = JSON.parseObject(definition, RunDefinitionRequest.class);
-
-                if (d != null) {
-                    Map<String, String> map = d.getEnvironmentMap();
-                    if (map != null) {
-                        if (map.isEmpty()) {
-                            List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
-                            idList.addAll(new HashSet<>(ids));
-                        } else {
-                            Set<String> set = d.getEnvironmentMap().keySet();
-                            idList = new ArrayList<>(set);
-                        }
-                    } else {
-                        // 兼容历史数据，无EnvironmentMap直接赋值场景所属项目
-                        idList.add(data.getProjectId());
-                    }
-                }
-
-            }
-            data.setProjectIds(idList);
-        });
-    }
-
     public List<ApiScenarioDTO> relevanceList(ApiScenarioRequest request) {
         request.setNotInTestPlan(true);
         List<ApiScenarioDTO> list = apiAutomationService.list(request);
-        setApiScenarioProjectIds(list);
         return list;
     }
 
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index c8bade0683..f226375d16 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -439,7 +439,7 @@
       },
       handleBatchEdit() {
         this.$refs.batchEdit.open(this.selectDataCounts);
-        this.$refs.batchEdit.setScenarioSelectRows(this.selectRows);
+        this.$refs.batchEdit.setScenarioSelectRows(this.selectRows, "scenario");
       },
       handleBatchMove() {
         this.$refs.testBatchMove.open(this.moduleTree, [], this.moduleOptions);
@@ -457,11 +457,7 @@
         // 批量修改环境
         if (form.type === 'projectEnv') {
           let param = {};
-          let map = new Map();
-          this.selectRows.forEach(row => {
-            map.set(row.id, row.projectIds);
-          })
-          param.mapping = strMapToObj(map);
+          param.mapping = strMapToObj(form.map);
           param.envMap = strMapToObj(form.projectEnvMap);
           this.$post('/api/automation/batch/update/env', param, () => {
             this.$success(this.$t('commons.save_success'));
@@ -519,11 +515,7 @@
 
         this.planVisible = false;
 
-        let map = new Map();
-        this.selectRows.forEach(row => {
-          map.set(row.id, row.projectIds);
-        })
-        obj.mapping = strMapToObj(map);
+        obj.mapping = strMapToObj(params[2]);
         obj.envMap = strMapToObj(params[1]);
 
         this.$post("/api/automation/scenario/plan", obj, response => {
diff --git a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
index bcbe85bf8b..af4b987937 100644
--- a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
+++ b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
@@ -195,7 +195,8 @@ export default {
         ],
         projectEnvMap: new Map(),
         projectList: [],
-        projectIds: new Set()
+        projectIds: new Set(),
+        map: new Map(),
       }
     },
     watch: {
@@ -221,7 +222,7 @@ export default {
           if (!sign) {
             return false;
           }
-          this.$emit('addTestPlan', this.selection, this.projectEnvMap);
+          this.$emit('addTestPlan', this.selection, this.projectEnvMap, this.map);
         }
       },
       cancel(){
@@ -237,7 +238,11 @@ export default {
       setScenarioSelectRows(rows) {
         this.projectIds.clear();
         rows.forEach(row => {
-          row.projectIds.forEach(id => this.projectIds.add(id));
+          this.result = this.$get('/api/automation/getApiScenario/' + row.id, res => {
+            let data = res.data;
+            data.projectIds.forEach(d => this.projectIds.add(d));
+            this.map.set(row.id, data.projectIds);
+          })
         })
       },
       initTableData() {
diff --git a/frontend/src/business/components/track/case/components/BatchEdit.vue b/frontend/src/business/components/track/case/components/BatchEdit.vue
index 89070b4556..3c4a5fb55b 100644
--- a/frontend/src/business/components/track/case/components/BatchEdit.vue
+++ b/frontend/src/business/components/track/case/components/BatchEdit.vue
@@ -7,6 +7,7 @@
       class="batch-edit-dialog"
       :destroy-on-close="true"
       @close="handleClose"
+      v-loading="result.loading"
     >
       <el-form :model="form" label-position="right" label-width="150px" size="medium" ref="form" :rules="rules">
         <el-form-item :label="$t('test_track.case.batch_update', [size])" prop="type">
@@ -72,7 +73,10 @@
         projectList: [],
         projectIds: new Set(),
         selectRows: new Set(),
-        projectEnvMap: new Map()
+        projectEnvMap: new Map(),
+        map: new Map(),
+        isScenario: '',
+        result: {}
       }
     },
     methods: {
@@ -84,6 +88,7 @@
               if (!this.$refs.envPopover.checkEnv()) {
                 return false;
               }
+              this.form.map = this.map;
             }
             this.$emit("batchEdit", this.form);
             this.dialogVisible = false;
@@ -113,12 +118,9 @@
           this.projectIds.add(row.projectId)
         })
       },
-      setScenarioSelectRows(rows) {
+      setScenarioSelectRows(rows, sign) {
         this.selectRows = rows;
-        this.projectIds.clear();
-        this.selectRows.forEach(row => {
-          row.projectIds.forEach(id => this.projectIds.add(id));
-        })
+        this.isScenario = sign;
       },
       handleClose() {
         this.form = {};
@@ -127,6 +129,17 @@
       },
       changeType(val) {
         this.$set(this.form, "value", "");
+        if (val === 'projectEnv' && this.isScenario !== '') {
+          this.projectIds.clear();
+          this.selectRows.forEach(row => {
+            let id = this.isScenario === 'scenario' ? row.id : row.caseId;
+            this.result = this.$get('/api/automation/getApiScenario/' + id, res => {
+              let data = res.data;
+              data.projectIds.forEach(d => this.projectIds.add(d));
+              this.map.set(row.id, data.projectIds);
+            })
+          })
+        }
         this.filterable = val === "maintainer" || val === "executor";
         this.options = this.valueArr[val];
         this.typeArr.forEach(item => {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
index a20cb5f123..fc2ba91129 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -93,6 +93,7 @@
         projectEnvMap: new Map(),
         projectList: [],
         projectIds: new Set(),
+        map: new Map()
       }
     },
     watch: {
@@ -159,8 +160,10 @@
       initProjectIds() {
         this.projectIds.clear();
         this.selectRows.forEach(row => {
-          row.projectIds.forEach(id => {
-            this.projectIds.add(id);
+          this.result = this.$get('/api/automation/getApiScenario/' + row.id, res => {
+            let data = res.data;
+            data.projectIds.forEach(d => this.projectIds.add(d));
+            this.map.set(row.id, data.projectIds);
           })
         })
       },
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
index 0791495606..5dcf7a01a2 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
@@ -104,12 +104,8 @@
         }
         let param = {};
         let url = '/api/automation/relevance';
-        let rows = this.$refs.apiScenarioList.selectRows;
         const envMap = this.$refs.apiScenarioList.projectEnvMap;
-        let map = new Map();
-        rows.forEach(row => {
-          map.set(row.id, row.projectIds);
-        })
+        let map = this.$refs.apiScenarioList.map;
         param.planId = this.planId;
         param.mapping = strMapToObj(map);
         param.envMap = strMapToObj(envMap);
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index 5c3612a19e..ef54695abc 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -358,15 +358,11 @@ export default {
     },
     handleBatchEdit() {
       this.$refs.batchEdit.open(this.selectRows.size);
-      this.$refs.batchEdit.setScenarioSelectRows(this.selectRows);
+      this.$refs.batchEdit.setScenarioSelectRows(this.selectRows, "planScenario");
     },
     batchEdit(form) {
       let param = {};
-      let map = new Map();
-      this.selectRows.forEach(row => {
-        map.set(row.id, row.projectIds);
-      })
-      param.mapping = strMapToObj(map);
+      param.mapping = strMapToObj(form.map);
       param.envMap = strMapToObj(form.projectEnvMap);
       if (this.planId) {
         this.$post('/test/plan/scenario/case/batch/update/env', param, () => {

From 806957ba798900203cb3189c8171cd05d1bc57b4 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 17 Mar 2021 15:02:44 +0800
Subject: [PATCH 41/95] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/TestCaseReviewScenario.java   |   7 +-
 .../domain/TestCaseReviewScenarioExample.java |  70 --------
 .../io/metersphere/base/domain/TestPlan.java  |   5 +-
 .../base/domain/TestPlanExample.java          |  60 +++++++
 .../mapper/TestCaseReviewScenarioMapper.java  |   9 +-
 .../mapper/TestCaseReviewScenarioMapper.xml   | 158 +++++++++++------
 .../base/mapper/TestPlanMapper.xml            | 161 ++++++++++--------
 .../track/controller/TestPlanController.java  |   5 +-
 .../track/service/TestPlanReportService.java  |   4 +-
 .../db/migration/V78__v1.8_release.sql        |   5 +-
 .../src/main/resources/generatorConfig.xml    |   2 +-
 .../components/common/model/JsonData.js       |   3 +
 .../track/plan/components/TestPlanList.vue    |  34 ++++
 .../comonents/base/TestCaseRelevanceBase.vue  |   9 +-
 .../TestCaseFunctionalRelevance.vue           |   1 +
 frontend/src/i18n/en-US.js                    |   2 +
 frontend/src/i18n/zh-CN.js                    |   2 +
 frontend/src/i18n/zh-TW.js                    |   2 +
 18 files changed, 331 insertions(+), 208 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java
index 9040b490a7..980ad2d36b 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenario.java
@@ -1,8 +1,9 @@
 package io.metersphere.base.domain;
 
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 public class TestCaseReviewScenario implements Serializable {
     private String id;
@@ -13,8 +14,6 @@ public class TestCaseReviewScenario implements Serializable {
 
     private String status;
 
-    private String environment;
-
     private Long createTime;
 
     private Long updateTime;
@@ -25,5 +24,7 @@ public class TestCaseReviewScenario implements Serializable {
 
     private String reportId;
 
+    private String environment;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java
index d83a2b911e..4eafd6e659 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewScenarioExample.java
@@ -384,76 +384,6 @@ public class TestCaseReviewScenarioExample {
             return (Criteria) this;
         }
 
-        public Criteria andEnvironmentIsNull() {
-            addCriterion("environment is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentIsNotNull() {
-            addCriterion("environment is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentEqualTo(String value) {
-            addCriterion("environment =", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentNotEqualTo(String value) {
-            addCriterion("environment <>", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentGreaterThan(String value) {
-            addCriterion("environment >", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentGreaterThanOrEqualTo(String value) {
-            addCriterion("environment >=", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentLessThan(String value) {
-            addCriterion("environment <", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentLessThanOrEqualTo(String value) {
-            addCriterion("environment <=", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentLike(String value) {
-            addCriterion("environment like", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentNotLike(String value) {
-            addCriterion("environment not like", value, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentIn(List<String> values) {
-            addCriterion("environment in", values, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentNotIn(List<String> values) {
-            addCriterion("environment not in", values, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentBetween(String value1, String value2) {
-            addCriterion("environment between", value1, value2, "environment");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnvironmentNotBetween(String value1, String value2) {
-            addCriterion("environment not between", value1, value2, "environment");
-            return (Criteria) this;
-        }
-
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
index e08e5acda2..16cfa759c5 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
@@ -1,8 +1,9 @@
 package io.metersphere.base.domain;
 
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 public class TestPlan implements Serializable {
     private String id;
@@ -41,6 +42,8 @@ public class TestPlan implements Serializable {
 
     private String projectId;
 
+    private Integer executionTimes;
+
     private String tags;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java b/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java
index 9c32388ed3..afe2e93584 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java
@@ -1303,6 +1303,66 @@ public class TestPlanExample {
             addCriterion("project_id not between", value1, value2, "projectId");
             return (Criteria) this;
         }
+
+        public Criteria andExecutionTimesIsNull() {
+            addCriterion("execution_times is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesIsNotNull() {
+            addCriterion("execution_times is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesEqualTo(Integer value) {
+            addCriterion("execution_times =", value, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesNotEqualTo(Integer value) {
+            addCriterion("execution_times <>", value, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesGreaterThan(Integer value) {
+            addCriterion("execution_times >", value, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesGreaterThanOrEqualTo(Integer value) {
+            addCriterion("execution_times >=", value, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesLessThan(Integer value) {
+            addCriterion("execution_times <", value, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesLessThanOrEqualTo(Integer value) {
+            addCriterion("execution_times <=", value, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesIn(List<Integer> values) {
+            addCriterion("execution_times in", values, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesNotIn(List<Integer> values) {
+            addCriterion("execution_times not in", values, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesBetween(Integer value1, Integer value2) {
+            addCriterion("execution_times between", value1, value2, "executionTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andExecutionTimesNotBetween(Integer value1, Integer value2) {
+            addCriterion("execution_times not between", value1, value2, "executionTimes");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.java b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.java
index 3e458cef66..c33a8b714e 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.java
@@ -2,9 +2,10 @@ package io.metersphere.base.mapper;
 
 import io.metersphere.base.domain.TestCaseReviewScenario;
 import io.metersphere.base.domain.TestCaseReviewScenarioExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface TestCaseReviewScenarioMapper {
     long countByExample(TestCaseReviewScenarioExample example);
 
@@ -16,15 +17,21 @@ public interface TestCaseReviewScenarioMapper {
 
     int insertSelective(TestCaseReviewScenario record);
 
+    List<TestCaseReviewScenario> selectByExampleWithBLOBs(TestCaseReviewScenarioExample example);
+
     List<TestCaseReviewScenario> selectByExample(TestCaseReviewScenarioExample example);
 
     TestCaseReviewScenario selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") TestCaseReviewScenario record, @Param("example") TestCaseReviewScenarioExample example);
 
+    int updateByExampleWithBLOBs(@Param("record") TestCaseReviewScenario record, @Param("example") TestCaseReviewScenarioExample example);
+
     int updateByExample(@Param("record") TestCaseReviewScenario record, @Param("example") TestCaseReviewScenarioExample example);
 
     int updateByPrimaryKeySelective(TestCaseReviewScenario record);
 
+    int updateByPrimaryKeyWithBLOBs(TestCaseReviewScenario record);
+
     int updateByPrimaryKey(TestCaseReviewScenario record);
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml
index 07929624e8..2059c38ce8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewScenarioMapper.xml
@@ -2,16 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.TestCaseReviewScenarioMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.TestCaseReviewScenario">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="test_case_review_id" jdbcType="VARCHAR" property="testCaseReviewId" />
-    <result column="api_scenario_id" jdbcType="VARCHAR" property="apiScenarioId" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="environment" jdbcType="VARCHAR" property="environment" />
-    <result column="create_time" jdbcType="BIGINT" property="createTime" />
-    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-    <result column="pass_rate" jdbcType="VARCHAR" property="passRate" />
-    <result column="last_result" jdbcType="VARCHAR" property="lastResult" />
-    <result column="report_id" jdbcType="VARCHAR" property="reportId" />
+    <id column="id" jdbcType="VARCHAR" property="id"/>
+    <result column="test_case_review_id" jdbcType="VARCHAR" property="testCaseReviewId"/>
+    <result column="api_scenario_id" jdbcType="VARCHAR" property="apiScenarioId"/>
+    <result column="status" jdbcType="VARCHAR" property="status"/>
+    <result column="create_time" jdbcType="BIGINT" property="createTime"/>
+    <result column="update_time" jdbcType="BIGINT" property="updateTime"/>
+    <result column="pass_rate" jdbcType="VARCHAR" property="passRate"/>
+    <result column="last_result" jdbcType="VARCHAR" property="lastResult"/>
+    <result column="report_id" jdbcType="VARCHAR" property="reportId"/>
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseReviewScenario">
+    <result column="environment" jdbcType="LONGVARCHAR" property="environment"/>
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -72,26 +74,49 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, test_case_review_id, api_scenario_id, `status`, environment, create_time, update_time, 
-    pass_rate, last_result, report_id
+    id, test_case_review_id, api_scenario_id, `status`, create_time, update_time, pass_rate, 
+    last_result, report_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.base.domain.TestCaseReviewScenarioExample" resultMap="BaseResultMap">
+  <sql id="Blob_Column_List">
+    environment
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.TestCaseReviewScenarioExample"
+          resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
     </if>
-    <include refid="Base_Column_List" />
+    <include refid="Base_Column_List"/>
+    ,
+    <include refid="Blob_Column_List"/>
     from test_case_review_scenario
     <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
+      <include refid="Example_Where_Clause"/>
     </if>
     <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.TestCaseReviewScenarioExample"
+          resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List"/>
+    from test_case_review_scenario
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause"/>
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select
+    <include refid="Base_Column_List"/>
+    ,
+    <include refid="Blob_Column_List"/>
     from test_case_review_scenario
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -106,14 +131,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
-    insert into test_case_review_scenario (id, test_case_review_id, api_scenario_id, 
-      `status`, environment, create_time, 
-      update_time, pass_rate, last_result, 
-      report_id)
-    values (#{id,jdbcType=VARCHAR}, #{testCaseReviewId,jdbcType=VARCHAR}, #{apiScenarioId,jdbcType=VARCHAR}, 
-      #{status,jdbcType=VARCHAR}, #{environment,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
-      #{updateTime,jdbcType=BIGINT}, #{passRate,jdbcType=VARCHAR}, #{lastResult,jdbcType=VARCHAR}, 
-      #{reportId,jdbcType=VARCHAR})
+    insert into test_case_review_scenario (id, test_case_review_id, api_scenario_id,
+                                           `status`, create_time, update_time,
+                                           pass_rate, last_result, report_id,
+                                           environment)
+    values (#{id,jdbcType=VARCHAR}, #{testCaseReviewId,jdbcType=VARCHAR}, #{apiScenarioId,jdbcType=VARCHAR},
+            #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
+            #{passRate,jdbcType=VARCHAR}, #{lastResult,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR},
+            #{environment,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
     insert into test_case_review_scenario
@@ -130,9 +155,6 @@
       <if test="status != null">
         `status`,
       </if>
-      <if test="environment != null">
-        environment,
-      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -148,6 +170,9 @@
       <if test="reportId != null">
         report_id,
       </if>
+      <if test="environment != null">
+        environment,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -162,9 +187,6 @@
       <if test="status != null">
         #{status,jdbcType=VARCHAR},
       </if>
-      <if test="environment != null">
-        #{environment,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
       </if>
@@ -180,6 +202,9 @@
       <if test="reportId != null">
         #{reportId,jdbcType=VARCHAR},
       </if>
+      <if test="environment != null">
+        #{environment,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.TestCaseReviewScenarioExample" resultType="java.lang.Long">
@@ -203,9 +228,6 @@
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=VARCHAR},
       </if>
-      <if test="record.environment != null">
-        environment = #{record.environment,jdbcType=VARCHAR},
-      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
       </if>
@@ -221,22 +243,40 @@
       <if test="record.reportId != null">
         report_id = #{record.reportId,jdbcType=VARCHAR},
       </if>
+      <if test="record.environment != null">
+        environment = #{record.environment,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
+      <include refid="Update_By_Example_Where_Clause"/>
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update test_case_review_scenario
+    set id = #{record.id,jdbcType=VARCHAR},
+    test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+    api_scenario_id = #{record.apiScenarioId,jdbcType=VARCHAR},
+    `status` = #{record.status,jdbcType=VARCHAR},
+    create_time = #{record.createTime,jdbcType=BIGINT},
+    update_time = #{record.updateTime,jdbcType=BIGINT},
+    pass_rate = #{record.passRate,jdbcType=VARCHAR},
+    last_result = #{record.lastResult,jdbcType=VARCHAR},
+    report_id = #{record.reportId,jdbcType=VARCHAR},
+    environment = #{record.environment,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause"/>
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
     update test_case_review_scenario
     set id = #{record.id,jdbcType=VARCHAR},
-      test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
-      api_scenario_id = #{record.apiScenarioId,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
-      environment = #{record.environment,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT},
-      pass_rate = #{record.passRate,jdbcType=VARCHAR},
-      last_result = #{record.lastResult,jdbcType=VARCHAR},
+    test_case_review_id = #{record.testCaseReviewId,jdbcType=VARCHAR},
+    api_scenario_id = #{record.apiScenarioId,jdbcType=VARCHAR},
+    `status` = #{record.status,jdbcType=VARCHAR},
+    create_time = #{record.createTime,jdbcType=BIGINT},
+    update_time = #{record.updateTime,jdbcType=BIGINT},
+    pass_rate = #{record.passRate,jdbcType=VARCHAR},
+    last_result = #{record.lastResult,jdbcType=VARCHAR},
       report_id = #{record.reportId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -254,9 +294,6 @@
       <if test="status != null">
         `status` = #{status,jdbcType=VARCHAR},
       </if>
-      <if test="environment != null">
-        environment = #{environment,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
       </if>
@@ -272,18 +309,33 @@
       <if test="reportId != null">
         report_id = #{reportId,jdbcType=VARCHAR},
       </if>
+      <if test="environment != null">
+        environment = #{environment,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
+    update test_case_review_scenario
+    set test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
+        api_scenario_id     = #{apiScenarioId,jdbcType=VARCHAR},
+        `status`            = #{status,jdbcType=VARCHAR},
+        create_time         = #{createTime,jdbcType=BIGINT},
+        update_time         = #{updateTime,jdbcType=BIGINT},
+        pass_rate           = #{passRate,jdbcType=VARCHAR},
+        last_result         = #{lastResult,jdbcType=VARCHAR},
+        report_id           = #{reportId,jdbcType=VARCHAR},
+        environment         = #{environment,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.TestCaseReviewScenario">
     update test_case_review_scenario
     set test_case_review_id = #{testCaseReviewId,jdbcType=VARCHAR},
-      api_scenario_id = #{apiScenarioId,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
-      environment = #{environment,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT},
-      pass_rate = #{passRate,jdbcType=VARCHAR},
+        api_scenario_id     = #{apiScenarioId,jdbcType=VARCHAR},
+        `status`            = #{status,jdbcType=VARCHAR},
+        create_time         = #{createTime,jdbcType=BIGINT},
+        update_time         = #{updateTime,jdbcType=BIGINT},
+        pass_rate           = #{passRate,jdbcType=VARCHAR},
       last_result = #{lastResult,jdbcType=VARCHAR},
       report_id = #{reportId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml
index 933036e208..daa5b8cd4a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml
@@ -20,6 +20,7 @@
     <result column="actual_start_time" jdbcType="BIGINT" property="actualStartTime" />
     <result column="creator" jdbcType="VARCHAR" property="creator" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="execution_times" jdbcType="INTEGER" property="executionTimes"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestPlan">
     <result column="tags" jdbcType="LONGVARCHAR" property="tags" />
@@ -85,7 +86,7 @@
   <sql id="Base_Column_List">
     id, workspace_id, report_id, `name`, description, `status`, stage, principal, test_case_match_rule, 
     executor_match_rule, create_time, update_time, actual_end_time, planned_start_time, 
-    planned_end_time, actual_start_time, creator, project_id
+    planned_end_time, actual_start_time, creator, project_id, execution_times
   </sql>
   <sql id="Blob_Column_List">
     tags
@@ -139,20 +140,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.TestPlan">
-    insert into test_plan (id, workspace_id, report_id, 
-      `name`, description, `status`, 
-      stage, principal, test_case_match_rule, 
-      executor_match_rule, create_time, update_time, 
-      actual_end_time, planned_start_time, planned_end_time, 
-      actual_start_time, creator, project_id, 
-      tags)
-    values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, 
-      #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
-      #{stage,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR}, 
-      #{executorMatchRule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{actualEndTime,jdbcType=BIGINT}, #{plannedStartTime,jdbcType=BIGINT}, #{plannedEndTime,jdbcType=BIGINT}, 
-      #{actualStartTime,jdbcType=BIGINT}, #{creator,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
-      #{tags,jdbcType=LONGVARCHAR})
+    insert into test_plan (id, workspace_id, report_id,
+                           `name`, description, `status`,
+                           stage, principal, test_case_match_rule,
+                           executor_match_rule, create_time, update_time,
+                           actual_end_time, planned_start_time, planned_end_time,
+                           actual_start_time, creator, project_id,
+                           execution_times, tags)
+    values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR},
+            #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
+            #{stage,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR},
+            #{executorMatchRule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
+            #{actualEndTime,jdbcType=BIGINT}, #{plannedStartTime,jdbcType=BIGINT}, #{plannedEndTime,jdbcType=BIGINT},
+            #{actualStartTime,jdbcType=BIGINT}, #{creator,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
+            #{executionTimes,jdbcType=INTEGER}, #{tags,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestPlan">
     insert into test_plan
@@ -211,6 +212,9 @@
       <if test="projectId != null">
         project_id,
       </if>
+      <if test="executionTimes != null">
+        execution_times,
+      </if>
       <if test="tags != null">
         tags,
       </if>
@@ -270,6 +274,9 @@
       <if test="projectId != null">
         #{projectId,jdbcType=VARCHAR},
       </if>
+      <if test="executionTimes != null">
+        #{executionTimes,jdbcType=INTEGER},
+      </if>
       <if test="tags != null">
         #{tags,jdbcType=LONGVARCHAR},
       </if>
@@ -338,6 +345,9 @@
       <if test="record.projectId != null">
         project_id = #{record.projectId,jdbcType=VARCHAR},
       </if>
+      <if test="record.executionTimes != null">
+        execution_times = #{record.executionTimes,jdbcType=INTEGER},
+      </if>
       <if test="record.tags != null">
         tags = #{record.tags,jdbcType=LONGVARCHAR},
       </if>
@@ -356,17 +366,18 @@
       `status` = #{record.status,jdbcType=VARCHAR},
       stage = #{record.stage,jdbcType=VARCHAR},
       principal = #{record.principal,jdbcType=VARCHAR},
-      test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
-      executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT},
-      actual_end_time = #{record.actualEndTime,jdbcType=BIGINT},
-      planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
-      planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
-      actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
-      creator = #{record.creator,jdbcType=VARCHAR},
-      project_id = #{record.projectId,jdbcType=VARCHAR},
-      tags = #{record.tags,jdbcType=LONGVARCHAR}
+    test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
+    executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
+    create_time = #{record.createTime,jdbcType=BIGINT},
+    update_time = #{record.updateTime,jdbcType=BIGINT},
+    actual_end_time = #{record.actualEndTime,jdbcType=BIGINT},
+    planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
+    planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
+    actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
+    creator = #{record.creator,jdbcType=VARCHAR},
+    project_id = #{record.projectId,jdbcType=VARCHAR},
+    execution_times = #{record.executionTimes,jdbcType=INTEGER},
+    tags = #{record.tags,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -380,17 +391,18 @@
       description = #{record.description,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=VARCHAR},
       stage = #{record.stage,jdbcType=VARCHAR},
-      principal = #{record.principal,jdbcType=VARCHAR},
-      test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
-      executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT},
-      actual_end_time = #{record.actualEndTime,jdbcType=BIGINT},
-      planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
-      planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
-      actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
-      creator = #{record.creator,jdbcType=VARCHAR},
-      project_id = #{record.projectId,jdbcType=VARCHAR}
+    principal = #{record.principal,jdbcType=VARCHAR},
+    test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
+    executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
+    create_time = #{record.createTime,jdbcType=BIGINT},
+    update_time = #{record.updateTime,jdbcType=BIGINT},
+    actual_end_time = #{record.actualEndTime,jdbcType=BIGINT},
+    planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
+    planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
+    actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
+    creator = #{record.creator,jdbcType=VARCHAR},
+    project_id = #{record.projectId,jdbcType=VARCHAR},
+    execution_times = #{record.executionTimes,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -449,6 +461,9 @@
       <if test="projectId != null">
         project_id = #{projectId,jdbcType=VARCHAR},
       </if>
+      <if test="executionTimes != null">
+        execution_times = #{executionTimes,jdbcType=INTEGER},
+      </if>
       <if test="tags != null">
         tags = #{tags,jdbcType=LONGVARCHAR},
       </if>
@@ -457,45 +472,47 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.TestPlan">
     update test_plan
-    set workspace_id = #{workspaceId,jdbcType=VARCHAR},
-      report_id = #{reportId,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
-      stage = #{stage,jdbcType=VARCHAR},
-      principal = #{principal,jdbcType=VARCHAR},
-      test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
-      executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT},
-      actual_end_time = #{actualEndTime,jdbcType=BIGINT},
-      planned_start_time = #{plannedStartTime,jdbcType=BIGINT},
-      planned_end_time = #{plannedEndTime,jdbcType=BIGINT},
-      actual_start_time = #{actualStartTime,jdbcType=BIGINT},
-      creator = #{creator,jdbcType=VARCHAR},
-      project_id = #{projectId,jdbcType=VARCHAR},
-      tags = #{tags,jdbcType=LONGVARCHAR}
+    set workspace_id         = #{workspaceId,jdbcType=VARCHAR},
+        report_id            = #{reportId,jdbcType=VARCHAR},
+        `name`               = #{name,jdbcType=VARCHAR},
+        description          = #{description,jdbcType=VARCHAR},
+        `status`             = #{status,jdbcType=VARCHAR},
+        stage                = #{stage,jdbcType=VARCHAR},
+        principal            = #{principal,jdbcType=VARCHAR},
+        test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
+        executor_match_rule  = #{executorMatchRule,jdbcType=VARCHAR},
+        create_time          = #{createTime,jdbcType=BIGINT},
+        update_time          = #{updateTime,jdbcType=BIGINT},
+        actual_end_time      = #{actualEndTime,jdbcType=BIGINT},
+        planned_start_time   = #{plannedStartTime,jdbcType=BIGINT},
+        planned_end_time     = #{plannedEndTime,jdbcType=BIGINT},
+        actual_start_time    = #{actualStartTime,jdbcType=BIGINT},
+        creator              = #{creator,jdbcType=VARCHAR},
+        project_id           = #{projectId,jdbcType=VARCHAR},
+        execution_times      = #{executionTimes,jdbcType=INTEGER},
+        tags                 = #{tags,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.TestPlan">
     update test_plan
-    set workspace_id = #{workspaceId,jdbcType=VARCHAR},
-      report_id = #{reportId,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
-      stage = #{stage,jdbcType=VARCHAR},
-      principal = #{principal,jdbcType=VARCHAR},
-      test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
-      executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT},
-      actual_end_time = #{actualEndTime,jdbcType=BIGINT},
-      planned_start_time = #{plannedStartTime,jdbcType=BIGINT},
-      planned_end_time = #{plannedEndTime,jdbcType=BIGINT},
-      actual_start_time = #{actualStartTime,jdbcType=BIGINT},
-      creator = #{creator,jdbcType=VARCHAR},
-      project_id = #{projectId,jdbcType=VARCHAR}
+    set workspace_id         = #{workspaceId,jdbcType=VARCHAR},
+        report_id            = #{reportId,jdbcType=VARCHAR},
+        `name`               = #{name,jdbcType=VARCHAR},
+        description          = #{description,jdbcType=VARCHAR},
+        `status`             = #{status,jdbcType=VARCHAR},
+        stage                = #{stage,jdbcType=VARCHAR},
+        principal            = #{principal,jdbcType=VARCHAR},
+        test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
+        executor_match_rule  = #{executorMatchRule,jdbcType=VARCHAR},
+        create_time          = #{createTime,jdbcType=BIGINT},
+        update_time          = #{updateTime,jdbcType=BIGINT},
+        actual_end_time      = #{actualEndTime,jdbcType=BIGINT},
+        planned_start_time   = #{plannedStartTime,jdbcType=BIGINT},
+        planned_end_time     = #{plannedEndTime,jdbcType=BIGINT},
+        actual_start_time    = #{actualStartTime,jdbcType=BIGINT},
+        creator              = #{creator,jdbcType=VARCHAR},
+        project_id           = #{projectId,jdbcType=VARCHAR},
+        execution_times      = #{executionTimes,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
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 84edbe995d..338f682d43 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
@@ -79,8 +79,9 @@ public class TestPlanController {
 
     @PostMapping("/add")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public void addTestPlan(@RequestBody AddTestPlanRequest testPlan) {
-        testPlanService.addTestPlan(testPlan);
+    public String addTestPlan(@RequestBody AddTestPlanRequest testPlan) {
+        return testPlanService.addTestPlan(testPlan);
+
     }
 
     @PostMapping("/edit")
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index c688c2a4b3..c6682eaf1d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -91,7 +91,9 @@ public class TestPlanReportService {
      */
     public TestPlanReport genTestPlanReport(String planId, String userId,String triggerMode) {
         TestPlan testPlan = testPlanMapper.selectByPrimaryKey(planId);
-
+        testPlan.setExecutionTimes(1);
+        testPlan.setExecutionTimes(testPlan.getExecutionTimes() + 1);
+        testPlanMapper.updateByPrimaryKey(testPlan);
         TestPlanApiCaseExample apiExample = new TestPlanApiCaseExample();
         apiExample.createCriteria().andTestPlanIdEqualTo(planId);
         List<String> apiCaseIdList = testPlanApiCaseMapper.selectByExample(apiExample)
diff --git a/backend/src/main/resources/db/migration/V78__v1.8_release.sql b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
index eb9441699c..9d4ff537cf 100644
--- a/backend/src/main/resources/db/migration/V78__v1.8_release.sql
+++ b/backend/src/main/resources/db/migration/V78__v1.8_release.sql
@@ -158,4 +158,7 @@ SET file_metadata.project_id = temp.project_id;
 UPDATE file_metadata JOIN (SELECT file_id, project_id
                            FROM api_test_file
                                     JOIN api_test ON test_id = api_test.id) temp ON file_id = file_metadata.id
-SET file_metadata.project_id = temp.project_id;
\ No newline at end of file
+SET file_metadata.project_id = temp.project_id;
+-- add execution_times testPlan
+alter table test_plan
+    add execution_times int null;
\ No newline at end of file
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index c0595762e2..22bd8330e7 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -75,7 +75,7 @@
         <table tableName="test_case_review_api_case"/>
         <table tableName="test_case_review_load"/>
         <table tableName="test_case_review_scenario"/>
-
+        <table tableName="test_plan"/>
 
     </context>
 </generatorConfiguration>
\ No newline at end of file
diff --git a/frontend/src/business/components/common/model/JsonData.js b/frontend/src/business/components/common/model/JsonData.js
index c6ae8d8dee..d60571fc3d 100644
--- a/frontend/src/business/components/common/model/JsonData.js
+++ b/frontend/src/business/components/common/model/JsonData.js
@@ -35,6 +35,9 @@ export const Test_Plan_List = [
   {id: 'plannedEndTime', label: i18n.t('test_track.plan.planned_end_time')},
   {id: 'actualStartTime', label: i18n.t('test_track.plan.actual_start_time')},
   {id: 'actualEndTime', label: i18n.t('test_track.plan.actual_end_time')},
+  {id:'tags',label:i18n.t('commons.tag')},
+  {id:'executionTimes',label:i18n.t('commons.execution_times')},
+  {id:'passRate',label:i18n.t('commons.pass_rate')}
 ]
 //接口定义-api列表
 export const Api_List = [
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 5848071fb4..eae5fdf3bc 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -92,6 +92,27 @@
           show-overflow-tooltip
           :key="index">
         </el-table-column>
+        <el-table-column  v-if="item.id == 'tags'" prop="tags"
+                         :label="$t('api_test.automation.tag')" :key="index">
+          <template v-slot:default="scope">
+            <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain"
+                    :content="itemName" style="margin-left: 5px"></ms-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="item.id == 'executionTimes'"
+          prop="executionTimes"
+          :label="$t('commons.execution_times')"
+          show-overflow-tooltip
+          :key="index">
+        </el-table-column>
+        <el-table-column
+          v-if="item.id == 'passRate'"
+          prop="passRate"
+          :label="$t('commons.pass_rate')"
+          show-overflow-tooltip
+          :key="index">
+        </el-table-column>
         <el-table-column
           v-if="item.id == 'plannedStartTime'"
           sortable
@@ -206,11 +227,13 @@ import {TEST_CASE_LIST, TEST_PLAN_LIST} from "@/common/js/constants";
 import {Test_Plan_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
+import MsTag from "@/business/components/common/components/MsTag";
 
 
 export default {
   name: "TestPlanList",
   components: {
+    MsTag,
     HeaderLabelOperate,
     HeaderCustom,
     MsDeleteConfirm,
@@ -281,8 +304,19 @@ export default {
         let data = response.data;
         this.total = data.itemCount;
         this.tableData = data.listObject;
+        this.tableData.forEach(item => {
+          if (item.tags && item.tags.length > 0) {
+            item.tags = JSON.parse(item.tags);
+          }
+          item.passRate=item.passRate+'%'
+        })
+        console.log(this.tableData)
+
       });
     },
+    copyData(status) {
+      return JSON.parse(JSON.stringify(this.dataMap.get(status)))
+    },
     buildPagePath(path) {
       return path + "/" + this.currentPage + "/" + this.pageSize;
     },
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 0794a6e846..21d51de87e 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -19,7 +19,7 @@
         <slot name="footer"></slot>
       </div>
       <div v-else>
-        <div style="margin-bottom: 15px;margin-right: 0">
+        <div style="margin-bottom: 15px" v-if="flag">
           <el-checkbox v-model="checked">同步添加关联的接口和性能测试</el-checkbox>
         </div>
         <ms-dialog-footer @cancel="close" @confirm="save"/>
@@ -44,7 +44,7 @@
     },
     data() {
       return {
-        checked: true,
+        checked:true,
         result: {},
         currentProject: {},
         projectId: '',
@@ -62,6 +62,9 @@
         default() {
           return this.$t('test_track.plan_view.relevance_test_case');
         }
+      },
+      flag:{
+        type:Boolean,
       }
     },
     watch: {
@@ -74,7 +77,7 @@
       },
 
       save() {
-        this.$emit('save', this.checked);
+        this.$emit('save',this.checked);
       },
 
       close() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
index 9d05b3afee..1efb808266 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
@@ -4,6 +4,7 @@
     @setProject="setProject"
     @save="saveCaseRelevance"
     :plan-id="planId"
+    :flag="true"
     ref="baseRelevance">
 
     <template v-slot:aside>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index cee8d7f0e9..731742f071 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    pass_rate:'Pass rate',
+    execution_times:'Execution times',
     cover: 'Cover',
     not_cover: 'Not Cover',
     import: 'Import',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index cf744e4cf7..56d8016bc4 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    pass_rate:'通过率',
+    execution_times:'执行次数',
     cover: '覆盖',
     not_cover: '不覆盖',
     import: '导入',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 0cbee14b76..a585456b56 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    pass_rate:'通過率',
+    execution_times:'執行次數',
     cover: '覆蓋',
     not_cover: '不覆蓋',
     import: '導入',

From 8170ffe3a426a613f14392ae14b979e071ae760d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 17 Mar 2021 15:06:19 +0800
Subject: [PATCH 42/95] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=BF=9B=E5=85=A5starting=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rmanceTestReport.vue => PerformanceTestReportList.vue} | 8 ++------
 frontend/src/business/components/performance/router.js    | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename frontend/src/business/components/performance/report/{PerformanceTestReport.vue => PerformanceTestReportList.vue} (97%)

diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
similarity index 97%
rename from frontend/src/business/components/performance/report/PerformanceTestReport.vue
rename to frontend/src/business/components/performance/report/PerformanceTestReportList.vue
index 8e46a0708d..02e4a052df 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
@@ -93,7 +93,7 @@ import MsTablePagination from "../../common/pagination/TablePagination";
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsPerformanceReportStatus from "./PerformanceReportStatus";
-import {getCurrentProjectID} from "../../../../common/js/utils";
+import {getCurrentProjectID} from "@/common/js/utils";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import ReportTriggerModeItem from "../../common/tableItem/ReportTriggerModeItem";
 import {REPORT_CONFIGS} from "../../common/components/search/search-components";
@@ -104,7 +104,7 @@ import {_filter, _sort} from "@/common/js/tableUtils";
 
 
 export default {
-  name: "PerformanceTestReport",
+  name: "PerformanceTestReportList",
   components: {
     MsTableHeader,
     ReportTriggerModeItem,
@@ -186,10 +186,6 @@ export default {
       this.multipleSelection = val;
     },
     handleEdit(report) {
-      if (report.status === "Starting") {
-        this.$info(this.$t('report.being_generated'))
-        return false
-      }
       this.$router.push({
         path: '/performance/report/view/' + report.id
       })
diff --git a/frontend/src/business/components/performance/router.js b/frontend/src/business/components/performance/router.js
index 6f3e24799e..7b8f266e53 100644
--- a/frontend/src/business/components/performance/router.js
+++ b/frontend/src/business/components/performance/router.js
@@ -4,7 +4,7 @@ const PerformanceTest = () => import('@/business/components/performance/Performa
 const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome')
 const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest')
 const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList')
-const PerformanceTestReport = () => import('@/business/components/performance/report/PerformanceTestReport')
+const PerformanceTestReportList = () => import('@/business/components/performance/report/PerformanceTestReportList')
 const PerformanceChart = () => import('@/business/components/performance/report/components/PerformanceChart')
 const PerformanceReportView = () => import('@/business/components/performance/report/PerformanceReportView')
 
@@ -51,7 +51,7 @@ export default {
     {
       path: "report/:type",
       name: "perReport",
-      component: PerformanceTestReport
+      component: PerformanceTestReportList
     },
     {
       path: "chart",

From 41d7619d746d8d4ae2936bf850e99fb5ec5f9193 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 17 Mar 2021 16:24:14 +0800
Subject: [PATCH 43/95] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84rps=E9=80=89=E9=A1=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/components/PerformancePressureConfig.vue         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
index 633b28f122..6ef4fc1ef0 100644
--- a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
@@ -46,10 +46,10 @@
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit')">
-                  <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
+                  <el-switch v-model="threadGroup.rpsLimitEnable" :disabled="true" @change="calculateTotalChart()"/>
                   &nbsp;
                   <el-input-number
-                    :disabled="true "
+                    :disabled="true"
                     v-model="threadGroup.rpsLimit"
                     @change="calculateChart(threadGroup)"
                     :min="1"
@@ -101,7 +101,7 @@
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit')">
-                  <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
+                  <el-switch v-model="threadGroup.rpsLimitEnable" :disabled="true" @change="calculateTotalChart()"/>
                   &nbsp;
                   <el-input-number
                     :disabled="true || !threadGroup.rpsLimitEnable"

From 03818c53eea19ef430d754cf8c4fead127ae0d21 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Mar 2021 16:59:33 +0800
Subject: [PATCH 44/95] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/service/TestCaseService.java    | 3 +++
 .../components/common/components/MsModuleMinder.vue      | 9 +++++++++
 .../components/track/common/minder/TestCaseMinder.vue    | 7 +++++--
 3 files changed, 17 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 9deb78377d..36579a7de3 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -731,6 +731,9 @@ public class TestCaseService {
     public void minderEdit(TestCaseMinderEditRequest request) {
         List<TestCaseWithBLOBs> data = request.getData();
         data.forEach(item -> {
+            if (StringUtils.isBlank(item.getNodeId()) || item.getNodeId().equals("root")) {
+                item.setNodeId("");
+            }
             item.setProjectId(request.getProjectId());
             if (StringUtils.isBlank(item.getId()) || item.getId().length() < 20) {
                 item.setId(UUID.randomUUID().toString());
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index f489472ba8..4838d71d50 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -96,6 +96,15 @@ export default {
     },
     parse(root, children) {
       root.children = [];
+      if (root.data.id ===  'root') {
+        // nodeId 为空的用例
+        let rootChildData = this.dataMap.get("");
+        if (rootChildData) {
+          rootChildData.forEach((dataNode) => {
+            root.children.push(dataNode);
+          })
+        }
+      }
       // 添加数据节点
       let dataNodes = this.dataMap.get(root.data.id);
       if (dataNodes) {
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index fd374674d8..c4588fa03b 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -47,9 +47,9 @@ name: "TestCaseMinder",
       }
     },
     save(data) {
+      console.log(this.dataMap);
       let saveCases = [];
       this.buildSaveCase(data.root, saveCases, undefined);
-      console.log(saveCases);
       let param = {
         projectId: this.projectId,
         data: saveCases
@@ -72,6 +72,9 @@ name: "TestCaseMinder",
     },
     _buildSaveCase(node, saveCases, parent) {
       let data = node.data;
+      if (!data.text) {
+        return;
+      }
       let isChange = false;
       let testCase = {
         id: data.id,
@@ -81,7 +84,7 @@ name: "TestCaseMinder",
         type: data.type ? data.type : 'functional',
         method: data.method ? data.method: 'manual',
         maintainer: data.maintainer,
-        priority: 'P' + data.priority,
+        priority: 'P' + (data.priority ? data.priority : 0),
       };
       if (data.changed) isChange = true;
       let steps = [];

From 72bb3b8368af1224716758cac2a91b7d7a5ccc01 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 17 Mar 2021 17:22:26 +0800
Subject: [PATCH 45/95] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20k8s=20job=E8=AE=BE=E7=BD=AE=E5=8F=8D=E4=BA=B2?=
 =?UTF-8?q?=E5=92=8C=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efd6af73b7..adefde265f 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
+Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7

From 54d180084a8924f62961e554e1a85e82c7fc5ea1 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 17 Mar 2021 17:31:42 +0800
Subject: [PATCH 46/95] chore: sync

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index f278121988..b2571e06e8 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f2781219889c2f993436bcc3ea90038f588fa73e
+Subproject commit b2571e06e8b211821409115cc2c4a7c52cbac1db

From b00a5a4fcd0c9c6056ad53d04d54f9b58f00810c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 17 Mar 2021 17:47:49 +0800
Subject: [PATCH 47/95] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E8=B0=83=E6=95=B4rps=E4=B8=8A=E9=99=90=E4=B8=BA9?=
 =?UTF-8?q?9999,=E8=BF=AD=E4=BB=A3=E6=AC=A1=E6=95=B0=E4=B8=8A=E9=99=90?=
 =?UTF-8?q?=E4=B8=BA9999999?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/components/PerformancePressureConfig.vue           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 29df9f4e18..b4c4317915 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -67,7 +67,7 @@
                     v-model="threadGroup.rpsLimit"
                     @change="calculateChart(threadGroup)"
                     :min="1"
-                    :max="500"
+                    :max="99999"
                     size="mini"/>
                 </el-form-item>
                 <br>
@@ -112,7 +112,7 @@
                     :disabled="isReadOnly"
                     v-model="threadGroup.iterateNum"
                     :min="1"
-                    :max="10000"
+                    :max="9999999"
                     @change="calculateChart(threadGroup)"
                     size="mini"/>
                 </el-form-item>
@@ -124,7 +124,7 @@
                     :disabled="isReadOnly || !threadGroup.rpsLimitEnable"
                     v-model="threadGroup.rpsLimit"
                     :min="1"
-                    :max="500"
+                    :max="99999"
                     size="mini"/>
                 </el-form-item>
                 <br>

From 41f81dff5e1cce8f5cfd705509cd5633610ff763 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 17 Mar 2021 18:19:34 +0800
Subject: [PATCH 48/95] =?UTF-8?q?fix:=20=E9=94=99=E8=AF=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=97=B6=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/handler/RestControllerExceptionHandler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6534abf2fe..32bb4e9d89 100644
--- a/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
+++ b/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
@@ -32,7 +32,7 @@ public class RestControllerExceptionHandler {
 
 
     @ExceptionHandler(SQLException.class)
-    public ResultHolder sqlExceptionHandler(HttpServletRequest request, HttpServletResponse response, MSException e) {
+    public ResultHolder sqlExceptionHandler(HttpServletRequest request, HttpServletResponse response, SQLException e) {
         response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
         return ResultHolder.error("SQL error happened, please check logs.");
     }

From 94b7cd3e4c8fa14dfe72ea73528bfde386bfe266 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 17 Mar 2021 18:32:15 +0800
Subject: [PATCH 49/95] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E7=94=A8=E4=BE=8B=E5=85=B3=E8=81=94Zentao=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/dto/DemandDTO.java   |  1 +
 .../track/issue/AbstractIssuePlatform.java    |  2 +-
 .../metersphere/track/issue/JiraPlatform.java |  7 ++-
 .../track/issue/LocalPlatform.java            |  2 +-
 .../metersphere/track/issue/TapdPlatform.java | 35 +++++++++------
 .../track/issue/ZentaoPlatform.java           | 43 +++++++++++++++++--
 .../track/service/DemandService.java          | 11 ++---
 .../track/case/components/TestCaseEdit.vue    | 29 +++++++++----
 8 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/dto/DemandDTO.java b/backend/src/main/java/io/metersphere/track/dto/DemandDTO.java
index 546f1a836c..1fba8cad3b 100644
--- a/backend/src/main/java/io/metersphere/track/dto/DemandDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/DemandDTO.java
@@ -8,4 +8,5 @@ import lombok.Setter;
 public class DemandDTO {
     private String id;
     private String name;
+    private String platform;
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index 6c89ff1732..3f809848aa 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -102,7 +102,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
      *
      * @return 其他平台和本地项目绑定的属性值
      */
-    abstract String getProjectId();
+    abstract String getProjectId(String projectId);
 
     protected boolean isIntegratedPlatform(String orgId, String platform) {
         IntegrationRequest request = new IntegrationRequest();
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index 204366015e..b4d3772bda 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -103,7 +103,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
         String auth = EncryptUtils.base64Encoding(account + ":" + password);
 
         String testCaseId = issuesRequest.getTestCaseId();
-        String jiraKey = getProjectId();
+        String jiraKey = getProjectId(null);
 
 
         if (StringUtils.isBlank(jiraKey)) {
@@ -200,7 +200,10 @@ public class JiraPlatform extends AbstractIssuePlatform {
     }
 
     @Override
-    String getProjectId() {
+    String getProjectId(String projectId) {
+        if (StringUtils.isNotBlank(projectId)) {
+            return projectService.getProjectById(projectId).getJiraKey();
+        }
         TestCaseWithBLOBs testCase = testCaseService.getTestCase(testCaseId);
         Project project = projectService.getProjectById(testCase.getProjectId());
         return project.getJiraKey();
diff --git a/backend/src/main/java/io/metersphere/track/issue/LocalPlatform.java b/backend/src/main/java/io/metersphere/track/issue/LocalPlatform.java
index a588c95092..51479778e2 100644
--- a/backend/src/main/java/io/metersphere/track/issue/LocalPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/LocalPlatform.java
@@ -66,7 +66,7 @@ public class LocalPlatform extends AbstractIssuePlatform {
     }
 
     @Override
-    String getProjectId() {
+    String getProjectId(String projectId) {
         return null;
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
index 6440c70074..41efb3e496 100644
--- a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
@@ -36,7 +36,7 @@ public class TapdPlatform extends AbstractIssuePlatform {
     @Override
     public List<Issues> getIssue() {
         List<Issues> list = new ArrayList<>();
-        String tapdId = getProjectId();
+        String tapdId = getProjectId("");
 
         TestCaseIssuesExample example = new TestCaseIssuesExample();
         example.createCriteria().andTestCaseIdEqualTo(testCaseId);
@@ -67,18 +67,22 @@ public class TapdPlatform extends AbstractIssuePlatform {
 
     @Override
     public List<DemandDTO> getDemandList(String projectId) {
-        System.out.println(projectId);
         List<DemandDTO> demandList = new ArrayList<>();
-        String url = "https://api.tapd.cn/stories?workspace_id=" + projectId;
-        ResultHolder call = call(url);
-        String listJson = JSON.toJSONString(call.getData());
-        JSONArray jsonArray = JSON.parseArray(listJson);
-        System.out.println(jsonArray);
-        for (int i = 0; i < jsonArray.size(); i++) {
-            JSONObject o = jsonArray.getJSONObject(i);
-            DemandDTO demand = o.getObject("Story", DemandDTO.class);
-            demandList.add(demand);
+        try {
+            String url = "https://api.tapd.cn/stories?workspace_id=" + getProjectId(projectId);
+            ResultHolder call = call(url);
+            String listJson = JSON.toJSONString(call.getData());
+            JSONArray jsonArray = JSON.parseArray(listJson);
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject o = jsonArray.getJSONObject(i);
+                DemandDTO demand = o.getObject("Story", DemandDTO.class);
+                demand.setPlatform(IssuesManagePlatform.Tapd.name());
+                demandList.add(demand);
+            }
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage());
         }
+
         return demandList;
     }
 
@@ -111,7 +115,7 @@ public class TapdPlatform extends AbstractIssuePlatform {
     public void addIssue(IssuesRequest issuesRequest) {
         String url = "https://api.tapd.cn/bugs";
         String testCaseId = issuesRequest.getTestCaseId();
-        String tapdId = getProjectId();
+        String tapdId = getProjectId("");
 
         if (StringUtils.isBlank(tapdId)) {
             MSException.throwException("未关联Tapd 项目ID");
@@ -172,7 +176,7 @@ public class TapdPlatform extends AbstractIssuePlatform {
     @Override
     public List<PlatformUser> getPlatformUser() {
         List<PlatformUser> users = new ArrayList<>();
-        String projectId = getProjectId();
+        String projectId = getProjectId("");
         String url = "https://api.tapd.cn/workspaces/users?workspace_id=" + projectId;
         ResultHolder call = call(url);
         String listJson = JSON.toJSONString(call.getData());
@@ -186,7 +190,10 @@ public class TapdPlatform extends AbstractIssuePlatform {
     }
 
     @Override
-    String getProjectId() {
+    String getProjectId(String projectId) {
+        if (StringUtils.isNotBlank(projectId)) {
+            return projectService.getProjectById(projectId).getTapdId();
+        }
         TestCaseWithBLOBs testCase = testCaseService.getTestCase(testCaseId);
         Project project = projectService.getProjectById(testCase.getProjectId());
         return project.getTapdId();
diff --git a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
index dd2b0caa51..2659cb1c88 100644
--- a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
@@ -48,7 +48,10 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
     }
 
     @Override
-    String getProjectId() {
+    String getProjectId(String projectId) {
+        if (StringUtils.isNotBlank(projectId)) {
+            return projectService.getProjectById(projectId).getZentaoId();
+        }
         TestCaseWithBLOBs testCase = testCaseService.getTestCase(testCaseId);
         Project project = projectService.getProjectById(testCase.getProjectId());
         return project.getZentaoId();
@@ -88,7 +91,39 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
 
     @Override
     public List<DemandDTO> getDemandList(String projectId) {
-        return null;
+        //getTestStories
+        List<DemandDTO> list = new ArrayList<>();
+        try {
+            String session = login();
+            String key = getProjectId(projectId);
+            HttpEntity<MultiValueMap> requestEntity = new HttpEntity<>(new HttpHeaders());
+            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<String> responseEntity = restTemplate.exchange(url + "api-getModel-story-getProductStories-productID={key}?zentaosid=" + session,
+                    HttpMethod.POST, requestEntity, String.class, key);
+            String body = responseEntity.getBody();
+            JSONObject obj = JSONObject.parseObject(body);
+
+            LogUtil.info("project story" + key + obj);
+
+            if (obj != null) {
+                JSONObject data = obj.getJSONObject("data");
+                String s = JSON.toJSONString(data);
+                Map<String, Object> map = JSONArray.parseObject(s, Map.class);
+                Collection<Object> values = map.values();
+                values.forEach(v -> {
+                    JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(v));
+                    DemandDTO demandDTO = new DemandDTO();
+                    demandDTO.setId(jsonObject.getString("id"));
+                    demandDTO.setName(jsonObject.getString("title"));
+                    demandDTO.setPlatform(IssuesManagePlatform.Zentao.name());
+                    list.add(demandDTO);
+                });
+
+            }
+        } catch (Exception e) {
+            LogUtil.error("get zentao bug fail " + e.getMessage());
+        }
+        return list;
     }
 
     private Issues getZentaoIssues(String bugId) {
@@ -135,7 +170,7 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
     public void addIssue(IssuesRequest issuesRequest) {
 
         String session = login();
-        String projectId = getProjectId();
+        String projectId = getProjectId(null);
 
         if (StringUtils.isBlank(projectId)) {
             MSException.throwException("add zentao bug fail, project zentao id is null");
@@ -279,7 +314,7 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
 
     public List<ZentaoBuild> getBuilds() {
         String session = login();
-        String projectId = getProjectId();
+        String projectId = getProjectId(null);
         HttpHeaders httpHeaders = new HttpHeaders();
         HttpEntity<MultiValueMap> requestEntity = new HttpEntity<>(httpHeaders);
         RestTemplate restTemplate = new RestTemplate();
diff --git a/backend/src/main/java/io/metersphere/track/service/DemandService.java b/backend/src/main/java/io/metersphere/track/service/DemandService.java
index 06a89abd43..5463ea27ae 100644
--- a/backend/src/main/java/io/metersphere/track/service/DemandService.java
+++ b/backend/src/main/java/io/metersphere/track/service/DemandService.java
@@ -32,9 +32,7 @@ public class DemandService {
     public List<DemandDTO> getDemandList(String projectId) {
         Project project = projectMapper.selectByPrimaryKey(projectId);
         SessionUser user = SessionUtils.getUser();
-/*
-        String orgId = "88aceecf-5764-4094-96a9-f82bd52e77ad";
-*/
+
         String orgId = user.getLastOrganizationId();
         boolean tapd = issuesService.isIntegratedPlatform(orgId, IssuesManagePlatform.Tapd.toString());
         boolean jira = issuesService.isIntegratedPlatform(orgId, IssuesManagePlatform.Jira.toString());
@@ -48,7 +46,6 @@ public class DemandService {
             if (StringUtils.isNotBlank(tapdId)) {
                 platforms.add(IssuesManagePlatform.Tapd.name());
             }
-            issueRequest.setProjectId(tapdId);
         }
 
         if (jira) {
@@ -56,7 +53,6 @@ public class DemandService {
             if (StringUtils.isNotBlank(jiraKey)) {
                 platforms.add(IssuesManagePlatform.Jira.name());
             }
-            issueRequest.setProjectId(jiraKey);
         }
 
         if (zentao) {
@@ -64,13 +60,14 @@ public class DemandService {
             if (StringUtils.isNotBlank(zentaoId)) {
                 platforms.add(IssuesManagePlatform.Zentao.name());
             }
-            issueRequest.setProjectId(zentaoId);
         }
+
         List<AbstractIssuePlatform> platformList = IssueFactory.createPlatforms(platforms, issueRequest);
         platformList.forEach(platform -> {
-            List<DemandDTO> demand = platform.getDemandList(issueRequest.getProjectId());
+            List<DemandDTO> demand = platform.getDemandList(projectId);
             list.addAll(demand);
         });
+
         return list;
     }
 }
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 4ddd1d4e2a..a40f69d661 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -136,12 +136,12 @@
           <el-row>
             <el-col :span="10">
               <el-form-item label="关联需求" :label-width="formLabelWidth" prop="demandId">
-                <el-select filterable :disabled="readOnly" v-model="form.demandId"
+                <el-select filterable :disabled="readOnly" v-model="form.demandId" @visible-change="visibleChange"
                            :placeholder="$t('test_track.case.input_type')" class="ms-case-input">
                   <el-option
                     v-for="item in demandOptions"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.platform + ': '+item.name"
                     :value="item.id">
                   </el-option>
                 </el-select>
@@ -761,18 +761,31 @@ export default {
         });
       }
     },
+    visibleChange(flag) {
+      if (flag) {
+        this.getDemandOptions()
+      }
+    },
     getDemandOptions() {
-      this.projectId = getCurrentProjectID()
-      this.result = this.$get("demand/list/" + this.projectId, response => {
-        this.demandOptions = response.data;
-        this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other')})
-      });
+      if (this.demandOptions.length === 0) {
+        this.projectId = getCurrentProjectID();
+        this.result = {loading : true};
+        this.$get("demand/list/" + this.projectId).then(response => {
+          this.demandOptions = response.data.data;
+          this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other'), platform: 'Other'})
+          this.result = {loading : false};
+        }).catch(() => {
+          this.result = {loading : false};
+        })
+      }
     },
     getSelectOptions() {
       this.getModuleOptions();
       this.getMaintainerOptions();
       this.getTestOptions();
-      // this.getDemandOptions()
+      if (this.type === 'edit') {
+        this.getDemandOptions();
+      }
     },
 
     resetForm() {

From 319450d701f43877fe73d184a6bb10edfbd5ca72 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 17 Mar 2021 18:44:59 +0800
Subject: [PATCH 50/95] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E6=AD=A5=E9=AA=A4=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E5=8C=96=E6=97=B6=E5=86=85=E5=AE=B9=E8=BF=87=E5=A4=9A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/common/ApiBaseComponent.vue      | 32 ++++---
 .../scenario/maximize/MaximizeScenario.vue    | 83 +++++++++++--------
 .../scenario/maximize/MsLeftContainer.vue     |  8 ++
 3 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index a2462b7669..837b8e655c 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -1,21 +1,23 @@
 <template>
-  <el-card class="api-component">
+  <el-card>
     <div class="header" @click="active(data)">
       <slot name="beforeHeaderLeft">
         <div v-if="data.index" class="el-step__icon is-text" style="margin-right: 10px;" :style="{'color': color, 'background-color': backgroundColor}">
           <div class="el-step__icon-inner">{{data.index}}</div>
         </div>
-        <el-tag class="ms-left-buttion" size="small" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-tag>
+        <el-tag class="ms-left-btn" size="small" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-tag>
         <el-tag size="mini" v-if="data.method">{{data.method}}</el-tag>
       </slot>
 
-      <span @click.stop>
+      <span>
         <slot name="headerLeft">
           <i class="icon el-icon-arrow-right" :class="{'is-active': data.active}"
              @click="active(data)" v-if="data.type!='scenario'  && !isMax "/>
-          <el-input :draggable="draggable" v-if="isShowInput && isShowNameInput" size="mini" v-model="data.name" class="name-input"
-                    @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
-          <span v-else>
+          <span @click.stop v-if="isShowInput && isShowNameInput">
+            <el-input :draggable="draggable" size="mini" v-model="data.name" class="name-input"
+                      @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
+          </span>
+          <span :class="isMax?'ms-step-name':'scenario-name'" v-else>
             {{data.name}}
             <i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled"/>
           </span>
@@ -159,7 +161,8 @@
     margin-right: 5px;
   }
 
-  .ms-left-buttion {
+  .ms-left-btn {
+    font-size: 13px;
     margin-right: 15px;
   }
 
@@ -173,15 +176,24 @@
     margin-right: 10px;
   }
 
-  .node-title {
+  .ms-step-name {
     display: inline-block;
-    margin: 0px;
+    font-size: 13px;
+    margin: 0 5px;
     overflow-x: hidden;
     padding-bottom: 0;
     text-overflow: ellipsis;
     vertical-align: middle;
     white-space: nowrap;
-    width: 100px;
+    width: 180px;
+  }
+
+  .scenario-name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 13px;
+    width: 100%;
   }
 
   /deep/ .el-step__icon {
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index b1e3c1d553..f926d9e4fe 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -5,21 +5,32 @@
       <ms-aside-container>
         <!-- 场景步骤内容 -->
         <div v-loading="loading">
-          <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition"
+          <el-tree node-key="resourceId"
+                   :props="props"
+                   :data="scenarioDefinition"
                    :default-expanded-keys="expandedNode"
                    :expand-on-click-node="false"
                    highlight-current
                    @node-expand="nodeExpand"
                    @node-collapse="nodeCollapse"
                    :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable>
-                    <span class="custom-tree-node father" slot-scope="{ node, data}">
-                      <!-- 步骤组件-->
-                       <ms-component-config :isMax="true" :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
-                                            :currentEnvironmentId="currentEnvironmentId" :node="node" :project-list="projectList" :env-map="projectEnvMap"
-                                            @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" @openScenario="openScenario"/>
-                    </span>
+              <span class="custom-tree-node father" slot-scope="{ node, data}">
+                <!-- 步骤组件-->
+                 <ms-component-config
+                   :isMax="true"
+                   :type="data.type"
+                   :scenario="data"
+                   :response="response"
+                   :currentScenario="currentScenario"
+                   :currentEnvironmentId="currentEnvironmentId"
+                   :node="node"
+                   :project-list="projectList"
+                   :env-map="projectEnvMap"
+                   @remove="remove" @copyRow="copyRow"
+                   @suggestClick="suggestClick"
+                   @refReload="refReload" @openScenario="openScenario"/>
+              </span>
           </el-tree>
-
           <div @click="fabClick">
             <vue-fab id="fab" mainBtnColor="#783887" size="small" :global-options="globalOptions"
                      :click-auto-close="false">
@@ -41,39 +52,39 @@
 
       <ms-main-container>
         <!-- 第一层当前节点内容-->
-        <ms-component-config :isMax="false"
-                             :showBtn="false"
-                             :type="selectedTreeNode.type"
-                             :scenario="selectedTreeNode"
-                             :response="response"
-                             :currentScenario="currentScenario"
-                             :currentEnvironmentId="currentEnvironmentId"
-                             :node="selectedNode"
-                             :project-list="projectList"
-                             :env-map="projectEnvMap"
-                             :draggable="false"
-                             @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" @openScenario="openScenario"
-                             v-if="selectedTreeNode && selectedNode"/>
+        <ms-component-config
+          :isMax="false"
+          :showBtn="false"
+          :type="selectedTreeNode.type"
+          :scenario="selectedTreeNode"
+          :response="response"
+          :currentScenario="currentScenario"
+          :currentEnvironmentId="currentEnvironmentId"
+          :node="selectedNode"
+          :project-list="projectList"
+          :env-map="projectEnvMap"
+          :draggable="false"
+          @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick" @refReload="refReload" @openScenario="openScenario"
+          v-if="selectedTreeNode && selectedNode"/>
         <!-- 请求下还有的子步骤-->
         <div v-if="selectedTreeNode && selectedTreeNode.hashTree && showNode(selectedTreeNode)">
           <div v-for="item in selectedTreeNode.hashTree" :key="item.id" class="ms-col-one">
-            <ms-component-config :showBtn="false"
-                                 :isMax="false"
-                                 :type="item.type"
-                                 :scenario="item"
-                                 :response="response"
-                                 :currentScenario="currentScenario"
-                                 :currentEnvironmentId="currentEnvironmentId"
-                                 :project-list="projectList"
-                                 :env-map="projectEnvMap"
-                                 :draggable="false"
-                                 @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick"
-                                 @refReload="refReload" @openScenario="openScenario"
-                                 v-if="selectedTreeNode && selectedNode"/>
-
+            <ms-component-config
+              :showBtn="false"
+              :isMax="false"
+              :type="item.type"
+              :scenario="item"
+              :response="response"
+              :currentScenario="currentScenario"
+              :currentEnvironmentId="currentEnvironmentId"
+              :project-list="projectList"
+              :env-map="projectEnvMap"
+              :draggable="false"
+              @remove="remove" @copyRow="copyRow" @suggestClick="suggestClick"
+              @refReload="refReload" @openScenario="openScenario"
+              v-if="selectedTreeNode && selectedNode"/>
           </div>
         </div>
-
       </ms-main-container>
     </ms-container>
 
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue b/frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue
index 7e0d92babd..7e71ecd51b 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MsLeftContainer.vue
@@ -43,6 +43,14 @@
     position: relative;
   }
 
+  .scenario-aside {
+    position: relative;
+    border-radius: 4px;
+    border: 1px solid #EBEEF5;
+    box-sizing: border-box;
+  }
+
+
   .hiddenBottom i {
     margin-left: -2px;
   }

From 17ebeda90b2b389b24a0817376fb0a723ec5b94e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 17 Mar 2021 19:02:28 +0800
Subject: [PATCH 51/95] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E7=BB=88=E6=AD=A2=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=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/xpack                    | 2 +-
 .../api/automation/scenario/common/ApiBaseComponent.vue       | 4 ++--
 frontend/src/business/components/xpack                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index adefde265f..efd6af73b7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7
+Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index 837b8e655c..31e8805ba4 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -12,14 +12,14 @@
       <span>
         <slot name="headerLeft">
           <i class="icon el-icon-arrow-right" :class="{'is-active': data.active}"
-             @click="active(data)" v-if="data.type!='scenario'  && !isMax "/>
+             @click="active(data)" v-if="data.type!='scenario' && data.type!='JmeterElement' && !isMax " @click.stop/>
           <span @click.stop v-if="isShowInput && isShowNameInput">
             <el-input :draggable="draggable" size="mini" v-model="data.name" class="name-input"
                       @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
           </span>
           <span :class="isMax?'ms-step-name':'scenario-name'" v-else>
             {{data.name}}
-            <i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled"/>
+            <i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled" @click.stop/>
           </span>
         </slot>
         <slot name="behindHeaderLeft" v-if="!isMax"></slot>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index b2571e06e8..f278121988 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit b2571e06e8b211821409115cc2c4a7c52cbac1db
+Subproject commit f2781219889c2f993436bcc3ea90038f588fa73e

From 1b66871e2f2418e41d2c4fe992696e14d28192f6 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 10:36:43 +0800
Subject: [PATCH 52/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=9C=80=E5=A4=A7=E5=8C=96=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/component/ApiComponent.vue |  2 +-
 .../scenario/component/ComponentConfig.vue         |  6 +++---
 .../scenario/maximize/MaximizeScenario.vue         | 14 ++++++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index cd282e7f81..d88ebfb62f 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -275,7 +275,6 @@
             }
           }
         }
-
         this.request.active = true;
         this.loading = true;
         this.runData = [];
@@ -295,6 +294,7 @@
         this.request.requestResult = data;
         this.request.result = undefined;
         this.loading = false;
+        this.$emit('refReload',this.request,this.node);
       },
       reload() {
         this.loading = true
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 40231b855d..a87ce11b4b 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -124,14 +124,14 @@
         this.$emit('copyRow', row, node);
 
       },
-      openScenario(data){
+      openScenario(data) {
         this.$emit('openScenario', data);
       },
       suggestClick(node) {
         this.$emit('suggestClick', node);
       },
-      refReload() {
-        this.$emit('refReload');
+      refReload(data, node) {
+        this.$emit('refReload', data, node);
       }
     }
   }
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index f926d9e4fe..bc87648903 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -50,7 +50,7 @@
         </div>
       </ms-aside-container>
 
-      <ms-main-container>
+      <ms-main-container v-if="!loading">
         <!-- 第一层当前节点内容-->
         <ms-component-config
           :isMax="false"
@@ -235,6 +235,11 @@
       this.operatingElements = ELEMENTS.get("ALL");
       this.projectEnvMap = this.envMap;
     },
+    watch: {
+      envMap() {
+        this.projectEnvMap = this.envMap;
+      }
+    },
     directives: {OutsideClick},
     computed: {
       buttons() {
@@ -877,8 +882,7 @@
           this.currentScenario.apiScenarioModuleId = this.currentModule.id;
         }
         this.currentScenario.projectId = this.projectId;
-      }
-      ,
+      },
       runRefresh() {
         this.debugVisible = true;
         this.loading = false;
@@ -911,7 +915,9 @@
       setProjectEnvMap(projectEnvMap) {
         this.projectEnvMap = projectEnvMap;
       },
-      refReload() {
+      refReload(data,node) {
+        this.selectedTreeNode = data;
+        this.selectedNode = node;
         this.initProjectIds();
         this.reload();
       },

From 850af874eeace0adbee33436cf469189c3865c2b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 13:34:18 +0800
Subject: [PATCH 53/95] chore: sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efd6af73b7..adefde265f 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
+Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index f278121988..d3c3ba9835 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f2781219889c2f993436bcc3ea90038f588fa73e
+Subproject commit d3c3ba983502dc9864db88645af392e36004f301

From 3593c907cdb251b19fe8146965ae7219aa83cb91 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 18 Mar 2021 13:54:18 +0800
Subject: [PATCH 54/95] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/components/TestReviewTestCaseList.vue       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 33432539b0..1ccafc535b 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="card-container">
-        <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
+        <ms-table-header :is-,tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :show-create="false" :tip="$t('commons.search_by_name_or_id')">
-          <template v-slot:title>
-            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"
-                             :title="$t('test_track.review_view.all_case')"/>
-          </template>
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" icon="el-icon-video-play"
                              :content="$t('test_track.review_view.start_review')" @click="startReview"/>
@@ -471,5 +467,11 @@ export default {
 .ms-table-header {
   margin: 20px;
 }
+
+/deep/ .table-title {
+  height: 0px;
+  font-weight: bold;
+  font-size: 0px;
+}
 </style>
 

From 878439795dc4016f2a262191ae96701c5d7948d7 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 18 Mar 2021 13:59:51 +0800
Subject: [PATCH 55/95] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseEdit.vue    | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index a40f69d661..4ddd1d4e2a 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -136,12 +136,12 @@
           <el-row>
             <el-col :span="10">
               <el-form-item label="关联需求" :label-width="formLabelWidth" prop="demandId">
-                <el-select filterable :disabled="readOnly" v-model="form.demandId" @visible-change="visibleChange"
+                <el-select filterable :disabled="readOnly" v-model="form.demandId"
                            :placeholder="$t('test_track.case.input_type')" class="ms-case-input">
                   <el-option
                     v-for="item in demandOptions"
                     :key="item.id"
-                    :label="item.platform + ': '+item.name"
+                    :label="item.name"
                     :value="item.id">
                   </el-option>
                 </el-select>
@@ -761,31 +761,18 @@ export default {
         });
       }
     },
-    visibleChange(flag) {
-      if (flag) {
-        this.getDemandOptions()
-      }
-    },
     getDemandOptions() {
-      if (this.demandOptions.length === 0) {
-        this.projectId = getCurrentProjectID();
-        this.result = {loading : true};
-        this.$get("demand/list/" + this.projectId).then(response => {
-          this.demandOptions = response.data.data;
-          this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other'), platform: 'Other'})
-          this.result = {loading : false};
-        }).catch(() => {
-          this.result = {loading : false};
-        })
-      }
+      this.projectId = getCurrentProjectID()
+      this.result = this.$get("demand/list/" + this.projectId, response => {
+        this.demandOptions = response.data;
+        this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other')})
+      });
     },
     getSelectOptions() {
       this.getModuleOptions();
       this.getMaintainerOptions();
       this.getTestOptions();
-      if (this.type === 'edit') {
-        this.getDemandOptions();
-      }
+      // this.getDemandOptions()
     },
 
     resetForm() {

From 8ef938dac1a05184ce57fdb76deaed3c9191231f Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 14:01:02 +0800
Subject: [PATCH 56/95] =?UTF-8?q?fix:=20ui.theme=20=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SystemParameterService.java       | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 70f1eaaa59..6ad755b758 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -27,7 +27,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
 
 
 @Service
@@ -111,13 +114,13 @@ public class SystemParameterService {
             LogUtil.error(e.getMessage(), e);
             MSException.throwException(Translator.get("connection_failed"));
         }
-        if(!StringUtils.isBlank(recipients)){
+        if (!StringUtils.isBlank(recipients)) {
             MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             MimeMessageHelper helper = null;
             try {
                 helper = new MimeMessageHelper(mimeMessage, true);
                 helper.setFrom(javaMailSender.getUsername());
-                helper.setSubject("MeterSphere测试邮件 " );
+                helper.setSubject("MeterSphere测试邮件 ");
                 helper.setText("这是一封测试邮件，邮件发送成功", true);
                 helper.setTo(recipients);
                 javaMailSender.send(mimeMessage);
@@ -136,10 +139,10 @@ public class SystemParameterService {
 
     public MailInfo mailInfo(String type) {
         List<SystemParameter> paramList = this.getParamList(type);
-        MailInfo mailInfo=new MailInfo ();
+        MailInfo mailInfo = new MailInfo();
         if (!CollectionUtils.isEmpty(paramList)) {
             for (SystemParameter param : paramList) {
-                if (StringUtils.equals(param.getParamKey(),ParamConstants.MAIL.SERVER.getValue() )) {
+                if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.SERVER.getValue())) {
                     mailInfo.setHost(param.getParamValue());
                 } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.PORT.getValue())) {
                     mailInfo.setPort(param.getParamValue());
@@ -205,8 +208,8 @@ public class SystemParameterService {
 
     public String getValue(String key) {
         SystemParameter param = systemParameterMapper.selectByPrimaryKey(key);
-        if (param == null) {
-            return null;
+        if (param == null || StringUtils.isBlank(param.getParamValue())) {
+            return "#783887";
         }
         return param.getParamValue();
     }
@@ -241,16 +244,16 @@ public class SystemParameterService {
 
     //保存表头
     public void saveHeader(UserHeader userHeader) {
-        UserHeaderExample example=new UserHeaderExample();
+        UserHeaderExample example = new UserHeaderExample();
         example.createCriteria().andUserIdEqualTo(userHeader.getUserId()).andTypeEqualTo(userHeader.getType());
-       if(userHeaderMapper.countByExample(example)>0){
-           userHeaderMapper.deleteByExample(example);
-           userHeader.setId(UUID.randomUUID().toString());
-           userHeaderMapper.insert(userHeader);
-       }else{
-           userHeader.setId(UUID.randomUUID().toString());
-           userHeaderMapper.insert(userHeader);
-       }
+        if (userHeaderMapper.countByExample(example) > 0) {
+            userHeaderMapper.deleteByExample(example);
+            userHeader.setId(UUID.randomUUID().toString());
+            userHeaderMapper.insert(userHeader);
+        } else {
+            userHeader.setId(UUID.randomUUID().toString());
+            userHeaderMapper.insert(userHeader);
+        }
         example.clear();
     }
 

From 21709ff323727723d3d8de0ed3659b8cab52ed99 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 14:11:41 +0800
Subject: [PATCH 57/95] =?UTF-8?q?fix:=20ui.theme=20=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/service/SystemParameterService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 6ad755b758..853c6bdc63 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -209,7 +209,7 @@ public class SystemParameterService {
     public String getValue(String key) {
         SystemParameter param = systemParameterMapper.selectByPrimaryKey(key);
         if (param == null || StringUtils.isBlank(param.getParamValue())) {
-            return "#783887";
+            return "";
         }
         return param.getParamValue();
     }

From fec05d2ed06d51a70fbfbe4efb550d9c2becec6d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 14:31:27 +0800
Subject: [PATCH 58/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsession=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E4=B9=8B=E5=90=8E=E4=B8=8D=E8=83=BD=E7=99=BB=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/metersphere/commons/utils/ShiroUtils.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
index 79ad0b6f70..5483e08edd 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
@@ -16,6 +16,7 @@ public class ShiroUtils {
         filterChainDefinitionMap.put("/signin", "anon");
         filterChainDefinitionMap.put("/ldap/signin", "anon");
         filterChainDefinitionMap.put("/ldap/open", "anon");
+        filterChainDefinitionMap.put("/signout", "anon");
         filterChainDefinitionMap.put("/isLogin", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");
         filterChainDefinitionMap.put("/js/**", "anon");

From 02177026558e195dfcdbb5175731fe963e70dd88 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 18 Mar 2021 14:43:51 +0800
Subject: [PATCH 59/95] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsModuleMinder.vue      | 21 +---------------
 .../components/track/case/TestCase.vue        |  6 ++---
 .../track/common/minder/TestCaseMinder.vue    |  9 ++++---
 .../track/common/minder/TestPlanMinder.vue    | 24 +++++++++----------
 .../track/common/minder/TestReviewMinder.vue  | 16 ++++++-------
 .../tableItems/planview/StatusTableItem.vue   |  2 +-
 .../functional/TestPlanFunctional.vue         |  6 ++---
 .../view/components/TestReviewFunction.vue    |  6 ++---
 frontend/src/i18n/en-US.js                    |  2 ++
 frontend/src/i18n/zh-CN.js                    |  2 ++
 frontend/src/i18n/zh-TW.js                    |  2 ++
 11 files changed, 41 insertions(+), 55 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index 4838d71d50..9f879a88fc 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -46,29 +46,10 @@ export default {
   },
   data() {
     return {
-      importJsonTest: {
-        "root": {
-          "data": {
-            "text": "test111"
-          },
-          "children": [
-            { "data": { "text": "新闻"}},
-            { "data": { "text": "网页"} },
-            { "data": { "text": "贴吧"} },
-            { "data": { "text": "知道"} },
-            { "data": { "text": "音乐" } },
-            { "data": { "text": "图片"} },
-            { "data": { "text": "视频"} },
-            { "data": { "text": "地图" } },
-            { "data": { "text": "百科","expandState":"collapse"}}
-          ]
-        },
-        "template":"default"
-      },
       importJson: {
         root: {
           data: {
-            text: "全部用例",
+            text: this.$t('test_track.review_view.all_case'),
             disable: true,
             id: "root",
             path: ""
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 9bc3ed09d0..f3bae0ef40 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -18,10 +18,10 @@
         <el-tab-pane name="default" :label="$t('api_test.definition.case_title')">
           <ms-tab-button
             :active-dom.sync="activeDom"
-            :left-tip="'用例列表'"
+            :left-tip="$t('api_test.definition.case_title')"
             :left-content="'CASE'"
-            :right-tip="'脑图'"
-            :right-content="'脑图'"
+            :right-tip="$t('test_track.case.minder')"
+            :right-content="$t('test_track.case.minder')"
             :middle-button-enable="false">
           <test-case-list
             v-if="activeDom === 'left'"
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index c4588fa03b..8e65deecc7 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -18,7 +18,7 @@ name: "TestCaseMinder",
     return{
       testCase: [],
       dataMap: new Map(),
-      tags: ['用例', '前置条件', '备注'],
+      tags: [this.$t('api_test.definition.request.case'), this.$t('test_track.case.prerequisite'), this.$t('commons.remark')],
       result: {}
     }
   },
@@ -47,7 +47,6 @@ name: "TestCaseMinder",
       }
     },
     save(data) {
-      console.log(this.dataMap);
       let saveCases = [];
       this.buildSaveCase(data.root, saveCases, undefined);
       let param = {
@@ -60,7 +59,7 @@ name: "TestCaseMinder",
     },
     buildSaveCase(root, saveCases, parent) {
       let data = root.data;
-      if (data.resource && data.resource.indexOf("用例") > -1) {
+      if (data.resource && data.resource.indexOf(this.$t('api_test.definition.request.case')) > -1) {
         this._buildSaveCase(root, saveCases, parent);
       } else {
         if (root.children) {
@@ -92,9 +91,9 @@ name: "TestCaseMinder",
       if (node.children) {
         node.children.forEach((childNode) => {
           let childData = childNode.data;
-          if (childData.resource && childData.resource.indexOf('前置条件') > -1) {
+          if (childData.resource && childData.resource.indexOf(this.$t('test_track.case.prerequisite')) > -1) {
             testCase.prerequisite = childData.text;
-          } else if (childData.resource && childData.resource.indexOf('备注') > -1) {
+          } else if (childData.resource && childData.resource.indexOf(this.$t('commons.remark')) > -1) {
             testCase.remark = childData.text;
           } else {
             // 测试步骤
diff --git a/frontend/src/business/components/track/common/minder/TestPlanMinder.vue b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
index b9a163da1f..5a8a82e5d1 100644
--- a/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestPlanMinder.vue
@@ -4,7 +4,7 @@
     :tree-nodes="treeNodes"
     :data-map="dataMap"
     :tags="tags"
-    :distinct-tags="[...tags, '未开始']"
+    :distinct-tags="[...tags, $t('test_track.plan.plan_status_prepare')]"
     @save="save"
   />
 </template>
@@ -19,7 +19,7 @@ name: "TestPlanMinder",
     return{
       dataMap: new Map(),
       result: {},
-      tags: ['通过', '失败', '阻塞', '跳过'],
+      tags: [this.$t('test_track.plan_view.pass'), this.$t('test_track.plan_view.failure'), this.$t('test_track.plan_view.blocking'), this.$t('test_track.plan_view.skip')],
     }
   },
   props: {
@@ -48,15 +48,15 @@ name: "TestPlanMinder",
         this.result = this.$get('/test/plan/case/list/minder/' + this.planId, response => {
           this.dataMap = getTestCaseDataMap(response.data, true, (data, item) => {
             if (item.stats === 'Pass') {
-              data.resource.push("通过");
+              data.resource.push(this.$t('test_track.plan_view.pass'));
             } else if (item.reviewStatus === 'Failure') {
-              data.resource.push("失败");
+              data.resource.push(this.$t('test_track.plan_view.failure'));
             } else if (item.reviewStatus === 'Blocking') {
-              data.resource.push("阻塞");
+              data.resource.push(this.$t('test_track.plan_view.blocking'));
             } else if (item.reviewStatus === 'Skip') {
-              data.resource.push("跳过");
+              data.resource.push(this.$t('test_track.plan_view.skip'));
             } else {
-              data.resource.push("未开始");
+              data.resource.push(this.$t('test_track.plan.plan_status_prepare'));
             }
           });
         });
@@ -71,7 +71,7 @@ name: "TestPlanMinder",
     },
     buildSaveCase(root, saveCases) {
       let data = root.data;
-      if (data.resource && data.resource.indexOf("用例") > -1) {
+      if (data.resource && data.resource.indexOf(this.$t('api_test.definition.request.case')) > -1) {
         this._buildSaveCase(root, saveCases, parent);
       } else {
         if (root.children) {
@@ -90,13 +90,13 @@ name: "TestPlanMinder",
         id: data.id,
       };
       if (data.resource.length > 1) {
-        if (data.resource.indexOf('失败') > -1) {
+        if (data.resource.indexOf(this.$t('test_track.plan_view.failure')) > -1) {
           testCase.status = 'Failure';
-        } else if (data.resource.indexOf('通过') > -1) {
+        } else if (data.resource.indexOf(this.$t('test_track.plan_view.pass')) > -1) {
           testCase.status = 'Pass';
-        } else if (data.resource.indexOf('阻塞') > -1) {
+        } else if (data.resource.indexOf(this.$t('test_track.plan_view.blocking')) > -1) {
           testCase.status = 'Blocking';
-        } else if (data.resource.indexOf('跳过') > -1) {
+        } else if (data.resource.indexOf(this.$t('test_track.plan_view.skip')) > -1) {
           testCase.status = 'Skip';
         }
       }
diff --git a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
index 6295625b19..65ad2f954c 100644
--- a/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestReviewMinder.vue
@@ -4,7 +4,7 @@
     :tree-nodes="treeNodes"
     :data-map="dataMap"
     :tags="tags"
-    :distinct-tags="[...tags, '未开始']"
+    :distinct-tags="[...tags, $t('test_track.plan.plan_status_prepare')]"
     @save="save"
   />
 </template>
@@ -18,7 +18,7 @@ name: "TestReviewMinder",
   data() {
     return{
       dataMap: new Map(),
-      tags: ['通过', '不通过'],
+      tags: [this.$t('test_track.plan_view.pass'), this.$t('test_track.plan_view.not_pass')],
       result: {}
     }
   },
@@ -48,11 +48,11 @@ name: "TestReviewMinder",
         this.result = this.$post('/test/review/case/list/all', {reviewId: this.reviewId}, response => {
           this.dataMap = getTestCaseDataMap(response.data, true, (data, item) => {
             if (item.reviewStatus === 'Pass') {
-              data.resource.push("通过");
+              data.resource.push(this.$t('test_track.plan_view.pass'));
             } else if (item.reviewStatus === 'UnPass') {
-              data.resource.push("不通过");
+              data.resource.push(this.$t('test_track.plan_view.not_pass'));
             } else {
-              data.resource.push("未开始");
+              data.resource.push(this.$t('test_track.plan.plan_status_prepare'));
             }
             data.caseId = item.caseId;
           });
@@ -68,7 +68,7 @@ name: "TestReviewMinder",
     },
     buildSaveCase(root, saveCases) {
       let data = root.data;
-      if (data.resource && data.resource.indexOf("用例") > -1) {
+      if (data.resource && data.resource.indexOf(this.$t('api_test.definition.request.case')) > -1) {
         this._buildSaveCase(root, saveCases);
       } else {
         if (root.children) {
@@ -89,9 +89,9 @@ name: "TestReviewMinder",
         // name: data.text,
       };
       if (data.resource.length > 1) {
-        if (data.resource.indexOf('不通过') > -1) {
+        if (data.resource.indexOf(this.$t('test_track.plan_view.not_pass')) > -1) {
           testCase.status = 'UnPass';
-        } else if (data.resource.indexOf('通过') > -1) {
+        } else if (data.resource.indexOf(this.$t('test_track.plan_view.pass')) > -1) {
           testCase.status = 'Pass';
         }
       }
diff --git a/frontend/src/business/components/track/common/tableItems/planview/StatusTableItem.vue b/frontend/src/business/components/track/common/tableItems/planview/StatusTableItem.vue
index 14b4bd8de4..80a08496c7 100644
--- a/frontend/src/business/components/track/common/tableItems/planview/StatusTableItem.vue
+++ b/frontend/src/business/components/track/common/tableItems/planview/StatusTableItem.vue
@@ -3,7 +3,7 @@
       <ms-tag v-if="value == 'Prepare'" type="info" :content="$t('test_track.plan.plan_status_prepare')"/>
       <ms-tag v-if="value == 'Underway'" type="primary" :content="$t('test_track.plan.plan_status_running')"/>
       <ms-tag v-if="value == 'Pass'" type="success" :content="$t('test_track.plan_view.pass')"/>
-      <ms-tag v-if="value == 'UnPass'" type="danger" content="未通过"/>
+      <ms-tag v-if="value == 'UnPass'" type="danger" content="$t('test_track.plan_view.not_pass')"/>
       <ms-tag v-if="value == 'Failure'" type="danger" :content="$t('test_track.plan_view.failure')"/>
       <ms-tag v-if="value == 'Blocking'" type="warning" :content="$t('test_track.plan_view.blocking')"/>
       <ms-tag v-if="value == 'Skip'" type="info" :content="$t('test_track.plan_view.skip')"/>
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
index a4c154d3c6..94bc8e1e18 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
@@ -11,10 +11,10 @@
     <template v-slot:main>
       <ms-tab-button
         :active-dom.sync="activeDom"
-        :left-tip="'用例列表'"
+        :left-tip="$t('api_test.definition.case_title')"
         :left-content="'CASE'"
-        :right-tip="'脑图'"
-        :right-content="'脑图'"
+        :right-tip="$t('test_track.case.minder')"
+        :right-content="$t('test_track.case.minder')"
         :middle-button-enable="false">
       <functional-test-case-list
         class="table-list"
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
index d1b58f6d5b..e8e0ab2208 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
@@ -12,10 +12,10 @@
     <template v-slot:main>
       <ms-tab-button
         :active-dom.sync="activeDom"
-        :left-tip="'用例列表'"
+        :left-tip="$t('api_test.definition.case_title')"
         :left-content="'CASE'"
-        :right-tip="'脑图'"
-        :right-content="'脑图'"
+        :right-tip="$t('test_track.case.minder')"
+        :right-content="$t('test_track.case.minder')"
         :middle-button-enable="false">
         <test-review-test-case-list
           class="table-list"
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index cee8d7f0e9..83d63674d4 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1102,6 +1102,7 @@ export default {
     cancel_relevance_success: "Unlinked successfully",
     switch_project: "Switch project",
     case: {
+      minder: "Minder",
       check_select: "Please check the case",
       export_all_cases: 'Are you sure you want to export all use cases?',
       input_test_case: 'Please enter the associated case name',
@@ -1310,6 +1311,7 @@ export default {
       executor: "Executor",
       execute_result: "Result",
       pass: "Pass",
+      not_pass: "UnPass",
       failure: "Failure",
       blocking: "Blocking",
       skip: "Skip",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index cf744e4cf7..a9173e8d0a 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1106,6 +1106,7 @@ export default {
     cancel_relevance_success: "取消关联成功",
     switch_project: "切换项目",
     case: {
+      minder: "脑图",
       check_select: "请勾选用例",
       export_all_cases: '确定要导出全部用例吗?',
       input_test_case: '请输入关联用例名称',
@@ -1314,6 +1315,7 @@ export default {
       executor: "执行人",
       execute_result: "执行结果",
       pass: "通过",
+      not_pass: "不通过",
       failure: "失败",
       blocking: "阻塞",
       skip: "跳过",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 0cbee14b76..d9935e0c7a 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1104,6 +1104,7 @@ export default {
     cancel_relevance_success: "取消關聯成功",
     switch_project: "切換項目",
     case: {
+      minder: "腦圖",
       check_select: "請勾選用例",
       export_all_cases: '確定要導出全部用例嗎?',
       input_test_case: '請輸入關聯用例名稱',
@@ -1312,6 +1313,7 @@ export default {
       executor: "執行人",
       execute_result: "執行結果",
       pass: "通過",
+      not_pass: "不通過",
       failure: "失敗",
       blocking: "阻塞",
       skip: "跳過",

From 5818947ca7890e89e251534ad2f9860146a08690 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 18 Mar 2021 14:43:56 +0800
Subject: [PATCH 60/95] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=EF=BC=88=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/review/view/TestCaseReviewView.vue   | 8 ++++----
 .../track/review/view/components/TestReviewRelevance.vue  | 6 ++----
 .../review/view/components/TestReviewTestCaseList.vue     | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
index 51b982123f..cd6b54f4f2 100644
--- a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
+++ b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
@@ -13,16 +13,16 @@
                  class="el-menu-demo header-menu" mode="horizontal" @select="handleSelect"
                  :default-active="activeIndex">
           <el-menu-item index="functional">功能测试用例</el-menu-item>
-          <el-menu-item index="api">接口测试用例</el-menu-item>
-          <el-menu-item index="load">性能测试用例</el-menu-item>
+<!--          <el-menu-item index="api">接口测试用例</el-menu-item>
+          <el-menu-item index="load">性能测试用例</el-menu-item>-->
           <!--          <el-menu-item index="report">报告统计</el-menu-item>-->
         </el-menu>
       </template>
     </ms-test-plan-header-bar>
     <test-review-function v-if="activeIndex === 'functional'" :redirectCharType="redirectCharType"
                           :clickType="clickType" :review-id="reviewId"></test-review-function>
-    <test-review-api v-if="activeIndex === 'api'" :review-id="reviewId"></test-review-api>
-    <test-review-load v-if="activeIndex === 'load'" :review-id="reviewId"></test-review-load>
+    <!--    <test-review-api v-if="activeIndex === 'api'" :review-id="reviewId"></test-review-api>
+        <test-review-load v-if="activeIndex === 'load'" :review-id="reviewId"></test-review-load>-->
 
   </div>
 
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 bf36f685a0..aa18c8ecd8 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -82,10 +82,6 @@
       </el-container>
 
       <template v-slot:footer>
-        <div style="margin-bottom: 15px">
-          <el-checkbox v-model="checked">同步添加关联的接口和性能测试</el-checkbox>
-        </div>
-
         <ms-dialog-footer @cancel="dialogFormVisible = false" @confirm="saveReviewRelevance"/>
       </template>
 
@@ -203,7 +199,9 @@ export default {
         param.reviewId = this.reviewId;
         param.testCaseIds = [...this.selectIds];
         param.request = this.condition;
+/*
         param.checked = this.checked;
+*/
         // 选择全选则全部加入到评审，无论是否加载完全部
         if (this.testReviews.length === param.testCaseIds.length) {
           param.testCaseIds = ['all'];
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 1ccafc535b..e00a6f1d4f 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="card-container">
-        <ms-table-header :is-,tester-permission="true" :condition.sync="condition" @search="initTableData"
+        <ms-table-header :tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :show-create="false" :tip="$t('commons.search_by_name_or_id')">
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" icon="el-icon-video-play"

From f5ec3169ea27266ebd3326fc81044a141cec89e6 Mon Sep 17 00:00:00 2001
From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com>
Date: Thu, 18 Mar 2021 14:48:19 +0800
Subject: [PATCH 61/95] fix (#1646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(接口测试):修复只读用户权限过高能对数据进行操作

* fix(测试计划):修复关联用例时样式不统一的问题

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
---
 .../mapper/ext/ExtTestPlanLoadCaseMapper.java |  2 +-
 .../mapper/ext/ExtTestPlanLoadCaseMapper.xml  |  7 +-
 .../service/TestPlanLoadCaseService.java      |  2 +-
 .../comonents/api/RelevanceScenarioList.vue   | 13 ++-
 .../comonents/load/TestCaseLoadRelevance.vue  | 93 +++++++++++--------
 5 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
index f0698d3fc2..79c27a3ea6 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface ExtTestPlanLoadCaseMapper {
 
-    List<String> selectIdsNotInPlan(@Param("projectId") String projectId, @Param("planId") String planId);
+    List<String> selectIdsNotInPlan(@Param("request") LoadCaseRequest request);
     List<TestPlanLoadCaseDTO> selectTestPlanLoadCaseList(@Param("request") LoadCaseRequest request);
     void updateCaseStatus(@Param("reportId") String reportId, @Param("status") String status);
     List<String> getStatusByTestPlanId(@Param("planId") String planId);
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
index af825ef83d..9d4373060a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
@@ -10,9 +10,12 @@
     <select id="selectIdsNotInPlan" resultType="java.lang.String">
         select load_test.id
         from load_test
-        where load_test.project_id = #{projectId}
+        where load_test.project_id = #{request.projectId}
+        <if test="request.name != null and request.name != ''">
+        and load_test.name like CONCAT('%', #{request.name},'%')
+        </if>
           and load_test.id not in (
-            select tplc.load_case_id from test_plan_load_case tplc where tplc.test_plan_id = #{planId}
+            select tplc.load_case_id from test_plan_load_case tplc where tplc.test_plan_id = #{request.testPlanId}
         )
     </select>
     <select id="selectTestPlanLoadCaseList" resultType="io.metersphere.track.dto.TestPlanLoadCaseDTO">
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
index 18b2c63e15..a596b37cf7 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
@@ -46,7 +46,7 @@ public class TestPlanLoadCaseService {
     private LoadTestMapper loadTestMapper;
 
     public List<LoadTest> relevanceList(LoadCaseRequest request) {
-        List<String> ids = extTestPlanLoadCaseMapper.selectIdsNotInPlan(request.getProjectId(), request.getTestPlanId());
+        List<String> ids = extTestPlanLoadCaseMapper.selectIdsNotInPlan(request);
         if (CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         }
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
index fc2ba91129..fd34dc24e3 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -2,8 +2,17 @@
   <div>
     <el-card class="table-card" v-loading="result.loading">
 
-      <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
-                   :project-list="projectList" ref="envPopover" class="env-popover"/>
+      <template v-slot:header>
+        <el-row>
+          <el-col :span="8" :offset="11">
+            <el-input :placeholder="$t('api_test.definition.request.select_case')" @blur="search"
+                      @keyup.enter.native="search" class="search-input" size="small" v-model="condition.name"/>
+          </el-col>
+
+          <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                       :project-list="projectList" ref="envPopover" class="env-popover"/>
+        </el-row>
+      </template>
 
       <el-table ref="scenarioTable" border :data="tableData" class="adjust-table" @select-all="handleSelectAll" @select="handleSelect">
         <el-table-column type="selection"/>
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
index 423c486781..35d5a3430d 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
@@ -13,48 +13,59 @@
                  ref="nodeTree"/>
     </template>
 
+    <el-card>
+      <template v-slot:header>
+        <el-row>
+          <el-col :span="8" :offset="16">
+            <el-input :placeholder="$t('api_test.definition.request.select_case')" @blur="getTestCases"
+                      @keyup.enter.native="getTestCases" class="search-input" size="small" v-model="condition.name"/>
+          </el-col>
+        </el-row>
+      </template>
 
-    <el-table
-      v-loading="result.loading"
-      :data="testCases"
-      row-key="id"
-      @select-all="handleSelectAll"
-      @select="handleSelectionChange"
-      height="50vh"
-      ref="table">
-      <el-table-column
-        type="selection"/>
-      <el-table-column
-        prop="name"
-        :label="$t('commons.name')"
-        show-overflow-tooltip>
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        column-key="status"
-        :filters="statusFilters"
-        :label="$t('commons.status')">
-        <template v-slot:default="{row}">
-          <ms-performance-test-status :row="row"/>
-        </template>
-      </el-table-column>
-      <el-table-column
-        sortable
-        prop="createTime"
-        :label="$t('commons.create_time')">
-        <template v-slot:default="scope">
-          <span>{{ scope.row.createTime | timestampFormatDate }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        sortable
-        prop="updateTime"
-        :label="$t('commons.update_time')">
-        <template v-slot:default="scope">
-          <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
+      <el-table
+        v-loading="result.loading"
+        :data="testCases"
+        row-key="id"
+        @select-all="handleSelectAll"
+        @select="handleSelectionChange"
+        height="50vh"
+        ref="table">
+        <el-table-column
+          type="selection"/>
+        <el-table-column
+          prop="name"
+          :label="$t('commons.name')"
+          show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+          prop="status"
+          column-key="status"
+          :filters="statusFilters"
+          :label="$t('commons.status')">
+          <template v-slot:default="{row}">
+            <ms-performance-test-status :row="row"/>
+          </template>
+        </el-table-column>
+        <el-table-column
+          sortable
+          prop="createTime"
+          :label="$t('commons.create_time')">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          sortable
+          prop="updateTime"
+          :label="$t('commons.update_time')">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </el-card>
     <ms-table-pagination :change="getTestCases" :current-page.sync="currentPage" :page-size.sync="pageSize"
                          :total="total"/>
   </test-case-relevance-base>

From 1696001475d0521a63dc98a498aaa331547b71f9 Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Thu, 18 Mar 2021 14:48:47 +0800
Subject: [PATCH 62/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=8F=96=E6=B6=88=E5=85=B3=E9=97=AD=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8Cswitch=E4=BB=8D=E7=84=B6=E4=BC=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A2=AB=E5=85=B3=E9=97=AD=20(#1640)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix: 修复点击取消关闭定时任务，switch仍然会显示被关闭
---
 .../api/automation/schedule/ScheduleMaintain.vue         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
index 0c1d28457c..1dcfb415fb 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
@@ -127,11 +127,18 @@ export default {
       let param = {};
       param.taskID = this.schedule.id;
       param.enable = flag;
+      let that = this;
       if(flag == false) {
         this.$confirm(this.$t('api_test.home_page.running_task_list.confirm.close_title'), this.$t('commons.prompt'), {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
-          type: 'warning'
+          type: 'warning',
+          beforeClose(action, instance, done) {
+            if(action == 'cancel') {  //  否则在 messageBox 点击取消后，switch 按钮仍然会被关闭
+              that.schedule.enable = param.enable = true;
+            }
+            done(); //  done 是关闭 messageBox 的行为
+          },
         }).then(() => {
           this.updateTask(param);
         }).catch(() => {

From eb163bbb65c226ee4135c2b79625ad4e6da8ac11 Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Thu, 18 Mar 2021 14:49:39 +0800
Subject: [PATCH 63/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=AA=E6=95=B0=E4=B8=8D=E5=AF=B9=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?api=E5=92=8Ccase=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=20(#1659)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 修复导入接口个数不对，以及api和case判断错误
---
 .../api/dto/definition/parse/MsDefinitionParser.java          | 4 ++--
 .../java/io/metersphere/api/service/ApiDefinitionService.java | 1 +
 .../src/business/components/api/definition/ApiDefinition.vue  | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
index c5194c0c8b..d3799f69a0 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
@@ -22,9 +22,9 @@ public class MsDefinitionParser extends MsAbstractParser<ApiDefinitionImport> {
         String testStr = getApiTestStr(source);
         JSONObject testObject = JSONObject.parseObject(testStr, Feature.OrderedField);
         this.projectId = request.getProjectId();
-        if (testObject.get("projectName") != null || testObject.get("projectId") != null ) {
+        if (testObject.get("projectName") != null || testObject.get("projectId") != null ) {//  metersphere 格式导入
             return parseMsFormat(testStr, request);
-        } else {
+        } else {    //  chrome 插件录制格式导入
             request.setPlatform(ApiImportPlatform.Plugin.name());
             ApiDefinitionImport apiImport = new ApiDefinitionImport();
             apiImport.setProtocol(RequestType.HTTP);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 94d4cd2fb9..20bd8c32ae 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -216,6 +216,7 @@ public class ApiDefinitionService {
         ApiDefinitionExample example = new ApiDefinitionExample();
         if (request.getProtocol().equals(RequestType.HTTP)) {
             example.createCriteria().andMethodEqualTo(request.getMethod()).andStatusNotEqualTo("Trash")
+                    .andPathEqualTo(request.getPath())
                     .andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(request.getId());
             return apiDefinitionMapper.selectByExample(example);
         } else {
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index bafa5b22ee..9f49986678 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -240,7 +240,6 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
       }
     },
     methods: {
-
       changeRedirectParam(redirectIDParam) {
         this.redirectID = redirectIDParam;
       },
@@ -349,7 +348,7 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
         this.showCasePage = true;
       },
       exportAPI(type) {
-        if (!this.isApiListEnable) {
+        if (this.activeDom !== 'left') {
           this.$warning('用例列表暂不支持导出，请切换成接口列表');
           return;
         }

From 3fd2139607a1c95a70bb3b5387ae3d404c9077bc Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Thu, 18 Mar 2021 14:53:15 +0800
Subject: [PATCH 64/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20(#1643)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix: 修复定时任务点击跳转错误

* fix: 测试计划首页的定时任务只显示测试计划任务

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
---
 .../api/controller/APITestController.java       | 17 +++++++++++------
 .../base/mapper/ext/ExtScheduleMapper.xml       |  7 ++++---
 .../track/service/TestPlanService.java          |  2 +-
 .../components/api/homepage/ApiTestHomePage.vue |  2 +-
 .../api/homepage/components/RunningTaskList.vue | 10 ++++++----
 .../components/track/home/TrackHome.vue         |  6 ++++--
 6 files changed, 27 insertions(+), 17 deletions(-)

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 36becbff0b..d43ea2acb9 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -26,6 +26,7 @@ import io.metersphere.dto.ScheduleDao;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.service.CheckPermissionService;
 import io.metersphere.service.ScheduleService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -342,12 +343,16 @@ public class APITestController {
         return returnList;
     }
 
-    @GetMapping("/runningTask/{projectID}")
-    public List<TaskInfoResult> runningTask(@PathVariable String projectID) {
-        List<String> typeFilter = Arrays.asList(   //  首页显示的运行中定时任务，只要这3种，不需要 性能测试、api_test(旧版)
-                ScheduleGroup.API_SCENARIO_TEST.name(),
-                ScheduleGroup.SWAGGER_IMPORT.name(),
-                ScheduleGroup.TEST_PLAN_TEST.name());
+    @GetMapping("/runningTask/{projectID}/{callFrom}")
+    public List<TaskInfoResult> runningTask(@PathVariable String projectID, @PathVariable String callFrom) {
+        List<String> typeFilter = new ArrayList<>();
+        if(StringUtils.equals(callFrom, "api_test")) {   //  接口测试首页显示的运行中定时任务，只要这3种，不需要 性能测试、api_test(旧版)
+            typeFilter.add(ScheduleGroup.API_SCENARIO_TEST.name());
+            typeFilter.add(ScheduleGroup.SWAGGER_IMPORT.name());
+            typeFilter.add(ScheduleGroup.TEST_PLAN_TEST.name());
+        } else if(StringUtils.equals(callFrom, "track_home")) { //  测试跟踪首页只显示测试计划的定时任务
+            typeFilter.add(ScheduleGroup.TEST_PLAN_TEST.name());
+        }
         List<TaskInfoResult> resultList = scheduleService.findRunningTaskInfoByProjectID(projectID, typeFilter);
         int dataIndex = 1;
         for (TaskInfoResult taskInfo :
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
index 853c7db49b..d234a83ebe 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
@@ -69,17 +69,18 @@
            sch.id          AS taskID,
            sch.`value`     AS rule,
            sch.`enable`    AS `taskStatus`,
-           u.name        AS creator,
+           u.`name`        AS creator,
            sch.update_time AS updateTime,
            sch.type      AS taskType,
-           sch.group    AS taskGroup
+           sch.`group`    AS taskGroup,
+           sch.resource_id  AS scenarioId
         FROM (
           schedule sch left join user u
           ON sch.user_id = u.id
         )
         WHERE sch.`enable` = true
           AND sch.project_id = #{projectId,jdbcType=VARCHAR}
-          and sch.group in
+          and sch.`group` in
             <foreach collection="types" item="item" separator="," open="(" close=")">
                 #{item}
             </foreach>
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 410e2c568c..1b1a647ea8 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -194,7 +194,6 @@ public class TestPlanService {
                 testPlan.setActualEndTime(System.currentTimeMillis());
             }
         }
-        extScheduleMapper.updateNameByResourceID(testPlan.getId(), testPlan.getName());//   同步更新该测试的定时任务的name
 
         List<String> userIds = new ArrayList<>();
         userIds.add(testPlan.getPrincipal());
@@ -204,6 +203,7 @@ public class TestPlanService {
             i = testPlanMapper.updateByPrimaryKeySelective(testPlan);
         }
         else {  //  有修改字段的调用，为保证将某些时间置null的情况，使用updateByPrimaryKey
+            extScheduleMapper.updateNameByResourceID(testPlan.getId(), testPlan.getName());//   同步更新该测试的定时任务的name
             i = testPlanMapper.updateByPrimaryKey(testPlan); //  更新
         }
         if (!StringUtils.isBlank(testPlan.getStatus())) {
diff --git a/frontend/src/business/components/api/homepage/ApiTestHomePage.vue b/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
index c0c4f5ff7b..dd5236a8e8 100644
--- a/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
+++ b/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
@@ -46,7 +46,7 @@
           <ms-failure-test-case-list @redirectPage="redirectPage"/>
         </el-col>
         <el-col :span="12">
-          <ms-running-task-list @redirectPage="redirectPage"/>
+          <ms-running-task-list :call-from="'api_test'" @redirectPage="redirectPage"/>
         </el-col>
       </el-row>
 
diff --git a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
index 66979a2b06..4594a6682c 100644
--- a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
+++ b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
@@ -64,7 +64,9 @@ export default {
   components: {
     MsTag
   },
-
+  props: {
+    callFrom: String,
+  },
   data() {
     return {
       value: '100',
@@ -84,7 +86,7 @@ export default {
   methods: {
     search() {
       let projectID = getCurrentProjectID();
-      this.result = this.$get("/api/runningTask/"+projectID, response => {
+      this.result = this.$get("/api/runningTask/"+projectID+"/"+this.callFrom, response => {
         this.tableData = response.data;
       });
     },
@@ -109,9 +111,9 @@ export default {
       });
     },
     redirect(param){
-      if(param.taskType === 'testPlan'){
+      if(param.taskGroup === 'TEST_PLAN_TEST'){
         this.$emit('redirectPage','testPlanEdit','', param.scenarioId);
-      }else{
+      }else if(param.taskGroup === 'API_SCENARIO_TEST') {
         this.$emit('redirectPage','scenario','scenario', 'edit:'+param.scenarioId);
       }
     }
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index 4d50ed46c2..798c94966c 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -58,7 +58,7 @@
           <review-list class="track-card"/>
         </el-col>
         <el-col :span="12">
-          <ms-running-task-list class="track-card"/>
+          <ms-running-task-list :call-from="'track_home'" class="track-card" @redirectPage="redirectPage"/>
         </el-col>
       </el-row>
 
@@ -73,7 +73,7 @@ import MsMainContainer from "@/business/components/common/components/MsMainConta
 import MsContainer from "@/business/components/common/components/MsContainer";
 import CaseCountCard from "@/business/components/track/home/components/CaseCountCard";
 import RelevanceCaseCard from "@/business/components/track/home/components/RelevanceCaseCard";
-import {getCurrentProjectID, getUUID} from "@/common/js/utils";
+import {getCurrentProjectID,getUUID} from "@/common/js/utils";
 import CaseMaintenance from "@/business/components/track/home/components/CaseMaintenance";
 import {COUNT_NUMBER, COUNT_NUMBER_SHALLOW} from "@/common/js/constants";
 import BugCountCard from "@/business/components/track/home/components/BugCountCard";
@@ -187,6 +187,8 @@ export default {
       this.caseOption = option;
     },
     redirectPage(page,dataType,selectType){
+      //test_plan 页面跳转
+      this.$router.push('/track/plan/view/'+selectType);
       switch (page){
         case "case":
           this.$router.push({name:'testCase',params:{dataType:dataType,dataSelectRange:selectType, projectId: getCurrentProjectID()}});

From d2466c364eb792b8ee3d51960600f56415e18e36 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 15:02:24 +0800
Subject: [PATCH 65/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSQL=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E8=AF=A6=E6=83=85=E6=B2=A1=E6=9C=89=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=88=B0=E6=8E=A7=E5=88=B6=E5=8F=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/handler/RestControllerExceptionHandler.java      | 2 ++
 1 file changed, 2 insertions(+)

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 32bb4e9d89..b81d91fafe 100644
--- a/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
+++ b/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
@@ -2,6 +2,7 @@ package io.metersphere.controller.handler;
 
 
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.controller.ResultHolder;
 import org.apache.shiro.ShiroException;
 import org.apache.shiro.authz.UnauthorizedException;
@@ -34,6 +35,7 @@ public class RestControllerExceptionHandler {
     @ExceptionHandler(SQLException.class)
     public ResultHolder sqlExceptionHandler(HttpServletRequest request, HttpServletResponse response, SQLException e) {
         response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+        LogUtil.error(e);
         return ResultHolder.error("SQL error happened, please check logs.");
     }
 

From 1961c8fec38de5c3304064f9fc3f4d92ab075129 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 15:03:46 +0800
Subject: [PATCH 66/95] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=A2=9E=E5=8A=A0jmx=E5=AF=BC=E5=85=A5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=9A=84=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                | 2 +-
 .../api/automation/scenario/common/ApiBaseComponent.vue   | 5 +----
 .../scenario/component/JmeterElementComponent.vue         | 8 +++++++-
 .../api/automation/scenario/maximize/MaximizeScenario.vue | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index adefde265f..efd6af73b7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7
+Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index 31e8805ba4..c2aea0332c 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -12,7 +12,7 @@
       <span>
         <slot name="headerLeft">
           <i class="icon el-icon-arrow-right" :class="{'is-active': data.active}"
-             @click="active(data)" v-if="data.type!='scenario' && data.type!='JmeterElement' && !isMax " @click.stop/>
+             @click="active(data)" v-if="data.type!='scenario' && !isMax " @click.stop/>
           <span @click.stop v-if="isShowInput && isShowNameInput">
             <el-input :draggable="draggable" size="mini" v-model="data.name" class="name-input"
                       @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
@@ -113,9 +113,6 @@
           this.$refs.nameEdit.focus();
         });
       }
-      if (this.data && this.data.type === "JmeterElement") {
-        this.data.active = false;
-      }
       if (this.data && ELEMENTS.get("AllSamplerProxy").indexOf(this.data.type) != -1) {
         if (!this.data.method) {
           this.data.method = this.data.protocol;
diff --git a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
index 28cb9a1843..7c47a3484b 100644
--- a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
@@ -2,6 +2,7 @@
   <api-base-component
     @copy="copyRow"
     @remove="remove"
+    @active="active"
     :data="request"
     :draggable="draggable"
     :color="defColor"
@@ -9,7 +10,9 @@
     :show-btn="showBtn"
     :background-color="defBackgroundColor"
     :title="request.elementType">
-
+    <div style="height: 300px;width: 100%">
+      <ms-code-edit mode="xml" :data.sync="request.jmeterElement" theme="eclipse" ref="codeEdit"/>
+    </div>
   </api-base-component>
 </template>
 
@@ -56,6 +59,9 @@
       copyRow() {
         this.$emit('copyRow', this.jsr223Processor, this.node);
       },
+      active() {
+        this.request.active = !this.request.active;
+      },
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index bc87648903..fb6ce10dbb 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -459,11 +459,11 @@
         } else {
           this.operatingElements = [];
         }
-        if (data && data.type != "JmeterElement") {
+        if (data) {
           data.active = true;
           if (data.hashTree) {
             data.hashTree.forEach(item => {
-              if (item && item.type != "JmeterElement") {
+              if (item) {
                 item.active = true;
               }
             })
@@ -915,7 +915,7 @@
       setProjectEnvMap(projectEnvMap) {
         this.projectEnvMap = projectEnvMap;
       },
-      refReload(data,node) {
+      refReload(data, node) {
         this.selectedTreeNode = data;
         this.selectedNode = node;
         this.initProjectIds();

From 0109e0a8481e30a8d4d7f9a720b164c2810c5ed4 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 15:22:17 +0800
Subject: [PATCH 67/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSQL=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E8=AF=A6=E6=83=85=E6=B2=A1=E6=9C=89=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=88=B0=E6=8E=A7=E5=88=B6=E5=8F=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/handler/RestControllerExceptionHandler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b81d91fafe..3228880f97 100644
--- a/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
+++ b/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
@@ -35,7 +35,7 @@ public class RestControllerExceptionHandler {
     @ExceptionHandler(SQLException.class)
     public ResultHolder sqlExceptionHandler(HttpServletRequest request, HttpServletResponse response, SQLException e) {
         response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
-        LogUtil.error(e);
+        LogUtil.error(e.getMessage(), e);
         return ResultHolder.error("SQL error happened, please check logs.");
     }
 

From 13adca8f578140af4cec69d15b7f14a00158a4cf Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 16:05:08 +0800
Subject: [PATCH 68/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=97=B6=E5=88=9D=E5=A7=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/case/ApiCaseList.vue          | 6 ++++--
 .../components/api/definition/components/list/ApiList.vue   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 5318d26e01..be73f0e974 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -222,7 +222,9 @@
           }
 
           this.result = this.$post("/api/testcase/list", this.condition, response => {
-            this.apiCaseList = response.data;
+            if(response.data){
+              this.apiCaseList = response.data;
+            }
             this.apiCaseList.forEach(apiCase => {
               if (apiCase.tags && apiCase.tags.length > 0) {
                 apiCase.tags = JSON.parse(apiCase.tags);
@@ -236,7 +238,7 @@
               }
 
             })
-            if (!this.useEnvironment && this.apiCaseList[0].request && this.apiCaseList[0].request.useEnvironment) {
+            if (!this.useEnvironment && this.apiCaseList[0] && this.apiCaseList[0].request && this.apiCaseList[0].request.useEnvironment) {
               this.useEnvironment = this.apiCaseList[0].request.useEnvironment;
               this.environment = this.useEnvironment;
             }
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 3ae913db9d..cdc386be99 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -524,7 +524,8 @@ export default {
       this.$emit('editApi', row);
     },
     runApi(row) {
-      let request = JSON.parse(row.request);
+
+      let request = row ? JSON.parse(row.request) : {};
       if (row.tags instanceof Array) {
         row.tags = JSON.stringify(row.tags);
       }

From e8fd3f1847080af9c33435f40f9d53665ff15b76 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 18 Mar 2021 16:10:38 +0800
Subject: [PATCH 69/95] =?UTF-8?q?fix:=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestCaseReviewService.java     |  4 ++--
 .../definition/components/import/ApiImport.vue   | 16 ++++++++++++----
 .../components/common/head/HeaderCustom.vue      |  4 ++--
 frontend/src/i18n/en-US.js                       | 11 +++++++++--
 frontend/src/i18n/zh-CN.js                       | 11 +++++++++--
 frontend/src/i18n/zh-TW.js                       | 12 ++++++++++--
 6 files changed, 44 insertions(+), 14 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 3cff08ec4e..3a6d74178e 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -377,7 +377,7 @@ public class TestCaseReviewService {
 
         sqlSession.flushStatements();
         //同步添加关联的接口和测试用例
-        if(request.getChecked()){
+     /*   if(request.getChecked()){
             if (!testCaseIds.isEmpty()) {
                 testCaseIds.forEach(caseId -> {
                     TestCaseWithBLOBs testDtail=testCaseMapper.selectByPrimaryKey(caseId);
@@ -434,7 +434,7 @@ public class TestCaseReviewService {
 
                 });
             }
-        }
+        }*/
         TestCaseReview testCaseReview = testCaseReviewMapper.selectByPrimaryKey(request.getReviewId());
         if (StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Prepare.name())
                 || StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Completed.name())) {
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index 9d55688bb7..4a21594921 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -1,6 +1,7 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="$t('api_test.api_import.title')" width="30%"
-             :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close">
+             :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close"
+             :destroy-on-close="true">
 
     <div class="header-bar">
       <div>{{ $t('api_test.api_import.data_format') }}</div>
@@ -23,12 +24,12 @@
     <el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form">
       <el-row>
         <el-col :span="11">
-          <el-form-item :label="$t('commons.import_module')">
+          <el-form-item :label="$t('commons.import_module')" prop="moduleId">
             <el-select size="small" v-model="formData.moduleId" class="project-select" clearable>
               <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="!isScenarioModel&&!isHar" :label="$t('commons.import_mode')">
+          <el-form-item v-if="!isScenarioModel&&!isHar" :label="$t('commons.import_mode')" prop="modeId">
             <el-select size="small" v-model="formData.modeId" class="project-select" clearable>
               <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
@@ -167,7 +168,14 @@ export default {
         modeId: this.$t('commons.not_cover'),
         moduleId: '',
       },
-      rules: {},
+      rules: {
+        modeId: [
+          {required: true, message: this.$t('commons.please_select_import_mode'), trigger: 'change'},
+        ],
+        moduleId: [
+          {required: true, message: this.$t('commons.please_select_import_module'), trigger: 'change'},
+        ],
+      },
       currentModule: {},
       fileList: []
     }
diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index c99050641c..228bfff28a 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-dialog title="表头显示字段" :visible.sync="dialogTableVisible"  :append-to-body="true">
-    <tree-transfer :title="['待选字段', '已选字段']"
+  <el-dialog :title="$t('table.header_display_field')" :visible.sync="dialogTableVisible" :append-to-body="true">
+    <tree-transfer :title="[$t('table.fields_to_be_selected'), $t('table.selected_fields')]"
                    :from_data='optionalFields'
                    :draggable="true"
                    :to_data='fieldSelected'
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index fb3594604d..86cff09907 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,7 +1,9 @@
 export default {
   commons: {
-    pass_rate:'Pass rate',
-    execution_times:'Execution times',
+    please_select_import_mode: 'Please select import mode',
+    please_select_import_module: 'Please select import module',
+    pass_rate: 'Pass rate',
+    execution_times: 'Execution times',
     cover: 'Cover',
     not_cover: 'Not Cover',
     import: 'Import',
@@ -1608,5 +1610,10 @@ export default {
     delete_prompt: 'This operation will delete the authentication source, do you want to continue? ',
     title: 'Auth Source',
     auth_name_valid: 'Name does not support special characters',
+  },
+  table: {
+    header_display_field: 'Header display field',
+    fields_to_be_selected: 'Fields to be selected',
+    selected_fields: 'Selected fields'
   }
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index baac535903..e4d609b0af 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,7 +1,9 @@
 export default {
   commons: {
-    pass_rate:'通过率',
-    execution_times:'执行次数',
+    please_select_import_mode: '请选择导入模式',
+    please_select_import_module: '请选择导入模块',
+    pass_rate: '通过率',
+    execution_times: '执行次数',
     cover: '覆盖',
     not_cover: '不覆盖',
     import: '导入',
@@ -1611,5 +1613,10 @@ export default {
     delete_prompt: '此操作会删除认证源，是否继续？',
     title: '认证设置',
     auth_name_valid: '名称不支持特殊字符',
+  },
+  table: {
+    header_display_field: '表头显示字段',
+    fields_to_be_selected: '待选字段',
+    selected_fields: '已选字段'
   }
 };
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index c939f1bd90..c28d257f3d 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1,7 +1,9 @@
 export default {
   commons: {
-    pass_rate:'通過率',
-    execution_times:'執行次數',
+    please_select_import_mode: '請選擇導入模式',
+    please_select_import_module: '請選擇導入模塊',
+    pass_rate: '通過率',
+    execution_times: '執行次數',
     cover: '覆蓋',
     not_cover: '不覆蓋',
     import: '導入',
@@ -1609,5 +1611,11 @@ export default {
     delete_prompt: '此操作會刪除認證源，是否繼續？ ',
     title: '認證設置',
     auth_name_valid: '名稱不支持特殊字符',
+  },
+  table: {
+    header_display_field: '表頭顯示欄位',
+    fields_to_be_selected: '待選欄位',
+    selected_fields: '已選欄位'
   }
+
 };

From 095424a8099b0f7dd8033990988081742761668f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 16:11:00 +0800
Subject: [PATCH 70/95] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E6=8A=A5=E9=94=99=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/api/service/ApiAutomationService.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 9da3974953..6ac27b6001 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -332,8 +332,10 @@ public class ApiAutomationService {
     public ApiScenarioDTO getApiScenario(String id) {
         ApiScenarioDTO apiScenarioDTO = new ApiScenarioDTO();
         ApiScenarioWithBLOBs scenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(id);
-        BeanUtils.copyBean(apiScenarioDTO, scenarioWithBLOBs);
-        setApiScenarioProjectIds(apiScenarioDTO);
+        if (scenarioWithBLOBs != null) {
+            BeanUtils.copyBean(apiScenarioDTO, scenarioWithBLOBs);
+            setApiScenarioProjectIds(apiScenarioDTO);
+        }
         return apiScenarioDTO;
     }
 

From 0ba062f00855a50daef9fda7e822e5670ca74cf8 Mon Sep 17 00:00:00 2001
From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com>
Date: Thu, 18 Mar 2021 16:11:20 +0800
Subject: [PATCH 71/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=E4=BD=BFXPath=E6=96=AD=E8=A8=80=E8=A7=84=E5=88=99=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E8=83=BD=E6=8E=A5=E6=94=B6=E6=9B=B4?=
 =?UTF-8?q?=E9=95=BF=E7=9A=84=E5=AD=97=E7=AC=A6=20(#1661)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
---
 .../api/definition/components/assertion/ApiAssertionXPath2.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue
index c134f9faea..1c686b3afe 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue
@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="10" type="flex" justify="space-between" align="middle">
       <el-col>
-        <el-input :disabled="isReadOnly" v-model="xPath2.expression" maxlength="200" size="small" show-word-limit
+        <el-input :disabled="isReadOnly" v-model="xPath2.expression" maxlength="500" size="small" show-word-limit
                   :placeholder="$t('api_test.request.extract.xpath_expression')"/>
       </el-col>
       <el-col class="assertion-btn">

From af5a0edfe278f4bb7a224ba96dea0dd50638d653 Mon Sep 17 00:00:00 2001
From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com>
Date: Thu, 18 Mar 2021 16:12:08 +0800
Subject: [PATCH 72/95] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE)?=
 =?UTF-8?q?:=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=A1=86=20(#1662)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
---
 .../components/settings/system/User.vue       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 3f9da0158a..be2f32c869 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -330,6 +330,9 @@
         <el-form-item :label="$t('member.new_password')" prop="newpassword">
           <el-input type="password" v-model="ruleForm.newpassword" autocomplete="off" show-password></el-input>
         </el-form-item>
+        <el-form-item :label="$t('member.repeat_password')" prop="confirmpassword">
+          <el-input type="password" v-model="ruleForm.confirmpassword" autocomplete="off" show-password></el-input>
+        </el-form-item>
         <el-form-item>
           <el-input v-model="ruleForm.id" autocomplete="off" :disabled="true" style="display:none"/>
         </el-form-item>
@@ -385,6 +388,15 @@ export default {
     ShowMoreBtn
   },
   data() {
+    const validateConfirmPwd = (rule, value, callback) => {
+      if(value === ''){
+        callback(new Error(this.$t('user.input_password')));
+      }else if((value !== this.ruleForm.newpassword)){
+        callback(new Error(this.$t('member.inconsistent_passwords')));
+      }else{
+        callback();
+      }
+    };
     return {
       referenced: false,
       queryPath: '/user/special/list',
@@ -479,7 +491,17 @@ export default {
             message: this.$t('member.password_format_is_incorrect'),
             trigger: 'blur'
           }
+        ],
+        confirmpassword: [
+          {
+            required: true,
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,30}$/,
+            message: this.$t('member.password_format_is_incorrect'),
+            trigger: 'blur'
+          },
+          {trigger: ['blur', 'change'], validator: validateConfirmPwd}
         ]
+
       }
     }
   },

From 613555101ea8aac84f4607ea4b665f3c3c4189eb Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 16:55:54 +0800
Subject: [PATCH 73/95] =?UTF-8?q?fix(LDAP):=20=E4=BF=AE=E5=A4=8DLDAP?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=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/ldap/controller/LdapController.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
index 6771d3a87e..4d14f667d9 100644
--- a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
+++ b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
@@ -4,6 +4,9 @@ import io.metersphere.base.domain.User;
 import io.metersphere.commons.constants.ParamConstants;
 import io.metersphere.commons.constants.UserSource;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.RsaKey;
+import io.metersphere.commons.utils.RsaUtil;
 import io.metersphere.controller.ResultHolder;
 import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.i18n.Translator;
@@ -16,6 +19,7 @@ import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.security.NoSuchAlgorithmException;
 
 @RestController
 @RequestMapping("/ldap")
@@ -29,7 +33,7 @@ public class LdapController {
     private SystemParameterService systemParameterService;
 
     @PostMapping(value = "/signin")
-    public ResultHolder login(@RequestBody LoginRequest request) {
+    public ResultHolder login(@RequestBody LoginRequest request) throws NoSuchAlgorithmException {
 
         String isOpen = systemParameterService.getValue(ParamConstants.LDAP.OPEN.getValue());
         if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) {
@@ -71,7 +75,8 @@ public class LdapController {
 
         // 执行 ShiroDBRealm 中 LDAP 登录逻辑
         LoginRequest loginRequest = new LoginRequest();
-        loginRequest.setUsername(userId);
+        RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
+        loginRequest.setUsername(RsaUtil.publicEncrypt(userId,rsaKey.getPublicKey()));
         return userService.login(loginRequest);
     }
 

From ecc33663ecae855ff7c2623fb1ccb84f21481a1b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:04:13 +0800
Subject: [PATCH 74/95] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=AF=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/controller/request/LoginRequest.java   |  4 ++--
 .../io/metersphere/ldap/controller/LdapController.java | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java b/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java
index 20c2ab2dd9..78bd20ff87 100644
--- a/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java
@@ -20,7 +20,7 @@ public class LoginRequest {
         try {
             RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
             return RsaUtil.privateDecrypt(username, rsaKey.getPrivateKey());
-        } catch (NoSuchAlgorithmException e) {
+        } catch (Exception e) {
             return username;
         }
     }
@@ -29,7 +29,7 @@ public class LoginRequest {
         try {
             RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
             return RsaUtil.privateDecrypt(password, rsaKey.getPrivateKey());
-        } catch (NoSuchAlgorithmException e) {
+        } catch (Exception e) {
             return password;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
index 4d14f667d9..abf6b7299b 100644
--- a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
+++ b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
@@ -4,9 +4,6 @@ import io.metersphere.base.domain.User;
 import io.metersphere.commons.constants.ParamConstants;
 import io.metersphere.commons.constants.UserSource;
 import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.commons.utils.RsaKey;
-import io.metersphere.commons.utils.RsaUtil;
 import io.metersphere.controller.ResultHolder;
 import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.i18n.Translator;
@@ -17,9 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
-import java.security.NoSuchAlgorithmException;
 
 @RestController
 @RequestMapping("/ldap")
@@ -33,7 +28,7 @@ public class LdapController {
     private SystemParameterService systemParameterService;
 
     @PostMapping(value = "/signin")
-    public ResultHolder login(@RequestBody LoginRequest request) throws NoSuchAlgorithmException {
+    public ResultHolder login(@RequestBody LoginRequest request) {
 
         String isOpen = systemParameterService.getValue(ParamConstants.LDAP.OPEN.getValue());
         if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) {
@@ -75,8 +70,7 @@ public class LdapController {
 
         // 执行 ShiroDBRealm 中 LDAP 登录逻辑
         LoginRequest loginRequest = new LoginRequest();
-        RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
-        loginRequest.setUsername(RsaUtil.publicEncrypt(userId,rsaKey.getPublicKey()));
+        loginRequest.setUsername(userId);
         return userService.login(loginRequest);
     }
 

From 4a93952020a09189072842835039cad42475f6b9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:19:14 +0800
Subject: [PATCH 75/95] chore: sync

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

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efd6af73b7..adefde265f 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
+Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7

From 5e5be76df599ff125745708097340b2f8d9b3f27 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:24:10 +0800
Subject: [PATCH 76/95] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=97=B6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseEdit.vue    | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 4ddd1d4e2a..2d9ec236b8 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -136,12 +136,12 @@
           <el-row>
             <el-col :span="10">
               <el-form-item label="关联需求" :label-width="formLabelWidth" prop="demandId">
-                <el-select filterable :disabled="readOnly" v-model="form.demandId"
-                           :placeholder="$t('test_track.case.input_type')" class="ms-case-input">
+                <el-select filterable :disabled="readOnly" v-model="form.demandId" @visible-change="visibleChange"
+                           placeholder="请选择要关联的需求" class="ms-case-input">
                   <el-option
                     v-for="item in demandOptions"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.platform + ': '+item.name"
                     :value="item.id">
                   </el-option>
                 </el-select>
@@ -761,18 +761,31 @@ export default {
         });
       }
     },
+    visibleChange(flag) {
+      if (flag) {
+        this.getDemandOptions();
+      }
+    },
     getDemandOptions() {
-      this.projectId = getCurrentProjectID()
-      this.result = this.$get("demand/list/" + this.projectId, response => {
-        this.demandOptions = response.data;
-        this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other')})
-      });
+      if (this.demandOptions.length === 0) {
+        this.projectId = getCurrentProjectID();
+        this.result = {loading : true};
+        this.$get("demand/list/" + this.projectId).then(response => {
+          this.demandOptions = response.data.data;
+          this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other'), platform: 'Other'})
+          this.result = {loading : false};
+        }).catch(() => {
+          this.result = {loading : false};
+        })
+      }
     },
     getSelectOptions() {
       this.getModuleOptions();
       this.getMaintainerOptions();
       this.getTestOptions();
-      // this.getDemandOptions()
+      if (this.type === 'edit') {
+        this.getDemandOptions();
+      }
     },
 
     resetForm() {

From 3f1da2414360e23ce058c7747e7ce694a39ba64c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:27:23 +0800
Subject: [PATCH 77/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=8A=A0=E8=BD=BD=E5=A4=96=E9=83=A8js?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=20Nashorn=20JavaS?=
 =?UTF-8?q?cript=E5=BC=95=E6=93=8E=E5=88=87=E6=8D=A2=E5=88=B0GraalVM=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/processors/MsJSR223Processor.java          |  6 ++++++
 .../request/processors/post/MsJSR223PostProcessor.java |  6 ++++++
 .../request/processors/pre/MsJSR223PreProcessor.java   | 10 ++++++++++
 .../scenario/common/Jsr233ProcessorContent.vue         |  5 +++--
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
index ba03b6a7a0..10136f6356 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
@@ -46,6 +46,12 @@ public class MsJSR223Processor extends MsTestElement {
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
         processor.setProperty("scriptLanguage", this.getScriptLanguage());
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
+            processor.setProperty("scriptLanguage", "nashorn");
+        }
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
+            processor.setProperty("scriptLanguage", "javascript");
+        }
         processor.setProperty("script", this.getScript());
 
         final HashTree jsr223PreTree = tree.add(processor);
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
index cdf5ec9dd9..3172f2855e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
@@ -40,6 +40,12 @@ public class MsJSR223PostProcessor extends MsTestElement {
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
         processor.setProperty("scriptLanguage", this.getScriptLanguage());
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
+            processor.setProperty("scriptLanguage", "nashorn");
+        }
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
+            processor.setProperty("scriptLanguage", "javascript");
+        }
         processor.setProperty("script", this.getScript());
 
         final HashTree jsr223PostTree = tree.add(processor);
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
index 48bb6108d2..9cc8b35e56 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
@@ -12,6 +12,7 @@ import org.apache.jmeter.modifiers.JSR223PreProcessor;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
+import org.graalvm.polyglot.Context;
 
 import java.util.List;
 
@@ -38,6 +39,8 @@ public class MsJSR223PreProcessor extends MsTestElement {
     }
 
     public JSR223PreProcessor getJSR223PreProcessor() {
+        Context.newBuilder().allowNativeAccess(true).build();
+
         JSR223PreProcessor processor = new JSR223PreProcessor();
         processor.setEnabled(this.isEnable());
         if (StringUtils.isNotEmpty(this.getName())) {
@@ -49,6 +52,13 @@ public class MsJSR223PreProcessor extends MsTestElement {
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
         processor.setProperty("scriptLanguage", this.getScriptLanguage());
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
+            processor.setProperty("scriptLanguage", "nashorn");
+        }
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
+            processor.setProperty("scriptLanguage", "javascript");
+        }
+
         processor.setProperty("script", this.getScript());
         return processor;
     }
diff --git a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
index e00edd4aaa..0fdeff80af 100644
--- a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
@@ -72,13 +72,14 @@
           ],
           isCodeEditAlive: true,
           languages: [
-            'beanshell', "python", "groovy", "javascript"
+            'beanshell', "python", "groovy", "nashornScript","graalVMScript"
           ],
           codeEditModeMap: {
             beanshell: 'java',
             python: 'python',
             groovy: 'java',
-            javascript: 'javascript',
+            nashornScript: 'javascript',
+            graalVMScript: 'javascript',
           }
         }
       },

From 1952d50b4542ea63a2c69458b66cb1ca978b8016 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:33:08 +0800
Subject: [PATCH 78/95] =?UTF-8?q?fix:=20swagger2.0=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AF=B7=E6=B1=82=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/definition/parse/Swagger2Parser.java     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
index 3701079c1e..3b05aefa87 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
@@ -137,7 +137,7 @@ public class Swagger2Parser extends SwaggerAbstractParser {
 
     private String getBodyType(Operation operation) {
         if (CollectionUtils.isEmpty(operation.getConsumes())) {
-            return Body.RAW;
+            return Body.JSON;
         }
         String contentType = operation.getConsumes().get(0);
         return getBodyType(contentType);
@@ -238,12 +238,10 @@ public class Swagger2Parser extends SwaggerAbstractParser {
             return propertyList.toString();
         } else if (schema instanceof ModelImpl) {
             ModelImpl model = (ModelImpl) schema;
-            if (StringUtils.equals("object", model.getType())) {
-                model.getProperties();
-                if (model != null) {
-                    JSONObject bodyParameters = getBodyParameters(model.getProperties(), new HashSet<>());
-                    return bodyParameters.toJSONString();
-                }
+            Map<String, Property> properties = model.getProperties();
+            if (model != null && properties != null) {
+                JSONObject bodyParameters = getBodyParameters(properties, new HashSet<>());
+                return bodyParameters.toJSONString();
             }
         }
         return "";

From 46a47552ea43e23332e0df4a7e9190c0b007b202 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:33:32 +0800
Subject: [PATCH 79/95] =?UTF-8?q?style(XPack):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index adefde265f..efd6af73b7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7
+Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837

From 5a98df399b8ec898326aecd728593f85306a63c3 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:37:54 +0800
Subject: [PATCH 80/95] =?UTF-8?q?style(XPack):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index d3c3ba9835..06b31ddd4f 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit d3c3ba983502dc9864db88645af392e36004f301
+Subproject commit 06b31ddd4f2542cb86bf3e31a1a8f624742a2193

From 6a93a0d0c4bb0b726c3cc29801291b82e9c9e277 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 18:00:40 +0800
Subject: [PATCH 81/95] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=9F=A5=E7=9C=8B=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/report/ApiReportList.vue        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue
index f26eda2ed4..f4aedc38b4 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue
@@ -159,6 +159,10 @@ export default {
     },
     handleView(report) {
       this.reportId = report.id;
+      if(report.status ==='Running'){
+        this.$warning("正在运行中，请稍后查看")
+        return;
+      }
       this.currentProjectId = report.projectId;
         this.$router.push({
           path: 'report/view/' + report.id,

From 376d7a08c827b94c07dbe7953c41cc7c506430d2 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 19:10:52 +0800
Subject: [PATCH 82/95] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/parse/MsJmeterParser.java  |  2 +-
 .../request/sampler/MsHTTPSamplerProxy.java       |  4 +++-
 .../api/service/ApiAutomationService.java         | 15 ++++++++++-----
 .../scenario/component/ApiComponent.vue           |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 971ea265f9..914ef1eef0 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -174,7 +174,7 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
                     }
                 }
             }
-            samplerProxy.setPath(source.getPath());
+            samplerProxy.setPath("");
             samplerProxy.setMethod(source.getMethod());
             if (source.getUrl() != null) {
                 samplerProxy.setUrl(source.getUrl().toString());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 73238aab23..d09567ba5d 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -137,7 +137,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                 URL urlObject = new URL(url);
                 if (isUrl) {
                     sampler.setDomain(URLDecoder.decode(urlObject.getHost(), "UTF-8"));
-                    sampler.setPort(urlObject.getPort());
+                    if (urlObject.getPort() > 0) {
+                        sampler.setPort(urlObject.getPort());
+                    }
                     sampler.setProtocol(urlObject.getProtocol());
                 } else {
                     sampler.setDomain(config.getConfig().get(this.getProjectId()).getHttpConfig().getDomain());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 6ac27b6001..7483b5e6e2 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -72,7 +72,7 @@ public class ApiAutomationService {
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
     @Resource
-    private TestCaseReviewScenarioMapper  testCaseReviewScenarioMapper;
+    private TestCaseReviewScenarioMapper testCaseReviewScenarioMapper;
     @Resource
     private JMeterService jMeterService;
     @Resource
@@ -96,11 +96,13 @@ public class ApiAutomationService {
         List<ApiScenarioDTO> list = extApiScenarioMapper.list(request);
         return list;
     }
+
     public List<ApiScenarioDTO> listReview(ApiScenarioRequest request) {
         request = this.initRequest(request, true, true);
         List<ApiScenarioDTO> list = extApiScenarioMapper.listReview(request);
         return list;
     }
+
     private void setApiScenarioProjectIds(ApiScenarioDTO data) {
         // 如果场景步骤涉及多项目，则把涉及到的项目ID保存在projectIds属性
         List<String> idList = new ArrayList<>();
@@ -335,8 +337,9 @@ public class ApiAutomationService {
         if (scenarioWithBLOBs != null) {
             BeanUtils.copyBean(apiScenarioDTO, scenarioWithBLOBs);
             setApiScenarioProjectIds(apiScenarioDTO);
+            return apiScenarioDTO;
         }
-        return apiScenarioDTO;
+        return null;
     }
 
     public List<ApiScenarioWithBLOBs> getApiScenarios(List<String> ids) {
@@ -715,14 +718,15 @@ public class ApiAutomationService {
             testPlanApiScenarioMapper.insert(testPlanApiScenario);
         });
     }
-    public void relevanceReview(ApiCaseRelevanceRequest request){
+
+    public void relevanceReview(ApiCaseRelevanceRequest request) {
         Map<String, List<String>> mapping = request.getMapping();
         Map<String, String> envMap = request.getEnvMap();
         Set<String> set = mapping.keySet();
         if (set.isEmpty()) {
             return;
         }
-        set.forEach(id->{
+        set.forEach(id -> {
             Map<String, String> newEnvMap = new HashMap<>(16);
             if (envMap != null && !envMap.isEmpty()) {
                 List<String> list = mapping.get(id);
@@ -730,7 +734,7 @@ public class ApiAutomationService {
                     newEnvMap.put(l, envMap.get(l));
                 });
             }
-            TestCaseReviewScenario testCaseReviewScenario=new TestCaseReviewScenario();
+            TestCaseReviewScenario testCaseReviewScenario = new TestCaseReviewScenario();
             testCaseReviewScenario.setId(UUID.randomUUID().toString());
             testCaseReviewScenario.setApiScenarioId(id);
             testCaseReviewScenario.setTestCaseReviewId(request.getReviewId());
@@ -741,6 +745,7 @@ public class ApiAutomationService {
 
         });
     }
+
     public List<ApiScenario> selectByIds(List<String> ids) {
         ApiScenarioExample example = new ApiScenarioExample();
         example.createCriteria().andIdIn(ids);
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index d88ebfb62f..5ea30dcb85 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -202,7 +202,7 @@
           new URL(url);
           this.request.url = url;
         } catch (e) {
-          if (url) {
+          if (url && (!url.startsWith("http://") || !url.startsWith("https://"))) {
             this.request.path = url;
             this.request.url = undefined;
           }

From db3d08efbd181e353e1b67ab6aefef655a165448 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 19 Mar 2021 09:47:41 +0800
Subject: [PATCH 83/95] chore: sync

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

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efd6af73b7..adefde265f 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
+Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7

From fb08b185b78861dbde2aee93e53e423974c9eae9 Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Fri, 19 Mar 2021 10:11:29 +0800
Subject: [PATCH 84/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E5=88=A0=E9=99=A4=E7=94=A8=E4=BE=8B=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E7=94=A8=E4=BE=8B=20(#1664)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 删除用例提示的是删除接口，改成用例
---
 .../components/api/definition/components/case/ApiCaseItem.vue  | 3 +--
 frontend/src/i18n/en-US.js                                     | 1 +
 frontend/src/i18n/zh-CN.js                                     | 1 +
 frontend/src/i18n/zh-TW.js                                     | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index f39fce3b76..b1743f0720 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -194,7 +194,7 @@
         this.$emit('batchEditCase');
       },
       deleteCase(index, row) {
-        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
+        this.$alert(this.$t('api_test.definition.request.delete_case_confirm') + ' ' + row.name + " ？", '', {
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
@@ -317,7 +317,6 @@
         } else {
           this.saveCase(row);
         }
-
       },
       showInput(row) {
         // row.type = "create";
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 86cff09907..af75fd4080 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -624,6 +624,7 @@ export default {
         res_param: "Response content",
         batch_delete: "Batch deletion",
         delete_confirm: "Confirm deletion",
+        delete_case_confirm: "Confirm case deletion",
         delete_confirm_step: "Confirm deletion step",
         assertions_rule: "Assertion rule",
         response_header: "Response header",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e4d609b0af..75775fe6e4 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -625,6 +625,7 @@ export default {
         res_param: "响应内容",
         batch_delete: "批量删除",
         delete_confirm: "确认删除接口",
+        delete_case_confirm: "确认删除用例",
         delete_confirm_step: "确认删除步骤",
         assertions_rule: "断言规则",
         response_header: "响应头",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index c28d257f3d..8057211e0b 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -624,6 +624,7 @@ export default {
         res_param: "響應內容",
         batch_delete: "批量刪除",
         delete_confirm: "確認刪除接口",
+        delete_case_confirm: "確認刪除用例",
         delete_confirm_step: "確認刪除步驟",
         assertions_rule: "斷言規則",
         response_header: "響應頭",

From 553a25881c9796ae030c176af1441dd44bb17788 Mon Sep 17 00:00:00 2001
From: Coooder-X <55648333+Coooder-X@users.noreply.github.com>
Date: Fri, 19 Mar 2021 10:11:46 +0800
Subject: [PATCH 85/95] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E8=BE=93=E5=85=A5=E7=94=A8=E4=BE=8B=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A9=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=BC=80=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=87=AA=E5=8A=A8=E4=BF=9D=E5=AD=98=20=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E6=8A=98=E5=8F=A0=E9=A1=B5=E9=9D=A2=E4=B9=9F=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=20(#1665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 输入用例名称，让鼠标移开后台自动保存 不用折叠页面也不用弹出提示
---
 .../components/api/definition/components/case/ApiCaseItem.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index b1743f0720..af20e63c9b 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -305,10 +305,6 @@
           row.id = data.id;
           row.createTime = data.createTime;
           row.updateTime = data.updateTime;
-          if (!row.message) {
-            this.$success(this.$t('commons.save_success'));
-            this.$emit('refresh');
-          }
         });
       },
       saveTestCase(row) {

From 937d33e955b569162f72eb63e91a3ee11ef5d176 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 19 Mar 2021 10:28:52 +0800
Subject: [PATCH 86/95] =?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=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/home/components/CaseCountCard.vue    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/home/components/CaseCountCard.vue b/frontend/src/business/components/track/home/components/CaseCountCard.vue
index fe96b3d429..fcac031ba3 100644
--- a/frontend/src/business/components/track/home/components/CaseCountCard.vue
+++ b/frontend/src/business/components/track/home/components/CaseCountCard.vue
@@ -94,8 +94,8 @@
                     <span class="default-property">
                       未通过
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('Pass')" target="_blank" style="color: #000000">
-                        {{trackCountData.passCount}}
+                      <el-link type="info" @click="redirectPage('UnPass')" target="_blank" style="color: #000000">
+                        {{trackCountData.unPassCount}}
                       </el-link>
                     </span>
                   </el-col>
@@ -103,8 +103,8 @@
                     <span class="main-property">
                       已通过
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('UnPass')" target="_blank" style="color: #000000">
-                        {{trackCountData.unPassCount}}
+                      <el-link type="info" @click="redirectPage('Pass')" target="_blank" style="color: #000000">
+                        {{trackCountData.passCount}}
                       </el-link>
                     </span>
                   </el-col>

From fadc55470703993805fcca184e87d0c803eff0b3 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 19 Mar 2021 10:30:30 +0800
Subject: [PATCH 87/95] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20k8s=20job=E8=AE=BE=E7=BD=AE=E5=8F=8D=E4=BA=B2?=
 =?UTF-8?q?=E5=92=8C=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index adefde265f..3623e15de5 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7
+Subproject commit 3623e15de5cfc9837a46850ff462f9c9194e9892

From 04bf8111f5fed822837b3823fa8e9a32bdd0cc4a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 19 Mar 2021 10:47:44 +0800
Subject: [PATCH 88/95] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/service/TestPlanService.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 1b1a647ea8..bc850fe47d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -551,8 +551,8 @@ public class TestPlanService {
         queryTestPlanRequest.setId(planId);
 
         TestPlanDTO testPlan = extTestPlanMapper.list(queryTestPlanRequest).get(0);
-        String projectName = getProjectNameByPlanId(planId);
-        testPlan.setProjectName(projectName);
+        Project project = projectMapper.selectByPrimaryKey(testPlan.getProjectId());
+        testPlan.setProjectName(project.getName());
 
         TestCaseReport testCaseReport = testCaseReportMapper.selectByPrimaryKey(testPlan.getReportId());
         JSONObject content = JSONObject.parseObject(testCaseReport.getContent());
@@ -708,8 +708,8 @@ public class TestPlanService {
         queryTestPlanRequest.setId(planId);
 
         TestPlanDTO testPlan = extTestPlanMapper.list(queryTestPlanRequest).get(0);
-        String projectName = getProjectNameByPlanId(planId);
-        testPlan.setProjectName(projectName);
+        Project project = projectMapper.selectByPrimaryKey(testPlan.getProjectId());
+        testPlan.setProjectName(project.getName());
 
         TestCaseReport testCaseReport = testCaseReportMapper.selectByPrimaryKey(testPlan.getReportId());
         JSONObject content = JSONObject.parseObject(testCaseReport.getContent());

From 8812a17cdb2672b24d9de5433b0ef1ae3366f40d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 19 Mar 2021 11:03:43 +0800
Subject: [PATCH 89/95] chore: sync

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

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 3623e15de5..245845e07b 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 3623e15de5cfc9837a46850ff462f9c9194e9892
+Subproject commit 245845e07bf3fe2f60311eeb78f8f109301a2d39

From cd8c7a9124a6798618d0836202b586905045efae Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 19 Mar 2021 11:05:30 +0800
Subject: [PATCH 90/95] =?UTF-8?q?refactor:=20=E5=85=B3=E8=81=94=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=A1=B9=E7=9B=AE=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/components/TestPlanList.vue         |  2 --
 .../view/comonents/base/TestCaseRelevanceBase.vue  | 14 +++++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index eae5fdf3bc..2447032590 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -310,8 +310,6 @@ export default {
           }
           item.passRate=item.passRate+'%'
         })
-        console.log(this.tableData)
-
       });
     },
     copyData(status) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 21d51de87e..c3c1a9dd0b 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -34,6 +34,7 @@
   import MsDialogFooter from '../../../../../common/components/MsDialogFooter'
   import SelectMenu from "../../../../common/SelectMenu";
   import RelevanceDialog from "./RelevanceDialog";
+  import {getCurrentProjectID} from "@/common/js/utils";
 
   export default {
     name: "TestCaseRelevanceBase",
@@ -93,10 +94,17 @@
         this.result = this.$get("/project/listAll", res => {
           let data = res.data;
           if (data) {
+            const index = data.findIndex(d => d.id === getCurrentProjectID());
             this.projects = data;
-            this.projectId = data[0].id;
-            this.projectName = data[0].name;
-            this.changeProject(data[0]);
+            if (index !== -1) {
+              this.projectId = data[index].id;
+              this.projectName = data[index].name;
+              this.changeProject(data[index]);
+            } else {
+              this.projectId = data[0].id;
+              this.projectName = data[0].name;
+              this.changeProject(data[0]);
+            }
           }
         })
       },

From 17453e926890c7bc3d44dba0f494cc92c3021b9e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 19 Mar 2021 11:31:01 +0800
Subject: [PATCH 91/95] =?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=E8=AF=84=E5=AE=A1=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 a520d29d33..2e56a206ce 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
@@ -161,12 +161,12 @@
                                     #{value}
                                 </foreach>
                             </when>
-                            <otherwise>
-                                and test_case_review_test_case.status in
+                            <when test="key=='status'">
+                                and test_case.review_status in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
                                     #{value}
                                 </foreach>
-                            </otherwise>
+                            </when>
                         </choose>
                     </if>
                 </foreach>

From 87334f4b5eafc6392132c79ab410f5e69ddb93d5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 19 Mar 2021 12:00:36 +0800
Subject: [PATCH 92/95] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92)?=
 =?UTF-8?q?:=20=E6=9F=A5=E8=AF=A2=E7=BC=BA=E9=99=B7=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=97=B6=E6=8D=95=E8=8E=B7=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/FunctionalTestCaseEdit.vue     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index cfa3aa69c9..c4d3b1f1e5 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -591,17 +591,23 @@ export default {
           const project = res.data;
           if (project.tapdId) {
             this.hasTapdId = true;
-            this.result = this.$get("/issues/tapd/user/" + this.testCase.caseId, response => {
-              this.users = response.data;
+            this.result = this.$get("/issues/tapd/user/" + this.testCase.caseId).then(response => {
+              this.users = response.data.data;
+            }).catch(() => {
+              console.log("get tapd user error.");
             })
           }
           if (project.zentaoId) {
             this.hasZentaoId = true;
-            this.result = this.$get("/issues/zentao/builds/" + this.testCase.caseId, response => {
-              this.Builds = response.data;
+            this.result = this.$get("/issues/zentao/builds/" + this.testCase.caseId).then(response => {
+              this.Builds = response.data.data;
+            }).catch(() => {
+              console.log("get zentao builds error.");
             })
-            this.result = this.$get("/issues/zentao/user/" + this.testCase.caseId, response => {
-              this.zentaoUsers = response.data;
+            this.result = this.$get("/issues/zentao/user/" + this.testCase.caseId).then(response => {
+              this.zentaoUsers = response.data.data;
+            }).catch(() => {
+              console.log("get zentao user error.");
             })
           }
         })
@@ -649,8 +655,10 @@ export default {
       this.testCase.zentaoAssigned = "";
     },
     getIssues(caseId) {
-      this.result = this.$get("/issues/get/" + caseId, response => {
-        this.issues = response.data;
+      this.result = this.$get("/issues/get/" + caseId).then(response => {
+        this.issues = response.data.data;
+      }).catch(() => {
+        console.log("get issues error")
       })
     },
     closeIssue(row) {

From 07ecb9702268dcf1eeb95d2a57b751838ab81fde Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 19 Mar 2021 13:44:46 +0800
Subject: [PATCH 93/95] =?UTF-8?q?refactor:=20=E8=84=91=E5=9B=BE=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/components/MsDrawer.vue | 27 ++++++------
 .../common/components/MsFullScreenButton.vue  | 37 +++++++++++++++++
 .../common/components/MsModuleMinder.vue      | 41 ++++++++++++++++---
 .../track/plan/components/TestPlanList.vue    |  2 -
 4 files changed, 86 insertions(+), 21 deletions(-)
 create mode 100644 frontend/src/business/components/common/components/MsFullScreenButton.vue

diff --git a/frontend/src/business/components/common/components/MsDrawer.vue b/frontend/src/business/components/common/components/MsDrawer.vue
index fa675d267f..472c8007ad 100644
--- a/frontend/src/business/components/common/components/MsDrawer.vue
+++ b/frontend/src/business/components/common/components/MsDrawer.vue
@@ -8,8 +8,7 @@
     <div class="ms-drawer-header">
       <slot name="header"></slot>
       <i v-if="isShowClose" class="el-icon-close" @click="close"/>
-      <font-awesome-icon v-if="!isFullScreen && showFullScreen" class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="fullScreen"/>
-      <font-awesome-icon v-if="isFullScreen && showFullScreen" class="alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="unFullScreen"/>
+      <ms-full-screen-button v-if="showFullScreen" :is-full-screen.sync="isFullScreen"/>
     </div>
     <div class="ms-drawer-body">
       <slot></slot>
@@ -23,9 +22,10 @@
     import MsRight2LeftDragBar from "./dragbar/MsRight2LeftDragBar";
     import MsLeft2RightDragBar from "./dragbar/MsLeft2RightDragBar";
     import MsBottom2TopDragBar from "./dragbar/MsBottom2TopDragBar";
+    import MsFullScreenButton from "@/business/components/common/components/MsFullScreenButton";
     export default {
       name: "MsDrawer",
-      components: {MsBottom2TopDragBar, MsLeft2RightDragBar, MsRight2LeftDragBar},
+      components: {MsFullScreenButton, MsBottom2TopDragBar, MsLeft2RightDragBar, MsRight2LeftDragBar},
       data() {
         return {
           x: 0,
@@ -74,6 +74,15 @@
       mounted() {
         this.init();
       },
+      watch: {
+        isFullScreen() {
+          if (this.isFullScreen) {
+            this.fullScreen()
+          } else {
+            this.unFullScreen();
+          }
+        }
+      },
       methods: {
         init() {
           //  todo 其他方向待优化
@@ -123,12 +132,10 @@
           this.originalH = this.h;
           this.w = document.body.clientWidth;
           this.h = document.body.clientHeight;
-          this.isFullScreen = true;
         },
         unFullScreen() {
           this.w = this.originalW;
           this.h = this.originalH;
-          this.isFullScreen = false;
         },
         close() {
           this.$emit('close')
@@ -206,18 +213,10 @@
     color: red;
   }
 
-  .alt-ico {
+  /deep/ .alt-ico {
     position: absolute;
-    font-size: 15px;
     right: 40px;
     top: 15px;
-    color: #8c939d;
   }
 
-  .alt-ico:hover {
-    color: black;
-    font-size: 18px;
-  }
-
-
 </style>
diff --git a/frontend/src/business/components/common/components/MsFullScreenButton.vue b/frontend/src/business/components/common/components/MsFullScreenButton.vue
new file mode 100644
index 0000000000..44ddc031cb
--- /dev/null
+++ b/frontend/src/business/components/common/components/MsFullScreenButton.vue
@@ -0,0 +1,37 @@
+<template>
+  <span class="fulls-screen-btn">
+    <font-awesome-icon v-if="!isFullScreen" class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="change(true)"/>
+    <font-awesome-icon v-if="isFullScreen" class="alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="change(false)"/>
+  </span>
+</template>
+
+<script>
+export default {
+  name: "MsFullScreenButton",
+  props: {
+    isFullScreen: {
+      type: Boolean,
+      default: false
+    },
+  },
+  methods: {
+    change(bool) {
+      this.$emit("update:isFullScreen", bool);
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.alt-ico:hover {
+  color: black;
+  font-size: 18px;
+}
+
+.alt-ico {
+  font-size: 15px;
+  color: #8c939d;
+}
+
+</style>
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index 9f879a88fc..ac8df743b5 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="minder">
+  <div class="minder" :class="{'full-screen': isFullScreen}">
+    <ms-full-screen-button :is-full-screen.sync="isFullScreen"/>
     <minder-editor
       v-if="isActive"
       class="minder-container"
       :import-json="importJson"
-      :height="700"
       :progress-enable="false"
       :tags="tags"
       :distinct-tags="distinctTags"
@@ -15,9 +15,10 @@
 
 <script>
 
+import MsFullScreenButton from "@/business/components/common/components/MsFullScreenButton";
 export default {
   name: "MsModuleMinder",
-  components: {},
+  components: {MsFullScreenButton},
   props: {
     treeNodes: {
       type: Array,
@@ -58,10 +59,11 @@ export default {
         },
         "template":"default"
       },
-      isActive: true
+      isActive: true,
+      isFullScreen: false
     }
   },
-  mounted() {
+  created() {
   },
   watch: {
     dataMap() {
@@ -128,4 +130,33 @@ export default {
   bottom: auto;
   top: 30px;
 }
+
+.minder {
+  position: relative;
+}
+
+.fulls-screen-btn {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  z-index: 1;
+}
+
+.full-screen {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  background: white;
+  height: 100vh;
+  z-index: 999999;
+}
+
+.full-screen >>> .minder-container {
+  height: calc(100vh - 109px) !important;
+}
+
+.full-screen .fulls-screen-btn {
+  right: 30px;
+}
 </style>
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index eae5fdf3bc..2447032590 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -310,8 +310,6 @@ export default {
           }
           item.passRate=item.passRate+'%'
         })
-        console.log(this.tableData)
-
       });
     },
     copyData(status) {

From 37abc8efd8a794df1587733c243d4b38ff95f5ac Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 19 Mar 2021 13:51:06 +0800
Subject: [PATCH 94/95] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E8=B0=83=E6=95=B4=E6=89=A7=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF=E6=9C=80=E5=A4=A7=E5=80=BC=E6=98=AF9999=E7=A7=92?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=EF=BC=8C=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/test/components/PerformancePressureConfig.vue  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index b4c4317915..ee4f21d433 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -42,12 +42,11 @@
               <br>
               <div v-if="threadGroup.threadType === 'DURATION'">
                 <el-form-item :label="$t('load_test.duration')">
-                  <!-- 最多两天的测试时长 -->
                   <el-input-number
                     :disabled="isReadOnly"
                     v-model="threadGroup.duration"
                     :min="1"
-                    :max="99999"
+                    :max="9999"
                     @change="calculateChart(threadGroup)"
                     size="mini"/>
                 </el-form-item>

From 6251fa18c7ad93622a4510d6cabe0fd8071a6c79 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 19 Mar 2021 13:58:21 +0800
Subject: [PATCH 95/95] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/config/ShiroConfig.java | 12 ++++++------
 .../metersphere/ldap/controller/LdapController.java  |  2 +-
 .../realm/{ShiroDBRealm.java => LocalRealm.java}     |  4 ++--
 backend/src/main/java/io/metersphere/xpack           |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename backend/src/main/java/io/metersphere/security/realm/{ShiroDBRealm.java => LocalRealm.java} (97%)

diff --git a/backend/src/main/java/io/metersphere/config/ShiroConfig.java b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
index 4755bbe8d4..a6ef0f4214 100644
--- a/backend/src/main/java/io/metersphere/config/ShiroConfig.java
+++ b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
@@ -5,7 +5,7 @@ import io.metersphere.security.ApiKeyFilter;
 import io.metersphere.security.CsrfFilter;
 import io.metersphere.security.UserModularRealmAuthenticator;
 import io.metersphere.security.realm.LdapRealm;
-import io.metersphere.security.realm.ShiroDBRealm;
+import io.metersphere.security.realm.LocalRealm;
 import org.apache.shiro.authc.pam.FirstSuccessfulStrategy;
 import org.apache.shiro.authc.pam.ModularRealmAuthenticator;
 import org.apache.shiro.cache.MemoryConstrainedCacheManager;
@@ -70,7 +70,7 @@ public class ShiroConfig implements EnvironmentAware {
     }
 
     /**
-     * securityManager 不用直接注入shiroDBRealm，可能会导致事务失效
+     * securityManager 不用直接注入 Realm，可能会导致事务失效
      * 解决方法见 handleContextRefresh
      * http://www.debugrun.com/a/NKS9EJQ.html
      */
@@ -85,8 +85,8 @@ public class ShiroConfig implements EnvironmentAware {
 
     @Bean
     @DependsOn("lifecycleBeanPostProcessor")
-    public ShiroDBRealm shiroDBRealm() {
-        return new ShiroDBRealm();
+    public LocalRealm localRealm() {
+        return new LocalRealm();
     }
 
     @Bean
@@ -135,10 +135,10 @@ public class ShiroConfig implements EnvironmentAware {
     public void handleContextRefresh(ContextRefreshedEvent event) {
         ApplicationContext context = event.getApplicationContext();
         List<Realm> realmList = new ArrayList<>();
-        ShiroDBRealm shiroDBRealm = context.getBean(ShiroDBRealm.class);
+        LocalRealm localRealm = context.getBean(LocalRealm.class);
         LdapRealm ldapRealm = context.getBean(LdapRealm.class);
         // 基本realm
-        realmList.add(shiroDBRealm);
+        realmList.add(localRealm);
         realmList.add(ldapRealm);
         context.getBean(DefaultWebSecurityManager.class).setRealms(realmList);
     }
diff --git a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
index abf6b7299b..b345cdfed6 100644
--- a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
+++ b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
@@ -68,7 +68,7 @@ public class LdapController {
             userService.addLdapUser(user);
         }
 
-        // 执行 ShiroDBRealm 中 LDAP 登录逻辑
+        // 执行 LocalRealm 中 LDAP 登录逻辑
         LoginRequest loginRequest = new LoginRequest();
         loginRequest.setUsername(userId);
         return userService.login(loginRequest);
diff --git a/backend/src/main/java/io/metersphere/security/realm/ShiroDBRealm.java b/backend/src/main/java/io/metersphere/security/realm/LocalRealm.java
similarity index 97%
rename from backend/src/main/java/io/metersphere/security/realm/ShiroDBRealm.java
rename to backend/src/main/java/io/metersphere/security/realm/LocalRealm.java
index 337e282eb6..97a9ef746a 100644
--- a/backend/src/main/java/io/metersphere/security/realm/ShiroDBRealm.java
+++ b/backend/src/main/java/io/metersphere/security/realm/LocalRealm.java
@@ -34,9 +34,9 @@ import java.util.stream.Collectors;
  * set realm
  * </p>
  */
-public class ShiroDBRealm extends AuthorizingRealm {
+public class LocalRealm extends AuthorizingRealm {
 
-    private Logger logger = LoggerFactory.getLogger(ShiroDBRealm.class);
+    private Logger logger = LoggerFactory.getLogger(LocalRealm.class);
     @Resource
     private UserService userService;
 
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 245845e07b..6806c68338 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 245845e07bf3fe2f60311eeb78f8f109301a2d39
+Subproject commit 6806c68338543cf1d04bb25dc24201dd1949e111