From 6204c6b8cd832ffdc65b85b6b9d6df505c486137 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 7 Dec 2022 10:46:39 +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=E8=AE=BE=E7=BD=AE=E5=A4=9A=E4=B8=AAcookie?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1020689 --user=赵勇 【接口测试】github#20467，环境配置里面的请求头Cookie和单个接口里面请求头冲突 https://www.tapd.cn/55049933/s/1313765
---
 .../report/components/ResponseText.vue        |   2 +-
 .../components/esb/EsbResponseResult.vue      |   2 +-
 .../mock/Components/MockResponseParam.vue     |   2 +-
 .../components/response/ResponseResult.vue    |   2 +-
 .../report/detail/api/ResponseResult.vue      | 189 ++++++++++++++----
 5 files changed, 151 insertions(+), 46 deletions(-)

diff --git a/api-test/frontend/src/business/automation/report/components/ResponseText.vue b/api-test/frontend/src/business/automation/report/components/ResponseText.vue
index c6ebf87173..6dde1e752b 100644
--- a/api-test/frontend/src/business/automation/report/components/ResponseText.vue
+++ b/api-test/frontend/src/business/automation/report/components/ResponseText.vue
@@ -40,7 +40,7 @@
             <pre>{{ request.headers }}</pre>
           </div>
           <div class="ms-div" v-if="request.url && request.url !== ''">
-            Cookies :
+            Cookie :
             <pre>{{ request.cookies }}</pre>
           </div>
           <div class="ms-div">
