fix(接口自动化): 修复引用步骤执行结果内容运行复制

frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue

@@ -37,14 +37,19 @@
     </div>
     <!--最大化不显示具体内容-->
     <div class="header" v-if="!isMax">
-      <fieldset :disabled="data.disabled" class="ms-fieldset">
-        <el-collapse-transition>
-          <div v-if="data.active && showCollapse" :draggable="draggable">
-            <el-divider></el-divider>
+      <el-collapse-transition>
+        <div v-if="data.active && showCollapse" :draggable="draggable">
+          <el-divider></el-divider>
+          <fieldset :disabled="data.disabled" class="ms-fieldset">
+            <!--四种协议请求内容-->
+            <slot name="request"></slot>
+            <!--其他模版内容，比如断言，提取等-->
             <slot></slot>
-          </div>
-        </el-collapse-transition>
-      </fieldset>
+          </fieldset>
+          <!--四种协议执行结果内容-->
+          <slot name="result"></slot>
+        </div>
+      </el-collapse-transition>
     </div>
 
   </el-card>

frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue

@@ -27,48 +27,58 @@
         </el-tooltip>
       </template>
 
-      <customize-req-info :is-customize-req="isCustomizeReq" :request="request"/>
-
-      <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-      <ms-api-request-form :isShowEnable="true" :referenced="true" :headers="request.headers " :request="request"
-                           v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"/>
-      <esb-definition v-xpack :request="request" :showScript="false" v-if="this.showXpackCompnent&&request.esbDataStruct!=null" ref="esbDefinition"/>
-      <ms-tcp-basis-parameters :request="request" v-if="(request.protocol==='TCP'|| request.type==='TCPSampler')&&request.esbDataStruct==null " :showScript="false"/>
-
-      <ms-sql-basis-parameters :request="request" v-if="request.protocol==='SQL'|| request.type==='JDBCSampler'"
-                               :showScript="false"/>
-      <ms-dubbo-basis-parameters :request="request"
-                                 v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'|| request.type==='DubboSampler'"
+      <!--请求内容-->
+      <template v-slot:request>
+        <customize-req-info :is-customize-req="isCustomizeReq" :request="request"/>
+        <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
+        <ms-api-request-form v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"
+                             :isShowEnable="true"
+                             :referenced="true"
+                             :headers="request.headers "
+                             :request="request"/>
+        <esb-definition v-if="showXpackCompnent&&request.esbDataStruct!=null"
+                        v-xpack
+                        :request="request"
+                        :showScript="false"
+                        ref="esbDefinition"/>
+        <ms-tcp-basis-parameters v-if="(request.protocol==='TCP'|| request.type==='TCPSampler')&&request.esbDataStruct==null "
+                                 :request="request"
                                  :showScript="false"/>
-
-      <p class="tip">{{ $t('api_test.definition.request.res_param') }} </p>
-      <div v-if="request.result">
-        <el-tabs v-model="request.activeName" closable class="ms-tabs">
-          <el-tab-pane :label="item.name" :name="item.name" v-for="(item,index) in request.result.scenarios" :key="index">
-            <div v-for="(result,i) in item.requestResults" :key="i" style="margin-bottom: 5px">
-              <api-response-component v-if="result.name===request.name" :result="result"/>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <div v-else-if="showXpackCompnent&&request.backEsbDataStruct != null">
-        <esb-definition-response :currentProtocol="request.protocol" :request="request" :is-api-component="false"
-                                 :show-options-button="false" :show-header="true" :result="request.requestResult"/>
-      </div>
-      <div v-else>
-        <api-response-component :currentProtocol="request.protocol" :result="request.requestResult"/>
-      </div>
-
-      <!-- 保存操作 -->
-      <el-button type="primary" size="small" class="ms-btn-flot" @click="saveTestCase(item)"
-                 v-if="!request.referenced">
-        {{ $t('commons.save') }}
-      </el-button>
+        <ms-sql-basis-parameters v-if="request.protocol==='SQL'|| request.type==='JDBCSampler'"
+                                 :request="request"
+                                 :showScript="false"/>
+        <ms-dubbo-basis-parameters v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'|| request.type==='DubboSampler'"
+                                   :request="request"
+                                   :showScript="false"/>
+      </template>
+      <!-- 执行结果内容 -->
+      <template v-slot:result>
+        <p class="tip">{{ $t('api_test.definition.request.res_param') }} </p>
+        <div v-if="request.result">
+          <el-tabs v-model="request.activeName" closable class="ms-tabs">
+            <el-tab-pane :label="item.name" :name="item.name" v-for="(item,index) in request.result.scenarios" :key="index">
+              <div v-for="(result,i) in item.requestResults" :key="i" style="margin-bottom: 5px">
+                <api-response-component v-if="result.name===request.name" :result="result"/>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+        <div v-else-if="showXpackCompnent&&request.backEsbDataStruct != null">
+          <esb-definition-response :currentProtocol="request.protocol" :request="request" :is-api-component="false"
+                                   :show-options-button="false" :show-header="true" :result="request.requestResult"/>
+        </div>
+        <div v-else>
+          <api-response-component :currentProtocol="request.protocol" :result="request.requestResult"/>
+        </div>
+        <!-- 保存操作 -->
+        <el-button type="primary" size="small" class="ms-btn-flot" @click="saveTestCase(item)" v-if="!request.referenced">
+          {{ $t('commons.save') }}
+        </el-button>
+      </template>
     </api-base-component>
     <ms-run :debug="true" :reportId="reportId" :run-data="runData" :env-map="envMap"
             @runRefresh="runRefresh" ref="runTest"/>
 
-
   </div>
 </template>