From 43137f54e4f9b76635fd1f90341edeeab7ce86c0 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 29 Jan 2021 14:11:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/request/database/BasisParameters.vue         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
index 18f539452a..94177448ef 100644
--- a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="isReloadData">
     <el-row>
       <el-col :span="21" style="padding-bottom: 20px">
         <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;margin: 20px">
@@ -28,7 +28,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('api_test.request.sql.dataSource')" prop="dataSourceId" style="margin-left: 10px">
-                  <el-select v-model="request.dataSourceId" size="small">
+                  <el-select v-model="request.dataSourceId" size="small" @change="reload">
                     <el-option v-for="(item, index) in databaseConfigsOptions" :key="index" :value="item.id" :label="item.name"/>
                   </el-select>
                 </el-form-item>
@@ -143,7 +143,7 @@
         activeName: "variables",
         rules: {
           environmentId: [{required: true, message: this.$t('api_test.definition.request.run_env'), trigger: 'change'}],
-          dataSourceId: [{required: true, message: this.$t('api_test.request.sql.dataSource'), trigger: 'change'}],
+          dataSourceId: [{required: true, message: this.$t('api_test.request.sql.dataSource'), trigger: 'blur'}],
         },
       }
     },

From fa9a0f6023e7ea28ffe0ef5b9edc68ce978c6521 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 29 Jan 2021 14:45:18 +0800
Subject: [PATCH 2/2] =?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=E8=B0=83=E8=AF=95=E6=97=B6csv?=
 =?UTF-8?q?=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/DebugRun.vue       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/frontend/src/business/components/api/automation/scenario/DebugRun.vue b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
index ef4f21e5ed..f5f6880cc5 100644
--- a/frontend/src/business/components/api/automation/scenario/DebugRun.vue
+++ b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
@@ -67,6 +67,19 @@
             });
           }
         }
+        if (item && item.files) {
+          item.files.forEach(fileItem => {
+            if (fileItem.file) {
+              if (!fileItem.id) {
+                let fileId = getUUID().substring(0, 12);
+                fileItem.name = fileItem.file.name;
+                fileItem.id = fileId;
+              }
+              obj.bodyUploadIds.push(fileItem.id);
+              bodyUploadFiles.push(fileItem.file);
+            }
+          });
+        }
       },
       recursiveFile(arr, bodyUploadFiles, obj) {
         arr.forEach(item => {
@@ -86,6 +99,11 @@
             this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
           }
         })
+        if (request.variables) {
+          request.variables.forEach(item => {
+            this.setFiles(item, bodyUploadFiles, obj);
+          })
+        }
         return bodyUploadFiles;
       },
       run() {