From fc42ad0527099c7c89ec5e358c53a9c98a4d6180 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 4 Jan 2022 13:29:35 +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=8F=92=E4=BB=B6=E5=8D=95=E6=AD=A5=E4=B8=8D?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009245 --user=赵勇 【github#8813】插件加载websocket插件之后创建的场景jmx与jmeter的生成的参数一样，但是没法在MS上单独运行而且运行一直处于测试中，只能整体调试 https://www.tapd.cn/55049933/s/1089421
---
 .../scenario/component/ApiComponent.vue       |   1 +
 .../scenario/component/LoopController.vue     |   3 +
 .../scenario/component/PluginComponent.vue    | 145 +++++++++---------
 3 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index cb26976a4a..3c9ddbdec1 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -583,6 +583,7 @@ export default {
           }
         }
       }
+      this.request.debug = true;
       this.request.active = true;
       this.loading = true;
       this.runData = [];
diff --git a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
index 0bb63879d7..5891bb8fae 100644
--- a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
@@ -258,6 +258,9 @@ export default {
         environmentId: this.currentEnvironmentId,
         hashTree: [this.controller],
       };
+      if (this.node && this.node.data) {
+        this.node.data.debug = true;
+      }
       this.reportId = getUUID().substring(0, 8);
     },
 
diff --git a/frontend/src/business/components/api/automation/scenario/component/PluginComponent.vue b/frontend/src/business/components/api/automation/scenario/component/PluginComponent.vue
index fc27d87984..14fba68827 100644
--- a/frontend/src/business/components/api/automation/scenario/component/PluginComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/PluginComponent.vue
@@ -1,93 +1,93 @@
 <template>
-  <api-base-component
-    @copy="copyRow"
-    @remove="remove"
-    @active="active"
-    :data="request"
-    :draggable="draggable"
-    :color="defColor"
-    :is-max="isMax"
-    :show-btn="showBtn"
-    :background-color="defBackgroundColor"
-    :title="pluginName">
+  <div>
+    <api-base-component
+      @copy="copyRow"
+      @remove="remove"
+      @active="active"
+      :data="request"
+      :draggable="draggable"
+      :color="defColor"
+      :is-max="isMax"
+      :show-btn="showBtn"
+      :background-color="defBackgroundColor"
+      :title="pluginName">
 
-    <template v-slot:request>
-      <legend style="width: 100%">
-        <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-        <div class="ms-form">
-          <div class="ms-form-create" v-loading="loading">
-            <formCreate
-              v-model="pluginForm"
-              :rule="rules"
-              :option="option"
-              :value.sync="data"
-              @prefix-change="change"
-              @prefix-click="change"
-              @prefix-visible-change="visibleChange"
-            />
+      <template v-slot:request>
+        <legend style="width: 100%">
+          <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
+          <div class="ms-form">
+            <div class="ms-form-create" v-loading="loading">
+              <formCreate
+                v-model="pluginForm"
+                :rule="rules"
+                :option="option"
+                :value.sync="data"
+                @prefix-change="change"
+                @prefix-click="change"
+                @prefix-visible-change="visibleChange"
+              />
+            </div>
           </div>
-        </div>
-      </legend>
-    </template>
+        </legend>
+      </template>
 
-    <template v-slot:debugStepCode>
+      <template v-slot:debugStepCode>
        <span v-if="request.testing" class="ms-test-running">
          <i class="el-icon-loading" style="font-size: 16px"/>
          {{ $t('commons.testing') }}
        </span>
-      <span class="ms-step-debug-code" :class="request.requestResult[0].success?'ms-req-success':'ms-req-error'" v-if="!loading && request.debug && request.requestResult[0] && request.requestResult[0].responseResult">
+        <span class="ms-step-debug-code" :class="request.requestResult[0].success?'ms-req-success':'ms-req-error'" v-if="!loading && request.debug && request.requestResult[0] && request.requestResult[0].responseResult">
           {{ request.requestResult[0].success ? 'success' : 'error' }}
         </span>
-    </template>
+      </template>
 
