From ddd7fa4587ee112d361b26d7e21d888f6178efd9 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 13 Apr 2022 15:46:36 +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=96=B0=E5=BB=BA=E6=8E=A5=E5=8F=A3case?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=AE=8C=E6=88=90=E5=90=8E=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?JSONPath=E6=8E=A8=E8=8D=90=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1012120 --user=赵勇 [接口测试]github #125681.19.2版本，新建接口case，执行完成后，点击JSONPath抓取功能无法使用了 https://www.tapd.cn/55049933/s/1133885
---
 .../components/case/ApiCaseItem.vue           | 56 ++++++++++++++-----
 .../components/case/ApiCaseList.vue           | 15 +++--
 2 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 1869ed90c7..13b3b70a8d 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -110,25 +110,52 @@
       <div v-if="apiCase.active||type==='detail'" v-loading="loading">
         <el-divider></el-divider>
         <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-        <ms-api-request-form :isShowEnable="true" :showScript="true" :headers="apiCase.request.headers "
-                             :response="apiCase.responseData" :request="apiCase.request" v-if="api.protocol==='HTTP'"/>
-        <tcp-format-parameters :showScript="true" :show-pre-script="true" :request="apiCase.request"
-                               :response="apiCase.responseData"
-                               v-if="api.method==='TCP'"/>
-        <esb-definition v-xpack :request="apiCase.request" :show-pre-script="true" :showScript="true"
-                        :response="apiCase.responseData"
-                        v-if="isXpack&&api.method==='ESB'" ref="esbDefinition"/>
-        <ms-sql-basis-parameters :showScript="true" :request="apiCase.request" :response="apiCase.responseData"
-                                 v-if="api.protocol==='SQL'"/>
-        <ms-dubbo-basis-parameters :showScript="true" :request="apiCase.request" :response="apiCase.responseData"
-                                   v-if="api.protocol==='DUBBO'"/>
+        <ms-api-request-form
+          :isShowEnable="true"
+          :showScript="true"
+          :headers="apiCase.request.headers "
+          :response="apiCase.responseData"
+          :request="apiCase.request" v-if="api.protocol==='HTTP'"/>
+        <tcp-format-parameters
+          :showScript="true"
+          :show-pre-script="true"
+          :request="apiCase.request"
+          :response="apiCase.responseData"
+          v-if="api.method==='TCP'"/>
+        <esb-definition
+          v-xpack
+          :request="apiCase.request"
+          :show-pre-script="true"
+          :showScript="true"
+          :response="apiCase.responseData"
+          v-if="isXpack&&api.method==='ESB'" ref="esbDefinition"/>
+        <ms-sql-basis-parameters
+          :showScript="true"
+          :request="apiCase.request"
+          :response="apiCase.responseData"
+          v-if="api.protocol==='SQL'"/>
+        <ms-dubbo-basis-parameters
+          :showScript="true"
+          :request="apiCase.request"
+          :response="apiCase.responseData"
+          v-if="api.protocol==='DUBBO'"/>
         <!-- HTTP 请求返回数据 -->
         <p class="tip">{{ $t('api_test.definition.request.res_param') }}</p>
         <div v-if="isXpack&&api.method==='ESB'">
-          <esb-definition-response v-xpack v-if="isXpack" :currentProtocol="apiCase.request.protocol" :request="apiCase.request" :is-api-component="false" :show-options-button="false" :show-header="true" :api-item="apiCase"/>
+          <esb-definition-response
+            v-xpack v-if="isXpack"
+            :currentProtocol="apiCase.request.protocol"
+            :request="apiCase.request"
+            :is-api-component="false"
+            :show-options-button="false"
+            :show-header="true"
+            :api-item="apiCase"/>
         </div>
         <div v-else>
-          <api-response-component :currentProtocol="apiCase.request.protocol" :api-item="apiCase" :result="runResult"/>
+          <api-response-component
+            :currentProtocol="apiCase.request.protocol"
+            :api-item="apiCase"
+            :result="apiCase.responseData"/>
         </div>
       </div>
     </el-collapse-transition>
@@ -226,7 +253,6 @@ export default {
     }
   },
   props: {
-    runResult: {},
     loaded: {
       type: Boolean,
       default: false,
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 9108eaabdb..c8188886fe 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -32,7 +32,6 @@
             :api="api"
             :currentApi="currentApi"
             :loaded="loaded"
-            :runResult="runResult"
             :maintainerOptions="maintainerOptions"
             :api-case="apiCaseList[0]" ref="apiCaseItem"/>
         </el-main>
@@ -40,8 +39,14 @@
     </ms-drawer>
 
     <!-- 执行组件 -->
-    <ms-run :debug="false" :reportId="reportId" :run-data="runData" :env-map="envMap" :edit-case-request="true"
-            @runRefresh="runRefresh" @errorRefresh="errorRefresh" ref="runTest"/>
+    <ms-run
+      :debug="false"
+      :reportId="reportId"
+      :run-data="runData"
+      :env-map="envMap"
+      :edit-case-request="true"
+      @runRefresh="runRefresh"
+      @errorRefresh="errorRefresh" ref="runTest"/>
     <ms-task-center ref="taskCenter" :show-menu="false"/>
   </div>
 </template>
@@ -68,6 +73,7 @@ export default {
       type: Boolean,
       default: false
     },
+    saveButtonText: String,
     refreshSign: String,
     currentApi: {
       type: Object
@@ -82,7 +88,6 @@ export default {
       batchLoadingIds: [],
       singleLoading: false,
       singleRunId: "",
-      runResult: {},
       runData: [],
       reportId: "",
       testCaseId: "",
@@ -248,7 +253,7 @@ export default {
       if (data) {
         let status = data.error > 0 ? "error" : "success";
         this.apiCaseList[0].execResult = status
-        this.runResult = data;
+        this.apiCaseList[0].responseData = data;
         this.$refs.apiCaseItem.runLoading = false;
         this.$store.state.currentApiCase = {refresh: true, id: data.id, status: status};
       }