From e1e98a8a24948c730f6cc5ad9d139d88f9548ba9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 6 Jul 2021 16:27:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E5=8F=98=E9=87=8F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/variable/VariableList.vue        | 466 +++++++++---------
 1 file changed, 245 insertions(+), 221 deletions(-)

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 79166bb81d..da3c4427a5 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
@@ -10,9 +10,11 @@
             <div>
               <el-row style="margin-bottom: 10px">
                 <div style="float: left">
-                  <el-input :placeholder="$t('commons.search_by_name')" v-model="selectVariable" size="small" @change="filter"
+                  <el-input :placeholder="$t('commons.search_by_name')" v-model="selectVariable" size="small"
+                            @change="filter"
                             @keyup.enter="filter">
-                    <el-select v-model="searchType" slot="prepend" :placeholder="$t('test_resource_pool.type')" style="width: 90px" @change="filter">
+                    <el-select v-model="searchType" slot="prepend" :placeholder="$t('test_resource_pool.type')"
+                               style="width: 90px" @change="filter">
                       <el-option value="CONSTANT" :label="$t('api_test.automation.constant')"></el-option>
                       <el-option value="LIST" :label="$t('test_track.case.list')"></el-option>
                       <el-option value="CSV" label="CSV"></el-option>
@@ -21,35 +23,41 @@
                     </el-select>
                   </el-input>
                 </div>
-
                 <div style="float: right">
                   <el-dropdown split-button type="primary" @command="handleClick" @click="handleClick('CONSTANT')"
                                size="small" style="margin-left: 10px">
                     {{ $t('commons.add') }}
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="CONSTANT">{{$t('api_test.automation.constant')}}</el-dropdown-item>
-                      <el-dropdown-item command="LIST">{{$t('test_track.case.list')}}</el-dropdown-item>
+                      <el-dropdown-item command="CONSTANT">{{ $t('api_test.automation.constant') }}</el-dropdown-item>
+                      <el-dropdown-item command="LIST">{{ $t('test_track.case.list') }}</el-dropdown-item>
                       <el-dropdown-item command="CSV">CSV</el-dropdown-item>
-                      <el-dropdown-item command="COUNTER">{{$t('api_test.automation.counter')}}</el-dropdown-item>
-                      <el-dropdown-item command="RANDOM">{{$t('api_test.automation.random')}}</el-dropdown-item>
+                      <el-dropdown-item command="COUNTER">{{ $t('api_test.automation.counter') }}</el-dropdown-item>
+                      <el-dropdown-item command="RANDOM">{{ $t('api_test.automation.random') }}</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                   <el-button size="small" style="margin-left: 10px" @click="deleteVariable">{{ $t('commons.delete') }}
                   </el-button>
 
                 </div>
+                <div style="float: right; margin-top: 10px">
+                  <el-link @click="batchAddParameter" type="primary" :disabled="disabled">
+                    {{ $t("commons.batch_add") }}
+                  </el-link>
+                </div>
               </el-row>
               <el-row>
                 <el-col :span="12">
                   <div style="border:1px #DCDFE6 solid; min-height: 400px;border-radius: 4px ;width: 100% ;">
-                    <el-table ref="table" border :data="variables" class="adjust-table" :row-class-name="tableRowClassName"
+                    <el-table ref="table" border :data="variables" class="adjust-table"
+                              :row-class-name="tableRowClassName"
                               @select-all="select"
                               @select="select"
                               @row-click="edit"
                               v-loading="loading" height="400px">
                       <el-table-column type="selection" width="38"/>
                       <el-table-column prop="num" label="ID" sortable width="60"/>
-                      <el-table-column prop="name" :label="$t('api_test.variable_name')" sortable show-overflow-tooltip/>
+                      <el-table-column prop="name" :label="$t('api_test.variable_name')" sortable
+                                       show-overflow-tooltip/>
                       <el-table-column prop="type" :label="$t('test_track.case.type')" width="70">
                         <template v-slot:default="scope">
                           <span>{{ types.get(scope.row.type) }}</span>
@@ -57,6 +65,7 @@
                       </el-table-column>
                       <el-table-column prop="value" :label="$t('api_test.value')" show-overflow-tooltip/>
                     </el-table>
+                    <batch-add-parameter @batchSave="batchSaveParameter" ref="batchAddParameter"/>
                   </div>
                 </el-col>
                 <el-col :span="12">
@@ -82,12 +91,13 @@
           </span>
             </el-tooltip>
             <el-row>
