From 6a89622f5e039a8d29ae044e45c2a26ac2f47884 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 27 Dec 2021 10:10:42 +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=E6=89=A7=E8=A1=8C=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=98=BE=E7=A4=BA=E6=B5=8B=E8=AF=95=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=81=9C=E6=AD=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009232 --user=赵勇 【接口测试】执行测试用例还是一直执行中【+github#8807】 https://www.tapd.cn/55049933/s/1087011
---
 .../component/ApiResponseComponent.vue        |   2 +-
 .../api/definition/components/Run.vue         |   3 +-
 .../components/response/ResponseResult.vue    | 247 +++++++++---------
 3 files changed, 125 insertions(+), 127 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue
index 9369b646b5..009b2f6287 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue
@@ -60,7 +60,7 @@ export default {
       if (this.apiItem && this.apiItem.id) {
         let url = "/api/definition/report/getReport/" + this.apiItem.id;
         this.$get(url, response => {
-          if (response.data) {
+          if (response.data && response.data.content) {
             try {
               let data = JSON.parse(response.data.content);
               this.response = data;
diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue
index c9716c6443..2dfafd873b 100644
--- a/frontend/src/business/components/api/definition/components/Run.vue
+++ b/frontend/src/business/components/api/definition/components/Run.vue
@@ -23,7 +23,7 @@ export default {
     return {
       result: {},
       loading: false,
-      requestResult: {},
+      requestResult: {responseResult: {}},
       reqNumber: 0,
       websocket: {}
     }
@@ -123,6 +123,7 @@ export default {
         threadGroup.hashTree.push(item);
       })
       this.sort(testPlan.hashTree);
+      this.requestResult.reportId = this.reportId;
       let reqObj = {id: this.reportId, testElement: testPlan, type: this.type, clazzName: this.clazzName ? this.clazzName : TYPE_TO_C.get(this.type), projectId: projectId, environmentMap: strMapToObj(this.envMap)};
       let bodyFiles = getBodyUploadFiles(reqObj, this.runData);
       if (this.runData[0].url) {
diff --git a/frontend/src/business/components/api/definition/components/response/ResponseResult.vue b/frontend/src/business/components/api/definition/components/response/ResponseResult.vue
index ac1cff56d1..0eb2e48338 100644
--- a/frontend/src/business/components/api/definition/components/response/ResponseResult.vue
+++ b/frontend/src/business/components/api/definition/components/response/ResponseResult.vue
@@ -1,6 +1,5 @@
 <template>
-  <div class="text-container">
-
+  <div class="text-container" v-if="responseResult">
     <el-tabs v-model="activeName" v-show="isActive">
       <el-tab-pane :label="$t('api_test.definition.request.response_body')" name="body" class="pane">
         <ms-sql-result-table v-if="isSqlType" :body="responseResult.body"/>
@@ -38,149 +37,147 @@
 </template>
 
 <script>
-  import MsAssertionResults from "./AssertionResults";
-  import MsCodeEdit from "../MsCodeEdit";
-  import MsDropdown from "../../../../common/components/MsDropdown";
-  import {BODY_FORMAT} from "../../model/ApiTestModel";
-  import MsSqlResultTable from "./SqlResultTable";
+import MsAssertionResults from "./AssertionResults";
+import MsCodeEdit from "../MsCodeEdit";
+import MsDropdown from "../../../../common/components/MsDropdown";
+import {BODY_FORMAT} from "../../model/ApiTestModel";
+import MsSqlResultTable from "./SqlResultTable";
 
-  export default {
-    name: "MsResponseResult",
+export default {
+  name: "MsResponseResult",
 
-    components: {
-      MsDropdown,
-      MsCodeEdit,
-      MsAssertionResults,
-      MsSqlResultTable
-    },
+  components: {
+    MsDropdown,
+    MsCodeEdit,
+    MsAssertionResults,
+    MsSqlResultTable
+  },
 
-    props: {
-      response: Object,
-      currentProtocol: String,
-    },
+  props: {
+    response: Object,
+    currentProtocol: String,
+  },
 
-    data() {
-      return {
-        isActive: true,
-        activeName: "body",
-        modes: ['text', 'json', 'xml', 'html'],
-        sqlModes: ['text', 'table'],
-        mode: BODY_FORMAT.TEXT,
-        isMsCodeEditShow: true,
-        reqMessages: "",
-      }
-    },
-    watch: {
-      response() {
-        this.setBodyType();
-        this.setReqMessage();
-      }
-    },
-    methods: {
-      modeChange(mode) {
-        this.mode = mode;
-      },
-      sqlModeChange(mode) {
-        this.mode = mode;
-      },
-      setBodyType() {
-        if (!this.response.responseResult || !this.response.responseResult.headers) {
-          return;
-        }
-        if (this.response.responseResult.headers.indexOf("Content-Type: application/json") > 0) {
-          this.mode = BODY_FORMAT.JSON;
-          this.$nextTick(() => {
-            if (this.$refs.modeDropdown) {
-              this.$refs.modeDropdown.handleCommand(BODY_FORMAT.JSON);
-              this.msCodeReload();
-            }
-          })
-        }
-      },
-      msCodeReload() {
-        this.isMsCodeEditShow = false;
-        this.$nextTick(() => {
-          this.isMsCodeEditShow = true;
-        });
-      },
-      setReqMessage() {
-        if (this.response) {
-          if (!this.response.url) {
-            this.response.url = "";
-          }
-          if (!this.response.headers) {
-            this.response.headers = "";
-          }
-          if (!this.response.cookies) {
-            this.response.cookies = "";
-          }
-          if (!this.response.body) {
-            this.response.body = "";
-          }
-          if (!this.response.responseResult) {
-            this.response.responseResult = {};
-          }
-          if (!this.response.responseResult.vars) {
-            this.response.responseResult.vars = "";
-          }
-          this.reqMessages = this.$t('api_test.request.address') + ":\n" + this.response.url + "\n" +
-            this.$t('api_test.scenario.headers') + ":\n" + this.response.headers + "\n" + "Cookies :\n" +
-            this.response.cookies + "\n" + "Body:" + "\n" + this.response.body;
-        }
-      },
-    },
-    mounted() {
+  data() {
+    return {
+      isActive: true,
+      activeName: "body",
+      modes: ['text', 'json', 'xml', 'html'],
+      sqlModes: ['text', 'table'],
+      mode: BODY_FORMAT.TEXT,
+      isMsCodeEditShow: true,
+      reqMessages: "",
+    }
+  },
+  watch: {
+    response() {
       this.setBodyType();
       this.setReqMessage();
+    }
+  },
+  methods: {
+    modeChange(mode) {
+      this.mode = mode;
     },
-    computed: {
-      isSqlType() {
-        return (this.currentProtocol === "SQL" && this.response.responseResult.responseCode === '200' && this.mode === 'table');
-      },
-      responseResult() {
-        return this.response && this.response.responseResult ? this.response.responseResult : {};
+    sqlModeChange(mode) {
+      this.mode = mode;
+    },
+    setBodyType() {
+      if (this.response && this.response.responseResult && this.response.responseResult.headers
+        && this.response.responseResult.headers.indexOf("Content-Type: application/json") > 0) {
+        this.mode = BODY_FORMAT.JSON;
+        this.$nextTick(() => {
+          if (this.$refs.modeDropdown) {
+            this.$refs.modeDropdown.handleCommand(BODY_FORMAT.JSON);
+            this.msCodeReload();
+          }
+        })
       }
+    },
+    msCodeReload() {
+      this.isMsCodeEditShow = false;
+      this.$nextTick(() => {
+        this.isMsCodeEditShow = true;
+      });
+    },
+    setReqMessage() {
+      if (this.response) {
+        if (!this.response.url) {
+          this.response.url = "";
+        }
+        if (!this.response.headers) {
+          this.response.headers = "";
+        }
+        if (!this.response.cookies) {
+          this.response.cookies = "";
+        }
+        if (!this.response.body) {
+          this.response.body = "";
+        }
+        if (!this.response.responseResult) {
+          this.response.responseResult = {};
+        }
+        if (!this.response.responseResult.vars) {
+          this.response.responseResult.vars = "";
+        }
+        this.reqMessages = this.$t('api_test.request.address') + ":\n" + this.response.url + "\n" +
+          this.$t('api_test.scenario.headers') + ":\n" + this.response.headers + "\n" + "Cookies :\n" +
+          this.response.cookies + "\n" + "Body:" + "\n" + this.response.body;
+      }
+    },
+  },
+  mounted() {
+    this.setBodyType();
+    this.setReqMessage();
+  },
+  computed: {
+    isSqlType() {
+      return (this.currentProtocol === "SQL" && this.response.responseResult.responseCode === '200' && this.mode === 'table');
+    },
+    responseResult() {
+      return this.response && this.response.responseResult ? this.response.responseResult : {};
     }
   }
+}
 </script>
 
 <style scoped>
-  .text-container .icon {
-    padding: 5px;
-  }
+.text-container .icon {
+  padding: 5px;
+}
 
-  .text-container .collapse {
-    cursor: pointer;
-  }
+.text-container .collapse {
+  cursor: pointer;
+}
 
-  .text-container .collapse:hover {
-    opacity: 0.8;
-  }
+.text-container .collapse:hover {
+  opacity: 0.8;
+}
 
-  .text-container .icon.is-active {
-    transform: rotate(90deg);
-  }
+.text-container .icon.is-active {
+  transform: rotate(90deg);
+}
 
-  .text-container .pane {
-    background-color: #F5F5F5;
+.text-container .pane {
+  background-color: #F5F5F5;
   padding: 1px 0;
-    height: 250px;
-    overflow-y: auto;
-  }
+  height: 250px;
+  overflow-y: auto;
+}
 
-  .text-container .pane.cookie {
-    padding: 0;
-  }
+.text-container .pane.cookie {
+  padding: 0;
+}
 
-  /deep/ .el-tabs__nav-wrap::after {
-    height: 0px;
-  }
+/deep/ .el-tabs__nav-wrap::after {
+  height: 0px;
+}
 
-  .ms-div {
-    margin-top: 20px;
-  }
+.ms-div {
+  margin-top: 20px;
+}
 
-  pre {
-    margin: 0;
-  }
+pre {
+  margin: 0;
+}
 </style>