diff --git a/api-test/frontend/src/business/definition/components/esb/EsbResponseResult.vue b/api-test/frontend/src/business/definition/components/esb/EsbResponseResult.vue
index 22cff9715f..d603391622 100644
--- a/api-test/frontend/src/business/definition/components/esb/EsbResponseResult.vue
+++ b/api-test/frontend/src/business/definition/components/esb/EsbResponseResult.vue
@@ -214,7 +214,7 @@ export default {
           ':\n' +
           this.response.headers +
           '\n' +
-          'Cookies :\n' +
+          'Cookie :' +
           this.response.cookies +
           '\n' +
           'Body:' +
diff --git a/api-test/frontend/src/business/definition/components/mock/Components/MockResponseParam.vue b/api-test/frontend/src/business/definition/components/mock/Components/MockResponseParam.vue
index 8ad92e906c..326cff89a1 100644
--- a/api-test/frontend/src/business/definition/components/mock/Components/MockResponseParam.vue
+++ b/api-test/frontend/src/business/definition/components/mock/Components/MockResponseParam.vue
@@ -234,7 +234,7 @@ export default {
           ':\n' +
           this.response.headers +
           '\n' +
-          'Cookies :\n' +
+          'Cookie :' +
           this.response.cookies +
           '\n' +
           'Body:' +
diff --git a/api-test/frontend/src/business/definition/components/response/ResponseResult.vue b/api-test/frontend/src/business/definition/components/response/ResponseResult.vue
index fbe3eb5b38..7320ce1a3e 100644
--- a/api-test/frontend/src/business/definition/components/response/ResponseResult.vue
+++ b/api-test/frontend/src/business/definition/components/response/ResponseResult.vue
@@ -166,7 +166,7 @@ export default {
         }
 
         if (this.response.cookies) {
-          this.reqMessages += 'Cookies :\n' + this.response.cookies + '\n';
+          this.reqMessages += 'Cookie :' + this.response.cookies + '\n';
         }
         this.reqMessages += 'Body:' + '\n' + this.response.body;
       }
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ResponseResult.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ResponseResult.vue
index 02ae536328..d7a0d1ce3d 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ResponseResult.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/api/ResponseResult.vue
@@ -1,43 +1,124 @@
 <template>
   <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 && activeName === 'body'" :body="responseResult.body"/>
-        <ms-code-edit v-if="!isSqlType && isMsCodeEditShow && activeName === 'body'" :mode="mode" :read-only="true"
-                      :modes="modes" :data.sync="responseResult.body" ref="codeEdit"/>
+      <el-tab-pane
+        :label="$t('api_test.definition.request.response_body')"
+        name="body"
+        class="pane"
+      >
+        <ms-sql-result-table
+          v-if="isSqlType && activeName === 'body'"
+          :body="responseResult.body"
+        />
+        <ms-code-edit
+          v-if="!isSqlType && isMsCodeEditShow && activeName === 'body'"
+          :mode="mode"
+          :read-only="true"
+          :modes="modes"
+          :data.sync="responseResult.body"
+          ref="codeEdit"
+        />
       </el-tab-pane>
 
-      <el-tab-pane :label="$t('api_test.definition.request.response_header')" name="headers" class="pane">
-        <ms-code-edit :mode="'text'" :read-only="true" :data.sync="responseResult.headers"
-                      v-if="activeName === 'headers'"/>
+      <el-tab-pane
+        :label="$t('api_test.definition.request.response_header')"
+        name="headers"
+        class="pane"
+      >
+        <ms-code-edit
+          :mode="'text'"
+          :read-only="true"
+          :data.sync="responseResult.headers"
+          v-if="activeName === 'headers'"
+        />
       </el-tab-pane>
 
-      <el-tab-pane v-if="isTestPlan" :label="$t('api_test.definition.request.console')" name="console" class="pane">
-        <ms-code-edit :mode="'text'" :read-only="true" :data.sync="responseResult.console"
-                      v-if="activeName === 'console'" height="calc(100vh - 300px)"/>
+      <el-tab-pane
+        v-if="isTestPlan"
+        :label="$t('api_test.definition.request.console')"
+        name="console"
+        class="pane"
+      >
+        <ms-code-edit
+          :mode="'text'"
+          :read-only="true"
+          :data.sync="responseResult.console"
+          v-if="activeName === 'console'"
+          height="calc(100vh - 300px)"
+        />
       </el-tab-pane>
 
-      <el-tab-pane v-if="!isTestPlan" :label="$t('api_test.definition.request.console')" name="console" class="pane">
-        <ms-code-edit :mode="'text'" :read-only="true" :data.sync="responseResult.console"
-                      v-if="activeName === 'console'"/>
+      <el-tab-pane
+        v-if="!isTestPlan"
+        :label="$t('api_test.definition.request.console')"
+        name="console"
+        class="pane"
+      >
+        <ms-code-edit
+          :mode="'text'"
+          :read-only="true"
+          :data.sync="responseResult.console"
+          v-if="activeName === 'console'"
+        />
       </el-tab-pane>
 
-      <el-tab-pane :label="$t('api_report.assertions')" name="assertions" class="pane assertions">
-        <ms-assertion-results :assertions="responseResult.assertions" v-if="activeName === 'assertions'"/>
+      <el-tab-pane
+        :label="$t('api_report.assertions')"
+        name="assertions"
+        class="pane assertions"
+      >
+        <ms-assertion-results
+          :assertions="responseResult.assertions"
+          v-if="activeName === 'assertions'"
+        />
       </el-tab-pane>
 
-      <el-tab-pane :label="$t('api_test.request.extract.label')" name="label" class="pane">
-        <ms-code-edit :mode="'text'" :read-only="true" :data.sync="responseResult.vars" v-if="activeName === 'label'"/>
+      <el-tab-pane
+        :label="$t('api_test.request.extract.label')"
+        name="label"
+        class="pane"
+      >
+        <ms-code-edit
+          :mode="'text'"
+          :read-only="true"
+          :data.sync="responseResult.vars"
+          v-if="activeName === 'label'"
+        />
       </el-tab-pane>
 
-      <el-tab-pane :label="$t('api_report.request_body')" name="request_body" class="pane">
-        <ms-code-edit :mode="'text'" :read-only="true" :data.sync="reqMessages" v-if="activeName === 'request_body'"/>
+      <el-tab-pane
+        :label="$t('api_report.request_body')"
+        name="request_body"
+        class="pane"
+      >
+        <ms-code-edit
+          :mode="'text'"
+          :read-only="true"
+          :data.sync="reqMessages"
+          v-if="activeName === 'request_body'"
+        />
       </el-tab-pane>
 
-      <el-tab-pane v-if="activeName == 'body'" :disabled="true" name="mode" class="pane cookie">
+      <el-tab-pane
+        v-if="activeName == 'body'"
+        :disabled="true"
+        name="mode"
+        class="pane cookie"
+      >
         <template v-slot:label>
-          <ms-dropdown v-if="currentProtocol==='SQL'" :commands="sqlModes" :default-command="mode" @command="sqlModeChange"/>
-          <ms-dropdown v-else :commands="modes" :default-command="mode" @command="modeChange" ref="modeDropdown"/>
+          <ms-dropdown
+            v-if="currentProtocol === 'SQL'"
+            :commands="sqlModes"
+            :default-command="mode"
+            @command="sqlModeChange"
+          />
+          <ms-dropdown
+            v-else
+            :commands="modes"
+            :default-command="mode"
+            @command="modeChange"
+            ref="modeDropdown"
+          />
         </template>
       </el-tab-pane>
     </el-tabs>
@@ -48,7 +129,7 @@
 import MsAssertionResults from "../ui/AssertionResults";
 import MsCodeEdit from "metersphere-frontend/src/components/MsCodeEdit";
 import MsDropdown from "metersphere-frontend/src/components/MsDropdown";
-import {BODY_FORMAT} from "metersphere-frontend/src/model/ApiTestModel";
+import { BODY_FORMAT } from "metersphere-frontend/src/model/ApiTestModel";
 import MsSqlResultTable from "./SqlResultTable";
 
 export default {
@@ -58,7 +139,7 @@ export default {
     MsDropdown,
     MsCodeEdit,
     MsAssertionResults,
-    MsSqlResultTable
+    MsSqlResultTable,
   },
 
   props: {
@@ -68,26 +149,26 @@ export default {
       type: Boolean,
       default() {
         return false;
-      }
-    }
+      },
+    },
   },
 
   data() {
     return {
       isActive: true,
       activeName: "body",
-      modes: ['text', 'json', 'xml', 'html'],
-      sqlModes: ['text', 'table'],
+      modes: ["text", "json", "xml", "html"],
+      sqlModes: ["text", "table"],
       mode: BODY_FORMAT.TEXT,
       isMsCodeEditShow: true,
       reqMessages: "",
-    }
+    };
   },
   watch: {
     response() {
       this.setBodyType();
       this.setReqMessage();
-    }
+    },
   },
   methods: {
     modeChange(mode) {
@@ -97,15 +178,21 @@ export default {
       this.mode = mode;
     },
     setBodyType() {
-      if (this.response && this.response.responseResult && this.response.responseResult.headers
-        && this.response.responseResult.headers.indexOf("Content-Type: application/json") > 0) {
+      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() {
@@ -134,9 +221,21 @@ export default {
         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;
+        this.reqMessages =
+          this.$t("api_test.request.address") +
+          ":\n" +
+          this.response.url +
+          "\n" +
+          this.$t("api_test.scenario.headers") +
+          ":\n" +
+          this.response.headers +
+          "\n" +
+          "Cookie :\n" +
+          this.response.cookies +
+          "\n" +
+          "Body:" +
+          "\n" +
+          this.response.body;
       }
     },
   },
@@ -146,13 +245,19 @@ export default {
   },
   computed: {
     isSqlType() {
-      return (this.currentProtocol === "SQL" && this.response.responseResult.responseCode === '200' && this.mode === 'table');
+      return (
+        this.currentProtocol === "SQL" &&
+        this.response.responseResult.responseCode === "200" &&
+        this.mode === "table"
+      );
     },
     responseResult() {
-      return this.response && this.response.responseResult ? this.response.responseResult : {};
-    }
-  }
-}
+      return this.response && this.response.responseResult
+        ? this.response.responseResult
+        : {};
+    },
+  },
+};
 </script>
 
 <style scoped>
@@ -173,7 +278,7 @@ export default {
 }
 
 .text-container .pane {
-  background-color: #F5F5F5;
+  background-color: #f5f5f5;
   padding: 1px 0;
   height: 250px;
   overflow-y: auto;