-              <el-link class="ms-variable-link" @click="batchAdd" style="color: #783887" :disabled="disabled"> {{ $t("commons.batch_add") }}
+              <el-link class="ms-variable-link" @click="batchAddHeader" type="primary" :disabled="disabled">
+                {{ $t("commons.batch_add") }}
               </el-link>
             </el-row>
             <div style="min-height: 400px">
               <ms-api-key-value :items="headers" :suggestions="headerSuggestions"/>
-              <batch-add-parameter @batchSave="batchSave" ref="batchAddParameter"/>
+              <batch-add-parameter @batchSave="batchSaveHeader" ref="batchAddHeader"/>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -102,229 +112,243 @@
 </template>
 
 <script>
-  import MsEditConstant from "./EditConstant";
-  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-  import MsTableHeader from "@/business/components/common/components/MsTableHeader";
-  import MsTablePagination from "@/business/components/common/pagination/TablePagination";
-  import MsEditCounter from "./EditCounter";
-  import MsEditRandom from "./EditRandom";
-  import MsEditListValue from "./EditListValue";
-  import MsEditCsv from "./EditCsv";
-  import {getUUID} from "@/common/js/utils";
-  import MsApiKeyValue from "../../../definition/components/ApiKeyValue";
-  import BatchAddParameter from "../../../definition/components/basis/BatchAddParameter";
-  import {KeyValue} from "../../../definition/model/ApiTestModel";
-  import {REQUEST_HEADERS} from "@/common/js/constants";
+import MsEditConstant from "./EditConstant";
+import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+import MsTableHeader from "@/business/components/common/components/MsTableHeader";
+import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+import MsEditCounter from "./EditCounter";
+import MsEditRandom from "./EditRandom";
+import MsEditListValue from "./EditListValue";
+import MsEditCsv from "./EditCsv";
+import {getUUID} from "@/common/js/utils";
+import MsApiKeyValue from "../../../definition/components/ApiKeyValue";
+import BatchAddParameter from "../../../definition/components/basis/BatchAddParameter";
+import {KeyValue} from "../../../definition/model/ApiTestModel";
+import {REQUEST_HEADERS} from "@/common/js/constants";
 
