From ede0559f5e24f65f76929efcbfcade2fe4d887d4 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 1 Mar 2022 11:42:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/ApiScenarioList.vue    | 14 +++++++++++---
 .../api/automation/scenario/common/RunMode.vue     |  2 ++
 .../components/list/ApiCaseRunModeWithEnv.vue      |  2 ++
 .../components/list/ApiCaseSimpleList.vue          |  6 +++++-
 .../track/plan/common/PlanRunModeWithEnv.vue       |  2 ++
 .../view/comonents/api/TestPlanApiCaseList.vue     |  7 ++++++-
 .../view/comonents/api/TestPlanApiScenarioList.vue |  8 +++++++-
 7 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index b620ef1e09..cc9e85de45 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -286,11 +286,19 @@
     <batch-edit ref="batchEdit" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"
                 :dialog-title="$t('test_track.case.batch_edit_case')"/>
     <batch-move @refresh="search" @moveSave="moveSave" ref="testBatchMove"/>
-    <ms-run-mode @handleRunBatch="handleRunBatch" :request="runRequest" ref="runMode"/>
-    <ms-run :debug="true" :environment="projectEnvMap" @runRefresh="runRefresh" :reportId="reportId" :saved="true"
+    <ms-run-mode
+      :request="runRequest"
+      @close="search"
+      @handleRunBatch="handleRunBatch"
+      ref="runMode"/>
+    <ms-run :debug="true" :environment="projectEnvMap"
+            :reportId="reportId"
+            :saved="true"
             :executeType="'Saved'"
             :environment-type="environmentType" :environment-group-id="envGroupId"
-            :run-data="debugData" ref="runTest"/>
+            :run-data="debugData"
+            @runRefresh="runRefresh"
+            ref="runTest"/>
     <ms-task-center ref="taskCenter" :show-menu="false"/>
     <relationship-graph-drawer :graph-data="graphData" ref="relationshipGraph"/>
     <!--  删除接口提示  -->
diff --git a/frontend/src/business/components/api/automation/scenario/common/RunMode.vue b/frontend/src/business/components/api/automation/scenario/common/RunMode.vue
index 94d1cd3403..65bcd64c6a 100644
--- a/frontend/src/business/components/api/automation/scenario/common/RunMode.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/RunMode.vue
@@ -3,6 +3,7 @@
     destroy-on-close
     :title="$t('load_test.runtime_config')"
     width="550px"
+    @close="close"
     :visible.sync="runModeVisible"
   >
     <div style="margin-bottom: 10px;">
@@ -145,6 +146,7 @@ export default {
         resourcePoolId: null,
       };
       this.runModeVisible = false;
+      this.$emit('close');
     },
     getWsProjects() {
       this.$get("/project/listAll", res => {
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseRunModeWithEnv.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseRunModeWithEnv.vue
index 86f01cb13c..27c3b4697a 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseRunModeWithEnv.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseRunModeWithEnv.vue
@@ -3,6 +3,7 @@
     destroy-on-close
     :title="$t('load_test.runtime_config')"
     width="550px"
+    @close="close"
     :visible.sync="runModeVisible"
   >
     <div style="margin-bottom: 10px;">
@@ -129,6 +130,7 @@ export default {
         environmentType: ENV_TYPE.JSON
       };
       this.runModeVisible = false;
+      this.$emit('close');
     },
     handleRunBatch() {
       this.$emit("handleRunBatch", this.runConfig);
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index bd441c9277..ccb99a0254 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -227,7 +227,11 @@
 
     <ms-task-center ref="taskCenter" :show-menu="false"/>
 
-    <ms-api-case-run-mode-with-env @handleRunBatch="runBatch" ref="batchRun" :project-id="projectId"/>
+    <ms-api-case-run-mode-with-env
+      :project-id="projectId"
+      @handleRunBatch="runBatch"
+      @close="initTable"
+      ref="batchRun"/>
 
     <el-dialog :close-on-click-modal="false" :title="$t('test_track.plan_view.test_result')" width="60%"
                :visible.sync="resVisible" class="api-import" destroy-on-close @close="resVisible=false">
diff --git a/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue b/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue
index eb7616e5e1..e3f45be577 100644
--- a/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue
+++ b/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue
@@ -3,6 +3,7 @@
     destroy-on-close
     :title="$t('load_test.runtime_config')"
     width="550px"
+    @close="close"
     :visible.sync="runModeVisible"
   >
     <div style="margin-bottom: 10px;">
@@ -133,6 +134,7 @@ export default {
         environmentType: ENV_TYPE.JSON
       };
       this.runModeVisible = false;
+      this.$emit('close');
     },
     handleRunBatch() {
       this.$emit("handleRunBatch", this.runConfig);
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index 7cb86c28bf..341ec979a7 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -163,7 +163,12 @@
       <batch-edit :dialog-title="$t('test_track.case.batch_edit_case')" :type-arr="typeArr" :value-arr="valueArr"
                   :select-row="$refs.table ? $refs.table.selectRows : new Set()" ref="batchEdit" @batchEdit="batchEdit"/>
 
-      <ms-plan-run-mode @handleRunBatch="handleRunBatch" ref="runMode" :plan-case-ids="testPlanCaseIds" :type="'apiCase'"/>
+      <ms-plan-run-mode
+        :type="'apiCase'"
+        :plan-case-ids="testPlanCaseIds"
+        @close="search"
+        @handleRunBatch="handleRunBatch"
+        ref="runMode"/>
     </el-card>
     <ms-task-center ref="taskCenter" :show-menu="false"/>
   </div>
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index 7a3c980215..5c463d228a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -184,7 +184,13 @@
     <!-- 批量编辑 -->
     <batch-edit :dialog-title="$t('test_track.case.batch_edit_case')" :type-arr="typeArr" :value-arr="valueArr"
                 :select-row="this.$refs.table ? this.$refs.table.selectRows : new Set()" ref="batchEdit" @batchEdit="batchEdit"/>
-    <ms-plan-run-mode @handleRunBatch="handleRunBatch" ref="runMode" :plan-case-ids="planCaseIds" :type="'apiScenario'"/>
+    <ms-plan-run-mode
+      :type="'apiScenario'"
+      :plan-case-ids="planCaseIds"
+      @close="search"
+      @handleRunBatch="handleRunBatch"
+      ref="runMode"/>
+
     <ms-task-center ref="taskCenter" :show-menu="false"/>
   </div>
 </template>