From 769d4bc204ff4746926651b59c36d05b5d208285 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 20 Aug 2021 10:17:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/case/ApiCaseItem.vue    | 11 ++++++++---
 .../api/definition/components/case/ApiCaseList.vue    |  7 ++++---
 .../definition/components/list/ApiCaseSimpleList.vue  |  8 +++++++-
 3 files changed, 19 insertions(+), 7 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 38baf70b20..e6f86bd26a 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card style="margin-top: 5px" @click.native="selectTestCase(apiCase,$event)" v-loading="loading">
+  <el-card style="margin-top: 5px" @click.native="selectTestCase(apiCase,$event)" v-loading="saveLoading">
     <div @click="active(apiCase)" v-if="type!=='detail'">
       <el-row>
         <el-col :span="3">
@@ -220,6 +220,7 @@ export default {
         {name: this.$t('test_track.case.batch_edit_case'), handleClick: this.handleEditBatch}
       ],
       methodColorMap: new Map(API_METHOD_COLOUR),
+      saveLoading: false,
     }
   },
   props: {
@@ -367,9 +368,9 @@ export default {
       });
     },
     reload() {
-      this.loading = true
+      this.saveLoading = true
       this.$nextTick(() => {
-        this.loading = false
+        this.saveLoading = false
       });
     },
     saveCase(row, hideAlert) {
@@ -415,6 +416,10 @@ export default {
           if (!hideAlert) {
             this.$emit('refresh');
           }
+          // 刷新编辑后用例列表
+          if (this.api.source === "editCase") {
+            this.$store.state.currentApiCase = {refresh: "true"};
+          }
         }
       });
     },
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 3f3fcdc2bc..80683766a8 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -184,6 +184,7 @@ export default {
     },
     add(api) {
       this.api = api;
+      this.api.source = "editCase";
       this.condition = {components: API_CASE_CONFIGS};
       this.sysAddition();
       this.visible = true;
@@ -262,14 +263,14 @@ export default {
       this.runResult = {testId: getUUID()};
       this.$refs.apiCaseItem.runLoading = false;
       this.$success(this.$t('organization.integration.successful_operation'));
-      this.$emit("refresh");
+      //this.$emit("refresh");
     },
     errorRefresh() {
       this.batchLoadingIds = [];
       this.singleLoading = false;
       this.singleRunId = "";
       this.$refs.apiCaseItem.runLoading = false;
-      this.$emit("refresh");
+      //this.$emit("refresh");
     },
     refresh() {
       this.getApiTest();
@@ -414,7 +415,7 @@ export default {
       this.runData.push(row.request);
       /*触发执行操作*/
       this.reportId = getUUID().substring(0, 8);
-      this.$emit("refresh", row.id);
+      this.$emit("refreshCase", row.id);
     },
 
     stop(callback) {
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 ac23d4a520..663a8e8dfd 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -162,7 +162,7 @@
         :total="total"/>
     </div>
 
-    <api-case-list @showExecResult="showExecResult" @refresh="initTable" :currentApi="selectCase" ref="caseList"/>
+    <api-case-list @showExecResult="showExecResult" @refreshCase="initTable" :currentApi="selectCase" ref="caseList"/>
     <!--批量编辑-->
     <ms-batch-edit ref="batchEdit" :data-count="$refs.caseTable ? $refs.caseTable.selectDataCounts : 0" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"/>
     <!--选择环境(当创建性能测试的时候)-->
@@ -419,6 +419,12 @@ export default {
     },
     relevanceProjectId() {
       this.initTable();
+    },
+    '$store.state.currentApiCase.refresh'() {
+      if (this.$store.state.currentApiCase.refresh) {
+        this.initTable();
+      }
+      this.$store.state.currentApiCase = {};
     }
   },
   computed: {