Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml

@@ -70,6 +70,6 @@
         from project, test_case_review_project
         where project.id = test_case_review_project.project_id
         and project.workspace_id = #{workspaceId}
-        and test_case_review_project.review_id = #{reviewId};
+        and test_case_review_project.review_id = #{reviewId}
     </select>
 </mapper>

frontend/src/business/components/api/test/components/ApiScenarioConfig.vue

@@ -61,7 +61,7 @@
                              :request="selected" :scenario="currentScenario" v-if="isRequest"/>
       </div>
     </el-main>
-    <ms-api-scenario-select :exclude-id="test.id" @select="selectScenario" ref="selectDialog"/>
+    <ms-api-scenario-select :exclude-id="test.id" :project-id="test.projectId" @select="selectScenario" ref="selectDialog"/>
   </el-container>
 </template>
 

frontend/src/business/components/api/test/components/ApiScenarioSelect.vue

@@ -43,6 +43,7 @@ import MsTableSearchBar from "@/business/components/common/components/MsTableSea
 import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
 import MsApiScenarioSelectSubTable from "@/business/components/api/test/components/ApiScenarioSelectSubTable";
 import {Scenario} from "@/business/components/api/test/model/ScenarioModel";
+import {parseEnvironment} from "../model/EnvironmentModel";
 
 export default {
   name: "MsApiScenarioSelect",
@@ -51,7 +52,8 @@ export default {
     MsTableAdvSearchBar, MsTableSearchBar, MsTablePagination, MsTableHeader
   },
   props: {
-    excludeId: String
+    excludeId: String,
+    projectId: String
   },
   data() {
     return {
@@ -64,6 +66,7 @@ export default {
       pageSize: 5,
       total: 0,
       selection: false,
+      environmentMap: new Map()
     }
   },
   methods: {
@@ -94,19 +97,50 @@ export default {
         }
         scenarios.push(scenario);
       }
+      this.initScenarioEnvironment(scenarios);
       this.$emit('select', scenarios);
     },
+    getEnvironment() {
+      if (this.projectId) {
+        this.result = this.$get('/api/environment/list/' + this.projectId, response => {
+          let environments = response.data;
+          this.environmentMap = new Map();
+          environments.forEach(environment => {
+            parseEnvironment(environment);
+            this.environmentMap.set(environment.id, environment);
+          });
+        });
+      }
+    },
+    initScenarioEnvironment(scenarios) {
+      scenarios.forEach(scenario => {
+        if (scenario.environmentId) {
+          let env = this.environmentMap.get(scenario.environmentId);
+          if (!env) {
+            scenario.environmentId = undefined;
+            scenario.environment = undefined;
+          } else {
+            scenario.environment = env;
+          }
+        } else {
+          scenario.environmentId = undefined;
+          scenario.environment = undefined;
+        }
+      });
+    },
     clone(row) {
       let scenarios = [];
       row.selected.forEach(options => {
         // 去掉ID，创建新的ID
         options.id = undefined;
         scenarios.push(new Scenario(options));
-      })
+      });
+      this.initScenarioEnvironment(scenarios);
       this.$emit('select', scenarios);
     },
     open() {
       this.search();
+      this.getEnvironment();
       this.visible = true;
     },
     close() {

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9