From b0e0aa13277cdc77fef353da6f6b2c18c3b2d27c Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 12 Aug 2020 16:48:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/report/ApiReportView.vue   | 23 ++++---------------
 .../report/components/RequestResultTail.vue   |  2 +-
 .../api/report/components/RequestText.vue     |  2 +-
 .../api/report/components/ResponseText.vue    |  7 ++++--
 .../common/components/MsCodeEdit.vue          |  8 ++++---
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/frontend/src/business/components/api/report/ApiReportView.vue b/frontend/src/business/components/api/report/ApiReportView.vue
index 6bbe3f497f..579f277332 100644
--- a/frontend/src/business/components/api/report/ApiReportView.vue
+++ b/frontend/src/business/components/api/report/ApiReportView.vue
@@ -10,27 +10,9 @@
           </header>
           <main v-if="this.isNotRunning">
             <ms-metric-chart :content="content" :totalTime="totalTime"/>
-            <!--<el-container>
-              <el-aside width="900px">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane :label="$t('api_report.total')" name="total">
-                    <ms-scenario-results :scenarios="content.scenarios"/>
-                  </el-tab-pane>
-                  <el-tab-pane name="fail">
-                    <template slot="label">
-                      <span class="fail">{{ $t('api_report.fail') }}</span>
-                    </template>
-                    <ms-scenario-results :scenarios="fails"/>
-                  </el-tab-pane>
-                </el-tabs>
-              </el-aside>
-              <el-main style="margin-top: 20px">
-
-              </el-main>
-            </el-container>-->
             <el-row :gutter="20">
               <el-col :span="8">
-                <el-tabs v-model="activeName">
+                <el-tabs v-model="activeName" @tab-click="handleClick">
                   <el-tab-pane :label="$t('api_report.total')" name="total">
                     <ms-scenario-results :scenarios="content.scenarios" v-on:requestResult="requestResult"/>
                   </el-tab-pane>
@@ -85,6 +67,9 @@
         this.content = {};
         this.fails = [];
       },
+      handleClick(tab, event) {
+        this.isRequestResult = false
+      },
       getReport() {
         this.init();
 
diff --git a/frontend/src/business/components/api/report/components/RequestResultTail.vue b/frontend/src/business/components/api/report/components/RequestResultTail.vue
index fe2f1aadb2..e287448a59 100644
--- a/frontend/src/business/components/api/report/components/RequestResultTail.vue
+++ b/frontend/src/business/components/api/report/components/RequestResultTail.vue
@@ -94,7 +94,7 @@
 
     data() {
       return {
-        isActive: false,
+        isActive: true,
         activeName: "sub",
       }
     },
diff --git a/frontend/src/business/components/api/report/components/RequestText.vue b/frontend/src/business/components/api/report/components/RequestText.vue
index 60da170d46..5ade3d474d 100644
--- a/frontend/src/business/components/api/report/components/RequestText.vue
+++ b/frontend/src/business/components/api/report/components/RequestText.vue
@@ -30,7 +30,7 @@
 
     data() {
       return {
-        isActive: false,
+        isActive: true,
         activeName: "body",
       }
     },
diff --git a/frontend/src/business/components/api/report/components/ResponseText.vue b/frontend/src/business/components/api/report/components/ResponseText.vue
index 50d49ded36..77b87fb7c7 100644
--- a/frontend/src/business/components/api/report/components/ResponseText.vue
+++ b/frontend/src/business/components/api/report/components/ResponseText.vue
@@ -7,7 +7,10 @@
     <el-collapse-transition>
       <el-tabs v-model="activeName" v-show="isActive">
         <el-tab-pane label="Body" name="body" class="pane">
-          <ms-code-edit :mode="mode" :read-only="true" :data="response.body" :modes="modes" ref="codeEdit"/>
+          <!--
+                    <ms-code-edit :mode="mode" :read-only="true" :data="response.body" :modes="modes" ref="codeEdit"/>
+          -->
+          <pre>{{response.body}}</pre>
         </el-tab-pane>
         <el-tab-pane label="Headers" name="headers" class="pane">
           <pre>{{response.headers}}</pre>
@@ -48,7 +51,7 @@
 
     data() {
       return {
-        isActive: false,
+        isActive: true,
         activeName: "body",
         modes: ['text', 'json', 'xml', 'html'],
         mode: BODY_FORMAT.TEXT
diff --git a/frontend/src/business/components/common/components/MsCodeEdit.vue b/frontend/src/business/components/common/components/MsCodeEdit.vue
index a4d5eca6e0..94c949d2fe 100644
--- a/frontend/src/business/components/common/components/MsCodeEdit.vue
+++ b/frontend/src/business/components/common/components/MsCodeEdit.vue
@@ -1,5 +1,7 @@
 <template>
-  <editor v-model="formatData" :lang="mode" @init="editorInit" theme="chrome"/>
+  <div>
+    <editor v-model="formatData" :lang="mode" @init="editorInit" theme="chrome"/>
+  </div>
 </template>
 
 <script>
@@ -63,7 +65,7 @@
             this.init(editor);
           }
         },
-        format() {
+        /*format() {
           if (this.mode === 'json') {
             try {
               this.formatData = JSON.stringify(JSON.parse(this.data), null, '\t');
@@ -77,7 +79,7 @@
               this.formatData = this.data;
             }
           }
-        }
+        }*/
       }
     }
 </script>