-  export default {
-    name: "MsVariableList",
-    components: {
-      MsEditConstant,
-      MsDialogFooter,
-      MsTableHeader,
-      MsTablePagination,
-      MsEditCounter,
-      MsEditRandom,
-      MsEditListValue,
-      MsEditCsv,
-      MsApiKeyValue,
-      BatchAddParameter
+export default {
+  name: "MsVariableList",
+  components: {
+    MsEditConstant,
+    MsDialogFooter,
+    MsTableHeader,
+    MsTablePagination,
+    MsEditCounter,
+    MsEditRandom,
+    MsEditListValue,
+    MsEditCsv,
+    MsApiKeyValue,
+    BatchAddParameter
+  },
+  data() {
+    return {
+      variables: [],
+      headers: [],
+      activeName: "variable",
+      searchType: "",
+      selectVariable: "",
+      condition: {},
+      types: new Map([
+        ['CONSTANT', this.$t('api_test.automation.constant')],
+        ['LIST', this.$t('test_track.case.list')],
+        ['CSV', 'CSV'],
+        ['COUNTER', this.$t('api_test.automation.counter')],
+        ['RANDOM', this.$t('api_test.automation.random')]
+      ]),
+      visible: false,
+      selection: [],
+      loading: false,
+      currentPage: 1,
+      editData: {},
+      pageSize: 10,
+      total: 0,
+      headerSuggestions: REQUEST_HEADERS,
+      disabled: false,
+    };
+  },
+  methods: {
+    batchAddParameter() {
+      this.$refs.batchAddParameter.open();
     },
-    data() {
-      return {
-        variables: [],
-        headers: [],
-        activeName: "variable",
-        searchType: "",
-        selectVariable: "",
-        condition: {},
-        types: new Map([
-          ['CONSTANT', this.$t('api_test.automation.constant')],
-          ['LIST', this.$t('test_track.case.list')],
-          ['CSV', 'CSV'],
-          ['COUNTER', this.$t('api_test.automation.counter')],
-          ['RANDOM', this.$t('api_test.automation.random')]
-        ]),
-        visible: false,
-        selection: [],
-        loading: false,
-        currentPage: 1,
-        editData: {},
-        pageSize: 10,
-        total: 0,
-        headerSuggestions: REQUEST_HEADERS,
-        disabled: false,
+    batchAddHeader() {
+      this.$refs.batchAddHeader.open();
+    },
+    _handleBatchVars(data) {
+      let params = data.split("\n");
+      let keyValues = [];
+      params.forEach(item => {
+        let line = item.split(/，|,/);
+        let required = false;
+        if (line[1] === '必填' || line[1] === 'true') {
+          required = true;
+        }
+        keyValues.push(new KeyValue({
+          name: line[0],
+          required: required,
+          value: line[2],
+          description: line[3],
+          type: "text",
+          valid: false,
+          file: false,
+          encode: true,
+          enable: true,
+          contentType: "text/plain"
+        }));
+      });
+      return keyValues;
+    },
+    batchSaveHeader(data) {
+      if (data) {
+        let keyValues = this._handleBatchVars(data);
+        keyValues.forEach(item => {
+          this.headers.unshift(item);
+        });
       }
     },
-    methods: {
-      batchAdd() {
-        this.$refs.batchAddParameter.open();
-      },
-      batchSave(data) {
-        if (data) {
-          let params = data.split("\n");
-          let keyValues = [];
-          params.forEach(item => {
-            let line = item.split(/，|,/);
-            let required = false;
-            if (line[1] === '必填' || line[1] === 'true') {
-              required = true;
-            }
-            keyValues.push(new KeyValue({
-              name: line[0],
-              required: required,
-              value: line[2],
-              description: line[3],
-              type: "text",
-              valid: false,
-              file: false,
-              encode: true,
-              enable: true,
-              contentType: "text/plain"
-            }));
-          })
-          keyValues.forEach(item => {
-            this.headers.unshift(item);
-          })
+    batchSaveParameter(data) {
+      if (data) {
+        let keyValues = this._handleBatchVars(data);
+        keyValues.forEach(item => {
+          item.type = 'CONSTANT';
+          this.addParameters(item);
+        });
+      }
+    },
+    handleClick(command) {
+      this.editData = {delimiter: ","};
+      this.editData.type = command;
+      this.addParameters(this.editData);
+    },
+    edit(row) {
+      this.$refs.table.clearSelection();
+      this.$refs.table.toggleRowSelection(row);
+      this.selection = [row.id];
+      this.editData = row;
+    },
+    tableRowClassName(row) {
+      if (row.row.hidden) {
+        return 'ms-variable-hidden-row';
+      }
+      return '';
+    },
+    addParameters(v) {
+      v.id = getUUID();
+      if (v.type === 'CSV') {
+        v.delimiter = ",";
+      }
+      this.variables.push(v);
+      let index = 1;
+      this.variables.forEach(item => {
+        item.num = index;
+        index++;
+      });
+    },
+    select(selection) {
+      this.selection = selection.map(s => s.id);
+    },
+    isSelect(row) {
+      return this.selection.includes(row.id);
+    },
+    open: function (variables, headers, disabled) {
+      if (variables) {
+        this.variables = variables;
+      }
+      if (headers) {
+        this.headers = headers;
+      }
+      this.visible = true;
+      this.editData = {type: "CONSTANT"};
+      this.addParameters(this.editData);
+      this.disabled = disabled;
+    },
+    save() {
+      this.visible = false;
+    },
+    close() {
+      this.visible = false;
+      let saveVariables = [];
+      this.variables.forEach(item => {
+        item.hidden = undefined;
+        if (item.name && item.name != "") {
+          saveVariables.push(item);
         }
-      },
-      handleClick(command) {
-        this.editData = {delimiter: ","};
-        this.editData.type = command;
-        this.addParameters(this.editData);
-      },
-      edit(row) {
-        this.$refs.table.clearSelection();
-        this.$refs.table.toggleRowSelection(row);
-        this.selection = [row.id];
-        this.editData = row;
-      },
-      tableRowClassName(row) {
-        if (row.row.hidden) {
-          return 'ms-variable-hidden-row';
-        }
-        return '';
-      },
-      addParameters(v) {
-        v.id = getUUID();
-        if (v.type === 'CSV') {
-          v.delimiter = ",";
-        }
-        this.variables.push(v);
-        let index = 1;
-        this.variables.forEach(item => {
-          item.num = index;
-          index++;
-        })
-      },
-      select(selection) {
-        this.selection = selection.map(s => s.id);
-      },
-      isSelect(row) {
-        return this.selection.includes(row.id)
-      },
-      open: function (variables, headers, disabled) {
-        if (variables) {
-          this.variables = variables;
-        }
-        if (headers) {
-          this.headers = headers;
-        }
-        this.visible = true;
-        this.editData = {type: "CONSTANT"};
-        this.addParameters(this.editData);
-        this.disabled = disabled;
-      },
-      save() {
-        this.visible = false;
-      },
-      close() {
-        this.visible = false;
-        let saveVariables = [];
-        this.variables.forEach(item => {
-          item.hidden = undefined;
-          if (item.name && item.name != "") {
-            saveVariables.push(item);
-          }
-        })
-        this.selectVariable = "";
-        this.searchType = "";
-        this.$emit('setVariables', saveVariables, this.headers);
-      },
-      deleteVariable() {
-        let ids = Array.from(this.selection);
-        if (ids.length == 0) {
-          this.$warning("请选择一条数据删除");
-          return;
-        }
-        ids.forEach(row => {
-          const index = this.variables.findIndex(d => d.id === row);
-          this.variables.splice(index, 1);
-        })
-        this.selection = [];
-        this.editData = {type: "CONSTANT"};
-      },
-      filter() {
-        let datas = [];
-        this.variables.forEach(item => {
-          if (this.searchType && this.searchType != "" && this.selectVariable && this.selectVariable != "") {
-            if ((item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) || (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1)) {
-              item.hidden = true;
-            } else {
-              item.hidden = undefined;
-            }
-          }
-          else if (this.selectVariable && this.selectVariable != "") {
-            if (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1) {
-              item.hidden = true;
-            } else {
-              item.hidden = undefined;
-            }
-          }
-          else if (this.searchType && this.searchType != "") {
-            if (item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) {
-              item.hidden = true;
-            } else {
-              item.hidden = undefined;
-            }
+      });
+      this.selectVariable = "";
+      this.searchType = "";
+      this.$emit('setVariables', saveVariables, this.headers);
+    },
+    deleteVariable() {
+      let ids = Array.from(this.selection);
+      if (ids.length == 0) {
+        this.$warning("请选择一条数据删除");
+        return;
+      }
+      ids.forEach(row => {
+        const index = this.variables.findIndex(d => d.id === row);
+        this.variables.splice(index, 1);
+      });
+      this.selection = [];
+      this.editData = {type: "CONSTANT"};
+    },
+    filter() {
+      let datas = [];
+      this.variables.forEach(item => {
+        if (this.searchType && this.searchType != "" && this.selectVariable && this.selectVariable != "") {
+          if ((item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) || (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1)) {
+            item.hidden = true;
           } else {
             item.hidden = undefined;
           }
-          datas.push(item);
-        })
-        this.variables = datas;
-      },
-      createFilter(queryString) {
-        return item => {
-          return (item.type && item.type.toLowerCase().indexOf(queryString.toLowerCase()) !== -1);
-        };
-      },
-    }
+        } else if (this.selectVariable && this.selectVariable != "") {
+          if (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1) {
+            item.hidden = true;
+          } else {
+            item.hidden = undefined;
+          }
+        } else if (this.searchType && this.searchType != "") {
+          if (item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) {
+            item.hidden = true;
+          } else {
+            item.hidden = undefined;
+          }
+        } else {
+          item.hidden = undefined;
+        }
+        datas.push(item);
+      });
+      this.variables = datas;
+    },
+    createFilter(queryString) {
+      return item => {
+        return (item.type && item.type.toLowerCase().indexOf(queryString.toLowerCase()) !== -1);
+      };
+    },
   }
+};
 </script>
 
 <style>
-  .ms-variable-hidden-row {
-    display: none;
-  }
+.ms-variable-hidden-row {
+  display: none;
+}
 
-  .ms-variable-header {
-    background: #783887;
-    color: white;
-    height: 18px;
-    border-radius: 42%;
-  }
+.ms-variable-header {
+  background: #783887;
+  color: white;
+  height: 18px;
+  border-radius: 42%;
+}
 
-  .ms-variable-link {
-    float: right;
-    margin-right: 45px;
-  }
+.ms-variable-link {
+  float: right;
+  margin-right: 45px;
+}
 
-  fieldset {
-    padding: 0px;
-    margin: 0px;
-    min-width: 100%;
-    min-inline-size: 0px;
-    border: 0px;
-  }
+fieldset {
+  padding: 0px;
+  margin: 0px;
+  min-width: 100%;
+  min-inline-size: 0px;
+  border: 0px;
+}
 </style>