From 1e0a349687070eaec95ab0e9b2255b2ee4cff042 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 26 Aug 2021 14:09:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E5=BF=AB=E6=8D=B7=E8=B0=83=E8=AF=95=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/api/definition/components/Run.vue | 8 +++++++-
 .../api/definition/components/debug/DebugDubboPage.vue    | 2 +-
 .../api/definition/components/debug/DebugHttpPage.vue     | 2 +-
 .../api/definition/components/debug/DebugJdbcPage.vue     | 2 +-
 .../api/definition/components/debug/DebugTcpPage.vue      | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue
index a8f6bab9fd..9ace0847dc 100644
--- a/frontend/src/business/components/api/definition/components/Run.vue
+++ b/frontend/src/business/components/api/definition/components/Run.vue
@@ -15,7 +15,8 @@ export default {
     reportId: String,
     runData: Array,
     type: String,
-    envMap: Map
+    envMap: Map,
+    isStop: Boolean,
   },
   data() {
     return {
@@ -31,6 +32,11 @@ export default {
     // 初始化
     reportId() {
       this.run()
+    },
+    isStop() {
+      if (!this.isStop && this.websocket && this.websocket.close instanceof Function) {
+        this.websocket.close();
+      }
     }
   },
   methods: {
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
index 67de4d15fc..d7493328a3 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
@@ -25,7 +25,7 @@
       </div>
       <ms-jmx-step :request="request" :response="responseData"/>
       <!-- 执行组件 -->
-      <ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
+      <ms-run :debug="true" :reportId="reportId" :isStop="isStop" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
     </el-card>
     <div v-if="scenario">
       <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{ $t('commons.save') }}</el-button>
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
index cfed27cfa4..32970becd5 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
@@ -45,7 +45,7 @@
         <ms-jmx-step :request="request" :response="responseData"/>
 
         <!-- 执行组件 -->
-        <ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
+        <ms-run :debug="true" :reportId="reportId" :isStop="isStop" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
       </div>
     </el-card>
 
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
index 7645c9e5a9..20b1990ba8 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
@@ -26,7 +26,7 @@
       <ms-jmx-step :request="request" :response="responseData"/>
 
       <!-- 执行组件 -->
-      <ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
+      <ms-run :debug="true" :reportId="reportId" :isStop="isStop" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
     </el-card>
     <div v-if="scenario">
       <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{ $t('commons.save') }}</el-button>
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
index c6a4b99802..ad1202a8c1 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
@@ -37,7 +37,7 @@
       <ms-jmx-step :request="request" :response="responseData"/>
 
       <!-- 执行组件 -->
-      <ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
+      <ms-run :debug="true" :reportId="reportId" :isStop="isStop" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
     </el-card>
     <div v-if="scenario">
       <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{ $t('commons.save') }}</el-button>