From 263aba9b577679ca3e955df30aac5cd45f047ac4 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 17 Aug 2020 13:06:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=95=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtApiTestReportMapper.xml            | 1 -
 backend/src/main/java/io/metersphere/xpack                | 2 +-
 .../api/test/components/request/ApiRequestForm.vue        | 8 +++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
index 94c4b629e..6079d8d5d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestReportMapper.xml
@@ -132,7 +132,6 @@
         LEFT JOIN user ON user.id = r.user_id
         <where>
             r.id = #{id}
-            AND r.status != 'Debug'
         </where>
         ORDER BY r.update_time DESC
     </select>
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index fadab72bb..356bb744a 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit fadab72bb656a3a2644e43bf46783c1f6cd96d4f
+Subproject commit 356bb744a72304067b9222cb0cb2be01d4ebff2a
diff --git a/frontend/src/business/components/api/test/components/request/ApiRequestForm.vue b/frontend/src/business/components/api/test/components/request/ApiRequestForm.vue
index 0172dac21..8e7418242 100644
--- a/frontend/src/business/components/api/test/components/request/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/request/ApiRequestForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="request-form">
     <component @runDebug="runDebug" :is="component" :is-read-only="isReadOnly" :request="request" :scenario="scenario"/>
-    <ms-scenario-results v-loading="debugReportLoading" v-if="isCompleted" :scenarios="isCompleted ? request.debugReport.scenarios : []"/>
+    <ms-request-result-tail v-loading="debugReportLoading" v-if="isCompleted" :request="request.debugRequestResult ? request.debugRequestResult : {responseResult: {}, subRequestResults: []}" :scenario-name="request.debugScenario ? request.debugScenario.name : ''"/>
   </div>
 </template>
 
@@ -10,10 +10,11 @@ import {Request, RequestFactory, Scenario} from "../../model/ScenarioModel";
 import MsApiHttpRequestForm from "./ApiHttpRequestForm";
 import MsApiDubboRequestForm from "./ApiDubboRequestForm";
 import MsScenarioResults from "../../../report/components/ScenarioResults";
+import MsRequestResultTail from "../../../report/components/RequestResultTail";
 
 export default {
   name: "MsApiRequestForm",
-  components: {MsScenarioResults, MsApiDubboRequestForm, MsApiHttpRequestForm},
+  components: {MsRequestResultTail, MsScenarioResults, MsApiDubboRequestForm, MsApiHttpRequestForm},
   props: {
     scenario: Scenario,
     request: Request,
@@ -66,12 +67,13 @@ export default {
               try {
                 res = JSON.parse(report.content);
               } catch (e) {
-                console.log(report.content)
                 throw e;
               }
               if (res) {
                 this.debugReportLoading = false;
                 this.request.debugReport = res;
+                this.request.debugScenario = res.scenarios[0];
+                this.request.debugRequestResult = this.request.debugScenario.requestResults[0];
                 this.deleteReport(this.debugReportId)
               } else {
                 setTimeout(this.getReport, 2000)
-- 
GitLab