From 23cd306a6298ba66becb9f41d29b5a886144dc5b Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 25 Jan 2021 14:24:14 +0800
Subject: [PATCH] =?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=8DCSV=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/EditApiScenario.vue           | 4 ++--
 .../api/automation/scenario/variable/EditCsv.vue          | 8 +++++---
 .../api/automation/scenario/variable/VariableList.vue     | 3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 521a3fc36c..827288a95e 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -143,7 +143,7 @@
                        highlight-current
                        @node-expand="nodeExpand"
                        @node-collapse="nodeCollapse"
-                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable>
+                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable class="ms-is-leaf">
                     <span class="custom-tree-node father" slot-scope="{ node, data}" style="width: 96%">
                       <!-- 步骤组件-->
                        <ms-component-config :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
@@ -1035,7 +1035,7 @@
     color: #7C3985;
   }
 
-  /deep/ .is-leaf {
+  .ms-is-leaf >>> .is-leaf {
     color: transparent;
   }
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/variable/EditCsv.vue b/frontend/src/business/components/api/automation/scenario/variable/EditCsv.vue
index 8acb289ebd..59543f8360 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/EditCsv.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/EditCsv.vue
@@ -29,7 +29,7 @@
           <el-col :span="20">
             <el-autocomplete
               size="small"
-              class="inline-input"
+              style="width: 100%"
               v-model="editData.encoding"
               :fetch-suggestions="querySearch"
               :placeholder="$t('commons.input_content')"
@@ -110,7 +110,7 @@
       },
 
       handleClick() {
-        let config = {complete: this.complete, step: this.step};
+        let config = {complete: this.complete, step: this.step, delimiter: this.editData.delimiter ? this.editData.delimiter : ","};
         this.allDatas = [];
         // 本地文件
         if (this.editData.files && this.editData.files.length > 0 && this.editData.files[0].file) {
@@ -152,5 +152,7 @@
 </script>
 
 <style scoped>
-
+  ms-is-leaf >>> .is-leaf {
+    color: red;
+  }
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
index c8b706842e..4665c8e08f 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
@@ -107,6 +107,9 @@
       },
       addParameters(v) {
         v.id = getUUID();
+        if (v.type === 'CSV') {
+          v.delimiter = ",";
+        }
         this.variables.push(v);
         let index = 1;
         this.variables.forEach(item => {