From a49eb5a4168547b939b7cecae2a0e976e91a4ab0 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 1 Mar 2021 12:11:21 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E6=96=B0=E7=89=88=E6=9C=ACauth=20=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/definition/request/auth/MsAuthManager.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java
index fcded90f88..96cf3fc04e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java
@@ -71,9 +71,13 @@ public class MsAuthManager extends MsTestElement {
                 ApiTestEnvironmentWithBLOBs environmentWithBLOBs = environmentService.get(environment);
                 EnvironmentConfig envConfig = JSONObject.parseObject(environmentWithBLOBs.getConfig(), EnvironmentConfig.class);
                 this.url = envConfig.getHttpConfig().getProtocol() + "://" + envConfig.getHttpConfig().getSocket();
+            } else if (config != null && config.isEffective(this.getProjectId())) {
+                if (config.isEffective(this.getProjectId())) {
+                    String url = config.getConfig().get(this.getProjectId()).getHttpConfig().getProtocol() + "://" + config.getConfig().get(this.getProjectId()).getHttpConfig().getSocket();
+                    auth.setURL(url);
+                }
             }
         }
-        auth.setDomain(this.domain);
         auth.setUser(this.username);
         auth.setPass(this.password);
         auth.setMechanism(AuthManager.Mechanism.DIGEST);