-    <template v-slot:button v-if="allSampler.indexOf(request.type) !==-1">
-      <el-tooltip :content="$t('api_test.run')" placement="top" v-if="!loading">
-        <el-button :disabled="!request.enable" @click="run" icon="el-icon-video-play" style="padding: 5px" class="ms-btn" size="mini" circle/>
-      </el-tooltip>
-      <el-tooltip :content="$t('report.stop_btn')" placement="top" :enterable="false" v-else>
-        <el-button :disabled="!request.enable" @click.once="stop" size="mini" style="color:white;padding: 0 0.1px;width: 24px;height: 24px;" class="stop-btn" circle>
-          <div style="transform: scale(0.66)">
-            <span style="margin-left: -4.5px;font-weight: bold;">STOP</span>
+      <template v-slot:button v-if="allSampler.indexOf(request.type) !==-1">
+        <el-tooltip :content="$t('api_test.run')" placement="top" v-if="!loading">
+          <el-button :disabled="!request.enable" @click="run" icon="el-icon-video-play" style="padding: 5px" class="ms-btn" size="mini" circle/>
+        </el-tooltip>
+        <el-tooltip :content="$t('report.stop_btn')" placement="top" :enterable="false" v-else>
+          <el-button :disabled="!request.enable" @click.once="stop" size="mini" style="color:white;padding: 0 0.1px;width: 24px;height: 24px;" class="stop-btn" circle>
+            <div style="transform: scale(0.66)">
+              <span style="margin-left: -4.5px;font-weight: bold;">STOP</span>
+            </div>
+          </el-button>
+        </el-tooltip>
+      </template>
+
+      <template v-slot:result>
+        <div v-if="allSampler.indexOf(request.type) !==-1">
+          <p class="tip">{{ $t('api_test.definition.request.res_param') }} </p>
+          <div v-if="request.result">
+            <div v-for="(scenario,h) in request.result.scenarios" :key="h">
+              <el-tabs v-model="request.activeName" closable class="ms-tabs">
+                <el-tab-pane v-for="(item,i) in scenario.requestResults" :label="'循环'+(i+1)" :key="i" style="margin-bottom: 5px">
+                  <api-response-component :currentProtocol="request.protocol" :apiActive="true" :result="item"/>
+                </el-tab-pane>
+              </el-tabs>
+            </div>
           </div>
-        </el-button>
-      </el-tooltip>
-    </template>
-
-    <template v-slot:result>
-      <div v-if="allSampler.indexOf(request.type) !==-1">
-        <p class="tip">{{ $t('api_test.definition.request.res_param') }} </p>
-        <div v-if="request.result">
-          <div v-for="(scenario,h) in request.result.scenarios" :key="h">
-            <el-tabs v-model="request.activeName" closable class="ms-tabs">
-              <el-tab-pane v-for="(item,i) in scenario.requestResults" :label="'循环'+(i+1)" :key="i" style="margin-bottom: 5px">
-                <api-response-component :currentProtocol="request.protocol" :apiActive="true" :result="item"/>
+          <div v-else>
+            <el-tabs v-model="request.activeName" closable class="ms-tabs" v-if="request.requestResult && request.requestResult.length > 1">
+              <el-tab-pane v-for="(item,i) in request.requestResult" :label="'循环'+(i+1)" :key="i" style="margin-bottom: 5px">
+                <api-response-component
+                  :currentProtocol="request.protocol"
+                  :apiActive="true"
+                  :result="item"
+                />
               </el-tab-pane>
             </el-tabs>
+            <api-response-component
+              :currentProtocol="request.protocol"
+              :apiActive="true"
+              :result="request.requestResult[0]"
+              v-else/>
           </div>
         </div>
-        <div v-else>
-          <el-tabs v-model="request.activeName" closable class="ms-tabs" v-if="request.requestResult && request.requestResult.length > 1">
-            <el-tab-pane v-for="(item,i) in request.requestResult" :label="'循环'+(i+1)" :key="i" style="margin-bottom: 5px">
-              <api-response-component
-                :currentProtocol="request.protocol"
-                :apiActive="true"
-                :result="item"
-              />
-            </el-tab-pane>
-          </el-tabs>
-          <api-response-component
-            :currentProtocol="request.protocol"
-            :apiActive="true"
-            :result="request.requestResult[0]"
-            v-else/>
-        </div>
-      </div>
-    </template>
-
+      </template>
+    </api-base-component>
     <ms-run :debug="true" :reportId="reportId" :run-data="runData" :env-map="envMap"
             @runRefresh="runRefresh" @errorRefresh="errorRefresh" ref="runTest"/>
-
-  </api-base-component>
+  </div>
 </template>
 
 <script>
@@ -217,6 +217,7 @@ export default {
           }
         }
       }
+      this.request.debug = true;
       this.request.active = true;
       this.loading = true;
       this.runData = [];