From 122b96692325c445674982e98e97fdffbe5db5ed Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Thu, 1 Sep 2022 14:00:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B6=E8=A1=8C=E6=8E=A7=E5=88=B6=E5=99=A8?=
 =?UTF-8?q?=E5=A4=9A=E5=B1=95=E7=A4=BA=E5=89=8D=E5=90=8E=E7=BD=AE=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=9A=84=E7=BC=BA=E9=99=B7=20(#17617)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016058 --user=王孝刚 【接口测试】并行控制器，添加子步骤后，里面的断言规则会变多
https://www.tapd.cn/55049933/s/1236803

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../scenario/component/PluginComponent.vue    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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 5d32c37824..a6510bf95a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/PluginComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/PluginComponent.vue
@@ -36,25 +36,28 @@
             </el-tab-pane>
 
             <!-- 脚本步骤/断言步骤 -->
-            <el-tab-pane :label="$t('api_test.definition.request.pre_operation')" name="preOperate">
+            <el-tab-pane :label="$t('api_test.definition.request.pre_operation')" name="preOperate" v-if="showOther">
               <span class="item-tabs" effect="dark" placement="top-start" slot="label">
                 {{ $t('api_test.definition.request.pre_operation') }}
                 <div class="el-step__icon is-text ms-api-col ms-header" v-if="request.preSize > 0">
                   <div class="el-step__icon-inner">{{ request.preSize }}</div>
                 </div>
               </span>
-              <ms-jmx-step :request="request" :apiId="request.id" :scenario-id="currentScenario.id" :response="response" :tab-type="'pre'" ref="preStep"/>
+              <ms-jmx-step :request="request" :apiId="request.id" :scenario-id="currentScenario.id" :response="response"
+                           :tab-type="'pre'" ref="preStep"/>
             </el-tab-pane>
-            <el-tab-pane :label="$t('api_test.definition.request.post_operation')" name="postOperate">
+            <el-tab-pane :label="$t('api_test.definition.request.post_operation')" name="postOperate" v-if="showOther">
                 <span class="item-tabs" effect="dark" placement="top-start" slot="label">
                 {{ $t('api_test.definition.request.post_operation') }}
                 <div class="el-step__icon is-text ms-api-col ms-header" v-if="request.postSize > 0">
                   <div class="el-step__icon-inner">{{ request.postSize }}</div>
                 </div>
               </span>
-              <ms-jmx-step :request="request" :apiId="request.id" :scenario-id="currentScenario.id" :response="response" :tab-type="'post'" ref="postStep"/>
+              <ms-jmx-step :request="request" :apiId="request.id" :scenario-id="currentScenario.id" :response="response"
+                           :tab-type="'post'" ref="postStep"/>
             </el-tab-pane>
-            <el-tab-pane :label="$t('api_test.definition.request.assertions_rule')" name="assertionsRule">
+            <el-tab-pane :label="$t('api_test.definition.request.assertions_rule')" name="assertionsRule"
+                         v-if="showOther">
                 <span class="item-tabs" effect="dark" placement="top-start" slot="label">
                 {{ $t('api_test.definition.request.assertions_rule') }}
                 <div class="el-step__icon is-text ms-api-col ms-header" v-if="request.ruleSize > 0">
@@ -62,7 +65,8 @@
                 </div>
               </span>
               <div style="margin-right: 20px">
-                <ms-jmx-step :request="request" :apiId="request.id" :scenario-id="currentScenario.id" :response="response" @reload="reload" :tab-type="'assertionsRule'" ref="assertionsRule"/>
+                <ms-jmx-step :request="request" :apiId="request.id" :scenario-id="currentScenario.id"
+                             :response="response" @reload="reload" :tab-type="'assertionsRule'" ref="assertionsRule"/>
               </div>
             </el-tab-pane>
 
@@ -201,6 +205,7 @@ export default {
       ),
       pluginName: "",
       response: {},
+      showOther: true
     }
   },
   computed: {
@@ -236,6 +241,9 @@ export default {
     }
     this.data = this.request;
     this.pluginName = this.request.stepName ? this.request.stepName : this.request.type;
+    if (this.request.type === 'GenericController') {
+      this.showOther = false;
+    }
     if (this.request.hashTree) {
       this.initStepSize(this.request.hashTree);
       this.historicalDataProcessing(this.request.hashTree);