From 08719f830023f98a46080a1e3e597c1afe7c9a77 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sat, 9 Apr 2022 09:50:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9C=A8=E7=89=B9=E5=AE=9A=E6=9D=A1=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=A1=E6=AD=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseList.vue    | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index d5db421ca7..f5d17a3dbe 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -1,8 +1,9 @@
 <template>
 
   <span>
-    <el-input :placeholder="$t('commons.search_by_name_or_id')" @change="initTableData" class="search-input" size="small"
-                 v-model="condition.name" ref="inputVal"/>
+    <el-input :placeholder="$t('commons.search_by_name_or_id')" @change="initTableData" class="search-input"
+              size="small"
+              v-model="condition.name" ref="inputVal"/>
     <el-link type="primary" @click="open" style="float: right;margin-top: 5px;padding-right: 10px">
         {{ $t('commons.adv_search.title') }}
     </el-link>
@@ -131,8 +132,9 @@
           :label="$t('commons.tag')"
           min-width="80">
           <template v-slot:default="scope">
-            <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="scope.row.tags.length===1&&itemName.length*12<=80"
-                     :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
+            <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain"
+                    :show-tooltip="scope.row.tags.length===1&&itemName.length*12<=80"
+                    :content="itemName" style="margin-left: 0px; margin-right: 2px"/>
             <span/>
           </template>
         </ms-table-column>
@@ -554,17 +556,19 @@ export default {
     }
     this.getVersionOptions();
   },
-  activated() {
-    this.getTemplateField();
-    let ids = this.$route.params.ids;
-    if (ids) {
-      this.condition.ids = ids;
-    }
-    this.initTableData();
-    this.condition.ids = null;
-    this.getVersionOptions();
-  },
   watch: {
+    '$route'(to) {
+      if (to.path.indexOf("/track/case/all") >= 0) {
+        this.getTemplateField();
+        let ids = this.$route.params.ids;
+        if (ids) {
+          this.condition.ids = ids;
+        }
+        this.initTableData();
+        this.condition.ids = null;
+        this.getVersionOptions();
+      }
+    },
     selectNodeIds() {
       this.page.currentPage = 1;
       if (!this.trashEnable) {
@@ -615,7 +619,6 @@ export default {
   },
   methods: {
     getTemplateField() {
-      this.page.result.loading = true;
       let p1 = getProjectMember((data) => {
         this.members = data;
         this.members.forEach(item => {
@@ -623,18 +626,19 @@ export default {
         });
       });
       let p2 = getTestTemplate();
-      Promise.all([p1, p2]).then((data) => {
+      this.page.result = Promise.all([p1, p2]).then((data) => {
         let template = data[1];
-        this.page.result.loading = true;
         this.testCaseTemplate = template;
         this.fields = getTableHeaderWithCustomFields('TRACK_TEST_CASE', this.testCaseTemplate.customFields);
         this.setTestCaseDefaultValue(template);
-        this.page.result.loading = false;
-        if (this.$refs.table) {
-          this.$refs.table.reloadTable();
-        }
         this.typeArr = [];
         getCustomFieldBatchEditOption(template.customFields, this.typeArr, this.valueArr, this.members);
+
+        this.$nextTick(() => {
+          if (this.$refs.table) {
+            this.$refs.table.reloadTable();
+          }
+        });
       });
     },
     setTestCaseDefaultValue(template) {
@@ -783,7 +787,7 @@ export default {
           parseTag(this.page.data);
         });
         this.$emit("getTrashList");
-        this.$emit("getPublicList")
+        this.$emit("getPublicList");
       }
     },
     search() {
@@ -1078,9 +1082,9 @@ export default {
             this.refresh();
           });
         } else {
-          this.$warning(this.$t('test_track.case.public_warning'))
+          this.$warning(this.$t('test_track.case.public_warning'));
         }
-      })
+      });
 
     },
     handleDeleteBatchToPublic() {
@@ -1115,8 +1119,7 @@ export default {
             this.$refs.apiDeleteConfirm.close();
             this.$emit("refreshTable");
           });
-        }
-        else {
+        } else {
           this.$get('/test/case/delete/' + testCase.versionId + '/' + testCase.refId, () => {
             this.$success(this.$t('commons.delete_success'));
             this.$refs.apiDeleteConfirm.close();