From cbd3f6a9b4977ea363ccb6b2628c3a2ebbd90f4b Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 1 Mar 2021 13:58:18 +0800
Subject: [PATCH 02/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E9=87=8D=E5=86=99=E8=AE=A4=E8=AF=81=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/auth/MsAuthManager.java           | 33 ++++++++++++-------
 .../request/sampler/MsHTTPSamplerProxy.java   |  3 +-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java
index 96cf3fc04e..cae25e201f 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java
@@ -1,19 +1,15 @@
 package io.metersphere.api.dto.definition.request.auth;
 
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.annotation.JSONType;
 import io.metersphere.api.dto.definition.request.MsTestElement;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
-import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
-import io.metersphere.api.service.ApiTestEnvironmentService;
-import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
-import io.metersphere.commons.utils.CommonBeanFactory;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.control.AuthManager;
 import org.apache.jmeter.protocol.http.control.Authorization;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
@@ -66,12 +62,7 @@ public class MsAuthManager extends MsTestElement {
         if (this.url != null) {
             auth.setURL(this.url);
         } else {
-            if (environment != null) {
-                ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
-                ApiTestEnvironmentWithBLOBs environmentWithBLOBs = environmentService.get(environment);
-                EnvironmentConfig envConfig = JSONObject.parseObject(environmentWithBLOBs.getConfig(), EnvironmentConfig.class);
-                this.url = envConfig.getHttpConfig().getProtocol() + "://" + envConfig.getHttpConfig().getSocket();
-            } else if (config != null && config.isEffective(this.getProjectId())) {
+            if (config != null && config.isEffective(this.getProjectId())) {
                 if (config.isEffective(this.getProjectId())) {
                     String url = config.getConfig().get(this.getProjectId()).getHttpConfig().getProtocol() + "://" + config.getConfig().get(this.getProjectId()).getHttpConfig().getSocket();
                     auth.setURL(url);
@@ -84,4 +75,24 @@ public class MsAuthManager extends MsTestElement {
         authManager.addAuth(auth);
         tree.add(authManager);
     }
+
+    public void setAuth(HashTree tree, MsAuthManager msAuthManager, HTTPSamplerProxy samplerProxy) {
+        try {
+            AuthManager authManager = new AuthManager();
+            authManager.setEnabled(true);
+            authManager.setName(StringUtils.isNotEmpty(this.getName()) ? this.getName() : "AuthManager");
+            authManager.setProperty(TestElement.TEST_CLASS, AuthManager.class.getName());
+            authManager.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("AuthPanel"));
+            Authorization auth = new Authorization();
+            auth.setURL(samplerProxy.getUrl().toString());
+            auth.setDomain(samplerProxy.getDomain());
+            auth.setUser(msAuthManager.getUsername());
+            auth.setPass(msAuthManager.getPassword());
+            auth.setMechanism(AuthManager.Mechanism.DIGEST);
+            authManager.addAuth(auth);
+            tree.add(authManager);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 5557952920..cf61040421 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -8,7 +8,6 @@ import io.metersphere.api.dto.definition.request.auth.MsAuthManager;
 import io.metersphere.api.dto.definition.request.dns.MsDNSCacheManager;
 import io.metersphere.api.dto.scenario.Body;
 import io.metersphere.api.dto.scenario.KeyValue;
-import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.commons.constants.MsTestElementConstants;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.ScriptEngineUtils;
@@ -232,7 +231,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
             }
         }
         if (this.authManager != null) {
-            this.authManager.toHashTree(tree, hashTree, config);
+            this.authManager.setAuth(tree, this.authManager, sampler);
         }
     }
 

From 3b2fe5ddb35ab894a34a042df35b20c2d75541db Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 1 Mar 2021 14:59:50 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=9B=BA=E5=AE=9A=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/ApiScenarioEnv.vue    | 53 ++++++++++---------
 .../automation/scenario/EditApiScenario.vue   |  3 +-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue
index 5ec2dccd2d..5547777048 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue
@@ -6,8 +6,8 @@
     :destroy-on-close="true"
     :before-close="handleClose">
 
-    <div v-for="pe in data" :key="pe.id">
-      <div>
+    <div v-loading="result.loading">
+      <div v-for="pe in data" :key="pe.id" style="margin-left: 20px;">
         {{ getProjectName(pe.id) }}
         <el-select v-model="pe['selectEnv']" placeholder="请选择环境" style="margin-left:10px; margin-top: 10px;"
                    size="small">
@@ -29,51 +29,55 @@
     </div>
 
     <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false" size="small">取 消</el-button>
-    <el-button type="primary" @click="handleConfirm" size="small">确 定</el-button>
-  </span>
+      <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+      <el-button type="primary" @click="handleConfirm" size="small">确 定</el-button>
+    </span>
+
+    <!-- 环境配置 -->
     <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
+
   </el-dialog>
 </template>
 
 <script>
 import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
 import ApiEnvironmentConfig from "@/business/components/api/definition/components/environment/ApiEnvironmentConfig";
+
 export default {
   name: "ApiScenarioEnv",
   components: {ApiEnvironmentConfig},
   props: {
+    envMap: Map,
     projectIds: Set,
-    envMap: Map
+    projectList: Array
   },
   data() {
     return {
-      dialogVisible: false,
-      projects: [],
       data: [],
+      result: {},
+      projects: [],
       environmentId: '',
-      environments: []
+      environments: [],
+      dialogVisible: false
     }
   },
-  created() {
-    this.getWsProjects();
-  },
   methods: {
     handleClose() {
       this.dialogVisible = false;
     },
     init() {
       this.projectIds.forEach(id => {
+        let item = {id: id, envs: [], selectEnv: ""};
+        this.data.push(item);
         this.result = this.$get('/api/environment/list/' + id, res => {
           let envs = res.data;
           envs.forEach(environment => {
             parseEnvironment(environment);
           });
-          let item = {};
-          item.id = id;
-          item.envs = envs;
-          item.selectEnv = this.envMap.get(id);
-          this.data.push(item)
+          // 固定环境列表渲染顺序
+          let temp = this.data.find(dt => dt.id === id);
+          temp.envs = envs;
+          temp.selectEnv = this.envMap.get(id);
         })
       })
     },
@@ -84,13 +88,8 @@ export default {
         this.init();
       }
     },
-    getWsProjects() {
-      this.$get("/project/listAll", res => {
-        this.projects = res.data;
-      })
-    },
     getProjectName(id) {
-      const project = this.projects.find(p => p.id === id);
+      const project = this.projectList.find(p => p.id === id);
       return project ? project.name : "";
     },
     openEnvironmentConfig(projectId) {
@@ -123,7 +122,7 @@ export default {
         this.data.forEach(dt => {
           if (!dt.selectEnv) {
             sign = false;
-            return;
+            return false;
           }
         })
       } else {
@@ -137,12 +136,14 @@ export default {
       return true;
     },
     environmentConfigClose(id) {
-      // todo
+      // todo 关闭时刷新环境列表
     }
   }
 }
 </script>
 
 <style scoped>
-
+.ms-scenario-button {
+  margin-left: 20px;
+}
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 3400e7e644..4f4ef858e5 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -186,7 +186,8 @@
       <!--场景导入 -->
       <scenario-relevance @save="addScenario" ref="scenarioRelevance"/>
 
-      <api-scenario-env :project-ids="projectIds" :env-map="projectEnvMap" ref="apiScenarioEnv" @setProjectEnvMap="setProjectEnvMap"/>
+      <api-scenario-env :project-ids="projectIds" :env-map="projectEnvMap"
+                        ref="apiScenarioEnv" @setProjectEnvMap="setProjectEnvMap" :project-list="projectList"/>
 
       <!-- 环境 -->
       <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>

From 1a633fe2caa237dbef7237156cfc7821f57b90d4 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 1 Mar 2021 15:21:10 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E6=94=B9=E9=80=A0=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E7=94=A8=E4=BE=8B=EF=BC=8C=E5=88=9B=E5=BB=BA=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=EF=BC=8C=E8=AF=84=E5=AE=A1=E8=AF=A6=E6=83=85=20fix?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/TestCaseReview.java           |   2 +
 .../base/domain/TestCaseReviewExample.java    |  70 ++++++++++++
 .../base/mapper/TestCaseReviewMapper.xml      |  31 ++++--
 .../mapper/ext/ExtTestCaseReviewMapper.xml    |   3 +-
 .../src/main/resources/generatorConfig.xml    |   1 +
 .../definition/components/list/ApiList.vue    |  31 +++++-
 .../components/runtest/RunTestHTTPPage.vue    |   2 +
 .../components/common/head/HeaderCustom.vue   |   6 +-
 .../components/common/model/JsonData.js       |   1 +
 .../review/components/TestCaseReviewEdit.vue  |  12 +-
 .../review/components/TestCaseReviewList.vue  |  14 +++
 .../track/review/view/TestCaseReviewView.vue  | 104 +++++++++++-------
 .../review/view/components/TestReviewApi.vue  |  94 ++++++++++++++++
 .../view/components/TestReviewFunction.vue    |  93 ++++++++++++++++
 .../review/view/components/TestReviewLoad.vue |  94 ++++++++++++++++
 .../components/TestReviewTestCaseList.vue     |   8 ++
 16 files changed, 515 insertions(+), 51 deletions(-)
 create mode 100644 frontend/src/business/components/track/review/view/components/TestReviewApi.vue
 create mode 100644 frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
 create mode 100644 frontend/src/business/components/track/review/view/components/TestReviewLoad.vue

diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java
index 3787996ee7..f3a6e98dac 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java
@@ -21,6 +21,8 @@ public class TestCaseReview implements Serializable {
 
     private String projectId;
 
+    private String tags;
+
     private String description;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java
index 1935c4c171..61d810336f 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java
@@ -633,6 +633,76 @@ public class TestCaseReviewExample {
             addCriterion("project_id not between", value1, value2, "projectId");
             return (Criteria) this;
         }
+
+        public Criteria andTagsIsNull() {
+            addCriterion("tags is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsIsNotNull() {
+            addCriterion("tags is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsEqualTo(String value) {
+            addCriterion("tags =", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotEqualTo(String value) {
+            addCriterion("tags <>", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsGreaterThan(String value) {
+            addCriterion("tags >", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsGreaterThanOrEqualTo(String value) {
+            addCriterion("tags >=", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsLessThan(String value) {
+            addCriterion("tags <", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsLessThanOrEqualTo(String value) {
+            addCriterion("tags <=", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsLike(String value) {
+            addCriterion("tags like", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotLike(String value) {
+            addCriterion("tags not like", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsIn(List<String> values) {
+            addCriterion("tags in", values, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotIn(List<String> values) {
+            addCriterion("tags not in", values, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsBetween(String value1, String value2) {
+            addCriterion("tags between", value1, value2, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotBetween(String value1, String value2) {
+            addCriterion("tags not between", value1, value2, "tags");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml
index 16691a5515..aad38c2b1c 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml
@@ -10,6 +10,7 @@
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="end_time" jdbcType="BIGINT" property="endTime" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="tags" jdbcType="VARCHAR" property="tags" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseReview">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -73,7 +74,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, creator, `status`, create_time, update_time, end_time, project_id
+    id, `name`, creator, `status`, create_time, update_time, end_time, project_id, tags
   </sql>
   <sql id="Blob_Column_List">
     description
@@ -129,12 +130,12 @@
   <insert id="insert" parameterType="io.metersphere.base.domain.TestCaseReview">
     insert into test_case_review (id, `name`, creator, 
       `status`, create_time, update_time, 
-      end_time, project_id, description
-      )
+      end_time, project_id, tags, 
+      description)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR}, 
       #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{endTime,jdbcType=BIGINT}, #{projectId,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}
-      )
+      #{endTime,jdbcType=BIGINT}, #{projectId,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, 
+      #{description,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseReview">
     insert into test_case_review
@@ -163,6 +164,9 @@
       <if test="projectId != null">
         project_id,
       </if>
+      <if test="tags != null">
+        tags,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -192,6 +196,9 @@
       <if test="projectId != null">
         #{projectId,jdbcType=VARCHAR},
       </if>
+      <if test="tags != null">
+        #{tags,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -230,6 +237,9 @@
       <if test="record.projectId != null">
         project_id = #{record.projectId,jdbcType=VARCHAR},
       </if>
+      <if test="record.tags != null">
+        tags = #{record.tags,jdbcType=VARCHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -248,6 +258,7 @@
       update_time = #{record.updateTime,jdbcType=BIGINT},
       end_time = #{record.endTime,jdbcType=BIGINT},
       project_id = #{record.projectId,jdbcType=VARCHAR},
+      tags = #{record.tags,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -262,7 +273,8 @@
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       end_time = #{record.endTime,jdbcType=BIGINT},
-      project_id = #{record.projectId,jdbcType=VARCHAR}
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      tags = #{record.tags,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -291,6 +303,9 @@
       <if test="projectId != null">
         project_id = #{projectId,jdbcType=VARCHAR},
       </if>
+      <if test="tags != null">
+        tags = #{tags,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -306,6 +321,7 @@
       update_time = #{updateTime,jdbcType=BIGINT},
       end_time = #{endTime,jdbcType=BIGINT},
       project_id = #{projectId,jdbcType=VARCHAR},
+      tags = #{tags,jdbcType=VARCHAR},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -317,7 +333,8 @@
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       end_time = #{endTime,jdbcType=BIGINT},
-      project_id = #{projectId,jdbcType=VARCHAR}
+      project_id = #{projectId,jdbcType=VARCHAR},
+      tags = #{tags,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
index 02af9171cd..1798133e8e 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
@@ -4,7 +4,8 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestCaseReviewDTO"
             parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest">
-        select distinct test_case_review.id, test_case_review.name, test_case_review.creator, test_case_review.status,
+        select distinct  test_case_review.id, test_case_review.name, test_case_review.creator, test_case_review.status,
+        test_case_review.tags,
         test_case_review.create_time, test_case_review.update_time, test_case_review.end_time,
         test_case_review.description, user.name as creatorName, project.name as projectName, test_case_review.project_id
         from test_case_review
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index 27511b8cc8..8a049afd7a 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -70,6 +70,7 @@
         <!--<table tableName="test_plan_api_scenario"/>-->
         <!--<table tableName="test_plan"/>-->
         <!--<table tableName="api_scenario_report"/>-->
+        <table tableName="test_case_review"/>
 
     </context>
 </generatorConfiguration>
\ No newline at end of file
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 6a3ab516e3..2e0aa7578a 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -222,7 +222,7 @@ import MsBottomContainer from "../BottomContainer";
 import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
 import MsBatchEdit from "../basis/BatchEdit";
 import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
-import {downloadFile} from "@/common/js/utils";
+import {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';
@@ -244,6 +244,7 @@ import {_filter, _sort} from "@/common/js/tableUtils";
 import {Api_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
+import {Body} from "@/business/components/api/definition/model/ApiTestModel";
 
 
 export default {
@@ -533,7 +534,35 @@ export default {
     },
     runApi(row) {
       let request = JSON.parse(row.request);
+      if (row.tags instanceof Array) {
+        row.tags = JSON.stringify(row.tags);
+      }
+      let response = ""
+      if (row.response != null && row.response != 'null' && row.response != undefined) {
+        if (Object.prototype.toString.call(row.response).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+          response = row.response;
+        } else {
+          response = JSON.parse(row.response);
+        }
+      } else {
+        response = {headers: [], body: new Body(), statusCode: [], type: "HTTP"};
+      }
+      if (response.body) {
+        let body = new Body();
+        Object.assign(body, response.body);
+        if (!body.binary) {
+          body.binary = [];
+        }
+        if (!body.kvs) {
+          body.kvs = [];
+        }
+        if (!body.binary) {
+          body.binary = [];
+        }
+        response.body = body;
+      }
       row.request = request
+      row.response = response
       this.$emit('runTest', row);
     },
     reductionApi(row) {
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
index 91054215dd..7802e477ef 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
@@ -201,6 +201,8 @@ export default {
         let bodyFiles = this.getBodyUploadFiles();
         this.api.method = this.api.request.method;
         this.api.path = this.api.request.path;
+        console.log(this.api)
+        console.log(typeof (bodyFiles))
         this.$fileUpload(url, null, bodyFiles, this.api, () => {
           this.$success(this.$t('commons.save_success'));
           this.$emit('saveApi', this.api);
diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index 2b4cf51471..0bc8b9f4e6 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -6,9 +6,9 @@
                    :to_data='fieldSelected'
                    :defaultProps="{label:'label'}"
                    :mode='mode' height='540px' filter openAll/>
-        <template v-slot:footer>
-          <ms-dialog-footer @cancel="close" @confirm="saveHeader"/>
-        </template>
+    <template v-slot:footer>
+      <ms-dialog-footer @cancel="close" @confirm="saveHeader"/>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/frontend/src/business/components/common/model/JsonData.js b/frontend/src/business/components/common/model/JsonData.js
index e54e1b41e8..d9dd6eae95 100644
--- a/frontend/src/business/components/common/model/JsonData.js
+++ b/frontend/src/business/components/common/model/JsonData.js
@@ -21,6 +21,7 @@ export const Test_Case_Review = [
   {id: 'status', label: i18n.t('test_track.review.review_status')},
   {id: 'createTime', label: i18n.t('commons.create_time')},
   {id: 'endTime', label: i18n.t('test_track.review.end_time')},
+  {id: 'tags', label: '标签'},
 ]
 //测试计划-测试用例
 export const Test_Plan_List = [
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
index b9e8948757..b8301a29ac 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
@@ -21,6 +21,11 @@
               <el-input v-model="form.name"/>
             </el-form-item>
           </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item :label="$t('commons.tag')" :label-width="formLabelWidth" prop="tag">
+              <ms-input-tag :currentScenario="form" ref="tag"/>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -94,10 +99,11 @@
 import TestPlanStatusButton from "../../plan/common/TestPlanStatusButton";
 import {WORKSPACE_ID} from "@/common/js/constants";
 import {getCurrentProjectID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
 
 export default {
   name: "TestCaseReviewEdit",
-  components: {TestPlanStatusButton},
+  components: {MsInputTag, TestPlanStatusButton},
   data() {
     return {
       dialogFormVisible: false,
@@ -149,6 +155,10 @@ export default {
           let param = {};
           Object.assign(param, this.form);
           param.name = param.name.trim();
+          if (this.form.tags instanceof Array) {
+            this.form.tags = JSON.stringify(this.form.tags);
+          }
+          param.tags = this.form.tags;
           if (param.name === '') {
             this.$warning(this.$t('test_track.plan.input_plan_name'));
             return;
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 574994c017..4824621c36 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -58,6 +58,13 @@
           </span>
           </template>
         </el-table-column>
+        <el-table-column v-if="item.id == 'tags'" prop="tags"
+                         :label="$t('api_test.automation.tag')" :key="index">
+          <template v-slot:default="scope">
+            <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain"
+                    :content="itemName" style="margin-left: 5px"></ms-tag>
+          </template>
+        </el-table-column>
         <el-table-column
           v-if="item.id=='createTime'"
           prop="createTime"
@@ -122,10 +129,12 @@ import {Test_Case_Review} from "@/business/components/common/model/JsonData";
 import {TEST_CASE_LIST, TEST_CASE_REVIEW_LIST} from "@/common/js/constants";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
+import MsTag from "@/business/components/common/components/MsTag";
 
 export default {
   name: "TestCaseReviewList",
   components: {
+    MsTag,
     HeaderLabelOperate,
     HeaderCustom,
     MsDeleteConfirm,
@@ -184,6 +193,11 @@ export default {
         let data = response.data;
         this.total = data.itemCount;
         this.tableData = data.listObject;
+        this.tableData.forEach(item => {
+          if (item.tags && item.tags.length > 0) {
+            item.tags = JSON.parse(item.tags);
+          }
+        })
         for (let i = 0; i < this.tableData.length; i++) {
           let path = "/test/case/review/project";
           this.$post(path, {id: this.tableData[i].id}, res => {
diff --git a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
index 2fa0ae23bb..c98e4bf136 100644
--- a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
+++ b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
@@ -1,37 +1,31 @@
 <template>
-  <ms-container>
+  <div>
+    <ms-test-plan-header-bar>
+      <template v-slot:info>
+        <select-menu
+          :data="testReviews"
+          :current-data="currentReview"
+          :title="$t('test_track.review_view.review')"
+          @dataChange="changeReview"/>
+      </template>
+      <template v-slot:menu>
+        <el-menu v-if="isMenuShow" active-text-color="#6d317c"
+                 class="el-menu-demo header-menu" mode="horizontal" @select="handleSelect">
+          <el-menu-item index="functional">功能测试用例</el-menu-item>
+          <el-menu-item index="api">接口测试用例</el-menu-item>
+          <el-menu-item index="load">性能测试用例</el-menu-item>
+          <el-menu-item index="report">报告统计</el-menu-item>
+        </el-menu>
+      </template>
+    </ms-test-plan-header-bar>
+    <test-review-function v-if="activeIndex === 'functional'" :redirectCharType="redirectCharType"
+                          :clickType="clickType" :review-id="reviewId"></test-review-function>
+    <test-review-api v-if="activeIndex === 'api'" :redirectCharType="redirectCharType" :clickType="clickType"
+                     :review-id="reviewId"></test-review-api>
+    <test-review-load v-if="activeIndex === 'load'" :redirectCharType="redirectCharType" :clickType="clickType"
+                      :review-id="reviewId"></test-review-load>
+  </div>
 
-    <ms-aside-container>
-      <select-menu
-        :data="testReviews"
-        :current-data="currentReview"
-        :title="$t('test_track.review_view.review')"
-        @dataChange="changeReview"/>
-      <node-tree class="node-tree"
-                 :all-label="$t('commons.all_label.review')"
-                 v-loading="result.loading"
-                 @nodeSelectEvent="nodeChange"
-                 :tree-nodes="treeNodes"
-                 ref="nodeTree"/>
-    </ms-aside-container>
-
-    <ms-main-container>
-      <test-review-test-case-list
-        class="table-list"
-        @openTestReviewRelevanceDialog="openTestReviewRelevanceDialog"
-        @refresh="refresh"
-        :review-id="reviewId"
-        :select-node-ids="selectNodeIds"
-        :select-parent-nodes="selectParentNodes"
-        ref="testPlanTestCaseList"/>
-    </ms-main-container>
-
-    <test-review-relevance
-      @refresh="refresh"
-      :review-id="reviewId"
-      ref="testReviewRelevance"/>
-
-  </ms-container>
 </template>
 
 <script>
@@ -44,10 +38,18 @@ import NodeTree from "../../common/NodeTree";
 import TestReviewTestCaseList from "./components/TestReviewTestCaseList";
 import SelectMenu from "../../common/SelectMenu";
 import TestReviewRelevance from "./components/TestReviewRelevance";
+import MsTestPlanHeaderBar from "@/business/components/track/plan/view/comonents/head/TestPlanHeaderBar";
+import TestReviewFunction from "@/business/components/track/review/view/components/TestReviewFunction";
+import TestReviewApi from "@/business/components/track/review/view/components/TestReviewApi";
+import TestReviewLoad from "@/business/components/track/review/view/components/TestReviewLoad";
 
 export default {
   name: "TestCaseReviewView",
   components: {
+    TestReviewLoad,
+    TestReviewApi,
+    TestReviewFunction,
+    MsTestPlanHeaderBar,
     MsMainContainer,
     MsAsideContainer,
     MsContainer,
@@ -63,7 +65,14 @@ export default {
       currentReview: {},
       selectNodeIds: [],
       selectParentNodes: [],
-      treeNodes: []
+      treeNodes: [],
+      currentPlan: {},
+      activeIndex: "functional",
+      isMenuShow: true,
+      //报表跳转过来的参数-通过哪个图表跳转的
+      redirectCharType: '',
+      //报表跳转过来的参数-通过哪种数据跳转的
+      clickType: '',
     }
   },
   computed: {
@@ -83,12 +92,25 @@ export default {
       this.initData();
     }
   },
+  activated() {
+    this.genRedirectParam();
+  },
   methods: {
-    refresh() {
-      this.selectNodeIds = [];
-      this.selectParentNodes = [];
-      this.$refs.testReviewRelevance.search();
-      this.getNodeTreeByReviewId();
+    handleSelect(key) {
+      this.activeIndex = key;
+    },
+    genRedirectParam() {
+      this.redirectCharType = this.$route.params.charType;
+      this.clickType = this.$route.params.clickType;
+      if (this.redirectCharType != "") {
+        if (this.redirectCharType == 'scenario') {
+          this.activeIndex = 'api';
+        } else if (this.redirectCharType != null && this.redirectCharType != '') {
+          this.activeIndex = this.redirectCharType;
+        }
+      } else {
+        this.activeIndex = "functional";
+      }
     },
     initData() {
       this.getTestReviews();
@@ -133,6 +155,12 @@ export default {
           }
         });
       }
+    },
+    reloadMenu() {
+      this.isMenuShow = false;
+      this.$nextTick(() => {
+        this.isMenuShow = true;
+      });
     }
   }
 }
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewApi.vue b/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
new file mode 100644
index 0000000000..9a221f418d
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
@@ -0,0 +1,94 @@
+<template>
+  <ms-test-plan-common-component>
+    <template v-slot:aside>
+      <ms-node-tree
+        class="node-tree"
+        :all-label="$t('commons.all_label.review')"
+        v-loading="result.loading"
+        @nodeSelectEvent="nodeChange"
+        :tree-nodes="treeNodes"
+        ref="nodeTree"/>
+    </template>
+    <template v-slot:main>
+      <test-review-test-case-list
+        class="table-list"
+        @openTestReviewRelevanceDialog="openTestReviewRelevanceDialog"
+        @refresh="refresh"
+        :review-id="reviewId"
+        :select-node-ids="selectNodeIds"
+        :select-parent-nodes="selectParentNodes"
+        :clickType="clickType"
+        ref="testPlanTestCaseList"/>
+    </template>
+    <test-review-relevance
+      @refresh="refresh"
+      :review-id="reviewId"
+      ref="testReviewRelevance"/>
+  </ms-test-plan-common-component>
+
+</template>
+
+<script>
+import MsTestPlanCommonComponent from "@/business/components/track/plan/view/comonents/base/TestPlanCommonComponent";
+import FunctionalTestCaseList from "@/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList";
+import MsNodeTree from "@/business/components/track/common/NodeTree";
+import TestReviewRelevance from "@/business/components/track/review/view/components/TestReviewRelevance";
+import TestReviewTestCaseList from "@/business/components/track/review/view/components/TestReviewTestCaseList";
+
+export default {
+  name: "TestReviewApi",
+  components: {
+    TestReviewTestCaseList,
+    TestReviewRelevance, MsNodeTree, FunctionalTestCaseList, MsTestPlanCommonComponent
+  },
+  data() {
+    return {
+      result: {},
+      testReviews: [],
+      currentReview: {},
+      selectNodeIds: [],
+      selectParentNodes: [],
+      treeNodes: [],
+      isMenuShow: true,
+    }
+  },
+  props: [
+    'reviewId',
+    'redirectCharType',
+    'clickType'
+  ],
+  mounted() {
+    this.getNodeTreeByReviewId()
+  },
+  activated() {
+    this.getNodeTreeByReviewId()
+
+  },
+  methods: {
+    refresh() {
+      this.selectNodeIds = [];
+      this.selectParentNodes = [];
+      this.$refs.testReviewRelevance.search();
+      this.getNodeTreeByReviewId();
+    },
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+      this.selectParentNodes = pNodes;
+    },
+    getNodeTreeByReviewId() {
+      if (this.reviewId) {
+        this.result = this.$get("/case/node/list/review/" + this.reviewId, response => {
+          this.treeNodes = response.data;
+        });
+      }
+    },
+    openTestReviewRelevanceDialog() {
+      this.$refs.testReviewRelevance.openTestReviewRelevanceDialog();
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
new file mode 100644
index 0000000000..2d0015cf89
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
@@ -0,0 +1,93 @@
+<template>
+  <ms-test-plan-common-component>
+    <template v-slot:aside>
+      <ms-node-tree
+        class="node-tree"
+        :all-label="$t('commons.all_label.review')"
+        v-loading="result.loading"
+        @nodeSelectEvent="nodeChange"
+        :tree-nodes="treeNodes"
+        ref="nodeTree"/>
+    </template>
+    <template v-slot:main>
+      <test-review-test-case-list
+        class="table-list"
+        @openTestReviewRelevanceDialog="openTestReviewRelevanceDialog"
+        @refresh="refresh"
+        :review-id="reviewId"
+        :select-node-ids="selectNodeIds"
+        :select-parent-nodes="selectParentNodes"
+        :clickType="clickType"
+        ref="testPlanTestCaseList"/>
+    </template>
+    <test-review-relevance
+      @refresh="refresh"
+      :review-id="reviewId"
+      ref="testReviewRelevance"/>
+  </ms-test-plan-common-component>
+</template>
+
+<script>
+import MsTestPlanCommonComponent from "@/business/components/track/plan/view/comonents/base/TestPlanCommonComponent";
+import FunctionalTestCaseList from "@/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList";
+import MsNodeTree from "@/business/components/track/common/NodeTree";
+import TestReviewRelevance from "@/business/components/track/review/view/components/TestReviewRelevance";
+import TestReviewTestCaseList from "@/business/components/track/review/view/components/TestReviewTestCaseList";
+
+export default {
+  name: "TestReviewFunction",
+  components: {
+    TestReviewTestCaseList,
+    TestReviewRelevance, MsNodeTree, FunctionalTestCaseList, MsTestPlanCommonComponent
+  },
+  data() {
+    return {
+      result: {},
+      testReviews: [],
+      currentReview: {},
+      selectNodeIds: [],
+      selectParentNodes: [],
+      treeNodes: [],
+      isMenuShow: true,
+    }
+  },
+  props: [
+    'reviewId',
+    'redirectCharType',
+    'clickType'
+  ],
+  mounted() {
+    this.getNodeTreeByReviewId()
+  },
+  activated() {
+    this.getNodeTreeByReviewId()
+
+  },
+  methods: {
+    refresh() {
+      this.selectNodeIds = [];
+      this.selectParentNodes = [];
+      this.$refs.testReviewRelevance.search();
+      this.getNodeTreeByReviewId();
+    },
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+      this.selectParentNodes = pNodes;
+    },
+    getNodeTreeByReviewId() {
+      if (this.reviewId) {
+        this.result = this.$get("/case/node/list/review/" + this.reviewId, response => {
+          this.treeNodes = response.data;
+        });
+      }
+    },
+    openTestReviewRelevanceDialog() {
+      this.$refs.testReviewRelevance.openTestReviewRelevanceDialog();
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewLoad.vue b/frontend/src/business/components/track/review/view/components/TestReviewLoad.vue
new file mode 100644
index 0000000000..b61650d1df
--- /dev/null
+++ b/frontend/src/business/components/track/review/view/components/TestReviewLoad.vue
@@ -0,0 +1,94 @@
+<template>
+  <ms-test-plan-common-component>
+    <template v-slot:aside>
+      <ms-node-tree
+        class="node-tree"
+        :all-label="$t('commons.all_label.review')"
+        v-loading="result.loading"
+        @nodeSelectEvent="nodeChange"
+        :tree-nodes="treeNodes"
+        ref="nodeTree"/>
+    </template>
+    <template v-slot:main>
+      <test-review-test-case-list
+        class="table-list"
+        @openTestReviewRelevanceDialog="openTestReviewRelevanceDialog"
+        @refresh="refresh"
+        :review-id="reviewId"
+        :select-node-ids="selectNodeIds"
+        :select-parent-nodes="selectParentNodes"
+        :clickType="clickType"
+        ref="testPlanTestCaseList"/>
+    </template>
+    <test-review-relevance
+      @refresh="refresh"
+      :review-id="reviewId"
+      ref="testReviewRelevance"/>
+  </ms-test-plan-common-component>
+
+</template>
+
+<script>
+import MsTestPlanCommonComponent from "@/business/components/track/plan/view/comonents/base/TestPlanCommonComponent";
+import FunctionalTestCaseList from "@/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList";
+import MsNodeTree from "@/business/components/track/common/NodeTree";
+import TestReviewRelevance from "@/business/components/track/review/view/components/TestReviewRelevance";
+import TestReviewTestCaseList from "@/business/components/track/review/view/components/TestReviewTestCaseList";
+
+export default {
+  name: "TestReviewLoad",
+  components: {
+    TestReviewTestCaseList,
+    TestReviewRelevance, MsNodeTree, FunctionalTestCaseList, MsTestPlanCommonComponent
+  },
+  data() {
+    return {
+      result: {},
+      testReviews: [],
+      currentReview: {},
+      selectNodeIds: [],
+      selectParentNodes: [],
+      treeNodes: [],
+      isMenuShow: true,
+    }
+  },
+  props: [
+    'reviewId',
+    'redirectCharType',
+    'clickType'
+  ],
+  mounted() {
+    this.getNodeTreeByReviewId()
+  },
+  activated() {
+    this.getNodeTreeByReviewId()
+
+  },
+  methods: {
+    refresh() {
+      this.selectNodeIds = [];
+      this.selectParentNodes = [];
+      this.$refs.testReviewRelevance.search();
+      this.getNodeTreeByReviewId();
+    },
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+      this.selectParentNodes = pNodes;
+    },
+    getNodeTreeByReviewId() {
+      if (this.reviewId) {
+        this.result = this.$get("/case/node/list/review/" + this.reviewId, response => {
+          this.treeNodes = response.data;
+        });
+      }
+    },
+    openTestReviewRelevanceDialog() {
+      this.$refs.testReviewRelevance.openTestReviewRelevanceDialog();
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index 57146429a0..a3c5e0e88b 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -313,6 +313,14 @@ export default {
       if (this.reviewId) {
         this.condition.reviewId = this.reviewId;
       }
+      if (this.clickType) {
+        if (this.status == 'default') {
+          this.condition.status = this.clickType;
+        } else {
+          this.condition.status = null;
+        }
+        this.status = 'all';
+      }
       this.condition.nodeIds = this.selectNodeIds;
       if (this.reviewId) {
         this.result = this.$post(this.buildPagePath('/test/review/case/list'), this.condition, response => {

From 957c186b32de19517b34fa301c1a5c454342e80e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 1 Mar 2021 16:45:15 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=85=B3=E9=97=AD=E7=8E=AF=E5=A2=83=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=8E=AF=E5=A2=83=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=AA=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/scenario/ApiScenarioEnv.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue
index 5547777048..85bbcc697e 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue
@@ -135,8 +135,9 @@ export default {
       }
       return true;
     },
-    environmentConfigClose(id) {
-      // todo 关闭时刷新环境列表
+    environmentConfigClose() {
+      this.data = [];
+      this.init();
     }
   }
 }

From e06d5bfaf6b399015dcb3532ad9887b34fd99046 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 2 Mar 2021 10:58:25 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1=E9=80=89=E4=B8=AD=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B3?=
 =?UTF-8?q?=E7=BA=A7=E6=8B=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/common/head/HeaderCustom.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index 0bc8b9f4e6..c50d5bb577 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -5,6 +5,9 @@
                    :draggable="true"
                    :to_data='fieldSelected'
                    :defaultProps="{label:'label'}"
+                   :allow-drop="allowDrop"
+                   :default-checked-keys="defaultCheckedKeys"
+                   :default-transfer="defaultTransfer"
                    :mode='mode' height='540px' filter openAll/>
     <template v-slot:footer>
       <ms-dialog-footer @cancel="close" @confirm="saveHeader"/>
@@ -25,6 +28,8 @@ export default {
       dialogTableVisible: false,
       value: [],
       fieldSelected: [],
+      defaultCheckedKeys: [],
+      defaultTransfer: true,
       mode: "transfer", // transfer addressList
     }
   },
@@ -37,8 +42,15 @@ export default {
     type: String
   },
   methods: {
+    allowDrop(draggingNode, dropNode, type) {
+      return type !== 'inner';
+    },
     open(items) {
       this.dialogTableVisible = true
+      items.forEach(i => {
+          this.defaultCheckedKeys.push(i.id)
+        }
+      )
       /*this.optionalField = items*/
     },
     saveHeader() {

From eae935989231beba3e50f2ecd9432b94e0688559 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 2 Mar 2021 11:26:30 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5jmx=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/parse/MsJmeterParser.java          | 4 +++-
 .../api/dto/scenario/environment/EnvironmentConfig.java   | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 19e078a3e0..3ebe7dc027 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -280,7 +280,9 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
         preCreate(hashTree);
         // 更新数据源
         ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
-        dataPools.getEnvConfig().setDatabaseConfigs(new ArrayList<>(dataPools.getDataSources().values()));
+        if (dataPools.getDataSources() != null) {
+            dataPools.getEnvConfig().setDatabaseConfigs(new ArrayList<>(dataPools.getDataSources().values()));
+        }
         if (dataPools.getIsCreate()) {
             dataPools.getTestEnvironmentWithBLOBs().setConfig(JSON.toJSONString(dataPools.getEnvConfig()));
             String id = environmentService.add(dataPools.getTestEnvironmentWithBLOBs());
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/environment/EnvironmentConfig.java b/backend/src/main/java/io/metersphere/api/dto/scenario/environment/EnvironmentConfig.java
index 8cf75f14d5..a9f2eb5389 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/environment/EnvironmentConfig.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/environment/EnvironmentConfig.java
@@ -5,6 +5,7 @@ import io.metersphere.api.dto.scenario.HttpConfig;
 import io.metersphere.api.dto.scenario.TCPConfig;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -13,4 +14,11 @@ public class EnvironmentConfig {
     private HttpConfig httpConfig;
     private List<DatabaseConfig> databaseConfigs;
     private TCPConfig tcpConfig;
+
+    public EnvironmentConfig() {
+        this.commonConfig = new CommonConfig();
+        this.httpConfig = new HttpConfig();
+        this.databaseConfigs = new ArrayList<>();
+        this.tcpConfig = new TCPConfig();
+    }
 }

From 8690b9afd8ecc8e95663a8eb70d45fd91a4be9b6 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 2 Mar 2021 12:52:21 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E5=8A=A0=E6=89=A7=E8=A1=8C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../review/components/TestCaseReviewEdit.vue  | 31 +++++++++++++++++++
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 4 files changed, 34 insertions(+)

diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
index b8301a29ac..904cd42a56 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
@@ -85,6 +85,9 @@
           <el-button type="primary" @click="saveReview">
             {{ $t('test_track.confirm') }}
           </el-button>
+          <el-button type="primary" @click="reviewInfo('form')">
+            {{ $t('test_track.planning_execution') }}
+          </el-button>
         </div>
       </template>
     </el-dialog>
@@ -134,6 +137,34 @@ export default {
     };
   },
   methods: {
+    reviewInfo(form) {
+      this.$refs['reviewForm'].validate((valid) => {
+        if (valid) {
+          let param = {};
+          Object.assign(param, this.form);
+          param.name = param.name.trim();
+          if (this.form.tags instanceof Array) {
+            this.form.tags = JSON.stringify(this.form.tags);
+          }
+          param.tags = this.form.tags;
+          if (param.name === '') {
+            this.$warning(this.$t('test_track.plan.input_plan_name'));
+            return;
+          }
+
+          if (!this.compareTime(new Date().getTime(), this.form.endTime)) {
+            return false;
+          }
+
+          this.result = this.$post('/test/case/review/' + this.operationType, param, response => {
+            this.dialogFormVisible = false;
+            this.$router.push('/track/review/view/' + response.data);
+          });
+        } else {
+          return false;
+        }
+      });
+    },
     openCaseReviewEditDialog(caseReview) {
       this.resetForm();
       this.setReviewerOptions();
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index cc8af26412..7b15d6a7b1 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1039,6 +1039,7 @@ export default {
     test_track: "Track",
     confirm: "Confirm",
     cancel: "Cancel",
+    planning_execution: "Planning&Execution",
     project: "Project",
     save: "Save",
     return: "Return",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index de0e5423ff..c5bb583634 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1041,6 +1041,7 @@ export default {
   },
   test_track: {
     test_track: "测试跟踪",
+    planning_execution: "规划&执行",
     confirm: "确 定",
     cancel: "取 消",
     project: "项目",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index b92acf43a4..7da7076b41 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1041,6 +1041,7 @@ export default {
     test_track: "測試跟蹤",
     confirm: "確 定",
     cancel: "取 消",
+    planning_execution: "規劃&執行",
     project: "項目",
     save: "保 存",
     return: "返 回",

From 140ce7c21104a32c965c821e1be1bb63b47fd9da Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 2 Mar 2021 14:06:10 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92)?=
 =?UTF-8?q?:=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C?=
 =?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

---
 .../metersphere/api/service/ApiTestCaseService.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 9c252f97a8..fbad14793a 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -486,6 +486,7 @@ public class ApiTestCaseService {
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         MsTestElement element = mapper.readValue(testCaseWithBLOBs.getRequest(), new TypeReference<MsTestElement>() {
         });
+        element.setProjectId(testCaseWithBLOBs.getProjectId());
         if (StringUtils.isBlank(request.getEnvironmentId())) {
             TestPlanApiCaseExample example = new TestPlanApiCaseExample();
             example.createCriteria().andTestPlanIdEqualTo(request.getTestPlanId()).andApiCaseIdEqualTo(request.getCaseId());
@@ -513,9 +514,14 @@ public class ApiTestCaseService {
         ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
         ApiTestEnvironmentWithBLOBs environment = environmentService.get(request.getEnvironmentId());
         ParameterConfig parameterConfig = new ParameterConfig();
-//        if (environment != null && environment.getConfig() != null) {
-//            parameterConfig.setConfig(JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class));
-//        }
+
+        Map<String, EnvironmentConfig> envConfig = new HashMap<>(16);
+        if (environment != null && environment.getConfig() != null) {
+            EnvironmentConfig environmentConfig = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+            envConfig.put(testCaseWithBLOBs.getProjectId(), environmentConfig);
+            parameterConfig.setConfig(envConfig);
+        }
+
         testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), parameterConfig);
         return jmeterHashTree;
     }

From 739d194854e5585142893782411a76c8e7b72147 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 2 Mar 2021 14:10:29 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92)?=
 =?UTF-8?q?:=20=E6=8B=BC=E5=86=99=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/plan/components/TestPlanList.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index d0905a2a10..7677da6ffd 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -83,13 +83,13 @@
             <el-progress :percentage="scope.row.testRate"></el-progress>
           </template>
         </el-table-column>
-        <el-table-colum
+        <el-table-column
           v-if="item.id == 'projectName'"
           prop="projectName"
           :label="$t('test_track.plan.plan_project')"
           show-overflow-tooltip
           :key="index">
-        </el-table-colum>
+        </el-table-column>
         <el-table-column
           v-if="item.id == 'plannedStartTime'"
           sortable

From bab80c4ef29bc6476ccf92e3383380e0314cfe69 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 2 Mar 2021 18:01:09 +0800
Subject: [PATCH 11/11] =?UTF-8?q?refactor(=E5=9C=BA=E6=99=AF=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E8=B0=83=E6=95=B4=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |  33 +---
 .../api/automation/scenario/EnvPopover.vue    |  49 ++++++
 .../api/automation/scenario/EnvSelect.vue     | 149 ++++++++++++++++++
 3 files changed, 204 insertions(+), 27 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/scenario/EnvPopover.vue
 create mode 100644 frontend/src/business/components/api/automation/scenario/EnvSelect.vue

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 4f4ef858e5..ac270ddc2a 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -111,26 +111,9 @@
                 <el-col :span="3" class="ms-col-one ms-font">
                   <el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
                 </el-col>
-                <el-col :span="7" class="ms-col-one ms-font">
-                  <el-link type="primary" @click="handleEnv">环境配置</el-link>
-                  <!--                  <el-select v-model="currentEnvironmentId" size="small" class="ms-htt-width"-->
-                  <!--                             :placeholder="$t('api_test.definition.request.run_env')"-->
-                  <!--                             clearable>-->
-                  <!--                    <el-option v-for="(environment, index) in environments" :key="index"-->
-                  <!--                               :label="environment.name + (environment.config.httpConfig.socket ? (': ' + environment.config.httpConfig.protocol + '://' + environment.config.httpConfig.socket) : '')"-->
-                  <!--                               :value="environment.id"/>-->
-                  <!--                    <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig">-->
-                  <!--                      {{ $t('api_test.environment.environment_config') }}-->
-                  <!--                    </el-button>-->
-                  <!--                    <template v-slot:empty>-->
-                  <!--                      <div class="empty-environment">-->
-                  <!--                        <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig">-->
-                  <!--                          {{ $t('api_test.environment.environment_config') }}-->
-                  <!--                        </el-button>-->
-                  <!--                      </div>-->
-                  <!--                    </template>-->
-                  <!--                  </el-select>-->
-
+                <el-col :span="7">
+                  <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
+                               :project-list="projectList" ref="envPopover"/>
                 </el-col>
                 <el-col :span="2">
                   <el-button :disabled="scenarioDefinition.length < 1" size="small" type="primary" @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
@@ -186,9 +169,6 @@
       <!--场景导入 -->
       <scenario-relevance @save="addScenario" ref="scenarioRelevance"/>
 
-      <api-scenario-env :project-ids="projectIds" :env-map="projectEnvMap"
-                        ref="apiScenarioEnv" @setProjectEnvMap="setProjectEnvMap" :project-list="projectList"/>
-
       <!-- 环境 -->
       <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
 
@@ -236,8 +216,7 @@
   import MsComponentConfig from "./component/ComponentConfig";
   import {handleCtrlSEvent} from "../../../../../common/js/utils";
   import {getProject} from "@/business/components/api/automation/scenario/event";
-  import ApiScenarioEnv from "@/business/components/api/automation/scenario/ApiScenarioEnv";
-
+  import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
   export default {
     name: "EditApiScenario",
     props: {
@@ -245,7 +224,6 @@
       currentScenario: {},
     },
     components: {
-      ApiScenarioEnv,
       MsVariableList,
       ScenarioRelevance,
       ScenarioApiRelevance,
@@ -255,6 +233,7 @@
       MsApiCustomize,
       ApiImport,
       MsComponentConfig,
+      EnvPopover
     },
     data() {
       return {
@@ -712,7 +691,7 @@
         //   this.$error(this.$t('api_test.environment.select_environment'));
         //   return;
         // }
-        let sign = this.$refs.apiScenarioEnv.checkEnv();
+        let sign = this.$refs.envPopover.checkEnv();
         if (!sign) {
           return;
         }
diff --git a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
new file mode 100644
index 0000000000..e9807cddab
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
@@ -0,0 +1,49 @@
+<template>
+  <el-popover
+    v-model="visible"
+    placement="bottom"
+    width="400"
+    @show="showPopover"
+    trigger="click">
+    <env-select :project-ids="projectIds" :env-map="envMap" @close="visible = false"
+                ref="envSelect" @setProjectEnvMap="setProjectEnvMap" :project-list="projectList"/>
+    <el-button type="primary" slot="reference" size="mini" style="margin-top: 2px;">
+      环境配置<i class="el-icon-caret-bottom el-icon--right"></i>
+    </el-button>
+  </el-popover>
+</template>
+
+<script>
+import EnvSelect from "@/business/components/api/automation/scenario/EnvSelect";
+
+export default {
+  name: "EnvPopover",
+  components: {EnvSelect},
+  props: {
+    envMap: Map,
+    projectIds: Set,
+    projectList: Array,
+  },
+  data() {
+    return {
+      visible: false
+    }
+  },
+  methods: {
+    showPopover() {
+      this.$refs.envSelect.open();
+    },
+    setProjectEnvMap(map) {
+      this.$emit("setProjectEnvMap", map);
+    },
+    checkEnv() {
+      return this.$refs.envSelect.checkEnv();
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
new file mode 100644
index 0000000000..93d437382e
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
@@ -0,0 +1,149 @@
+<template>
+  <div v-loading="result.loading">
+    <div v-for="pe in data" :key="pe.id" style="margin-left: 20px;">
+      <el-select v-model="pe['selectEnv']" placeholder="请选择环境" style="margin-top: 8px;width: 200px;" size="small">
+        <el-option v-for="(environment, index) in pe.envs" :key="index"
+                   :label="environment.name + (environment.config.httpConfig.socket ? (': ' + environment.config.httpConfig.protocol + '://' + environment.config.httpConfig.socket) : '')"
+                   :value="environment.id"/>
+        <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig(pe.id)">
+          {{ $t('api_test.environment.environment_config') }}
+        </el-button>
+        <template v-slot:empty>
+          <div class="empty-environment">
+            <el-button class="ms-scenario-button" size="mini" type="primary" @click="openEnvironmentConfig(pe.id)">
+              {{ $t('api_test.environment.environment_config') }}
+            </el-button>
+          </div>
+        </template>
+      </el-select>
+      <span class="project-name" :title="getProjectName(pe.id)">
+        {{ getProjectName(pe.id) }}
+      </span>
+    </div>
+
+    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
+
+    <!-- 环境配置 -->
+    <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
+  </div>
+</template>
+
+<script>
+import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
+import ApiEnvironmentConfig from "@/business/components/api/definition/components/environment/ApiEnvironmentConfig";
+
+export default {
+  name: "EnvironmentSelect",
+  components: {ApiEnvironmentConfig},
+  props: {
+    envMap: Map,
+    projectIds: Set,
+    projectList: Array
+  },
+  data() {
+    return {
+      data: [],
+      result: {},
+      projects: [],
+      environments: [],
+      dialogVisible: false
+    }
+  },
+  methods: {
+    init() {
+      this.projectIds.forEach(id => {
+        let item = {id: id, envs: [], selectEnv: ""};
+        this.data.push(item);
+        this.result = this.$get('/api/environment/list/' + id, res => {
+          let envs = res.data;
+          envs.forEach(environment => {
+            parseEnvironment(environment);
+          });
+          // 固定环境列表渲染顺序
+          let temp = this.data.find(dt => dt.id === id);
+          temp.envs = envs;
+          temp.selectEnv = this.envMap.get(id);
+        })
+      })
+    },
+    open() {
+      this.data = [];
+      if (this.projectIds.size > 0) {
+        this.init();
+      }
+    },
+    getProjectName(id) {
+      const project = this.projectList.find(p => p.id === id);
+      return project ? project.name : "";
+    },
+    openEnvironmentConfig(projectId) {
+      if (!projectId) {
+        this.$error(this.$t('api_test.select_project'));
+        return;
+      }
+      this.$refs.environmentConfig.open(projectId);
+    },
+    handleConfirm() {
+      let map = new Map();
+      let sign = true;
+      this.data.forEach(dt => {
+        if (!dt.selectEnv) {
+          sign = false;
+          return;
+        }
+        map.set(dt.id, dt.selectEnv);
+      })
+      if (!sign) {
+        this.$warning("请为每个项目选择一个运行环境！");
+        return;
+      }
+      this.$emit('setProjectEnvMap', map);
+      this.$emit('close');
+    },
+    checkEnv() {
+      let sign = true;
+      if (this.data.length > 0) {
+        this.data.forEach(dt => {
+          if (!dt.selectEnv) {
+            sign = false;
+            return false;
+          }
+        })
+      } else {
+        sign = false;
+      }
+
+      if (!sign) {
+        this.$warning("请为每个项目选择一个运行环境！");
+        return false;
+      }
+      return true;
+    },
+    environmentConfigClose() {
+      // todo 关闭处理
+    }
+  }
+}
+</script>
+
+<style scoped>
+.ms-scenario-button {
+  margin-left: 20px;
+}
+
+.env-confirm {
+  margin-left: 20px;
+  width: 360px;
+  margin-top: 10px;
+}
+
+.project-name {
+  display:inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 150px;
+  margin-left: 8px;
+  vertical-align:middle;
+}
+</style>