From 11cfa97f179a47d60361387c6441781828d240a7 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 8 Sep 2021 14:42:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96=20--stor?=
 =?UTF-8?q?y=3D1002976=20--user=3D=E8=B5=B5=E5=8B=87=204.=20#4372=20=20?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4=E3=80=81QU...=20https://www.tapd.cn?=
 =?UTF-8?q?/55049933/s/1044789?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/http/ApiHttpRequestForm.vue       | 432 +++++++++---------
 frontend/src/i18n/zh-CN.js                    |   2 +-
 frontend/src/i18n/zh-TW.js                    |   2 +-
 3 files changed, 226 insertions(+), 210 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
index 10332cfa48..11f8785018 100644
--- a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
+++ b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
@@ -83,224 +83,240 @@
 </template>
 
 <script>
-import MsApiKeyValue from "../../ApiKeyValue";
-import MsApiBody from "../../body/ApiBody";
-import MsApiAuthConfig from "../../auth/ApiAuthConfig";
-import ApiRequestMethodSelect from "../../collapse/ApiRequestMethodSelect";
-import {REQUEST_HEADERS} from "@/common/js/constants";
-import MsApiVariable from "../../ApiVariable";
-import MsApiAssertions from "../../assertion/ApiAssertions";
-import MsApiExtract from "../../extract/ApiExtract";
-import {Body, KeyValue} from "../../../model/ApiTestModel";
-import {hasLicense, getUUID} from "@/common/js/utils";
-import BatchAddParameter from "../../basis/BatchAddParameter";
-import MsApiAdvancedConfig from "./ApiAdvancedConfig";
-import MsJsr233Processor from "../../../../automation/scenario/component/Jsr233Processor";
-import ApiDefinitionStepButton from "../components/ApiDefinitionStepButton";
-import {hasPermission} from '@/common/js/utils';
-import Convert from "@/business/components/common/json-schema/convert/convert";
-
-export default {
-  name: "MsApiHttpRequestForm",
-  components: {
-    ApiDefinitionStepButton,
-    MsJsr233Processor,
-    MsApiAdvancedConfig,
-    BatchAddParameter,
-    MsApiVariable,
-    ApiRequestMethodSelect,
-    MsApiExtract,
-    MsApiAuthConfig,
-    MsApiBody,
-    MsApiKeyValue,
-    MsApiAssertions
-  },
-  props: {
-    method: String,
-    request: {},
-    response: {},
-    showScript: {
-      type: Boolean,
-      default: true,
+  import MsApiKeyValue from "../../ApiKeyValue";
+  import MsApiBody from "../../body/ApiBody";
+  import MsApiAuthConfig from "../../auth/ApiAuthConfig";
+  import ApiRequestMethodSelect from "../../collapse/ApiRequestMethodSelect";
+  import {REQUEST_HEADERS} from "@/common/js/constants";
+  import MsApiVariable from "../../ApiVariable";
+  import MsApiAssertions from "../../assertion/ApiAssertions";
+  import MsApiExtract from "../../extract/ApiExtract";
+  import {Body, KeyValue} from "../../../model/ApiTestModel";
+  import {hasLicense, getUUID} from "@/common/js/utils";
+  import BatchAddParameter from "../../basis/BatchAddParameter";
+  import MsApiAdvancedConfig from "./ApiAdvancedConfig";
+  import MsJsr233Processor from "../../../../automation/scenario/component/Jsr233Processor";
+  import ApiDefinitionStepButton from "../components/ApiDefinitionStepButton";
+  import {hasPermission} from '@/common/js/utils';
+  import Convert from "@/business/components/common/json-schema/convert/convert";
+  export default {
+    name: "MsApiHttpRequestForm",
+    components: {
+      ApiDefinitionStepButton,
+      MsJsr233Processor,
+      MsApiAdvancedConfig,
+      BatchAddParameter,
+      MsApiVariable,
+      ApiRequestMethodSelect,
+      MsApiExtract,
+      MsApiAuthConfig,
+      MsApiBody,
+      MsApiKeyValue,
+      MsApiAssertions
     },
-    headers: {
-      type: Array,
-      default() {
-        return [];
-      }
-    },
-    referenced: {
-      type: Boolean,
-      default: false,
-    },
-    isShowEnable: Boolean,
-    jsonPathList: Array,
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    },
-    type: String,
-  },
-
-  data() {
-    let validateURL = (rule, value, callback) => {
-      try {
-        new URL(this.addProtocol(this.request.url));
-      } catch (e) {
-        callback(this.$t('api_test.request.url_invalid'));
-      }
-    };
-    return {
-      activeName: this.request.method === "POST" ? "body" : "parameters",
-      rules: {
-        name: [
-          {max: 300, message: this.$t('commons.input_limit', [1, 300]), trigger: 'blur'}
-        ],
-        url: [
-          {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
-          {validator: validateURL, trigger: 'blur'}
-        ],
-        path: [
-          {max: 500, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
-        ]
+    props: {
+      method: String,
+      request: {},
+      response: {},
+      showScript: {
+        type: Boolean,
+        default: true,
       },
-      spanCount: 21,
-      headerSuggestions: REQUEST_HEADERS,
-      isReloadData: false,
-      isBodyShow: true,
-      dialogVisible: false
-    }
-  },
-
-  created() {
-    if (!this.referenced && this.showScript) {
-      this.spanCount = 21;
-    } else {
-      this.spanCount = 24;
-    }
-    this.init();
-  },
-
-  methods: {
-    hasPermission,
-    hasLicense,
-    generate() {
-      if (this.request.body && (this.request.body.jsonSchema || this.request.body.raw)) {
-        if (!this.request.body.jsonSchema) {
-          const MsConvert = new Convert();
-          this.request.body.jsonSchema = MsConvert.format(JSON.parse(this.request.body.raw));
+      headers: {
+        type: Array,
+        default() {
+          return [];
         }
-        this.$post('/api/test/data/generator', this.request.body.jsonSchema, response => {
-          if (response.data) {
-            if (this.request.body.format !== 'JSON-SCHEMA') {
-              this.request.body.raw = response.data;
-            } else {
-              const MsConvert = new Convert();
-              this.request.body.jsonSchema = MsConvert.format(JSON.parse(response.data));
+      },
+      referenced: {
+        type: Boolean,
+        default: false,
+      },
+      isShowEnable: Boolean,
+      jsonPathList: Array,
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      type: String,
+    },
+    data() {
+      let validateURL = (rule, value, callback) => {
+        try {
+          new URL(this.addProtocol(this.request.url));
+        } catch (e) {
+          callback(this.$t('api_test.request.url_invalid'));
+        }
+      };
+      return {
+        activeName: this.request.method === "POST" ? "body" : "parameters",
+        rules: {
+          name: [
+            {max: 300, message: this.$t('commons.input_limit', [1, 300]), trigger: 'blur'}
+          ],
+          url: [
+            {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
+            {validator: validateURL, trigger: 'blur'}
+          ],
+          path: [
+            {max: 500, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
+          ]
+        },
+        spanCount: 21,
+        headerSuggestions: REQUEST_HEADERS,
+        isReloadData: false,
+        isBodyShow: true,
+        dialogVisible: false
+      }
+    },
+    created() {
+      if (!this.referenced && this.showScript) {
+        this.spanCount = 21;
+      } else {
+        this.spanCount = 24;
+      }
+      this.init();
+    },
+    methods: {
+      hasPermission,
+      hasLicense,
+      generate() {
+        if (this.request.body && (this.request.body.jsonSchema || this.request.body.raw)) {
+          if (!this.request.body.jsonSchema) {
+            const MsConvert = new Convert();
+            this.request.body.jsonSchema = MsConvert.format(JSON.parse(this.request.body.raw));
+          }
+          this.$post('/api/test/data/generator', this.request.body.jsonSchema, response => {
+            if (response.data) {
+              if (this.request.body.format !== 'JSON-SCHEMA') {
+                this.request.body.raw = response.data;
+              } else {
+                const MsConvert = new Convert();
+                this.request.body.jsonSchema = MsConvert.format(JSON.parse(response.data));
+              }
+              this.reloadBody();
             }
-            this.reloadBody();
-          }
+          });
+        }
+      },
+      remove(row) {
+        let index = this.request.hashTree.indexOf(row);
+        this.request.hashTree.splice(index, 1);
+        this.reload();
+      },
+      copyRow(row) {
+        let obj = JSON.parse(JSON.stringify(row));
+        obj.id = getUUID();
+        this.request.hashTree.push(obj);
+        this.reload();
+      },
+      reload() {
+        this.isReloadData = true
+        this.$nextTick(() => {
+          this.isReloadData = false
+        })
+      },
+      init() {
+        if (!this.request.body) {
+          this.request.body = new Body();
+        }
+        if (!this.request.body.kvs) {
+          this.request.body.kvs = [];
+        }
+        if (!this.request.rest) {
+          this.request.rest = [];
+        }
+        if (!this.request.arguments) {
+          this.request.arguments = [];
+        }
+      },
+      // 解决修改请求头后 body 显示错位
+      reloadBody() {
+        this.isBodyShow = false;
+        this.$nextTick(() => {
+          this.isBodyShow = true;
         });
-      }
-    },
-    remove(row) {
-      let index = this.request.hashTree.indexOf(row);
-      this.request.hashTree.splice(index, 1);
-      this.reload();
-    },
-    copyRow(row) {
-      let obj = JSON.parse(JSON.stringify(row));
-      obj.id = getUUID();
-      this.request.hashTree.push(obj);
-      this.reload();
-    },
-    reload() {
-      this.isReloadData = true
-      this.$nextTick(() => {
-        this.isReloadData = false
-      })
-    },
-    init() {
+      },
+      batchAdd() {
+        this.$refs.batchAddParameter.open();
+      },
+      format(array, obj) {
+        if (array) {
+          let isAdd = true;
+          for (let i in array) {
+            let item = array[i];
+            if (item.name === obj.name) {
+              item.value = obj.value;
+              isAdd = false;
+            }
+          }
+          if (isAdd) {
+            this.request.arguments.unshift(obj);
+          }
+        }
+      },
+      batchSave(data) {
+        if (data) {
+          let params = data.split("\n");
+          let keyValues = [];
+          params.forEach(item => {
+            let line = item.split(/：|:/);
+            let required = false;
+            keyValues.unshift(new KeyValue({
+              name: line[0],
+              required: required,
+              value: line[1],
+              description: line[2],
+              type: "text",
+              valid: false,
+              file: false,
+              encode: true,
+              enable: true,
+              contentType: "text/plain"
+            }));
+          })
 
-      if (!this.request.body) {
-        this.request.body = new Body();
-      }
-      if (!this.request.body.kvs) {
-        this.request.body.kvs = [];
-      }
-      if (!this.request.rest) {
-        this.request.rest = [];
-      }
-      if (!this.request.arguments) {
-        this.request.arguments = [];
-      }
-    },
-    // 解决修改请求头后 body 显示错位
-    reloadBody() {
-      this.isBodyShow = false;
-      this.$nextTick(() => {
-        this.isBodyShow = true;
-      });
-    },
-    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] === 'Required' || 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 => {
-          switch (this.activeName) {
-            case "parameters":
-              this.request.arguments.unshift(item);
-              break;
-            case "rest":
-              this.request.rest.unshift(item);
-              break;
-            case "headers":
-              this.request.headers.unshift(item);
-              break;
-            default:
-              break;
-          }
-        })
+          keyValues.forEach(item => {
+            switch (this.activeName) {
+              case "parameters":
+                this.format(this.request.arguments,item);
+                break;
+              case "rest":
+                this.format(this.request.rest,item);
+                break;
+              case "headers":
+                this.format(this.request.headers,item);
+                break;
+              default:
+                break;
+            }
+          })
+        }
       }
+
     }
   }
-}
 </script>
 
 <style scoped>
-
-.ms-query {
-  background: #783887;
-  color: white;
-  height: 18px;
-  border-radius: 42%;
-}
-
-.ms-header {
-  background: #783887;
-  color: white;
-  height: 18px;
-  border-radius: 42%;
-}
-
-.request-tabs {
-  margin: 20px;
-  min-height: 200px;
-}
-
-.ms-el-link {
-  float: right;
-  margin-right: 45px;
-}
+  .ms-query {
+    background: #783887;
+    color: white;
+    height: 18px;
+    border-radius: 42%;
+  }
+  .ms-header {
+    background: #783887;
+    color: white;
+    height: 18px;
+    border-radius: 42%;
+  }
+  .request-tabs {
+    margin: 20px;
+    min-height: 200px;
+  }
+  .ms-el-link {
+    float: right;
+    margin-right: 45px;
+  }
 </style>
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index a9e02cd9b0..e41b1f4611 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -757,7 +757,7 @@ export default {
     export_config: "导出",
     enable_validate_tip: "没有可用请求",
     copy: "复制测试",
-    batch_add_parameter: "格式：参数名,必填,参数值,备注 <br/> 如：Accept-Encoding,必填,utf-8,编码",
+    batch_add_parameter: "格式：参数名:必填:参数值:备注 <br/> 如：Accept-Encoding:必填:utf-8:编码",
     jar_config: {
       title: "jar包管理",
       jar_file: "jar包",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6a706bda92..773bdbbcd1 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -757,7 +757,7 @@ export default {
     export_config: "導出",
     enable_validate_tip: "沒有可用請求",
     copy: "復制測試",
-    batch_add_parameter: "格式：參數名,必填,參數值,備註 <br/> 如：Accept-Encoding,必填,utf-8,編碼",
+    batch_add_parameter: "格式：參數名:必填:參數值:備註 <br/> 如：Accept-Encoding:必填:utf-8:編碼",
     jar_config: {
       title: "jar包管理",
       jar_file: "jar包",