From b42fbeafa27bcde082f3e00847e1050228df3900 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 8 Feb 2021 14:46:09 +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):=20query=E5=8F=82=E6=95=B0=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/common/CustomizeReqInfo.vue      | 70 ++++++++++++++-----
 .../components/debug/DebugHttpPage.vue        | 11 ++-
 2 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue b/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue
index d81101e5db..832ee39edf 100644
--- a/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <div v-if="request.protocol === 'HTTP'">
-      <el-input :placeholder="$t('api_test.definition.request.path_all_info')" v-if="request.url" v-model="request.url" style="width: 85%;margin-top: 10px" size="small">
+      <el-input :placeholder="$t('api_test.definition.request.path_all_info')" v-if="request.url" v-model="request.url" style="width: 85%;margin-top: 10px" size="small" @blur="urlChange">
         <el-select v-model="request.method" slot="prepend" style="width: 100px" size="small">
           <el-option v-for="item in reqOptions" :key="item.id" :label="item.label" :value="item.id"/>
         </el-select>
       </el-input>
-      <el-input :placeholder="$t('api_test.definition.request.path_all_info')" v-else v-model="request.path" style="width: 85%;margin-top: 10px" size="small">
+      <el-input :placeholder="$t('api_test.definition.request.path_all_info')" v-else v-model="request.path" style="width: 85%;margin-top: 10px" size="small" @blur="pathChange">
         <el-select v-model="request.method" slot="prepend" style="width: 100px" size="small">
           <el-option v-for="item in reqOptions" :key="item.id" :label="item.label" :value="item.id"/>
         </el-select>
@@ -18,14 +18,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item :label="$t('api_test.request.tcp.server')" prop="server">
-              <el-input class="server-input"  v-model="request.server" maxlength="300" show-word-limit size="small"/>
+              <el-input class="server-input" v-model="request.server" maxlength="300" show-word-limit size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('api_test.request.tcp.port')" prop="port" label-width="60px">
+              <el-input-number v-model="request.port" controls-position="right" :min="0" :max="65535" size="small"/>
             </el-form-item>
           </el-col>
-         <el-col :span="12">
-           <el-form-item :label="$t('api_test.request.tcp.port')" prop="port" label-width="60px">
-             <el-input-number v-model="request.port" controls-position="right" :min="0" :max="65535" size="small"/>
-           </el-form-item>
-         </el-col>
         </el-row>
       </el-form>
     </div>
@@ -33,17 +33,55 @@
 </template>
 
 <script>
-import {REQ_METHOD} from "@/business/components/api/definition/model/JsonData";
+  import {REQ_METHOD} from "@/business/components/api/definition/model/JsonData";
+  import {KeyValue} from "../../../definition/model/ApiTestModel";
 
-export default {
-  name: "CustomizeReqInfo",
-  props: ['request', 'isCustomizeReq'],
-  data() {
-    return {
-      reqOptions: REQ_METHOD,
+  export default {
+    name: "CustomizeReqInfo",
+    props: ['request', 'isCustomizeReq'],
+    data() {
+      return {
+        reqOptions: REQ_METHOD,
+      }
+    },
+    methods: {
+      pathChange() {
+        if (!this.request.path || this.request.path.indexOf('?') === -1) return;
+        let url = this.getURL(this.addProtocol(this.request.path));
+        if (url) {
+          this.request.path = decodeURIComponent(this.request.path.substr(0, this.request.path.indexOf("?")));
+        }
+      },
+      urlChange() {
+        if (!this.request.url || this.request.url.indexOf('?') === -1) return;
+        let url = this.getURL(this.addProtocol(this.request.url));
+        if (url) {
+          this.request.url = decodeURIComponent(this.request.url.substr(0, this.request.url.indexOf("?")));
+        }
+      },
+      addProtocol(url) {
+        if (url) {
+          if (!url.toLowerCase().startsWith("https") && !url.toLowerCase().startsWith("http")) {
+            return "https://" + url;
+          }
+        }
+        return url;
+      },
+      getURL(urlStr) {
+        try {
+          let url = new URL(urlStr);
+          url.searchParams.forEach((value, key) => {
+            if (key && value) {
+              this.request.arguments.splice(0, 0, new KeyValue({name: key, required: false, value: value}));
+            }
+          });
+          return url;
+        } catch (e) {
+          this.$error(this.$t('api_test.request.url_invalid'), 2000);
+        }
+      },
     }
   }
-}
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
index 4e2bc6434d..92f7c7725d 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
@@ -199,7 +199,7 @@
       },
       urlChange() {
         if (!this.debugForm.url) return;
-        let url = this.getURL(this.debugForm.url);
+        let url = this.getURL(this.addProtocol(this.debugForm.url));
         if (url && url.pathname) {
           if (this.debugForm.url.indexOf('?') != -1) {
             this.debugForm.url = decodeURIComponent(this.debugForm.url.substr(0, this.debugForm.url.indexOf("?")));
@@ -210,7 +210,14 @@
         }
 
       },
-
+      addProtocol(url) {
+        if (url) {
+          if (!url.toLowerCase().startsWith("https") && !url.toLowerCase().startsWith("http")) {
+            return "https://" + url;
+          }
+        }
+        return url;
+      },
       getURL(urlStr) {
         try {
           let url = new URL(urlStr);