From dc23cee80aae00a79ee7404487189f8578d8227b Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Sat, 7 Jan 2023 15:48:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92-UI=E7=94=A8=E4=BE=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C-=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1021693 --user=张大海 【测试跟踪】测试计划-UI用例列表-批量执行-环境显示错误 https://www.tapd.cn/55049933/s/1323945
---
 .../src/api/remote/ui/test-plan-ui-scenario-case.js        | 4 ++++
 .../plan/view/comonents/ui/TestPlanUiScenarioList.vue      | 4 ++--
 .../src/business/plan/view/comonents/ui/UiRunMode.vue      | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test-track/frontend/src/api/remote/ui/test-plan-ui-scenario-case.js b/test-track/frontend/src/api/remote/ui/test-plan-ui-scenario-case.js
index d58a2e974f..690de48269 100644
--- a/test-track/frontend/src/api/remote/ui/test-plan-ui-scenario-case.js
+++ b/test-track/frontend/src/api/remote/ui/test-plan-ui-scenario-case.js
@@ -43,3 +43,7 @@ export function testPlanUiScenarioCaseDelete(id) {
 export function uiScenarioModulePlanList(planId) {
   return get(BASE_URL + `list/module/${planId}`);
 }
+
+export function testPlanUiScenarioCaseEnv(params) {
+  return post(BASE_URL + 'get/env', params);
+}
diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
index a01391b7d1..9319d4ac52 100644
--- a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
@@ -178,7 +178,7 @@
                 @batchEdit="batchEdit"/>
 
     <ui-run-mode @handleRunBatch="handleRunBatch" ref="runMode" :custom-run-mode="true"
-                 :custom-serial-on-sample-error="true" :request="conditionRequest"/>
+                 :custom-serial-on-sample-error="true" :request="conditionRequest" :plan-case-ids="planCaseIds"/>
 
     <ms-task-center ref="taskCenter" :show-menu="false"/>
   </div>
@@ -440,7 +440,7 @@ export default {
       let rows = this.orderBySelectRows(this.$refs.table.selectRows);
       this.planCaseIds = [];
       rows.forEach(row => {
-        this.planCaseIds.push(row.caseId);
+        this.planCaseIds.push(row.id);
       })
       this.conditionRequest.id = getUUID();
       this.conditionRequest.ids = this.planCaseIds;
diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/UiRunMode.vue b/test-track/frontend/src/business/plan/view/comonents/ui/UiRunMode.vue
index 9677599bc6..0cef6e3cf3 100644
--- a/test-track/frontend/src/business/plan/view/comonents/ui/UiRunMode.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/ui/UiRunMode.vue
@@ -192,8 +192,8 @@
 <script>
 import MsDialogFooter from 'metersphere-frontend/src/components/MsDialogFooter'
 import {getCurrentProjectID, getOwnerProjects, strMapToObj} from "@/business/utils/sdk-utils";
-import {uiScenarioEnvMap} from "@/api/remote/ui/ui-automation";
 import EnvSelectPopover from "@/business/plan/env/EnvSelectPopover";
+import {testPlanUiScenarioCaseEnv} from "@/api/remote/ui/test-plan-ui-scenario-case";
 
 export default {
   name: "UiRunMode",
@@ -230,6 +230,9 @@ export default {
     };
   },
   props: {
+    planCaseIds: {
+      type: Array,
+    },
     request: {
       type: Object,
     },
@@ -326,7 +329,7 @@ export default {
     showScenarioPopover() {
       let currentProjectID = getCurrentProjectID();
       this.projectIds.clear();
-      uiScenarioEnvMap(this.request).then((res) => {
+      testPlanUiScenarioCaseEnv(this.request.ids).then((res) => {
         let data = res.data;
         this.projectEnvListMap = data;
         if (data) {