From 84467c1063a408225f57fea40c9b21e0503247cb Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 14 Nov 2023 18:20:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsql=E6=AD=A5=E9=AA=A4=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=90=8C=E5=90=8D=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1032777 --user=王孝刚 【接口测试】github#27497，切换自动化运行环境时，SQL步骤没有切换到对应环境的同名数据源 https://www.tapd.cn/55049933/s/1436469
---
 .../request/database/BasisParameters.vue      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/api-test/frontend/src/business/definition/components/request/database/BasisParameters.vue b/api-test/frontend/src/business/definition/components/request/database/BasisParameters.vue
index 236c013def..d46409c9d2 100644
--- a/api-test/frontend/src/business/definition/components/request/database/BasisParameters.vue
+++ b/api-test/frontend/src/business/definition/components/request/database/BasisParameters.vue
@@ -47,7 +47,7 @@
                   :label="$t('api_test.request.sql.dataSource')"
                   prop="dataSourceId"
                   style="margin-left: 10px">
-                  <el-select v-model="request.dataSourceId" size="small" @change="reload">
+                  <el-select v-model="request.dataSourceId" size="small" @change="reloadDataSource">
                     <el-option
                       v-for="(item, index) in databaseConfigsOptions"
                       :key="index"
@@ -287,6 +287,14 @@ export default {
     },
   },
   methods: {
+    reloadDataSource(dataSourceId) {
+      this.databaseConfigsOptions.forEach((item) => {
+        if (item.id === dataSourceId) {
+          this.request.targetDataSourceName = item.name;
+        }
+      });
+      this.reload();
+    },
     tabClick() {
       if (this.activeName === 'preOperate') {
         this.$refs.preStep.filter();
@@ -440,6 +448,13 @@ export default {
             if (!this.isCase) {
               this.environments = [currentEnvironment];
             }
+            if (environment.config && environment.config.databaseConfigs) {
+              environment.config.databaseConfigs.forEach((item) => {
+                if (item.id === this.request.dataSourceId) {
+                  this.request.targetDataSourceName = item.name;
+                }
+              });
+            }
           }
         });
         if (!hasEnvironment) {
@@ -452,6 +467,9 @@ export default {
       this.$refs.environmentConfig.open(this.request.projectId ? this.request.projectId : getCurrentProjectID());
     },
     initDataSource(envId, currentEnvironment, targetDataSourceName) {
+      if (!targetDataSourceName) {
+        targetDataSourceName = this.request.targetDataSourceName;
+      }
       this.databaseConfigsOptions = [];
       if (envId) {
         this.request.environmentId = envId;