From 307e063a4999bd110887d9c25e9523706e9ddc03 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 15 Jul 2021 17:15:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AFCSV=E5=8F=98=E9=87=8F=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=81=E8=AE=B8=E5=BC=95=E5=8F=B7=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=20#1005136=20--bug=3D1005136=20--user=3D=E8=B5=B5?=
 =?UTF-8?q?=E5=8B=87=20=E3=80=90github#4657=E3=80=91=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=87=AA...=20https://www.tapd.cn/55049933/s/1025495?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/definition/request/MsTestElement.java |  1 +
 .../request/variable/ScenarioVariable.java    |  1 +
 .../automation/scenario/variable/EditCsv.vue  | 24 +++++++++++++------
 .../scenario/variable/VariableList.vue        |  3 ++-
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 7 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
index a9d9765027..7caa0f4214 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
@@ -207,6 +207,7 @@ public abstract class MsTestElement {
                     csvDataSet.setProperty("shareMode", shareMode);
                     csvDataSet.setProperty("recycle", true);
                     csvDataSet.setProperty("delimiter", item.getDelimiter());
+                    csvDataSet.setProperty("quotedData", item.isQuotedData());
                     csvDataSet.setComment(StringUtils.isEmpty(item.getDescription()) ? "" : item.getDescription());
                     tree.add(csvDataSet);
                 });
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java
index 22f4f6b183..4ed0188566 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java
@@ -27,6 +27,7 @@ public class ScenarioVariable {
      */
     private List<BodyFile> files;
     private String delimiter;
+    private boolean quotedData;
     private String encoding;
     /**
      * counter
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 3c44d17422..6f09d3072f 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/EditCsv.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/EditCsv.vue
@@ -15,18 +15,18 @@
     <el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 40px">
       <el-tab-pane :label="$t('variables.config')" name="config">
         <el-row>
-          <el-col :span="4" style="margin-top: 5px">
+          <el-col :span="5" style="margin-top: 5px">
             <span>{{$t('variables.add_file')}}</span>
           </el-col>
-          <el-col :span="20">
+          <el-col :span="19">
             <ms-csv-file-upload :parameter="editData"/>
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px">
-          <el-col :span="4" style="margin-top: 5px">
+          <el-col :span="5" style="margin-top: 5px">
             <span>Encoding</span>
           </el-col>
-          <el-col :span="20">
+          <el-col :span="19">
             <el-autocomplete
               size="small"
               style="width: 100%"
@@ -37,14 +37,24 @@
           </el-col>
         </el-row>
         <el-row style="margin-top: 10px">
-          <el-col :span="4" style="margin-top: 5px">
+          <el-col :span="5" style="margin-top: 5px">
             <span>{{$t('variables.delimiter')}}</span>
           </el-col>
-          <el-col :span="20">
+          <el-col :span="19">
             <el-input v-model="editData.delimiter" size="small"/>
           </el-col>
         </el-row>
-
+        <el-row style="margin-top: 10px">
+          <el-col :span="5" style="margin-top: 5px">
+            <span>{{$t('variables.quoted_data')}}</span>
+          </el-col>
+          <el-col :span="19">
+            <el-select v-model="editData.quotedData" size="small">
+              <el-option label="True" :value="true"/>
+              <el-option label="False" :value="false"/>
+            </el-select>
+          </el-col>
+        </el-row>
       </el-tab-pane>
       <el-tab-pane :label="$t('schema.preview')" name="preview">
         <el-table
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 da3c4427a5..aa5d80171a 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
@@ -215,7 +215,7 @@ export default {
       }
     },
     handleClick(command) {
-      this.editData = {delimiter: ","};
+      this.editData = {delimiter: ",",quotedData: 'false'};
       this.editData.type = command;
       this.addParameters(this.editData);
     },
@@ -235,6 +235,7 @@ export default {
       v.id = getUUID();
       if (v.type === 'CSV') {
         v.delimiter = ",";
+        v.quotedData = false;
       }
       this.variables.push(v);
       let index = 1;
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 1c0a403053..6d07a6cd69 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1902,6 +1902,7 @@ export default {
     add_file: "Add file",
     delimiter: "Delimiter",
     format: "Output format",
+    quoted_data: "Whether to allow quotes",
   },
   auth_source: {
     delete_prompt: 'This operation will delete the authentication source, do you want to continue? ',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 261d8d097c..88512f8710 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1909,6 +1909,7 @@ export default {
     add_file: "添加文件",
     delimiter: "分隔符",
     format: "输出格式",
+    quoted_data: "是否允许带引号",
   },
   auth_source: {
     delete_prompt: '此操作会删除认证源，是否继续？',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6b60fc6258..b489ba3028 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1909,6 +1909,7 @@ export default {
     add_file: "添加文件",
     delimiter: "分隔符",
     format: "輸出格式",
+    quoted_data: "是否允许带引号",
   },
   auth_source: {
     delete_prompt: '此操作會刪除認證源，是否繼續？',