From 491afb54ca18726c6a531c76bd65d8baba139c61 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Nov 2021 19:21:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=8A=A0=E6=96=87=E6=A1=A3=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=90=8E=E5=8F=A6=E5=AD=98=E6=96=B0=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20--bug=3D1008041=20--user=3D=E8=B5=B5?=
 =?UTF-8?q?=E5=8B=87=20=E3=80=90=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E3=80=91-TEST=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=96=AD=E8=A8=80=E5=90=8E-=E5=8F=A6?=
 =?UTF-8?q?=E5=AD=98=E4=B8=BA=E6=96=B0=E7=94=A8=E4=BE=8B=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=B8=94CASE=E4=B8=AD=E6=B2=A1=E6=9C=89=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=E6=96=AD=E8=A8=80=E8=A7=84=E5=88=99=20https://www.tap?=
 =?UTF-8?q?d.cn/55049933/s/1070121?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assertion/document/DocumentBody.vue        |  4 ++--
 .../assertion/document/DocumentImport.vue      |  1 -
 .../api/definition/components/step/JmxStep.vue | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue b/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
index d709cfd2f6..ea48cfd68b 100644
--- a/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
@@ -152,13 +152,13 @@ export default {
   methods: {
     setJSONData(data) {
       this.checked = false;
+      this.document.data.jsonFollowAPI = "";
+      this.document.data.xmlFollowAPI = "";
       this.tableData = data;
       if (this.document.type === "JSON") {
         this.document.data.json = this.tableData;
-        this.document.data.jsonFollowAPI = this.apiId;
       } else if (this.document.type === "XML") {
         this.document.data.xml = this.tableData;
-        this.document.data.xmlFollowAPI = this.apiId;
       }
     },
     checkedAPI() {
diff --git a/frontend/src/business/components/api/definition/components/assertion/document/DocumentImport.vue b/frontend/src/business/components/api/definition/components/assertion/document/DocumentImport.vue
index 2209b992b2..75c2cf7d52 100644
--- a/frontend/src/business/components/api/definition/components/assertion/document/DocumentImport.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/document/DocumentImport.vue
@@ -99,7 +99,6 @@ export default {
       let url = "/api/definition/jsonGenerator";
       this.$post(url, {raw: this.json, type: this.document.type}, response => {
         if (response.data) {
-          console.log(response.data)
           this.$emit('setJSONData', response.data);
         }
       });
diff --git a/frontend/src/business/components/api/definition/components/step/JmxStep.vue b/frontend/src/business/components/api/definition/components/step/JmxStep.vue
index 5cdeab33c1..013fd47166 100644
--- a/frontend/src/business/components/api/definition/components/step/JmxStep.vue
+++ b/frontend/src/business/components/api/definition/components/step/JmxStep.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="request.hashTree && request.hashTree.length > 0">
+  <div v-if="loaded">
     <p class="tip">
       {{ $t('test_track.plan_view.step') }}
     </p>
@@ -120,6 +120,11 @@ export default {
       default: false
     }
   },
+  watch: {
+    'request.body.typeChange'() {
+      this.showHide();
+    },
+  },
   data() {
     let validateURL = (rule, value, callback) => {
       try {
@@ -130,6 +135,7 @@ export default {
     };
     return {
       activeName: "headers",
+      loaded: true,
       rules: {
         name: [
           {max: 300, message: this.$t('commons.input_limit', [1, 300]), trigger: 'blur'}
@@ -171,7 +177,7 @@ export default {
       this.reload();
     },
     addAssertions() {
-      let assertions = new Assertions({id:getUUID()});
+      let assertions = new Assertions({id: getUUID()});
       if (!this.request.hashTree) {
         this.request.hashTree = [];
       }
@@ -179,7 +185,7 @@ export default {
       this.reload();
     },
     addExtract() {
-      let jsonPostProcessor = new Extract({id:getUUID()});
+      let jsonPostProcessor = new Extract({id: getUUID()});
       if (!this.request.hashTree) {
         this.request.hashTree = [];
       }
@@ -208,6 +214,12 @@ export default {
         this.isReloadData = false
       })
     },
+    showHide() {
+      this.loaded = false
+      this.$nextTick(() => {
+        this.loaded = true
+      })
+    },
     init() {
       if (!this.request.body) {
         this.request.body = new Body();