From 30bb64655534d5fed89c182452e107c3aabc7440 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 22 Mar 2022 14:20:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20tcp=E5=8D=8F=E8=AE=AE=E5=89=8D=E7=BD=AE=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=90=8E=E7=BD=AE=E6=93=8D=E4=BD=9C=E6=96=AD=E8=A8=80=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E5=88=B0=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E8=AE=BE=E7=BD=AE=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1011537 --user=王孝刚 【接口测试】tcp协议-前置操作、后置操作、断言规则应该显示到其他设置后
https://www.tapd.cn/55049933/s/1123146
---
 .../request/tcp/TcpFormatParameters.vue       | 71 ++++++++++---------
 frontend/src/business/components/xpack        |  2 +-
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue b/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue
index 900e6fd052..56e7a049b1 100644
--- a/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue
@@ -49,40 +49,6 @@
                 </div>
               </el-tab-pane>
 
-              <!-- 脚本步骤/断言步骤 -->
-              <el-tab-pane :label="$t('api_test.definition.request.pre_operation')" name="preOperate" v-if="showScript">
-                <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" protocol="TCP" :response="response" :tab-type="'pre'"
-                             ref="preStep"/>
-              </el-tab-pane>
-              <el-tab-pane :label="$t('api_test.definition.request.post_operation')" name="postOperate"
-                           v-if="showScript">
-                  <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" protocol="TCP" :response="response" :tab-type="'post'"
-                             ref="postStep"/>
-              </el-tab-pane>
-              <el-tab-pane :label="$t('api_test.definition.request.assertions_rule')" name="assertionsRule"
-                           v-if="showScript">
-                <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">
-                    <div class="el-step__icon-inner">{{ request.ruleSize }}</div>
-                  </div>
-                </span>
-                <ms-jmx-step :request="request" :apiId="request.id" protocol="TCP" :response="response" @reload="reloadBody"
-                             :tab-type="'assertionsRule'" ref="assertionsRule"/>
-              </el-tab-pane>
-
               <el-tab-pane :label="$t('api_test.definition.request.other_config')" name="other" class="other-config">
                 <el-row>
                   <el-col :span="8">
@@ -154,6 +120,43 @@
                   </el-col>
                 </el-row>
               </el-tab-pane>
+
+              <!-- 脚本步骤/断言步骤 -->
+              <el-tab-pane :label="$t('api_test.definition.request.pre_operation')" name="preOperate" v-if="showScript">
+                <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" protocol="TCP" :response="response"
+                             :tab-type="'pre'"
+                             ref="preStep"/>
+              </el-tab-pane>
+              <el-tab-pane :label="$t('api_test.definition.request.post_operation')" name="postOperate"
+                           v-if="showScript">
+                  <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" protocol="TCP" :response="response"
+                             :tab-type="'post'"
+                             ref="postStep"/>
+              </el-tab-pane>
+              <el-tab-pane :label="$t('api_test.definition.request.assertions_rule')" name="assertionsRule"
+                           v-if="showScript">
+                <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">
+                    <div class="el-step__icon-inner">{{ request.ruleSize }}</div>
+                  </div>
+                </span>
+                <ms-jmx-step :request="request" :apiId="request.id" protocol="TCP" :response="response"
+                             @reload="reloadBody"
+                             :tab-type="'assertionsRule'" ref="assertionsRule"/>
+              </el-tab-pane>
             </el-tabs>
           </el-form>
         </div>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 85a393a4e0..3e15b08a9c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 85a393a4e025ff9e4431a6e80c40e138f26f7faf
+Subproject commit 3e15b08a9c7c85d7cf8b79ba6d3a3ef1f23b129a