From b2eb55d03f7ab117614d7c2197b579fddafb9b87 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 22 Mar 2021 20:36:47 +0800
Subject: [PATCH 01/35] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E9=87=8D=E5=90=8D=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
index bca5686ebd..aabc1146c7 100644
--- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
+++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
@@ -74,6 +74,7 @@ public class TestResourcePoolService {
         if (StringUtils.isNotBlank(testResourcePoolDTO.getId())) {
             criteria.andIdNotEqualTo(testResourcePoolDTO.getId());
         }
+        criteria.andStatusNotEqualTo(DELETE.name());
 
         if (testResourcePoolMapper.countByExample(example) > 0) {
             MSException.throwException(Translator.get("test_resource_pool_name_already_exists"));

From 2fb76d69e8294ea6d5f911bd8d6e25f1709d785b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 22 Mar 2021 21:14:56 +0800
Subject: [PATCH 02/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 54f0383933..0bda463e1a 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -65,7 +65,7 @@ html,body {
   border-right: 0 !important;
 }
 
-.adjust-table th {
+.adjust-table th:not([class*="el-table-column--selection"]) {
   border-right-color: white !important;
 }
 

From 6fe910114458bbb598ac26d63308a89041aa2d5b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 22 Mar 2021 21:24:50 +0800
Subject: [PATCH 03/35] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92)?=
 =?UTF-8?q?:=20=E5=8E=BB=E9=99=A4=E6=89=A7=E8=A1=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/FunctionalTestCaseEdit.vue         | 15 ++-------------
 1 file changed, 2 insertions(+), 13 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 8ee1ab81ad..da8facdcb8 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
@@ -48,10 +48,8 @@
                       <span class="cast_item">{{ testCase.priority }}</span>
                     </el-col>
                     <el-col :span="5">
-                      <span class="cast_label">{{ $t('test_track.case.case_type') }}：</span>
-                      <span class="cast_item" v-if="testCase.type === 'functional'">{{ $t('commons.functional') }}</span>
-                      <span class="cast_item" v-if="testCase.type === 'performance'">{{ $t('commons.performance') }}</span>
-                      <span class="cast_item" v-if="testCase.type === 'api'">{{ $t('commons.api') }}</span>
+                      <span class="cast_label">{{ $t('test_track.case.module') }}：</span>
+                      <span class="cast_item">{{ testCase.nodePath }}</span>
                     </el-col>
                     <el-col :span="10">
                       <test-plan-test-case-status-button class="status-button"
@@ -63,15 +61,6 @@
                   </el-row>
 
                   <el-row>
-                    <el-col :span="4" :offset="1">
-                      <span class="cast_label">{{ $t('test_track.case.method') }}：</span>
-                      <span v-if="testCase.method === 'manual'">{{ $t('test_track.case.manual') }}</span>
-                      <span v-if="testCase.method === 'auto'">{{ $t('test_track.case.auto') }}</span>
-                    </el-col>
-                    <el-col :span="5">
-                      <span class="cast_label">{{ $t('test_track.case.module') }}：</span>
-                      <span class="cast_item">{{ testCase.nodePath }}</span>
-                    </el-col>
                     <el-col :span="4" :offset="1">
                       <span class="cast_label">{{ $t('test_track.plan.plan_project') }}：</span>
                       <span class="cast_item">{{ testCase.projectName }}</span>

From b3c6e17cf7e34fe74f73fb5b47763f8ee4a9faa7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 22 Mar 2021 21:57:12 +0800
Subject: [PATCH 04/35] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../testcase/TestCaseMinderEditRequest.java     |  1 +
 .../track/service/TestCaseService.java          |  6 ++++++
 frontend/package.json                           |  2 +-
 .../track/common/minder/TestCaseMinder.vue      | 17 ++++++++++-------
 4 files changed, 18 insertions(+), 8 deletions(-)

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
index d3b43a66ae..ad6cd78cc7 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseMinderEditRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseMinderEditRequest.java
@@ -10,5 +10,6 @@ import java.util.List;
 @Setter
 public class TestCaseMinderEditRequest {
     private String projectId;
+    private List<String> ids;
     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 937bb20ae0..4956b8c653 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -780,6 +780,12 @@ public class TestCaseService {
                 editTestCase(item);
             }
         });
+        List<String> ids = request.getIds();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            TestCaseBatchRequest deleteRequest = new TestCaseBatchRequest();
+            deleteRequest.setIds(ids);
+            deleteTestCaseBath(deleteRequest);
+        }
     }
 
     public List<TestCase> getTestCaseByProjectId(String projectId) {
diff --git a/frontend/package.json b/frontend/package.json
index 6dc8af31e0..c688f436de 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.18",
+    "vue-minder-editor-plus": "^1.0.19",
     "jsencrypt": "^3.1.0"
   },
   "devDependencies": {
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index e9c189a7fa..c6121feaf7 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -49,26 +49,29 @@ name: "TestCaseMinder",
     },
     save(data) {
       let saveCases = [];
-      this.buildSaveCase(data.root, saveCases, undefined);
+      let deleteCases = [];
+      this.buildSaveCase(data.root, saveCases, deleteCases, undefined);
       let param = {
         projectId: this.projectId,
-        data: saveCases
+        data: saveCases,
+        ids: deleteCases.map(item => item.id)
       }
       this.result = this.$post('/test/case/minder/edit', param, () => {
         this.$success(this.$t('commons.save_success'));
       });
     },
