fix(接口定义): csv优化

backend/src/main/java/io/metersphere/config/KafkaConfig.java

@@ -7,9 +7,9 @@ import org.springframework.kafka.config.TopicBuilder;
 @Configuration
 public class KafkaConfig {
     // 执行内容监听
-    public final static String EXEC_TOPIC = "ms-automation-exec-topic";
+    public final static String EXEC_TOPIC = "ms-automation-exec-topic123";
     //执行结果回传
-    public static final String TOPICS = "ms-api-exec-topic";
+    public static final String TOPICS = "ms-api-exec-topic123";
 
     @Bean
     public NewTopic apiExecTopic() {

frontend/src/business/components/api/automation/scenario/variable/CsvFileUpload.vue

@@ -1,5 +1,7 @@
 <template>
     <span>
+      <el-row>
+        <el-col :span="18">
            <el-upload
              action="#"
              class="api-body-upload"
@@ -10,25 +12,28 @@
              :limit="1"
              :on-exceed="exceed"
              ref="upload">
-
          <div class="upload-default">
            <i class="el-icon-plus"/>
          </div>
          <div class="upload-item" slot="file" slot-scope="{file}">
-             <span>{{file.file ? file.file.name : file.name}}</span>
+           <span>{{ file.file ? file.file.name : file.name }}</span>
            <span class="el-upload-list__item-actions">
             <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
               <i class="el-icon-delete"/>
             </span>
            </span>
           </div>
-
       </el-upload>
+        </el-col>
+        <el-col :span="6">
+          <el-button size="small" style="margin: 3px 5px" @click="download">下载</el-button>
+        </el-col>
+      </el-row>
     </span>
 </template>
 
 <script>
-  export default {
+export default {
   name: "MsApiBodyFileUpload",
   data() {
     return {
@@ -42,6 +47,28 @@
     }
   },
   methods: {
+    download() {
+      // 本地文件
+      if (this.parameter.files && this.parameter.files.length > 0 && this.parameter.files[0].file) {
+        console.log("local",this.parameter.files[0].file)
+      }
+      // 远程下载文件
+      if (this.parameter.files && this.parameter.files.length > 0 && !this.parameter.files[0].file) {
+        let file = this.parameter.files[0];
+        let conf = {
+          url: "/api/automation/file/download",
+          method: 'post',
+          data: file,
+          responseType: 'blob',
+        };
+        this.result = this.$request(conf).then(response => {
+          const content = response.data;
+          const blob = new Blob([content]);
+          console.log(content)
+
+        });
+      }
+    },
     handleRemove(file) {
       this.$refs.upload.handleRemove(file);
       for (let i = 0; i < this.parameter.files.length; i++) {
@@ -78,48 +105,48 @@
       this.parameter.files = [];
     }
   }
-  }
+}
 </script>
 
 <style scoped>
 
-  .el-upload {
+.el-upload {
   background-color: black;
-  }
+}
 
-  .api-body-upload >>> .el-upload {
+.api-body-upload >>> .el-upload {
   height: 30px;
   width: 32px;
-  }
+}
 
-  .upload-default {
+.upload-default {
   min-height: 30px;
   width: 32px;
   line-height: 32px;
-  }
+}
 
-  .el-icon-plus {
+.el-icon-plus {
   font-size: 16px;
-  }
+}
 
-  .api-body-upload >>> .el-upload-list__item {
+.api-body-upload >>> .el-upload-list__item {
   height: 30px;
   width: auto;
   padding: 6px;
   margin-bottom: 0px;
-  }
+}
 
-  .api-body-upload >>> .el-upload-list--picture-card {
+.api-body-upload >>> .el-upload-list--picture-card {
-  }
+}
 
-  .api-body-upload {
+.api-body-upload {
   min-height: 30px;
   border: 1px solid #EBEEF5;
   padding: 2px;
   border-radius: 4px;
-  }
+}
 
-  .upload-item {
+.upload-item {
-  }
+}
 
 </style>

frontend/src/business/components/api/automation/scenario/variable/VariableList.vue

@@ -200,7 +200,7 @@ export default {
       if (data) {
         let keyValues = this._handleBatchVars(data);
         keyValues.forEach(item => {
-          this.format(this.headers,item);
+          this.format(this.headers, item);
         });
       }
     },
@@ -229,7 +229,7 @@ export default {
       }
     },
     handleClick(command) {
-      this.editData = {delimiter: ",",quotedData: 'false'};
+      this.editData = {delimiter: ",", quotedData: 'false'};
       this.editData.type = command;
       this.addParameters(this.editData);
     },
@@ -298,10 +298,32 @@ export default {
         this.$warning("请选择一条数据删除");
         return;
       }
+      let message = "";
+      ids.forEach(row => {
+        const v = this.variables.find(d => d.id === row);
+        if (v && v.type === 'CSV' && v.name) {
+          message += v.name + ";";
+        }
+      });
+      if (message !== "") {
+        message = message.substr(0, message.length - 1);
+        this.$alert('是否确认删除CSV：【 ' + message + " 】？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
               ids.forEach(row => {
                 const index = this.variables.findIndex(d => d.id === row);
                 this.variables.splice(index, 1);
               });
+            }
+          }
+        });
+      } else {
+        ids.forEach(row => {
+          const index = this.variables.findIndex(d => d.id === row);
+          this.variables.splice(index, 1);
+        });
+      }
       this.selection = [];
       this.editData = {type: "CONSTANT"};
     },