-    buildSaveCase(root, saveCases, parent) {
+    buildSaveCase(root, saveCases, deleteCases, parent) {
       let data = root.data;
       if (data.resource && data.resource.indexOf(this.$t('api_test.definition.request.case')) > -1) {
-        if (root.parent) {
-          console.log(root.parent);
-        }
         this._buildSaveCase(root, saveCases, parent);
       } else {
+        let deleteChild = data.deleteChild;
+        if (deleteChild && deleteChild.length > 0) {
+          deleteCases.push(...deleteChild);
+        }
         if (root.children) {
           root.children.forEach((childNode) => {
-            this.buildSaveCase(childNode, saveCases, root.data);
+            this.buildSaveCase(childNode, saveCases, deleteCases, root.data);
           })
         }
       }

From 9b87e41ec62b400e846ae38225073dff55bd896b Mon Sep 17 00:00:00 2001
From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com>
Date: Mon, 22 Mar 2021 21:59:05 +0800
Subject: [PATCH 05/35] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E5=90=8E=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E2=80=9D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BE=BF=E4=BA=8E=E8=AF=86=E5=88=AB=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=8E=9F=E6=9C=AC=E7=9A=84=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
 =?UTF-8?q?=E3=80=82=20(#1684)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
---
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.xml  |  8 +++++++-
 .../business/components/common/model/JsonData.js   |  1 +
 .../track/case/components/TestCaseEdit.vue         |  1 -
 .../functional/FunctionalTestCaseList.vue          | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

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 4d85aac3e1..454782792f 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
@@ -137,7 +137,7 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
-        test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags,
+        test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags, test_case.maintainer,
         test_case.node_path, test_case.method, test_case.num, test_plan_test_case.executor, test_plan_test_case.status,
         test_plan_test_case.update_time, test_case_node.name as model, project.name as projectName,
         test_plan_test_case.plan_id as planId
@@ -200,6 +200,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='maintainer'">
+                                and test_case.maintainer in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <when test="key=='executor'">
                                 and test_plan_test_case.executor in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
diff --git a/frontend/src/business/components/common/model/JsonData.js b/frontend/src/business/components/common/model/JsonData.js
index 0726b8692c..6855c63c45 100644
--- a/frontend/src/business/components/common/model/JsonData.js
+++ b/frontend/src/business/components/common/model/JsonData.js
@@ -109,6 +109,7 @@ export const Test_Plan_Function_Test_Case = [
   {id: 'executorName', label: i18n.t('test_track.plan_view.executor')},
   {id: 'status', label: i18n.t('test_track.plan_view.execute_result')},
   {id: 'updateTime', label: i18n.t('commons.update_time')},
+  {id: 'maintainer', label: i18n.t('api_test.definition.request.responsible')}
 ]
 //测试计划-api用例
 export const Test_Plan_Api_Case = [
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 15193b9724..f038217d89 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -83,7 +83,6 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-
             </el-col>
           </el-row>
           <el-row>
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 0fe3a3c88a..e8b2e13bac 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
@@ -173,6 +173,16 @@
             column-key="executor"
             :label="$t('test_track.plan_view.executor')">
           </el-table-column>
+          <!-- 责任人(创建该用例时所关联的责任人) -->
+          <el-table-column
+            v-if="item.id == 'maintainer'"
+            prop="maintainer"
+            :filters="maintainerFilters"
+            min-width="100px"
+            :key="index"
+            column-key="maintainer"
+            :label="$t('api_test.definition.request.responsible')">
+          </el-table-column>
 
           <el-table-column
             v-if="item.id == 'status'"
@@ -352,6 +362,7 @@ export default {
         {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
       ],
       executorFilters: [],
+      maintainerFilters: [],
       showMore: false,
       buttons: [
         {
@@ -665,6 +676,9 @@ export default {
         this.executorFilters = response.data.map(u => {
           return {text: u.name, value: u.id}
         });
+        this.maintainerFilters = response.data.map(u => {
+          return {text: u.id + '(' + u.name + ')', value: u.id};
+        });
       });
     }
   }

From b9035b42cb59b674eafe62587382d31d74d86d5b Mon Sep 17 00:00:00 2001
From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com>
Date: Mon, 22 Mar 2021 21:59:43 +0800
Subject: [PATCH 06/35] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=E5=88=A0=E9=99=A4=E2=80=9C=E5=85=A8=E9=83=A8=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E2=80=9D=E6=A0=87=E9=A2=98=E5=8F=8A=E2=80=9C=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=A8=E9=83=A8=E5=85=B3=E8=81=94=E2=80=9D=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20(#1685)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
---
 .../comonents/functional/FunctionalTestCaseList.vue  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 e8b2e13bac..d48ea81215 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
@@ -4,9 +4,12 @@
 <!--      <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>
-            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="breadcrumbRefresh"/>
+            <span></span>
           </template>
+
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" v-if="!showMyTestCase" icon="el-icon-s-custom"
                              :content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/>
@@ -15,8 +18,11 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
                              :content="$t('test_track.plan_view.relevance_test_case')"
                              @click="$emit('openTestCaseRelevanceDialog')"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-document-remove"
-                             :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>
+
+<!--            删除 “取消全部关联” 按钮-->
+<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-document-remove"-->
+<!--                             :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>-->
+
           </template>
         </ms-table-header>
 <!--      </template>-->

From 10c4ff2577c21e0d1a66a827aa27657c4f4274a2 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 22 Mar 2021 22:53:11 +0800
Subject: [PATCH 07/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/css/main.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 0bda463e1a..78662b129a 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -65,10 +65,14 @@ html,body {
   border-right: 0 !important;
 }
 
-.adjust-table th:not([class*="el-table-column--selection"]) {
+.adjust-table th {
   border-right-color: white !important;
 }
 
+.adjust-table.ms-select-all-fixed th:first-child.el-table-column--selection {
+  border-right-color: #DCDFE6 !important;
+}
+
 .adjust-table {
   border-color: white !important;
 }

From cec4ff28c2c8478b7be14a310479446151166df4 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 22 Mar 2021 23:23:41 +0800
Subject: [PATCH 08/35] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/ApiScenarioList.vue |  2 +-
 .../components/list/ApiCaseSimpleList.vue       |  2 +-
 .../api/definition/components/list/ApiList.vue  |  2 +-
 .../components/common/head/HeaderCustom.vue     | 17 ++++++-----------
 .../track/case/components/TestCaseCreate.vue    |  9 ++++-----
 .../track/case/components/TestCaseList.vue      |  2 +-
 .../track/plan/components/TestPlanList.vue      |  2 +-
 .../view/comonents/api/TestPlanApiCaseList.vue  |  2 +-
 .../comonents/api/TestPlanApiScenarioList.vue   |  2 +-
 .../functional/FunctionalTestCaseList.vue       |  2 +-
 .../comonents/load/TestPlanLoadCaseList.vue     |  2 +-
 11 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 141b314e7f..e05f4fa481 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -244,7 +244,7 @@
       return {
         type: API_SCENARIO_LIST,
         headerItems: Api_Scenario_List,
-        tableLabel: [],
+        tableLabel: Api_Scenario_List,
         loading: false,
         screenHeight: document.documentElement.clientHeight - 280,//屏幕高度,
         condition: {
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 4754744b4d..9493dc16be 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -186,7 +186,7 @@ export default {
       return {
         type: API_CASE_LIST,
         headerItems: Api_Case_List,
-        tableLabel: [],
+        tableLabel: Api_Case_List,
         condition: {
           components: API_CASE_CONFIGS
         },
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 6069e06e71..11efdfd8ee 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -272,7 +272,7 @@
       return {
         type: API_LIST,
         headerItems: Api_List,
-        tableLabel: [],
+        tableLabel: Api_List,
         condition: {
           components: API_DEFINITION_CONFIGS
         },
diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index 3becf9b217..d13351763c 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -47,18 +47,14 @@ export default {
     },
     open(items) {
       this.defaultCheckedKeys = []
-
       this.dialogTableVisible = true
-      this.fieldSelected = items
-      if (items.size <= 0) {
-        this.optionalField = this.optionalFields
-      } else {
-        items.forEach(i => {
-            this.defaultCheckedKeys.push(i.id)
-          }
-        )
-      }
+      items.forEach(i => {
+          this.defaultCheckedKeys.push(i.id)
+        }
+      )
       console.log(this.defaultCheckedKeys)
+      console.log(this.optionalFields)
+      console.log(this.fieldSelected)
 
     },
     saveHeader() {
@@ -83,7 +79,6 @@ export default {
     },
 
 
-
     // 切换模式 现有树形穿梭框模式transfer 和通讯录模式addressList
     // changeMode() {
     //   if (this.mode == "transfer") {
diff --git a/frontend/src/business/components/track/case/components/TestCaseCreate.vue b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
index e132bdfc4e..9f39733f06 100644
--- a/frontend/src/business/components/track/case/components/TestCaseCreate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
@@ -105,13 +105,12 @@ export default {
           this.testCaseForm.projectId = getCurrentProjectID();
           this.testCaseForm.type = "";
           this.testCaseForm.priority = "P0";
-          this.testCaseForm.method = "manual";
-          if(this.currentModule!==undefined){
+          if (this.currentModule !== undefined || this.currentModule !== null || this.currentModule !== 0 || this.currentModule !== "") {
             this.testCaseForm.nodePath = this.currentModule.path;
             this.testCaseForm.nodeId = this.currentModule.id;
-          }else{
-            this.testCaseForm.nodePath="/全部用例"
-            this.testCaseForm.nodeId="root"
+          } else {
+            this.testCaseForm.nodePath = "/全部用例"
+            this.testCaseForm.nodeId = "root"
           }
           this.result = this.$post(path, this.testCaseForm, response => {
             this.testCaseForm.id=response.data.id
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 3f40e08997..71af994e97 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -259,7 +259,7 @@ export default {
     return {
       type: TEST_CASE_LIST,
       headerItems: Track_Test_Case,
-      tableLabel: [],
+      tableLabel: Track_Test_Case,
       result: {},
       deletePath: "/test/case/delete",
       condition: {
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 90aa51084e..cd19db1a97 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -248,7 +248,7 @@ export default {
     return {
       type: TEST_PLAN_LIST,
       headerItems: Test_Plan_List,
-      tableLabel: [],
+      tableLabel: Test_Plan_List,
       result: {},
       enableDeleteTip: false,
       queryPath: "/test/plan/list",
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 c72d1eab50..370799ede6 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
@@ -192,7 +192,7 @@ export default {
     return {
       type: TEST_PLAN_API_CASE,
       headerItems: Test_Plan_Api_Case,
-      tableLabel: [],
+      tableLabel: Test_Plan_Api_Case,
       condition: {},
       selectCase: {},
       result: {},
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 556f0ba211..3a7f032486 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
@@ -148,7 +148,7 @@ export default {
     return {
       type: TEST_PLAN_SCENARIO_CASE,
       headerItems: Test_Plan_Scenario_Case,
-      tableLabel: [],
+      tableLabel: Test_Plan_Scenario_Case,
       loading: false,
       condition: {},
       currentScenario: {},
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 0fe3a3c88a..6a9f98e8ce 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
@@ -312,7 +312,7 @@ export default {
     return {
       type: TEST_PLAN_FUNCTION_TEST_CASE,
       headerItems: Test_Plan_Function_Test_Case,
-      tableLabel: [],
+      tableLabel: Test_Plan_Function_Test_Case,
       result: {},
       deletePath: "/test/case/delete",
       condition: {
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 3b480b7226..db66a0d7ce 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
@@ -154,7 +154,7 @@ export default {
     return {
       type: TEST_PLAN_LOAD_CASE,
       headerItems: Test_Plan_Load_Case,
-      tableLabel: [],
+      tableLabel: Test_Plan_Load_Case,
       condition: {},
       result: {},
       tableData: [],

From 8995209a159a0aeed3175a481efe34092258c63b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 23 Mar 2021 09:49:10 +0800
Subject: [PATCH 09/35] 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 f63ebb68eb..3571feccf7 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f63ebb68ebad78de42fd711f17e2671e34577a86
+Subproject commit 3571feccf7c2bc68e4b619f6c367ac47d37c6723

From 42023ee85a4e4327c37273acd0fc3396d2887054 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 23 Mar 2021 10:12:08 +0800
Subject: [PATCH 10/35] =?UTF-8?q?refactor:=20swagger2.0=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0base-url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 3b05aefa87..c51b92ac47 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
@@ -58,6 +58,7 @@ public class Swagger2Parser extends SwaggerAbstractParser {
 
         ApiModule parentNode = ApiDefinitionImportUtil.getSelectModule(importRequest.getModuleId());
 
+        String basePath = swagger.getBasePath();
         for (String pathName : pathNames) {
             Path path = paths.get(pathName);
             Map<HttpMethod, Operation> operationMap = path.getOperationMap();
@@ -68,6 +69,10 @@ public class Swagger2Parser extends SwaggerAbstractParser {
                 ApiDefinitionWithBLOBs apiDefinition = buildApiDefinition(request.getId(), operation, pathName, method.name(),importRequest);
                 parseParameters(operation, request);
                 addBodyHeader(request);
+                if (StringUtils.isNotBlank(basePath)) {
+                    apiDefinition.setPath(basePath + apiDefinition.getPath());
+                    request.setPath(basePath + request.getPath());
+                }
                 apiDefinition.setRequest(JSON.toJSONString(request));
                 apiDefinition.setResponse(JSON.toJSONString(parseResponse(operation, operation.getResponses())));
                 buildModule(parentNode, apiDefinition, operation.getTags());

From 3c05d1c4860343764cb6af3e7ce7ff2704d13c85 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 23 Mar 2021 10:12:19 +0800
Subject: [PATCH 11/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DCSRF-TOKEN?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E6=B2=A1=E6=9C=89=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E7=99=BB=E5=BD=95=E9=A1=B5=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/security/CsrfFilter.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/security/CsrfFilter.java b/backend/src/main/java/io/metersphere/security/CsrfFilter.java
index 32f6bc9ae0..66ef15689e 100644
--- a/backend/src/main/java/io/metersphere/security/CsrfFilter.java
+++ b/backend/src/main/java/io/metersphere/security/CsrfFilter.java
@@ -42,7 +42,12 @@ public class CsrfFilter extends AnonymousFilter {
         // 请求头取出的token value
         String csrfToken = httpServletRequest.getHeader(TOKEN_NAME);
         // 校验 token
-        validateToken(csrfToken);
+        try {
+            validateToken(csrfToken);
+        } catch (ExpiredCredentialsException e) {
+            ((HttpServletResponse) response).setHeader("Authentication-Status", "invalid");
+            return true;
+        }
         // 校验 referer
         validateReferer(httpServletRequest);
         return true;

From 56b58ce9cdccdc1cf589ca374881d9ce7622d920 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 23 Mar 2021 10:23:31 +0800
Subject: [PATCH 12/35] =?UTF-8?q?fix:=E8=A1=A8=E6=A0=BC=E9=94=99=E4=BD=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=80=90=E6=9D=A1?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TestReviewTestCaseService.java    | 54 ++++++++++++++++---
 .../automation/scenario/ApiScenarioList.vue   |  3 ++
 .../components/list/ApiCaseSimpleList.vue     | 41 ++++++++------
 .../definition/components/list/ApiList.vue    |  4 ++
 .../track/case/components/TestCaseEdit.vue    | 32 +++++------
 .../track/case/components/TestCaseFile.vue    |  1 +
 .../track/case/components/TestCaseList.vue    |  4 ++
 .../functional/FunctionalTestCaseList.vue     |  4 ++
 .../components/TestReviewTestCaseEdit.vue     | 40 ++++++++++++--
 9 files changed, 143 insertions(+), 40 deletions(-)

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 e77d06373d..ca4cdc75cd 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -1,16 +1,16 @@
 package io.metersphere.track.service;
 
 import io.metersphere.base.domain.*;
-import io.metersphere.base.mapper.TestCaseMapper;
-import io.metersphere.base.mapper.TestCaseReviewMapper;
-import io.metersphere.base.mapper.TestCaseReviewTestCaseMapper;
-import io.metersphere.base.mapper.TestCaseReviewUsersMapper;
+import io.metersphere.base.mapper.*;
+import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestReviewCaseMapper;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.member.QueryMemberRequest;
 import io.metersphere.service.UserService;
+import io.metersphere.track.dto.TestCaseTestDTO;
+import io.metersphere.track.dto.TestPlanCaseDTO;
 import io.metersphere.track.dto.TestReviewCaseDTO;
 import io.metersphere.track.request.testplancase.TestReviewCaseBatchRequest;
 import io.metersphere.track.request.testreview.DeleteRelevanceRequest;
@@ -29,7 +29,14 @@ import java.util.stream.Collectors;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class TestReviewTestCaseService {
-
+    @Resource
+    private TestCaseTestMapper testCaseTestMapper;
+    @Resource
+    private LoadTestMapper loadTestMapper;
+    @Resource
+    private ApiTestCaseMapper apiTestCaseMapper;
+    @Resource
+    private ApiScenarioMapper apiScenarioMapper;
     @Resource
     ExtTestReviewCaseMapper extTestReviewCaseMapper;
     @Resource
@@ -44,6 +51,8 @@ public class TestReviewTestCaseService {
     TestCaseReviewService testCaseReviewService;
     @Resource
     TestCaseMapper testCaseMapper;
+    @Resource
+    ExtTestPlanTestCaseMapper extTestPlanTestCaseMapper;
 
     public List<TestReviewCaseDTO> list(QueryCaseReviewRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
@@ -128,7 +137,40 @@ public class TestReviewTestCaseService {
     }
 
     public TestReviewCaseDTO get(String reviewId) {
-        return extTestReviewCaseMapper.get(reviewId);
+        TestReviewCaseDTO testReviewCaseDTO=extTestReviewCaseMapper.get(reviewId);
+        List<TestCaseTestDTO> testCaseTestDTOS = extTestPlanTestCaseMapper.listTestCaseTest(testReviewCaseDTO.getCaseId());
+        testCaseTestDTOS.forEach(dto -> {
+            setTestName(dto);
+        });
+        testReviewCaseDTO.setList(testCaseTestDTOS);
+        return testReviewCaseDTO;
+    }
+
+    private void setTestName(TestCaseTestDTO dto) {
+        String type = dto.getTestType();
+        String id = dto.getTestId();
+        switch (type) {
+            case "performance":
+                LoadTest loadTest = loadTestMapper.selectByPrimaryKey(id);
+                if (loadTest != null) {
+                    dto.setTestName(loadTest.getName());
+                }
+                break;
+            case "testcase":
+                ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(id);
+                if (apiTestCaseWithBLOBs != null) {
+                    dto.setTestName(apiTestCaseWithBLOBs.getName());
+                }
+                break;
+            case "automation":
+                ApiScenarioWithBLOBs apiScenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(id);
+                if (apiScenarioWithBLOBs != null) {
+                    dto.setTestName(apiScenarioWithBLOBs.getName());
+                }
+                break;
+            default:
+                break;
+        }
     }
 
     public void editTestCaseBatchStatus(TestReviewCaseBatchRequest request) {
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index e05f4fa481..0e1d859290 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -419,6 +419,9 @@
             });
             this.loading = false;
             this.unSelection = data.listObject.map(s => s.id);
+            if (this.$refs.scenarioTable) {
+              this.$refs.scenarioTable.doLayout()
+            }
           });
         }
         getLabel(this, API_SCENARIO_LIST);
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 9493dc16be..07576e28e7 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -260,6 +260,10 @@ export default {
     },
     created: function () {
       this.initTable();
+
+      this.$nextTick(() => {
+        this.$refs.caseTable.bodyWrapper.scrollTop = 5
+      })
     },
     watch: {
       selectNodeIds() {
@@ -277,24 +281,24 @@ export default {
         this.initTable();
       }
     },
-    computed: {
+  computed: {
 
-      // 接口定义用例列表
-      isApiModel() {
-        return this.model === 'api'
-      },
+    // 接口定义用例列表
+    isApiModel() {
+      return this.model === 'api'
     },
-    methods: {
-      customHeader() {
-        getLabel(this, API_CASE_LIST);
-        this.$refs.headerCustom.open(this.tableLabel)
-      },
-      initTable() {
+  },
+  methods: {
+    customHeader() {
+      getLabel(this, API_CASE_LIST);
+      this.$refs.headerCustom.open(this.tableLabel)
+    },
+    initTable() {
 
-        this.selectRows = new Set();
-        this.condition.status = "";
-        this.condition.moduleIds = this.selectNodeIds;
-        if (this.trashEnable) {
+      this.selectRows = new Set();
+      this.condition.status = "";
+      this.condition.moduleIds = this.selectNodeIds;
+      if (this.trashEnable) {
           this.condition.status = "Trash";
           this.condition.moduleIds = [];
         }
@@ -331,9 +335,13 @@ export default {
                 item.tags = JSON.parse(item.tags);
               }
             })
+            if (this.$refs.caseTable) {
+              this.$refs.caseTable.doLayout()
+            }
           });
         }
         getLabel(this, API_CASE_LIST);
+
       },
       open() {
         this.$refs.searchBar.open();
@@ -636,4 +644,7 @@ export default {
     top: -2px;
   }
 
+  /deep/ .el-table__fixed {
+    height: 100% !important;
+  }
 </style>
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 11efdfd8ee..4878c7275e 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -442,6 +442,10 @@
                 item.tags = JSON.parse(item.tags);
               }
             })
+            if (this.$refs.apiDefinitionTable) {
+              this.$refs.apiDefinitionTable.doLayout()
+            }
+
           });
         }
         getLabel(this, API_LIST);
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index f038217d89..0abba4cb81 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -97,17 +97,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
-                <el-form-item :label="$t('test_track.case.relate_test')" :label-width="formLabelWidth" prop="testId">
-                  <el-cascader  show-all-levels	   v-model="form.selected" :props="props"  ></el-cascader>
-                </el-form-item>
-            </el-col>
-<!--            <el-col :span="7" v-if="form.testId=='other'">
-              <el-form-item :label="$t('test_track.case.test_name')" :label-width="formLabelWidth" prop="testId">
-                <el-input v-model="form.otherTestName" :placeholder="$t('test_track.case.input_test_case')"></el-input>
+            <el-col :span="14">
+              <el-form-item :label="$t('test_track.case.relate_test')" :label-width="formLabelWidth">
+                <el-cascader filterable placeholder="请选择要关联的测试" show-all-levels v-model="form.selected" :props="props"
+                             class="ms-case"></el-cascader>
               </el-form-item>
-            </el-col>-->
-
+            </el-col>
           </el-row>
 
           <el-row>
@@ -125,8 +120,9 @@
               </el-form-item>
 
             </el-col>
-            <el-col :span="10">
-              <el-form-item label="需求名称" :label-width="formLabelWidth" prop="demandName" v-if="form.demandId=='other'">
+            <el-col :span="10" :offset="1">
+              <el-form-item label="需求ID/名称" :label-width="formLabelWidth" prop="demandName"
+                            v-if="form.demandId=='other'">
                 <el-input v-model="form.demandName"></el-input>
               </el-form-item>
             </el-col>
@@ -340,7 +336,6 @@ export default {
             }
             if (this.projectId && this.form.type != '' && this.form.type != 'undefined') {
               this.$get(url, response => {
-                response.data.unshift({id: 'other', name: this.$t('test_track.case.other')})
                 const nodes = response.data
                   .map(item => ({
                     value: item.id,
@@ -581,8 +576,10 @@ export default {
       }
       Object.assign(this.form, tmp);
       this.form.module = testCase.nodeId;
-      this.form.testId=testCase.selected
-      console.log(this.form.testId)
+      /*
+            this.form.testId=testCase.selected
+      */
+      console.log(this.form.selected)
       this.getFileMetaData(testCase);
     },
     setTestCaseExtInfo(testCase) {
@@ -778,7 +775,6 @@ export default {
       });
     },
     getTestOptions(val) {
-      console.log(val)
       this.projectId = getCurrentProjectID()
       this.testOptions = [];
       let url = '';
@@ -998,6 +994,10 @@ export default {
   width: 100%;
 }
 
+.ms-case {
+  width: 100%;
+}
+
 /deep/ .el-button-group > .el-button:first-child {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
diff --git a/frontend/src/business/components/track/case/components/TestCaseFile.vue b/frontend/src/business/components/track/case/components/TestCaseFile.vue
index 9992518869..51fcab9bc8 100644
--- a/frontend/src/business/components/track/case/components/TestCaseFile.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseFile.vue
@@ -29,6 +29,7 @@ export default {
   },
   methods: {
     open(file) {
+      console.log(file)
       this.file = file;
       this.dialogVisible = true;
     },
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 71af994e97..3c767df70e 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -443,6 +443,10 @@ export default {
               item.tags = JSON.parse(item.tags);
             }
           })
+          if (this.$refs.table) {
+            this.$refs.table.doLayout()
+          }
+
         });
       }
     },
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 4c2d7416e2..8b86c9210f 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
@@ -33,6 +33,7 @@
                    :select-ids="new Set(Array.from(this.selectRows).map(row => row.id))" @refresh="initTableData"/>
 
       <el-table
+        ref="table"
         class="adjust-table"
         border
         @select-all="handleSelectAll"
@@ -479,6 +480,9 @@ export default {
             }
           }
           this.selectRows.clear();
+          if (this.$refs.table) {
+            this.$refs.table.doLayout()
+          }
         });
       }
       getLabel(this, TEST_PLAN_FUNCTION_TEST_CASE);
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index 1e6fcad5c1..e2aab0f143 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -74,8 +74,12 @@
                   </el-row>
                   <el-row>
                     <el-col :offset="1">
-                      <span class="cast_label">{{ $t('test_track.plan_view.relevance_test_case') }}：</span>
-                      <span class="cast_item">{{ testCase.prerequisite }}</span>
+                      <span class="cast_label">关联测试：</span>
+                      <span v-for="(item,index) in testCase.list" :key="index">
+                        <el-button @click="openTest(item)" type="text" style="margin-left: 7px;">{{
+                            item.testName
+                          }}</el-button>
+                      </span>
                     </el-col>
                   </el-row>
                   <el-row>
@@ -241,7 +245,7 @@ import PerformanceTestDetail from "../../../plan/view/comonents/test/Performance
 import ApiTestResult from "../../../plan/view/comonents/test/ApiTestResult";
 import ApiTestDetail from "../../../plan/view/comonents/test/ApiTestDetail";
 import TestPlanTestCaseStatusButton from "../../../plan/common/TestPlanTestCaseStatusButton";
-import {getCurrentProjectID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentProjectID, getUUID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import ReviewComment from "../../commom/ReviewComment";
 import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
 import ApiCaseItem from "@/business/components/api/definition/components/case/ApiCaseItem";
@@ -295,6 +299,35 @@ export default {
     }
   },
   methods: {
+    openTest(item) {
+      const type = item.testType;
+      const id = item.testId;
+      switch (type) {
+        case "performance": {
+          let performanceData = this.$router.resolve({
+            path: '/performance/test/edit/' + id,
+          })
+          window.open(performanceData.href, '_blank');
+          break;
+        }
+        case "testcase": {
+          let caseData = this.$router.resolve({
+            name: 'ApiDefinition',
+            params: {redirectID: getUUID(), dataType: "apiTestCase", dataSelectRange: 'single:' + id}
+          });
+          window.open(caseData.href, '_blank');
+          break;
+        }
+        case "automation": {
+          let automationData = this.$router.resolve({
+            name: 'ApiAutomation',
+            params: {redirectID: getUUID(), dataType: "scenario", dataSelectRange: 'edit:' + id}
+          });
+          window.open(automationData.href, '_blank');
+          break;
+        }
+      }
+    },
     handleClose() {
       removeGoBackListener(this.handleClose);
       this.showDialog = false;
@@ -354,6 +387,7 @@ export default {
           item.steptResults.push(item.steps[i]);
         }
         this.testCase = item;
+        console.log(this.testCase)
         this.getRelatedTest();
         this.getComments(item);
         /*  this.initTest();*/

From 41bf5c6b1560f1423f78f8a5e9ded5caf3810316 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 10:24:29 +0800
Subject: [PATCH 13/35] =?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=99=84=E4=BB=B6=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=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

---
 .../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 7d2a0901a6..24cd86fc6d 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
@@ -52,6 +52,7 @@ public class ShiroUtils {
         filterChainDefinitionMap.put("/", "apikey, authc"); // 跳转到 / 不用校验 csrf
         filterChainDefinitionMap.put("/language", "apikey, authc");// 跳转到 /language 不用校验 csrf
         filterChainDefinitionMap.put("/document", "apikey, authc"); // 跳转到 /document 不用校验 csrf
+        filterChainDefinitionMap.put("/test/case/file/preview/**", "apikey, authc"); // 预览测试用例附件 不用校验 csrf
     }
 
     public static Cookie getSessionIdCookie(){

From 9a7f3cca3bf5567abc55a50f0603c81a6947a9ee Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 23 Mar 2021 10:24:46 +0800
Subject: [PATCH 14/35] =?UTF-8?q?fix:=E8=A1=A8=E6=A0=BC=E9=94=99=E4=BD=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=80=90=E6=9D=A1?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/track/dto/TestReviewCaseDTO.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
index 8440dd3c8b..4820a4a128 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
@@ -4,6 +4,8 @@ import io.metersphere.base.domain.TestCaseWithBLOBs;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class TestReviewCaseDTO extends TestCaseWithBLOBs {
@@ -16,4 +18,5 @@ public class TestReviewCaseDTO extends TestCaseWithBLOBs {
     private String issues;
     private String model;
     private String projectName;
+    private List<TestCaseTestDTO> list;
 }

From 6351bd9f269f2e2bab64153e048014ccce2b8c92 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 10:56:25 +0800
Subject: [PATCH 15/35] =?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?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/request/testcase/TrackCount.java  | 2 +-
 .../java/io/metersphere/track/response/TrackStatisticsDTO.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/TrackCount.java b/backend/src/main/java/io/metersphere/track/request/testcase/TrackCount.java
index b795deb9da..6cd0dd3002 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/TrackCount.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/TrackCount.java
@@ -6,7 +6,7 @@ public class TrackCount {
     public static final String P2 = "P2";
     public static final String P3 = "P3";
 
-    public static final String API = "api";
+    public static final String TESTCASE = "testcase";
     public static final String PERFORMANCE = "performance";
     public static final String AUTOMATION = "automation";
 }
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 264e0cf9cb..4749cf47e2 100644
--- a/backend/src/main/java/io/metersphere/track/response/TrackStatisticsDTO.java
+++ b/backend/src/main/java/io/metersphere/track/response/TrackStatisticsDTO.java
@@ -145,7 +145,7 @@ public class TrackStatisticsDTO {
     public void countRelevance(List<TrackCountResult> relevanceResults) {
         for (TrackCountResult countResult : relevanceResults) {
             switch (countResult.getGroupField()){
-                case TrackCount.API:
+                case TrackCount.TESTCASE:
                     this.apiCaseCount += countResult.getCountNumber();
                     this.allRelevanceCaseCount += countResult.getCountNumber();
                     break;

From 113c689f173792f0240d29cc3be1ca7fcf02656b Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Tue, 23 Mar 2021 11:09:33 +0800
Subject: [PATCH 16/35] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E8=A7=84=E8=8C=83=E9=83=A8=E5=88=86=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/en-US.js | 4 ++--
 frontend/src/i18n/zh-CN.js | 4 ++--
 frontend/src/i18n/zh-TW.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 502c42e06a..4ac574b7af 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -945,9 +945,9 @@ export default {
       export_tip: "Export Tip",
       ms_tip: "Support for MeterSphere JSON format",
       ms_export_tip: "Export jSON-formatted files via MeterSphere website or browser plug-ins",
-      har_export_tip: "Export Har files by browser dev-tool",
+      har_export_tip: "Export HAR files by browser dev-tool",
       swagger_tip: "Swagger 2.0 and 3.0 json files are supported",
-      har_tip: "Only Har files are supported",
+      har_tip: "Only HAR files are supported",
       postman_tip: "Only Postman Collection V2.1 json files are supported",
       postman_export_tip: "Export the test collection by Postman",
       swagger_export_tip: "Export jSON-formatted files via Swagger website",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 684f4abf22..93d1c867ba 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -948,10 +948,10 @@ export default {
       export_tip: "导出方法",
       ms_tip: "支持 MeterSphere json 格式",
       ms_export_tip: "通过 MeterSphere 接口测试页面或者浏览器插件导出 json 格式文件",
-      har_export_tip: "通过 浏览器的开发者工具 导出 Har 格式文件",
+      har_export_tip: "通过 浏览器的开发者工具 导出 HAR 格式文件",
       postman_tip: "只支持 Postman Collection v2.1 格式的 json 文件",
       swagger_tip: "支持 Swagger 2.0 与 3.0 版本的 json 文件",
-      har_tip: "只支持 Har 文件",
+      har_tip: "只支持 HAR 文件",
       post_export_tip: "通过 Postman 导出测试集合",
       swagger_export_tip: "通过 Swagger 页面导出",
       jmeter_export_tip: "通过 JMeter 生成JMX文件",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 54185a8feb..bb0d61b714 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -947,10 +947,10 @@ export default {
       export_tip: "導出方法",
       ms_tip: "支持 MeterSphere json 格式",
       ms_export_tip: "通過 MeterSphere 接口測試頁面或者瀏覽器插件導出 json 格式文件",
-      har_export_tip: "通过 瀏覽器到開發者工具 导出 Har 格式文件",
+      har_export_tip: "通过 瀏覽器到開發者工具 导出 HAR 格式文件",
       postman_tip: "只支持 Postman Collection v2.1 格式的 json 文件",
       swagger_tip: "支持 Swagger 2.0 與 3.0 版本的 json 文件",
-      har_tip: "只支持 Har 文件",
+      har_tip: "只支持 HAR 文件",
       post_export_tip: "通過 Postman 導出測試集合",
       swagger_export_tip: "通過 Swagger 頁面導出",
       jmeter_export_tip: "通過 JMeter 生成JMX文件",

From 5b87b340715d5b7735afbd5a691c11af2882bf68 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 11:11:08 +0800
Subject: [PATCH 17/35] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E8=A7=A3=E5=86=B3while=E5=BE=AA=E7=8E=AF=20?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E5=BD=B1=E5=93=8D=E5=90=8E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AF=B7=E6=B1=82=E4=B8=8D=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=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

---
 .../request/controller/MsLoopController.java  | 47 +++++++++++++++++--
 .../definition/request/extract/MsExtract.java |  6 +--
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
index b1d038c51f..30543eeb31 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
@@ -17,6 +17,8 @@ import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.control.RunTime;
 import org.apache.jmeter.control.WhileController;
 import org.apache.jmeter.modifiers.CounterConfig;
+import org.apache.jmeter.modifiers.JSR223PreProcessor;
+import org.apache.jmeter.protocol.java.sampler.JSR223Sampler;
 import org.apache.jmeter.reporters.ResultAction;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
@@ -24,6 +26,7 @@ import org.apache.jmeter.timers.ConstantTimer;
 import org.apache.jorphan.collections.HashTree;
 
 import java.util.List;
+import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -42,6 +45,9 @@ public class MsLoopController extends MsTestElement {
     @JSONField(ordinal = 23)
     private MsWhileController whileController;
 
+
+    private String ms_current_timer = UUID.randomUUID().toString();
+
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
         // 非导出操作，且不是启用状态则跳过执行
@@ -122,7 +128,8 @@ public class MsLoopController extends MsTestElement {
             operator = "";
             value = "";
         }
-        return "${__jexl3(" + variable + operator + value + ")}";
+        ms_current_timer = UUID.randomUUID().toString();
+        return "${__jexl3(" + variable + operator + value + " && \"${" + ms_current_timer + "}\" !=\"stop\")}";
     }
 
     private WhileController initWhileController() {
@@ -151,6 +158,32 @@ public class MsLoopController extends MsTestElement {
         return controller;
     }
 
+    private String script() {
+        String script = "\n" +
+                "import java.util.*;\n" +
+                "import java.text.SimpleDateFormat;\n" +
+                "import org.apache.jmeter.threads.JMeterContextService;\n" +
+                "\n" +
+                "// 循环控制器超时后结束循环\n" +
+                "try{\n" +
+                "\tString ms_current_timer = vars.get(\"" + ms_current_timer + "\");\n" +
+                "\tlong _nowTime = System.currentTimeMillis(); \n" +
+                "\tif(ms_current_timer == null ){\n" +
+                "\t\tvars.put(\"" + ms_current_timer + "\",_nowTime.toString());\n" +
+                "\t}\n" +
+                "\tlong time = Long.parseLong(vars.get(\"" + ms_current_timer + "\"));\n" +
+                "\t if((_nowTime - time) > " + this.whileController.getTimeout() + " ){\n" +
+                "\t \tvars.put(\"" + ms_current_timer + "\", \"stop\");\n" +
+                "\t \tlog.info( \"结束循环\");\n" +
+                "\t }\n" +
+                "}catch (Exception e){\n" +
+                "\tlog.info( e.getMessage());\n" +
+                "\tvars.put(\"" + ms_current_timer + "\", \"stop\");\n" +
+                "}\n";
+
+        return script;
+    }
+
     private HashTree controller(HashTree tree) {
         if (StringUtils.equals(this.loopType, LoopConstants.WHILE.name()) && this.whileController != null) {
             RunTime runTime = new RunTime();
@@ -162,9 +195,17 @@ public class MsLoopController extends MsTestElement {
                 timeout = 1;
             }
             runTime.setRuntime(timeout);
+            HashTree hashTree = tree.add(initWhileController());
             // 添加超时处理，防止死循环
-            HashTree hashTree = tree.add(runTime);
-            return hashTree.add(initWhileController());
+            JSR223PreProcessor jsr223PreProcessor = new JSR223PreProcessor();
+            jsr223PreProcessor.setName("循环超时处理");
+            jsr223PreProcessor.setProperty(TestElement.TEST_CLASS, JSR223Sampler.class.getName());
+            jsr223PreProcessor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
+            jsr223PreProcessor.setProperty("cacheKey", "true");
+            jsr223PreProcessor.setProperty("scriptLanguage", "beanshell");
+            jsr223PreProcessor.setProperty("script", script());
+            hashTree.add(jsr223PreProcessor);
+            return hashTree;
         }
         if (StringUtils.equals(this.loopType, LoopConstants.FOREACH.name()) && this.forEachController != null) {
             return tree.add(initForeachController());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
index 6a41b3d039..2c1c86c777 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
@@ -34,10 +34,10 @@ public class MsExtract extends MsTestElement {
         if (!config.isOperating() && !this.isEnable()) {
             return;
         }
-        addRequestExtractors(tree);
+        addRequestExtractors(tree, config);
     }
 
-    private void addRequestExtractors(HashTree samplerHashTree) {
+    private void addRequestExtractors(HashTree samplerHashTree, ParameterConfig config) {
         StringJoiner extract = new StringJoiner(";");
 
         if (CollectionUtils.isNotEmpty(this.getRegex())) {
@@ -55,7 +55,7 @@ public class MsExtract extends MsTestElement {
                     samplerHashTree.add(jsonPostProcessor(extractJSONPath, extract))
             );
         }
-        if (Optional.ofNullable(extract).orElse(extract).length() > 0) {
+        if (Optional.ofNullable(extract).orElse(extract).length() > 0 && !config.isOperating()) {
             JSR223PostProcessor shell = new JSR223PostProcessor();
             shell.setEnabled(true);
             shell.setName(StringUtils.isEmpty(this.getName()) ? "JSR223PostProcessor" : this.getName());

From 23628537a230103e0c7273d5ce85bbd5c39957dd Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 23 Mar 2021 11:23:21 +0800
Subject: [PATCH 18/35] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/head/TrackHeaderMenus.vue           | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/track/head/TrackHeaderMenus.vue b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
index 6d3fb0ee1f..3a72504195 100644
--- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue
+++ b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
@@ -9,18 +9,22 @@
           <el-menu-item :index="'/track/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
-
-          <el-submenu v-permission="['test_manager','test_user','test_viewer']"
-                      index="6" popper-class="submenu">
-            <template v-slot:title>{{ $t('test_track.case.test_case') }}</template>
-            <ms-recent-list ref="caseRecent" :options="caseRecent"/>
-            <el-divider/>
-            <ms-show-all :index="'/track/case/all'"/>
-            <el-menu-item :index="testCaseEditPath" class="blank_item"></el-menu-item>
-            <el-menu-item :index="testCaseProjectPath" class="blank_item"></el-menu-item>
-            <ms-create-button v-permission="['test_manager','test_user']" :index="'/track/case/create'"
-                              :title="$t('test_track.case.create_case')"/>
-          </el-submenu>
+          <el-menu-item :index="'/track/case/all'">
+            {{ $t("test_track.case.test_case") }}
+          </el-menu-item>
+          <!--
+                    <el-submenu v-permission="['test_manager','test_user','test_viewer']"
+                                index="6" popper-class="submenu">
+                      <template v-slot:title>{{ $t('test_track.case.test_case') }}</template>
+                      <ms-recent-list ref="caseRecent" :options="caseRecent"/>
+                      <el-divider/>
+                      <ms-show-all :index="'/track/case/all'"/>
+                      <el-menu-item :index="testCaseEditPath" class="blank_item"></el-menu-item>
+                      <el-menu-item :index="testCaseProjectPath" class="blank_item"></el-menu-item>
+                      <ms-create-button v-permission="['test_manager','test_user']" :index="'/track/case/create'"
+                                        :title="$t('test_track.case.create_case')"/>
+                    </el-submenu>
+          -->
 
           <el-submenu v-permission="['test_manager','test_user','test_viewer']"
                       index="8" popper-class="submenu">

From 14ba48c95be270e1c12982a81775e49f4c3bd541 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 23 Mar 2021 11:24:04 +0800
Subject: [PATCH 19/35] =?UTF-8?q?fix:=E5=85=B3=E8=81=94=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=82=B9=E5=87=BB=E8=A1=8C=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 0abba4cb81..f90c472cb5 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -439,6 +439,14 @@ export default {
     if (this.type === 'edit' || this.type === 'copy') {
       this.open(this.currentTestCaseInfo)
     }
+    // Cascader 级联选择器: 点击文本就让它自动点击前面的input就可以触发选择。
+    setInterval(function () {
+      document.querySelectorAll('.el-cascader-node__label').forEach(el => {
+        el.onclick = function () {
+          if (this.previousElementSibling) this.previousElementSibling.click();
+        };
+      });
+    }, 1000);
   },
   watch: {
     treeNodes() {

From 39f48e35830be05d5db384204bdc2993d962d076 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 11:40:52 +0800
Subject: [PATCH 20/35] =?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=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/base/mapper/ext/ExtTestCaseMapper.xml  |  5 ++++-
 .../track/request/testcase/QueryTestCaseRequest.java   |  2 ++
 .../io/metersphere/track/service/TestCaseService.java  | 10 ++++++++--
 .../components/track/case/components/TestCaseList.vue  |  4 ++++
 .../track/home/components/RelevanceCaseCard.vue        |  2 +-
 5 files changed, 19 insertions(+), 4 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 22a4d71d62..82948829e2 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,9 +306,12 @@
                 or test_case.num like CONCAT('%', #{request.name},'%')
                 or test_case.tags like CONCAT('%', #{request.name},'%'))
             </if>
-            <if test="request.createTime >0">
+            <if test="request.relevanceCreateTime >0">
                 and test_case.id in (select test_case_id from test_case_test where test_case_test.create_time >= #{request.createTime})
             </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=")">
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 e024a581b0..69cbe332a8 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
@@ -24,8 +24,10 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
     private String reviewId;
 
     private boolean isSelectThisWeedData = false;
+    private boolean isSelectThisWeedRelevanceData = false;
 
     private String caseCoverage;
 
     private long createTime = 0;
+    private long relevanceCreateTime = 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 4956b8c653..958c40d87a 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -210,13 +210,19 @@ public class TestCaseService {
      */
     private void initRequest(QueryTestCaseRequest request, boolean checkThisWeekData) {
         if (checkThisWeekData) {
+            Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
+            Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
             if (request.isSelectThisWeedData()) {
-                Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
-                Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
                 if (weekFirstTime != null) {
                     request.setCreateTime(weekFirstTime.getTime());
                 }
             }
+            if (request.isSelectThisWeedRelevanceData()) {
+                if (weekFirstTime != null) {
+                    request.setRelevanceCreateTime(weekFirstTime.getTime());
+                }
+            }
+
         }
     }
 
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 3c767df70e..46d95aecf2 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -409,11 +409,15 @@ export default {
     getData() {
       this.getSelectDataRange();
       this.condition.selectThisWeedData = false;
+      this.condition.selectThisWeedRelevanceData = false;
       this.condition.caseCoverage = null;
       switch (this.selectDataRange) {
         case 'thisWeekCount':
           this.condition.selectThisWeedData = true;
           break;
+        case 'thisWeekRelevanceCount':
+          this.condition.selectThisWeedRelevanceData = true;
+          break;
         case 'uncoverage':
           this.condition.caseCoverage = 'uncoverage';
           break;
diff --git a/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue b/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue
index be96f80db9..12b2518244 100644
--- a/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue
+++ b/frontend/src/business/components/track/home/components/RelevanceCaseCard.vue
@@ -40,7 +40,7 @@
         <el-row>
           <el-col>
             {{$t('api_test.home_page.api_details_card.this_week_add')}}
-            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{relevanceCountData.thisWeekAddedCount}}
+            <el-link type="info" @click="redirectPage('thisWeekRelevanceCount')" target="_blank" style="color: #000000">{{relevanceCountData.thisWeekAddedCount}}
             </el-link>
             {{$t('api_test.home_page.unit_of_measurement')}}
           </el-col>

From 1be8ab1cac18faf10addf09ea8a6916c9aa423ae Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 13:54:04 +0800
Subject: [PATCH 21/35] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96,=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20=E5=9B=9E?=
 =?UTF-8?q?=E6=94=B6=E7=AB=99=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiAutomationController.java   |  4 +--
 .../controller/ApiDefinitionController.java   |  4 +--
 .../api/service/ApiAutomationService.java     |  9 ++-----
 .../api/service/ApiDefinitionService.java     | 26 ++++++++-----------
 .../automation/scenario/ApiScenarioList.vue   | 20 ++++++++++----
 .../scenario/component/ApiComponent.vue       |  1 -
 .../definition/components/list/ApiList.vue    | 21 ++++++++++-----
 .../track/case/components/ShowMoreBtn.vue     |  5 ++++
 frontend/src/business/components/xpack        |  2 +-
 9 files changed, 52 insertions(+), 40 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 76084eb565..4e91455ace 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -80,8 +80,8 @@ public class ApiAutomationController {
     }
 
     @PostMapping("/reduction")
-    public void reduction(@RequestBody List<SaveApiScenarioRequest> requests) {
-        apiAutomationService.reduction(requests);
+    public void reduction(@RequestBody List<String> ids) {
+        apiAutomationService.reduction(ids);
     }
 
     @GetMapping("/getApiScenario/{id}")
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 6fca4e8cb6..879ce0f3e0 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -128,8 +128,8 @@ public class ApiDefinitionController {
     }
 
     @PostMapping("/reduction")
-    public void reduction(@RequestBody List<SaveApiDefinitionRequest> requests) {
-        apiDefinitionService.reduction(requests);
+    public void reduction(@RequestBody ApiBatchRequest request) {
+        apiDefinitionService.reduction(request);
     }
 
     @GetMapping("/get/{id}")
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 4b4abebdb6..a1398d86eb 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -316,13 +316,8 @@ public class ApiAutomationService {
         }
     }
 
-    public void reduction(List<SaveApiScenarioRequest> requests) {
-        List<String> apiIds = new ArrayList<>();
-        requests.forEach(item -> {
-            checkNameExist(item);
-            apiIds.add(item.getId());
-        });
-        extApiScenarioMapper.reduction(apiIds);
+    public void reduction(List<String> ids) {
+        extApiScenarioMapper.reduction(ids);
     }
 
     private void checkNameExist(SaveApiScenarioRequest request) {
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 52bafba745..1980bbe42c 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -136,10 +136,11 @@ public class ApiDefinitionService {
     public ApiDefinitionWithBLOBs getBLOBs(String id) {
         return apiDefinitionMapper.selectByPrimaryKey(id);
     }
+
     public List<ApiDefinitionWithBLOBs> getBLOBs(List<String> idList) {
-        if(idList == null || idList.isEmpty()){
-            return  new ArrayList<>(0);
-        }else{
+        if (idList == null || idList.isEmpty()) {
+            return new ArrayList<>(0);
+        } else {
             ApiDefinitionExample example = new ApiDefinitionExample();
             example.createCriteria().andIdIn(idList);
             example.setOrderByClause("create_time DESC ");
@@ -189,13 +190,8 @@ public class ApiDefinitionService {
         extApiDefinitionMapper.removeToGc(apiIds);
     }
 
-    public void reduction(List<SaveApiDefinitionRequest> requests) {
-        List<String> apiIds = new ArrayList<>();
-        requests.forEach(item -> {
-            checkNameExist(item);
-            apiIds.add(item.getId());
-        });
-        extApiDefinitionMapper.reduction(apiIds);
+    public void reduction(ApiBatchRequest request) {
+        extApiDefinitionMapper.reduction(request.getIds());
     }
 
     public void deleteBodyFiles(String apiId) {
@@ -243,7 +239,7 @@ public class ApiDefinitionService {
 
     private ApiDefinition updateTest(SaveApiDefinitionRequest request) {
         checkNameExist(request);
-        if(StringUtils.equals(request.getMethod(),"ESB")){
+        if (StringUtils.equals(request.getMethod(), "ESB")) {
             //ESB的接口类型数据，采用TCP方式去发送。并将方法类型改为TCP。 并修改发送数据
             request = esbApiParamService.handleEsbRequest(request);
         }
@@ -272,7 +268,7 @@ public class ApiDefinitionService {
 
     private ApiDefinition createTest(SaveApiDefinitionRequest request) {
         checkNameExist(request);
-        if(StringUtils.equals(request.getMethod(),"ESB")){
+        if (StringUtils.equals(request.getMethod(), "ESB")) {
             //ESB的接口类型数据，采用TCP方式去发送。并将方法类型改为TCP。 并修改发送数据
             request = esbApiParamService.handleEsbRequest(request);
         }
@@ -709,6 +705,7 @@ 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);
@@ -740,7 +737,7 @@ public class ApiDefinitionService {
                     res.setCaseStatus("-");
                 }
 
-                if(StringUtils.equals("ESB",res.getMethod())){
+                if (StringUtils.equals("ESB", res.getMethod())) {
                     esbApiParamService.handleApiEsbParams(res);
                 }
             }
@@ -827,8 +824,7 @@ public class ApiDefinitionService {
             ((MsApiExportResult) apiExportResult).setProtocol(request.getProtocol());
             ((MsApiExportResult) apiExportResult).setProjectId(request.getProjectId());
             ((MsApiExportResult) apiExportResult).setVersion(System.getenv("MS_VERSION"));
-        }
-        else { //  导出为 Swagger 格式
+        } else { //  导出为 Swagger 格式
             Swagger3Parser swagger3Parser = new Swagger3Parser();
             System.out.println(apiDefinitionMapper.selectByExampleWithBLOBs(example));
             apiExportResult = swagger3Parser.swagger3Export(apiDefinitionMapper.selectByExampleWithBLOBs(example));
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 0e1d859290..2b1e8df99a 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -24,7 +24,7 @@
 
         <el-table-column v-if="!referenced" width="30" min-width="30" :resizable="false" align="center">
           <template v-slot:default="scope">
-            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts" v-tester/>
+            <show-more-btn :is-show="scope.row.showMore" :buttons="trashEnable ? trashButtons: buttons" :size="selectDataCounts" v-tester/>
           </template>
         </el-table-column>
         <template v-for="(item, index) in tableLabel">
@@ -286,6 +286,12 @@
           {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
 
         ],
+        trashButtons: [
+          {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+          {
+            name: "批量恢复", handleClick: this.handleBatchRestore
+          },
+        ],
         isSelectAllDate: false,
         selectRows: new Set(),
         selectDataCounts: 0,
@@ -592,10 +598,14 @@
         this.$emit('edit', data);
       },
       reductionApi(row) {
-        row.scenarioDefinition = null;
-        row.tags = null;
-        let rows = [row];
-        this.$post("/api/automation/reduction", rows, response => {
+        this.$post("/api/automation/reduction", [row.id], response => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        })
+      },
+      handleBatchRestore() {
+        let ids = Array.from(this.selectRows).map(row => row.id);
+        this.$post("/api/automation/reduction", ids, response => {
           this.$success(this.$t('commons.save_success'));
           this.search();
         })
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 b5cf6df0fb..f3f63a773d 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -135,7 +135,6 @@
       }
       // 加载引用对象数据
       this.getApiInfo();
-      console.log(JSON.stringify(this.request));
       if (this.request.protocol === 'HTTP') {
         this.setUrl(this.request.url);
         this.setUrl(this.request.path);
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 4878c7275e..07d2a1d38f 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -28,7 +28,7 @@
         <el-table-column width="30" :resizable="false" align="center">
           <template v-slot:default="scope">
             <!-- 选中记录后浮现的按钮，提供对记录的批量操作 -->
-            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts" v-tester/>
+            <show-more-btn :is-show="scope.row.showMore" :buttons="trashEnable ? trashButtons : buttons" :size="selectDataCounts" v-tester/>
           </template>
         </el-table-column>
         <template v-for="(item, index) in tableLabel">
@@ -289,6 +289,12 @@
             name: this.$t('api_test.definition.request.batch_move'), handleClick: this.handleBatchMove
           }
         ],
+        trashButtons: [
+          {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+          {
+            name: "批量恢复", handleClick: this.handleBatchRestore
+          },
+        ],
         typeArr: [
           {id: 'status', name: this.$t('api_test.definition.api_status')},
           {id: 'method', name: this.$t('api_test.definition.api_type')},
@@ -564,17 +570,18 @@
       },
       reductionApi(row) {
         let tmp = JSON.parse(JSON.stringify(row));
-        tmp.request = null;
-        tmp.response = null;
-        if (tmp.tags instanceof Array) {
-          tmp.tags = JSON.stringify(tmp.tags);
-        }
-        let rows = [tmp];
+        let rows = {ids: [tmp.id]};
         this.$post('/api/definition/reduction/', rows, () => {
           this.$success(this.$t('commons.save_success'));
           this.search();
         });
       },
+      handleBatchRestore() {
+        this.$post('/api/definition/reduction/', buildBatchParam(this), () => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        });
+      },
       handleDeleteBatch() {
         if (this.trashEnable) {
           this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
diff --git a/frontend/src/business/components/track/case/components/ShowMoreBtn.vue b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
index 3a4a8b3b01..6bd401c7a3 100644
--- a/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
+++ b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
@@ -26,6 +26,11 @@
       row: Object,
       size: Number
     },
+    created() {
+      if (this.trashEnable) {
+        this.buttons.splice(1, 1);
+      }
+    },
     methods: {
       click(btn) {
         if (btn.handleClick instanceof Function) {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 3571feccf7..f63ebb68eb 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 3571feccf7c2bc68e4b619f6c367ac47d37c6723
+Subproject commit f63ebb68ebad78de42fd711f17e2671e34577a86

From b7fe6101ee131c928bb020f825a2d03b8de4eb55 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 14:11:48 +0800
Subject: [PATCH 22/35] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E6=81=A2=E5=A4=8D=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BE=8B=E4=B8=8D=E8=83=BD=E8=B7=9F=E7=9D=80?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/components/case/ApiCaseItem.vue  |  3 ++-
 .../definition/components/case/ApiCaseList.vue  | 17 +++++++----------
 2 files changed, 9 insertions(+), 11 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 5fe106ee77..3d73cbc088 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -230,7 +230,8 @@
         }
         data.message = true;
         data.request.useEnvironment = this.environment;
-        this.saveTestCase(data);
+        //this.saveTestCase(data);
+
         this.$emit('singleRun', data);
       },
       copyCase(data) {
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 9d70e77bd7..b9099856e1 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,7 @@
           }
 
           this.result = this.$post("/api/testcase/list", this.condition, response => {
-            if(response.data){
+            if (response.data) {
               this.apiCaseList = response.data;
             }
             this.apiCaseList.forEach(apiCase => {
@@ -260,7 +260,7 @@
           if (!request.hashTree) {
             request.hashTree = [];
           }
-          if(request.backScript != null){
+          if (request.backScript != null) {
             request.hashTree.push(request.backScript);
           }
           let uuid = getUUID();
@@ -290,14 +290,11 @@
         this.singleLoading = true;
         this.singleRunId = row.id;
         row.request.name = row.id;
-        this.$get('/api/definition/get/' + row.request.id, response => {
-          row.request.path = response.data.path;  //  取的path是对应接口的path，因此查库以获得
-          row.request.useEnvironment = this.environment;
-          row.request.projectId = getCurrentProjectID();
-          this.runData.push(row.request);
-          /*触发执行操作*/
-          this.reportId = getUUID().substring(0, 8);
-        });
+        row.request.useEnvironment = this.environment;
+        row.request.projectId = getCurrentProjectID();
+        this.runData.push(row.request);
+        /*触发执行操作*/
+        this.reportId = getUUID().substring(0, 8);
       },
 
       batchRun() {

From dc2f3cc092687e3c1e6e10f5f136a1aba3719c3d Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 23 Mar 2021 14:15:59 +0800
Subject: [PATCH 23/35] =?UTF-8?q?fix:=E8=A1=A8=E5=A4=B4=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/common/head/HeaderCustom.vue   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index d13351763c..98b3641546 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -52,10 +52,7 @@ export default {
           this.defaultCheckedKeys.push(i.id)
         }
       )
-      console.log(this.defaultCheckedKeys)
-      console.log(this.optionalFields)
-      console.log(this.fieldSelected)
-
+      this.fieldSelected = items;
     },
     saveHeader() {
       let param = {
@@ -67,8 +64,8 @@ export default {
         console.log(this.optionalFields)
         console.log(this.fieldSelected)
         this.$success(this.$t("commons.save_success"));
-        this.dialogTableVisible = false
         this.initTableData()
+        this.close();
       })
     },
     removeAt(idx) {

From a072f3992d1260f21cedf56e5fdf0ba705bf656f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 14:39:31 +0800
Subject: [PATCH 24/35] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92)?=
 =?UTF-8?q?:=20=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=9C=AA=E5=8C=85=E5=90=AB=E9=98=BB=E5=A1=9E=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/domain/ReportFailureAdvanceResultComponent.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/domain/ReportFailureAdvanceResultComponent.java b/backend/src/main/java/io/metersphere/track/domain/ReportFailureAdvanceResultComponent.java
index 6ab3b4a1e4..59a908f2e8 100644
--- a/backend/src/main/java/io/metersphere/track/domain/ReportFailureAdvanceResultComponent.java
+++ b/backend/src/main/java/io/metersphere/track/domain/ReportFailureAdvanceResultComponent.java
@@ -23,7 +23,8 @@ public class ReportFailureAdvanceResultComponent extends ReportComponent {
 
     @Override
     public void readRecord(TestPlanCaseDTO testCase) {
-        if (StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Failure.name())) {
+        if (StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Failure.name()) ||
+            StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Blocking.name())) {
             this.functionalTestCases.add(testCase);
         }
     }

From e9e73f87d3108a0e8324e50020911a90621ab456 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 23 Mar 2021 14:50:22 +0800
Subject: [PATCH 25/35] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=BF=87=E6=9D=A5=E7=9A=84=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/case/components/TestCaseEdit.vue        | 2 --
 .../track/plan/view/comonents/api/TestPlanApiCaseList.vue    | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index f90c472cb5..6534d3d646 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -682,8 +682,6 @@ export default {
               }
               this.dialogFormVisible = false;
               this.$emit("refresh");
-              // 发送广播，刷新 head 上的最新列表
-              TrackEvent.$emit(LIST_CHANGE);
             });
           }
         } else {
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 370799ede6..9e2d5bfde2 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
@@ -453,15 +453,12 @@ export default {
       this.initTable();
     },
     singleRun(row) {
-      if (!row.environmentId) {
-        this.$warning(this.$t('api_test.environment.select_environment'));
-        return;
-      }
       this.runData = [];
 
       this.rowLoading = row.id;
 
       this.$get('/api/testcase/get/' + row.caseId, (response) => {
+        console.log(response.data)
         let apiCase = response.data;
         let request = JSON.parse(apiCase.request);
         request.name = row.id;

From 27f9f34be3a775813139e9c9262a48bc4fb19b3c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 15:06:57 +0800
Subject: [PATCH 26/35] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=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/ApiDefinitionController.java   | 20 +++++++---
 .../dto/definition/ApiTestBatchRequest.java   |  3 ++
 .../api/service/ApiTestCaseService.java       | 37 +++++++++++++-----
 .../components/case/ApiCaseList.vue           | 38 +++++++++++--------
 4 files changed, 67 insertions(+), 31 deletions(-)

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 879ce0f3e0..54ec106dbc 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -63,6 +63,7 @@ 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);
@@ -103,7 +104,7 @@ public class ApiDefinitionController {
 
     @PostMapping(value = "/updateEsbRequest")
     public SaveApiDefinitionRequest updateEsbRequest(@RequestBody SaveApiDefinitionRequest request) {
-        if(StringUtils.equals(request.getMethod(),"ESB")){
+        if (StringUtils.equals(request.getMethod(), "ESB")) {
             //ESB的接口类型数据，采用TCP方式去发送。并将方法类型改为TCP。 并修改发送数据
             request = esbApiParamService.updateEsbRequest(request);
         }
@@ -180,15 +181,18 @@ public class ApiDefinitionController {
     public void createSchedule(@RequestBody ScheduleRequest request) throws MalformedURLException {
         apiDefinitionService.createSchedule(request);
     }
+
     @PostMapping(value = "/schedule/update")
-    public void updateSchedule(@RequestBody Schedule request){
+    public void updateSchedule(@RequestBody Schedule request) {
         apiDefinitionService.updateSchedule(request);
     }
+
     //查找定时任务资源Id
     @PostMapping(value = "/getResourceId")
-    public String getResourceId(@RequestBody SwaggerUrlRequest swaggerUrlRequest){
+    public String getResourceId(@RequestBody SwaggerUrlRequest swaggerUrlRequest) {
         return apiDefinitionService.getResourceId(swaggerUrlRequest);
     }
+
     //查找定时任务列表
     @GetMapping("/scheduleTask/{projectId}")
     public List<SwaggerTaskResult> getSwaggerScheduleList(@PathVariable String projectId) {
@@ -198,12 +202,13 @@ public class ApiDefinitionController {
                 resultList) {
             swaggerTaskResult.setIndex(dataIndex++);
             Date nextExecutionTime = CronUtils.getNextTriggerTime(swaggerTaskResult.getRule());
-            if(nextExecutionTime!=null){
+            if (nextExecutionTime != null) {
                 swaggerTaskResult.setNextExecutionTime(nextExecutionTime.getTime());
             }
         }
-        return  resultList;
+        return resultList;
     }
+
     //更新定时任务
     @PostMapping(value = "/schedule/updateByPrimyKey")
     public void updateScheduleEnableByPrimyKey(@RequestBody ScheduleInfoSwaggerUrlRequest request) {
@@ -211,11 +216,13 @@ public class ApiDefinitionController {
         schedule.setEnable(request.getTaskStatus());
         apiDefinitionService.updateSchedule(schedule);
     }
+
     //删除定时任务和swaggereUrl
     @PostMapping("/schedule/deleteByPrimyKey")
     public void deleteSchedule(@RequestBody ScheduleInfoSwaggerUrlRequest request) {
         apiDefinitionService.deleteSchedule(request);
     }
+
     @PostMapping("/getReference")
     public ReferenceDTO getReference(@RequestBody ApiScenarioRequest request) {
         return apiDefinitionService.getReference(request);
@@ -237,8 +244,9 @@ public class ApiDefinitionController {
     public void testPlanRelevance(@RequestBody ApiCaseRelevanceRequest request) {
         apiDefinitionService.testPlanRelevance(request);
     }
+
     @PostMapping("/relevance/review")
-    public void testCaseReviewRelevance(@RequestBody ApiCaseRelevanceRequest request){
+    public void testCaseReviewRelevance(@RequestBody ApiCaseRelevanceRequest request) {
         apiDefinitionService.testCaseReviewRelevance(request);
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestBatchRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestBatchRequest.java
index ab2788aae6..1e8791ce01 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestBatchRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestBatchRequest.java
@@ -40,4 +40,7 @@ public class ApiTestBatchRequest extends ApiTestCaseWithBLOBs {
     private String protocol;
 
     private String status;
+
+    private String envId;
+
 }
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 5ffa9ad8d5..2540a207c9 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -50,7 +50,7 @@ public class ApiTestCaseService {
     @Resource
     TestPlanMapper testPlanMapper;
     @Resource
-    TestCaseReviewMapper  testCaseReviewMapper;
+    TestCaseReviewMapper testCaseReviewMapper;
     @Resource
     private ApiTestCaseMapper apiTestCaseMapper;
     @Resource
@@ -82,12 +82,12 @@ public class ApiTestCaseService {
 
     public List<ApiTestCaseResult> list(ApiTestCaseRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
-        List<ApiTestCaseResult> returnList =  extApiTestCaseMapper.list(request);
+        List<ApiTestCaseResult> returnList = extApiTestCaseMapper.list(request);
 
         for (ApiTestCaseResult res : returnList) {
             esbApiParamService.handleApiEsbParams(res);
         }
-        return  returnList;
+        return returnList;
     }
 
     public List<ApiTestCaseDTO> listSimple(ApiTestCaseRequest request) {
@@ -230,7 +230,7 @@ public class ApiTestCaseService {
     private ApiTestCase updateTest(SaveApiTestCaseRequest request) {
         checkNameExist(request);
 
-        if(StringUtils.isNotEmpty(request.getEsbDataStruct())){
+        if (StringUtils.isNotEmpty(request.getEsbDataStruct())) {
             request = esbApiParamService.handleEsbRequest(request);
         }
 
@@ -253,7 +253,7 @@ public class ApiTestCaseService {
         request.setId(UUID.randomUUID().toString());
         checkNameExist(request);
 
-        if(StringUtils.isNotEmpty(request.getEsbDataStruct())||StringUtils.isNotEmpty(request.getBackEsbDataStruct())){
+        if (StringUtils.isNotEmpty(request.getEsbDataStruct()) || StringUtils.isNotEmpty(request.getBackEsbDataStruct())) {
             request = esbApiParamService.handleEsbRequest(request);
         }
 
@@ -332,7 +332,8 @@ public class ApiTestCaseService {
         List<ApiTestCase> apiTestCases = apiTestCaseMapper.selectByExample(example);
         relevance(apiTestCases, request);
     }
-    public void relevanceByApiByReview(ApiCaseRelevanceRequest request){
+
+    public void relevanceByApiByReview(ApiCaseRelevanceRequest request) {
         List<String> ids = request.getSelectIds();
         if (CollectionUtils.isEmpty(ids)) {
             return;
@@ -342,6 +343,7 @@ public class ApiTestCaseService {
         List<ApiTestCase> apiTestCases = apiTestCaseMapper.selectByExample(example);
         relevanceByReview(apiTestCases, request);
     }
+
     public void relevanceByCase(ApiCaseRelevanceRequest request) {
         List<String> ids = request.getSelectIds();
         if (CollectionUtils.isEmpty(ids)) {
@@ -391,7 +393,7 @@ public class ApiTestCaseService {
             TestCaseReviewApiCase.setUpdateTime(System.currentTimeMillis());
             batchMapper.insertIfNotExists(TestCaseReviewApiCase);
         });
-        TestCaseReview  testCaseReview=testCaseReviewMapper.selectByPrimaryKey(request.getReviewId());
+        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());
@@ -399,11 +401,13 @@ public class ApiTestCaseService {
         }
         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<String> selectIdsNotExistsInReview(String projectId, String reviewId) {
+        return extApiTestCaseMapper.selectIdsNotExistsInReview(projectId, reviewId);
     }
 
     public List<ApiDataCountResult> countProtocolByProjectID(String projectId) {
@@ -497,7 +501,22 @@ public class ApiTestCaseService {
             sqlSession.flushStatements();
 
         }
+        if (StringUtils.isNotEmpty(request.getEnvId())) {
+            List<ApiTestCaseWithBLOBs> bloBs = apiTestCaseMapper.selectByExampleWithBLOBs(apiDefinitionExample);
+            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+            ApiTestCaseMapper batchMapper = sqlSession.getMapper(ApiTestCaseMapper.class);
 
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            bloBs.forEach(apiTestCase -> {
+                JSONObject req = JSON.parseObject(apiTestCase.getRequest());
+                req.put("useEnvironment", request.getEnvId());
+                String requestStr = JSON.toJSONString(req);
+                apiTestCase.setRequest(requestStr);
+                batchMapper.updateByPrimaryKeySelective(apiTestCase);
+            });
+            sqlSession.flushStatements();
+        }
     }
 
     private List<String> getAllApiCaseIdsByFontedSelect(Map<String, List<String>> filters, List<String> moduleIds, String name, String projectId, String protocol, List<String> unSelectIds, String status) {
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 b9099856e1..d7efb5be4d 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -181,7 +181,7 @@
         this.visible = false;
       },
 
-      runRefresh(data) {
+      runRefresh() {
         this.batchLoadingIds = [];
         this.singleLoading = false;
         this.singleRunId = "";
@@ -192,12 +192,9 @@
             this.$set(item, 'selected', false);
           })
         }
-        // 更新最后一条的环境
-        let cases = this.apiCaseList[0];
-        cases.request.useEnvironment = this.environment;
-        cases.message = true;
-        this.$refs.apiCaseItem[0].saveCase(cases);
-        this.refresh();
+        // 批量更新最后执行环境
+        let obj = {envId: this.environment, show: true};
+        this.batchEdit(obj);
         this.$success(this.$t('organization.integration.successful_operation'));
       },
 
@@ -286,6 +283,8 @@
           this.$warning(this.$t('api_test.environment.select_environment'));
           return;
         }
+        this.selectdCases = [];
+        this.selectdCases.push(row.id);
         this.runData = [];
         this.singleLoading = true;
         this.singleRunId = row.id;
@@ -304,6 +303,7 @@
         }
         this.runData = [];
         this.batchLoadingIds = [];
+        this.selectdCases = [];
         if (this.apiCaseList.length > 0) {
           this.apiCaseList.forEach(item => {
             if (item.selected && item.id) {
@@ -311,6 +311,7 @@
               item.request.useEnvironment = this.environment;
               this.runData.push(item.request);
               this.batchLoadingIds.push(item.id);
+              this.selectdCases.push(item.id);
             }
           })
           if (this.runData.length > 0) {
@@ -350,17 +351,22 @@
       },
       batchEdit(form) {
         let param = {};
-        param[form.type] = form.value;
-        param.ids = this.selectdCases;
-        param.projectId = getCurrentProjectID();
-        if (this.api) {
-          param.protocol = this.api.protocol;
+        if (form) {
+          param[form.type] = form.value;
+          param.ids = this.selectdCases;
+          param.projectId = getCurrentProjectID();
+          param.envId = form.envId;
+          if (this.api) {
+            param.protocol = this.api.protocol;
+          }
+          param.selectAllDate = this.isSelectAllDate;
+          param.unSelectIds = this.unSelection;
+          param = Object.assign(param, this.condition);
         }
-        param.selectAllDate = this.isSelectAllDate;
-        param.unSelectIds = this.unSelection;
-        param = Object.assign(param, this.condition);
         this.$post('/api/testcase/batch/editByParam', param, () => {
-          this.$success(this.$t('commons.save_success'));
+          if (!form.show) {
+            this.$success(this.$t('commons.save_success'));
+          }
           this.selectdCases = [];
           this.getApiTest();
         });

From a92b750ae7910e195ac049c5d72773a5a6789afc Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Tue, 23 Mar 2021 15:08:00 +0800
Subject: [PATCH 27/35] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=87=E7=AD=BE=E5=88=97=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/scenario/ApiScenarioList.vue      | 2 +-
 .../api/definition/components/list/ApiCaseSimpleList.vue        | 2 +-
 .../components/api/definition/components/list/ApiList.vue       | 2 +-
 .../components/performance/test/components/ExistScenarios.vue   | 2 +-
 .../business/components/track/case/components/TestCaseList.vue  | 2 +-
 .../business/components/track/plan/components/TestPlanList.vue  | 2 +-
 .../track/plan/view/comonents/api/RelevanceScenarioList.vue     | 2 +-
 .../track/plan/view/comonents/api/TestPlanApiCaseList.vue       | 2 +-
 .../track/plan/view/comonents/api/TestPlanApiScenarioList.vue   | 2 +-
 .../TemplateComponent/component/ScenarioFailureCasesList.vue    | 2 +-
 .../components/track/review/components/TestCaseReviewList.vue   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 2b1e8df99a..84aa1151ee 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -69,7 +69,7 @@
           <el-table-column v-if="item.id == 'tags'" prop="tags" min-width="120px"
                            :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" :show-tooltip="true" tooltip style="margin-left: 5px"/>
+              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" :show-tooltip="true" tooltip style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
           <el-table-column v-if="item.id == 'userId'" prop="userId" min-width="120px"
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 07576e28e7..f5ad30f686 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -71,7 +71,7 @@
           <el-table-column v-if="item.id=='tags'" prop="tags" min-width="120px" :label="$t('commons.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  v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
 
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 07d2a1d38f..eaa6104b6d 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -116,7 +116,7 @@
             min-width="120px"
             :key="index">
             <template v-slot:default="scope">
-              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="true" :content="itemName" style="margin-left: 5px"/>
+              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="true" :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
 
diff --git a/frontend/src/business/components/performance/test/components/ExistScenarios.vue b/frontend/src/business/components/performance/test/components/ExistScenarios.vue
index 8b6c058279..ff33ff2a5b 100644
--- a/frontend/src/business/components/performance/test/components/ExistScenarios.vue
+++ b/frontend/src/business/components/performance/test/components/ExistScenarios.vue
@@ -22,7 +22,7 @@
                        :label="$t('api_test.automation.tag')">
         <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"/>
+                  style="margin-left: 0px; margin-right: 2px"/>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 46d95aecf2..af835039b4 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -131,7 +131,7 @@
           <el-table-column v-if="item.id=='tags'" prop="tags" :label="$t('commons.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"/>
+                      :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
 
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index cd19db1a97..872be37362 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -96,7 +96,7 @@
                          :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>
+                    :content="itemName" style="margin-left: 0px; margin-right: 2px"></ms-tag>
           </template>
         </el-table-column>
         <el-table-column
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 fd34dc24e3..1ca672c50c 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
@@ -31,7 +31,7 @@
         </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"/>
+              <ms-tag v-for="itemName in scope.row.tags" :key="itemName" type="success" effect="plain" :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
           </template>
         </el-table-column>
         <el-table-column prop="userId" :label="$t('api_test.automation.creator')" show-overflow-tooltip/>
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 9e2d5bfde2..af559f4c91 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
@@ -80,7 +80,7 @@
             :label="$t('commons.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 v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
 
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 3a7f032486..ace6c4148a 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
@@ -38,7 +38,7 @@
                            width="200px" :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"/>
+                      :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
           <el-table-column v-if="item.id == 'userId'" prop="userId" :label="$t('api_test.automation.creator')"
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue
index f9430218bf..742ea67c3f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue
@@ -20,7 +20,7 @@
 
       <el-table-column prop="tags" :label="$t('api_test.automation.tag')" width="200px">
         <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 v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
         </template>
       </el-table-column>
 
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 4824621c36..9908e46940 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -62,7 +62,7 @@
                          :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>
+                    :content="itemName" style="margin-left: 0px; margin-right: 2px"></ms-tag>
           </template>
         </el-table-column>
         <el-table-column

From 89dc94fac596dbf13922737ccac16cce16768f27 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 15:31:23 +0800
Subject: [PATCH 28/35] =?UTF-8?q?style:=20=E7=BB=9F=E4=B8=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/maximize/ScenarioHeader.vue    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 ece7f487cd..0f47956682 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -23,7 +23,7 @@
 
       <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"/>
+      <font-awesome-icon class="ms-alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="unFullScreen"/>
       ｜
       <i class="el-icon-close alt-ico-close" @click="close"/>
     </div>
@@ -124,14 +124,12 @@
 
   .ms-header-right {
     float: right;
+    width: 420px;
     margin-top: 2px;
-    position: fixed;
-    right: 20px;
     z-index: 1;
-
   }
 
-  .alt-ico {
+  .ms-alt-ico {
     font-size: 16px;
     margin: 10px 10px 0px;
   }
@@ -146,7 +144,7 @@
     cursor: pointer;
   }
 
-  .alt-ico:hover {
+  .ms-alt-ico:hover {
     color: black;
     cursor: pointer;
   }

From b6c550bb2afb32382d14d43a911479dc595bb9fa Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 15:32:02 +0800
Subject: [PATCH 29/35] =?UTF-8?q?style:=20=E7=BB=9F=E4=B8=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=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 f63ebb68eb..bc5735a2eb 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f63ebb68ebad78de42fd711f17e2671e34577a86
+Subproject commit bc5735a2eb796640bde400ae6cafca6229672905

From 4b7933a85d8b8b9c926fc773e95c40cc02f21512 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 23 Mar 2021 15:49:24 +0800
Subject: [PATCH 30/35] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84vuex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/head/ApiHeaderMenus.vue    | 23 +++---
 .../components/common/head/HeaderTopMenus.vue | 11 ++-
 .../components/common/head/HeaderUser.vue     | 16 +++--
 .../components/common/head/SearchList.vue     |  9 ++-
 .../performance/test/EditPerformanceTest.vue  |  2 +-
 .../components/track/home/TrackHome.vue       |  4 +-
 frontend/src/business/main.js                 |  2 +-
 frontend/src/business/store.js                | 72 -------------------
 frontend/src/store/actions.js                 |  6 ++
 frontend/src/store/getters.js                 |  6 ++
 frontend/src/store/index.js                   | 25 +++++++
 frontend/src/store/mutations.js               |  9 +++
 12 files changed, 90 insertions(+), 95 deletions(-)
 delete mode 100644 frontend/src/business/store.js
 create mode 100644 frontend/src/store/actions.js
 create mode 100644 frontend/src/store/getters.js
 create mode 100644 frontend/src/store/index.js
 create mode 100644 frontend/src/store/mutations.js

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 982ecc1960..68275d6e10 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -5,26 +5,26 @@
       <el-col :span="14">
         <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router :default-active='$route.path'>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/home'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
-          <el-menu-item v-show="$store.state.switch.value=='old'" :index="'/api/home_obsolete'">
+          <el-menu-item v-show="isOldVersion" :index="'/api/home_obsolete'">
             {{ $t("i18n.home") }}
           </el-menu-item>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/definition'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/definition'">
             {{ $t("i18n.definition") }}
           </el-menu-item>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/automation'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/automation'">
             {{ $t("i18n.automation") }}
           </el-menu-item>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/automation/report'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/automation/report'">
             {{ $t("i18n.report") }}
           </el-menu-item>
 
-          <el-submenu v-show="$store.state.switch.value=='old'"
+          <el-submenu v-show="isOldVersion"
                       v-permission="['test_manager','test_user','test_viewer']" index="4">
             <template v-slot:title>{{ $t('commons.test') }}</template>
             <ms-recent-list ref="testRecent" :options="testRecent"/>
@@ -35,7 +35,7 @@
                               :title="$t('load_test.create')"/>
           </el-submenu>
 
-          <el-submenu v-show="$store.state.switch.value=='old'"
+          <el-submenu v-show="isOldVersion"
                       v-permission="['test_manager','test_user','test_viewer']" index="5">
             <template v-slot:title>{{ $t('commons.report') }}</template>
             <ms-recent-list ref="reportRecent" :options="reportRecent"/>
@@ -44,7 +44,7 @@
           </el-submenu>
 
 
-          <el-menu-item v-show="$store.state.switch.value=='old'"
+          <el-menu-item v-show="isOldVersion"
                         v-permission="['test_manager','test_user','test_viewer']" :index="'/api/monitor/view'">
             {{ $t('commons.monitor') }}
           </el-menu-item>
@@ -64,6 +64,7 @@ import MsCreateTest from "../../common/head/CreateTest";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
 import SearchList from "@/business/components/common/head/SearchList";
 import ProjectChange from "@/business/components/common/head/ProjectSwitch";
+import {mapGetters} from "vuex";
 
 export default {
   name: "MsApiHeaderMenus",
@@ -94,6 +95,12 @@ export default {
       currentProject: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'isNewVersion',
+      'isOldVersion',
+    ])
+  },
   methods: {
     registerEvents() {
       ApiEvent.$on(LIST_CHANGE, () => {
diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index 7f2cc6056c..8d559d0e94 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -30,6 +30,7 @@
 
 <script>
   import {LicenseKey} from '@/common/js/constants';
+  import {mapGetters} from "vuex";
 
   const requireContext = require.context('@/business/components/xpack/', true, /router\.js$/)
   const report = requireContext.keys().map(key => requireContext(key).report);
@@ -62,15 +63,21 @@
         this.isReport = false;
       }
     },
+    computed: {
+      ...mapGetters([
+        'isNewVersion',
+        'isOldVersion',
+      ])
+    },
     methods: {
       handleSelect(index) {
         this.activeIndex = index
       },
       active() {
         if (this.activeIndex === '/api') {
-          if (this.$store.state.switch.value == 'new') {
+          if (this.isNewVersion) {
             window.location.href = "/#/api/home";
-          } else if (this.$store.state.switch.value == 'old') {
+          } else if (this.isOldVersion) {
             window.location.href = "/#/api/home_obsolete";
           }
         }
diff --git a/frontend/src/business/components/common/head/HeaderUser.vue b/frontend/src/business/components/common/head/HeaderUser.vue
index bd17eb32a4..59fb5744f8 100644
--- a/frontend/src/business/components/common/head/HeaderUser.vue
+++ b/frontend/src/business/components/common/head/HeaderUser.vue
@@ -9,10 +9,10 @@
         <el-dropdown-item command="about">{{ $t('commons.about_us') }} <i class="el-icon-info"/></el-dropdown-item>
         <el-dropdown-item command="help">{{ $t('commons.help_documentation') }}</el-dropdown-item>
         <el-dropdown-item command="ApiHelp">{{ $t('commons.api_help_documentation') }}</el-dropdown-item>
-        <el-dropdown-item command="old" v-show=isReadOnly @click.native="changeBar('old')">
+        <el-dropdown-item command="old" v-show=isNewVersion @click.native="changeBar('old')">
           {{ $t('commons.cut_back_old_version') }}
         </el-dropdown-item>
-        <el-dropdown-item command="new" v-show=!isReadOnly @click.native="changeBar('new')">
+        <el-dropdown-item command="new" v-show=isOldVersion @click.native="changeBar('new')">
           {{ $t('commons.cut_back_new_version') }}
         </el-dropdown-item>
         <el-dropdown-item command="logout">{{ $t('commons.exit_system') }}</el-dropdown-item>
@@ -27,6 +27,7 @@
 import {getCurrentUser} from "@/common/js/utils";
 import AboutUs from "./AboutUs";
 import axios from "axios";
+import {mapGetters} from "vuex";
 
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const auth = requireComponent.keys().length > 0 ? requireComponent("./auth/Auth.vue") : {};
@@ -36,13 +37,16 @@ export default {
   components: {AboutUs},
   data() {
     return {
-      isReadOnly: this.$store.state.isReadOnly.flag
     }
   },
   computed: {
     currentUser: () => {
       return getCurrentUser();
-    }
+    },
+    ...mapGetters([
+      'isNewVersion',
+      'isOldVersion',
+    ])
   },
   methods: {
     logout: function () {
@@ -79,9 +83,7 @@ export default {
       }
     },
     changeBar(item) {
-      this.isReadOnly = !this.isReadOnly
-      this.$store.commit('setFlag', this.isReadOnly);
-      this.$store.commit('setValue', item);
+      this.$store.commit('setVersionSwitch', item);
       if (item == "old") {
         window.location.href = "/#/api/home_obsolete";
       } else {
diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index ec087a2819..d15819eb9a 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -28,6 +28,7 @@
 <script>
 import {getCurrentProjectID, getCurrentUser, hasRoles} from "@/common/js/utils";
 import {PROJECT_ID, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "@/common/js/constants";
+import {mapGetters} from "vuex";
 
 export default {
   name: "SearchList",
@@ -39,6 +40,10 @@ export default {
     this.init();
   },
   computed: {
+    ...mapGetters([
+      'isNewVersion',
+      'isOldVersion',
+    ]),
     currentProjectId() {
       return localStorage.getItem(PROJECT_ID)
     }
@@ -106,9 +111,9 @@ export default {
         localStorage.setItem(PROJECT_ID, projectId);
         let path = this.$route.matched[0].path ? this.$route.matched[0].path : '/';
         if (path === '/api') {
-          if (this.$store.state.switch.value === 'new') {
+          if (this.isNewVersion) {
             path = "/api/home";
-          } else if (this.$store.state.switch.value === 'old') {
+          } else if (this.isOldVersion) {
             path = "/api/home_obsolete";
           } else {
             path = '/';
diff --git a/frontend/src/business/components/performance/test/EditPerformanceTest.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
index 97596ac98e..c4fe35f1dc 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTest.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
@@ -123,7 +123,7 @@ export default {
   },
   methods: {
     importAPITest() {
-      let apiTest = this.$store.state.api.test;
+      let apiTest = this.$store.state.test;
       if (apiTest && apiTest.name) {
         this.$set(this.test, "name", apiTest.name);
         let blob = new Blob([apiTest.jmx.xml], {type: "application/octet-stream"});
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index a978df9cea..206a2af82e 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -169,7 +169,7 @@ export default {
           type: 'bar',
           itemStyle: {
             normal: {
-              color: this.$store.state.theme.theme ? this.$store.state.theme.theme : COUNT_NUMBER
+              color: this.$store.state.theme ? this.$store.state.theme : COUNT_NUMBER
             }
           }
         },
@@ -179,7 +179,7 @@ export default {
             type: 'bar',
             itemStyle: {
               normal: {
-                color: this.$store.state.theme.theme ? this.$store.state.theme.theme : COUNT_NUMBER_SHALLOW
+                color: this.$store.state.theme ? this.$store.state.theme : COUNT_NUMBER_SHALLOW
               }
             }
           }]
diff --git a/frontend/src/business/main.js b/frontend/src/business/main.js
index 4d98b7cd4e..4fe1c4f6c3 100644
--- a/frontend/src/business/main.js
+++ b/frontend/src/business/main.js
@@ -10,7 +10,7 @@ import router from "./components/common/router/router";
 import YanProgress from 'yan-progress';
 import './permission' // permission control
 import i18n from "../i18n/i18n";
-import store from "./store";
+import store from "../store";
 import {permission, roles, tester, xpack} from './permission'
 import chart from "../common/js/chart";
 import CalendarHeatmap from "../common/js/calendar-heatmap";
diff --git a/frontend/src/business/store.js b/frontend/src/business/store.js
deleted file mode 100644
index 4fbb5d7f17..0000000000
--- a/frontend/src/business/store.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-
-Vue.use(Vuex);
-
-const Common = {
-  state: {
-    projectId: ""
-  },
-  mutations: {
-    setProjectId(state, projectId) {
-      state.projectId = projectId;
-    }
-  }
-}
-
-const API = {
-  state: {
-    test: {}
-  },
-  mutations: {
-    setTest(state, test) {
-      state.test = test;
-    },
-    clearTest(state) {
-      state.test = {};
-    }
-  }
-}
-
-const Switch = {
-  state: {
-    value: "new"
-  },
-  mutations: {
-    setValue(state, value) {
-      state.value = value;
-    }
-  }
-}
-
-const IsReadOnly = {
-  state: {
-    flag: true
-  },
-  mutations: {
-    setFlag(state, value) {
-      state.flag = value;
-    }
-  }
-}
-
-const Theme = {
-  state: {
-    theme: undefined
-  },
-  mutations: {
-    setTheme(state, value) {
-      state.theme = value;
-    }
-  }
-}
-
-export default new Vuex.Store({
-  modules: {
-    api: API,
-    common: Common,
-    switch: Switch,
-    isReadOnly: IsReadOnly,
-    theme: Theme
-  }
-})
diff --git a/frontend/src/store/actions.js b/frontend/src/store/actions.js
new file mode 100644
index 0000000000..97014f3a52
--- /dev/null
+++ b/frontend/src/store/actions.js
@@ -0,0 +1,6 @@
+const actions = {
+  // changeCount: ({
+  //   commit
+  // }) => commit('changeCount'),
+}
+export default actions;
diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js
new file mode 100644
index 0000000000..f0d2e0baab
--- /dev/null
+++ b/frontend/src/store/getters.js
@@ -0,0 +1,6 @@
+const getters = {
+  isNewVersion: state => state.versionSwitch === 'new',
+  isOldVersion: state => state.versionSwitch === 'old'
+}
+
+export default getters
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
new file mode 100644
index 0000000000..b3700caada
--- /dev/null
+++ b/frontend/src/store/index.js
@@ -0,0 +1,25 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import getters from './getters'
+import actions from './actions'
+import mutations from './mutations'
+
+Vue.use(Vuex)
+
+const state = {
+  projectId: "",
+  test: {},
+  versionSwitch: "new",
+  isReadOnly: true,
+  theme: undefined
+
+}
+
+const store = new Vuex.Store({
+  state,
+  getters,
+  actions,
+  mutations
+})
+
+export default store
diff --git a/frontend/src/store/mutations.js b/frontend/src/store/mutations.js
new file mode 100644
index 0000000000..a6f0a4a820
--- /dev/null
+++ b/frontend/src/store/mutations.js
@@ -0,0 +1,9 @@
+const mutations = {
+  setProjectId: (state, projectId) => state.projectId = projectId,
+  setTest: (state, test) => state.test = test,
+  clearTest: state => state.test = {},
+  setVersionSwitch: (state, value) => state.versionSwitch = value,
+  setTheme: (state, value) => state.theme = value
+}
+
+export default mutations;

From ed39f30328923edce72bd046545a12de8ec5cb2d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 23 Mar 2021 15:53:05 +0800
Subject: [PATCH 31/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0tags=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 e7b8089ea5..c7c1fed489 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -206,7 +206,7 @@ public class TestPlanService {
         }
         else {  //  有修改字段的调用，为保证将某些时间置null的情况，使用updateByPrimaryKey
             extScheduleMapper.updateNameByResourceID(testPlan.getId(), testPlan.getName());//   同步更新该测试的定时任务的name
-            i = testPlanMapper.updateByPrimaryKey(testPlan); //  更新
+            i = testPlanMapper.updateByPrimaryKeyWithBLOBs(testPlan); //  更新
         }
         if (!StringUtils.isBlank(testPlan.getStatus())) {
             BeanUtils.copyBean(testPlans, getTestPlan(testPlan.getId()));

From 8c965b2486517a9b85a154f2329cbc9525b39242 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 23 Mar 2021 15:56:33 +0800
Subject: [PATCH 32/35] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8shiro?=
 =?UTF-8?q?=E7=9A=84session=E8=BF=87=E6=9C=9F=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/security/CsrfFilter.java   | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/security/CsrfFilter.java b/backend/src/main/java/io/metersphere/security/CsrfFilter.java
index 66ef15689e..59442dc61d 100644
--- a/backend/src/main/java/io/metersphere/security/CsrfFilter.java
+++ b/backend/src/main/java/io/metersphere/security/CsrfFilter.java
@@ -7,7 +7,6 @@ import io.metersphere.commons.utils.SessionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.ExpiredCredentialsException;
 import org.apache.shiro.web.filter.authc.AnonymousFilter;
 import org.apache.shiro.web.util.WebUtils;
 import org.springframework.core.env.Environment;
@@ -42,12 +41,7 @@ public class CsrfFilter extends AnonymousFilter {
         // 请求头取出的token value
         String csrfToken = httpServletRequest.getHeader(TOKEN_NAME);
         // 校验 token
-        try {
-            validateToken(csrfToken);
-        } catch (ExpiredCredentialsException e) {
-            ((HttpServletResponse) response).setHeader("Authentication-Status", "invalid");
-            return true;
-        }
+        validateToken(csrfToken);
         // 校验 referer
         validateReferer(httpServletRequest);
         return true;
@@ -80,18 +74,6 @@ public class CsrfFilter extends AnonymousFilter {
         if (signatureArray.length != 3) {
             throw new RuntimeException("invalid token");
         }
-
-        long signatureTime;
-        try {
-            signatureTime = Long.parseLong(signatureArray[2]);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        Environment env = CommonBeanFactory.getBean(Environment.class);
-        long timeout = env.getProperty("session.timeout", Long.class, 43200L);
-        if (Math.abs(System.currentTimeMillis() - signatureTime) > timeout * 1000) {
-            throw new ExpiredCredentialsException("expired token");
-        }
         if (!StringUtils.equals(SessionUtils.getUserId(), signatureArray[0])) {
             throw new RuntimeException("Please check csrf token.");
         }

From e2285238d39699802f0901d02fe63fab92a4eed7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 23 Mar 2021 16:47:32 +0800
Subject: [PATCH 33/35] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=9B=E5=BB=BA=E5=88=B0=E5=85=B6=E4=BB=96=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/definition/ApiDefinition.vue  | 11 +++++------
 .../definition/components/basis/AddBasisApi.vue  | 12 ++++++++----
 .../components/basis/SetEnvironment.vue          |  8 ++++++--
 .../definition/components/case/ApiCaseList.vue   | 13 +++++++------
 .../definition/components/import/ApiImport.vue   |  8 +++++---
 .../components/list/ApiCaseSimpleList.vue        | 16 +++++++++-------
 .../api/definition/components/list/ApiList.vue   | 10 +++++++---
 .../definition/components/module/ApiModule.vue   |  8 ++++----
 .../components/module/ApiModuleHeader.vue        | 14 +++++++++-----
 .../components/common/head/SearchList.vue        |  4 ++++
 10 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 9f49986678..dc13136a3c 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -140,7 +140,7 @@ import MsRunTestHttpPage from "./components/runtest/RunTestHTTPPage";
 import MsRunTestTcpPage from "./components/runtest/RunTestTCPPage";
 import MsRunTestSqlPage from "./components/runtest/RunTestSQLPage";
 import MsRunTestDubboPage from "./components/runtest/RunTestDubboPage";
-import {checkoutTestManagerOrTestUser, getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser, getCurrentUser, getUUID} from "@/common/js/utils";
 import MsApiModule from "./components/module/ApiModule";
 import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
 
@@ -159,7 +159,10 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
       },
       isReadOnly(){
         return !checkoutTestManagerOrTestUser();
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     components: {
       MsTabButton,
@@ -211,13 +214,9 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
         }],
         activeDom: "left",
         syncTabs: [],
-        projectId: "",
         nodeTree: []
       }
     },
-    mounted() {
-      this.projectId = getCurrentProjectID();
-    },
     watch: {
       currentProtocol() {
         this.handleCommand("CLOSE_ALL");
diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
index d14d3eccfe..7bd6e6124a 100644
--- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
@@ -59,7 +59,7 @@
   import MsDialogFooter from "../../../../common/components/MsDialogFooter";
   import {WORKSPACE_ID} from '../../../../../../common/js/constants';
   import {REQ_METHOD} from "../../model/JsonData";
-  import {getCurrentProjectID, getCurrentUser} from "../../../../../../common/js/utils";
+  import {getCurrentUser} from "../../../../../../common/js/utils";
   import {createComponent, Request} from "../jmeter/components";
 
   export default {
@@ -94,8 +94,12 @@
         value: REQ_METHOD[0].id,
         options: REQ_METHOD,
       }
-    }
-    ,
+    },
+    computed: {
+      projectId() {
+        return this.$store.state.projectId
+      },
+    },
     methods: {
       saveApi(saveAs) {
         this.$refs['httpForm'].validate((valid) => {
@@ -137,7 +141,7 @@
             break;
         }
         this.httpForm.bodyUploadIds = [];
-        this.httpForm.projectId = getCurrentProjectID();
+        this.httpForm.projectId = this.projectId;
         this.httpForm.id = this.httpForm.request.id;
         this.httpForm.protocol = this.currentProtocol;
 
diff --git a/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue b/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue
index 2abc7a3191..46a4890fc7 100644
--- a/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue
+++ b/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue
@@ -36,7 +36,6 @@
 <script>
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-import {getUUID, getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "MsSetEnvironment",
@@ -64,6 +63,11 @@ export default {
       this.environmentChange(this.environmentId);
     },
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
     environmentChange(value) {
       for (let i in this.environments) {
@@ -74,7 +78,7 @@ export default {
       }
     },
     getEnvironments() {
-      let selectProjectId = getCurrentProjectID();
+      let selectProjectId = this.projectId;
       if (selectProjectId) {
         this.$get('/api/environment/list/' + selectProjectId, response => {
           this.environments = response.data;
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 d7efb5be4d..cdc7166ee4 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -50,7 +50,7 @@
   import ApiCaseHeader from "./ApiCaseHeader";
   import ApiCaseItem from "./ApiCaseItem";
   import MsRun from "../Run";
-  import {getCurrentProjectID, getUUID} from "@/common/js/utils";
+  import {getUUID} from "@/common/js/utils";
   import MsDrawer from "../../../../common/components/MsDrawer";
   import {CASE_ORDER} from "../../model/JsonData";
   import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
@@ -89,7 +89,6 @@
         runData: [],
         selectdCases: [],
         reportId: "",
-        projectId: "",
         testCaseId: "",
         checkedCases: new Set(),
         visible: false,
@@ -128,7 +127,6 @@
     },
     created() {
       this.api = this.currentApi;
-      this.projectId = getCurrentProjectID();
       if (this.createCase) {
         this.sysAddition();
       }
@@ -136,7 +134,10 @@
     computed: {
       isCaseEdit() {
         return this.testCaseId ? true : false;
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     methods: {
       open(api, testCaseId) {
@@ -290,7 +291,7 @@
         this.singleRunId = row.id;
         row.request.name = row.id;
         row.request.useEnvironment = this.environment;
-        row.request.projectId = getCurrentProjectID();
+        row.request.projectId = this.projectId;
         this.runData.push(row.request);
         /*触发执行操作*/
         this.reportId = getUUID().substring(0, 8);
@@ -354,7 +355,7 @@
         if (form) {
           param[form.type] = form.value;
           param.ids = this.selectdCases;
-          param.projectId = getCurrentProjectID();
+          param.projectId = this.projectId;
           param.envId = form.envId;
           if (this.api) {
             param.protocol = this.api.protocol;
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 e4e77933fc..6ccc97837a 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -94,7 +94,6 @@
 <script>
 import MsDialogFooter from "../../../../common/components/MsDialogFooter";
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
-import {getCurrentProjectID} from "../../../../../../common/js/utils";
 import ScheduleImport from "@/business/components/api/definition/components/import/ImportScheduleEdit";
 
 export default {
@@ -202,7 +201,10 @@ export default {
     },
     isScenarioModel() {
       return this.model === 'scenario';
-    }
+    },
+    projectId() {
+      return this.$store.state.projectId
+    },
   },
   methods: {
     scheduleEdit() {
@@ -283,7 +285,7 @@ export default {
         })
         param.modeId = this.formData.modeId
       }
-      param.projectId = getCurrentProjectID();
+      param.projectId = this.projectId;
       if (!this.swaggerUrlEnable) {
         param.swaggerUrl = undefined;
       }
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index f5ad30f686..c6fdcd47a0 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -143,7 +143,7 @@ import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
 import MsBatchEdit from "../basis/BatchEdit";
 import {API_METHOD_COLOUR, CASE_PRIORITY, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
 
-import {getBodyUploadFiles, getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
+import {getBodyUploadFiles} from "@/common/js/utils";
 import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
 import MsApiCaseTableExtendBtns from "../reference/ApiCaseTableExtendBtns";
 import MsReferenceView from "../reference/ReferenceView";
@@ -282,11 +282,13 @@ export default {
       }
     },
   computed: {
-
     // 接口定义用例列表
     isApiModel() {
       return this.model === 'api'
     },
+    projectId() {
+      return this.$store.state.projectId
+    },
   },
   methods: {
     customHeader() {
@@ -305,7 +307,7 @@ export default {
         this.selectAll = false;
         this.unSelection = [];
         this.selectDataCounts = 0;
-        this.condition.projectId = getCurrentProjectID();
+        this.condition.projectId = this.projectId;
 
         if (this.currentProtocol != null) {
           this.condition.protocol = this.currentProtocol;
@@ -409,7 +411,7 @@ export default {
           callback: (action) => {
             if (action === 'confirm') {
               let obj = {};
-              obj.projectId = getCurrentProjectID();
+              obj.projectId = this.projectId;
               obj.selectAllDate = this.isSelectAllDate;
               obj.unSelectIds = this.unSelection;
               obj.ids = Array.from(this.selectRows).map(row => row.id);
@@ -456,7 +458,7 @@ export default {
         let param = {};
         param[form.type] = form.value;
         param.ids = ids;
-        param.projectId = getCurrentProjectID();
+        param.projectId = this.projectId;
         param.selectAllDate = this.isSelectAllDate;
         param.unSelectIds = this.unSelection;
         param = Object.assign(param, this.condition);
@@ -528,7 +530,7 @@ export default {
       },
       showEnvironment(row) {
 
-        let projectID = getCurrentProjectID();
+        let projectID = this.projectId;
         if (this.projectId) {
           this.$get('/api/environment/list/' + this.projectId, response => {
             this.environments = response.data;
@@ -580,7 +582,7 @@ export default {
           id: row.id,
           testElement: testPlan,
           name: row.name,
-          projectId: getCurrentProjectID(),
+          projectId: this.projectId,
         };
         let bodyFiles = getBodyUploadFiles(reqObj, runData);
         reqObj.reportId = "run";
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 eaa6104b6d..3cae8525b0 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -225,7 +225,6 @@
   import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
   import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
   import {PROJECT_NAME} from '@/common/js/constants';
-  import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
   import {API_LIST, TEST_CASE_LIST, WORKSPACE_ID} from '@/common/js/constants';
   import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
   import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
@@ -370,6 +369,11 @@
         },
       }
     },
+    computed: {
+      projectId() {
+        return this.$store.state.projectId
+      },
+    },
     created: function () {
       if (this.trashEnable) {
         this.condition.filters = {status: ["Trash"]};
@@ -409,7 +413,7 @@
         initCondition(this.condition);
         this.selectDataCounts = 0;
         this.condition.moduleIds = this.selectNodeIds;
-        this.condition.projectId = getCurrentProjectID();
+        this.condition.projectId = this.projectId;
         if (this.currentProtocol != null) {
           this.condition.protocol = this.currentProtocol;
         }
@@ -636,7 +640,7 @@
         let arr = Array.from(this.selectRows);
         let ids = arr.map(row => row.id);
         param.ids = ids;
-        param.projectId = getCurrentProjectID();
+        param.projectId = this.projectId;
         param.moduleId = param.nodeId;
         param.condition = this.condition;
         param.selectAllDate = this.isSelectAllDate;
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 ca7e7691f7..11eb4dfccb 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -38,7 +38,6 @@ import MsAddBasisApi from "../basis/AddBasisApi";
 import SelectMenu from "../../../../track/common/SelectMenu";
 import {OPTIONS} from "../../model/JsonData";
 import ApiImport from "../import/ApiImport";
-import {getCurrentProjectID} from "@/common/js/utils";
 import MsNodeTree from "../../../../track/common/NodeTree";
 import ApiModuleHeader from "./ApiModuleHeader";
 import {buildNodePath} from "../../model/NodeTree";
@@ -60,7 +59,6 @@ export default {
           filterText: "",
           trashEnable: false
         },
-        projectId: "",
         data: [],
         currentModule: {},
       }
@@ -85,10 +83,12 @@ export default {
       },
       isReviewModel() {
         return this.reviewId ? true : false;
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     mounted() {
-      this.projectId = getCurrentProjectID();
       this.$emit('protocolChange', this.condition.protocol);
       this.list();
     },
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
index 4f5b2b6bb4..1339afced8 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
@@ -58,7 +58,6 @@ import {OPTIONS} from "../../model/JsonData";
 import MsAddBasisApi from "../basis/AddBasisApi";
 import ApiImport from "../import/ApiImport";
 import ModuleTrashButton from "./ModuleTrashButton";
-import {getCurrentProjectID} from "../../../../../../common/js/utils";
 import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
 import TemplateComponent from "../../../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
 
@@ -91,6 +90,11 @@ export default {
       }
     },
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
 
     handleCommand(e) {
@@ -104,12 +108,12 @@ export default {
         case "add-module":
           break;
         case "import":
-          if (!getCurrentProjectID()) {
+          if (!this.projectId) {
             this.$warning(this.$t('commons.check_project_tip'));
             return;
           }
           this.protocol = "HTTP";
-          this.result = this.$get("/api/module/list/" + getCurrentProjectID() + "/" + this.protocol, response => {
+          this.result = this.$get("/api/module/list/" + this.projectId + "/" + this.protocol, response => {
             if (response.data != undefined && response.data != null) {
               this.data = response.data;
               let moduleOptions = [];
@@ -124,7 +128,7 @@ export default {
       }
     },
     chooseExportType(e) {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
@@ -138,7 +142,7 @@ export default {
       }
     },
     addApi() {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index d15819eb9a..d8e05c4109 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -75,7 +75,10 @@ export default {
               let projectId = localStorage.getItem(PROJECT_ID);
               if (!projectId || projectId != userLastProjectId) {
                 localStorage.setItem(PROJECT_ID, userLastProjectId);
+                this.$store.commit('setProjectId', userLastProjectId);
                 window.location.reload();
+              } else {
+                this.$store.commit('setProjectId', projectId);
               }
             }
           }
@@ -109,6 +112,7 @@ export default {
       }
       this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => {
         localStorage.setItem(PROJECT_ID, projectId);
+        this.$store.commit('setProjectId', projectId);
         let path = this.$route.matched[0].path ? this.$route.matched[0].path : '/';
         if (path === '/api') {
           if (this.isNewVersion) {

From 79e11e651ae66e5f2d4f404d975f38fd8afe1837 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 17:03:00 +0800
Subject: [PATCH 34/35] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=9F=A5=E7=9C=8B=E5=9C=BA=E6=99=AF=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/service/ApiAutomationService.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 a1398d86eb..517e9ae764 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -114,9 +114,13 @@ public class ApiAutomationService {
                 Map<String, String> map = d.getEnvironmentMap();
                 if (map != null) {
                     if (map.isEmpty()) {
-                        List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
-                        if (CollectionUtils.isNotEmpty(ids)) {
-                            idList.addAll(new HashSet<>(ids));
+                        try {
+                            List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
+                            if (CollectionUtils.isNotEmpty(ids)) {
+                                idList.addAll(new HashSet<>(ids));
+                            }
+                        } catch (Exception e) {
+                            LogUtil.error("JSONPath.read projectId fail.");
                         }
                     } else {
                         Set<String> set = d.getEnvironmentMap().keySet();

From 41fe3cbe6b948e74ffbf8e6a925edcdaf2c91305 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 23 Mar 2021 17:06:14 +0800
Subject: [PATCH 35/35] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue
index e62d21ca7a..9a3843f6c4 100644
--- a/frontend/src/business/components/performance/test/components/ExistFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue
@@ -215,7 +215,7 @@ export default {
 
       // 检查数据库是否存在同名文件
       async function f() {
-        return await axios.post('/performance/file/' + getCurrentProjectID() + '/getMetadataByName', {filename: file.name})
+        return await axios.post('/performance/file/' + getCurrentProjectID() + '/getMetadataByName', {name: file.name})
       }
 
       await f().then(res => {