From 052bc03e0eacba5c587455a045198bc9f4daa447 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Mon, 2 Nov 2020 20:24:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(perms):=20=E7=94=A8=E6=88=B7=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E6=A0=91=E9=87=8D=E5=BB=BA=E5=86=B2=E7=AA=81=E6=97=B6?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=9D=E7=95=99=E4=B9=8B=E5=89=8D=E7=9A=84=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataZTree/components/ZTree/index.vue      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue
index 5e7147e97..b7deb6c55 100644
--- a/src/components/DataZTree/components/ZTree/index.vue
+++ b/src/components/DataZTree/components/ZTree/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
-    <div class="treebox">
+    <ul v-show="loading" class="ztree">
+      {{ this.$t('common.tree.Loading') }}...
+    </ul>
+    <div v-show="!loading" class="treebox">
       <ul :id="iZTreeID" class="ztree">
         {{ this.$t('common.tree.Loading') }}...
       </ul>
@@ -40,7 +43,8 @@ export default {
       iRMenuID: `rMenu_${this._uid}`,
       zTree: '',
       rMenu: '',
-      init: false
+      init: false,
+      loading: false
     }
   },
   computed: {
@@ -57,12 +61,15 @@ export default {
   },
   methods: {
     initTree: function() {
+      const vm = this
       let treeUrl
+      if (this.init) {
+        this.loading = true
+      }
       if (this.init && this.treeSetting.treeUrl.indexOf('/perms/') !== -1 && this.treeSetting.treeUrl.indexOf('rebuild_tree') === -1) {
         treeUrl = (this.treeSetting.treeUrl.indexOf('?') === -1) ? `${this.treeSetting.treeUrl}?rebuild_tree=1` : `${this.treeSetting.treeUrl}&rebuild_tree=1`
       } else {
         treeUrl = this.treeSetting.treeUrl
-        this.init = true
       }
       this.$axios.get(treeUrl).then(res => {
         if (!res) {
@@ -74,6 +81,9 @@ export default {
           })
         }
         this.treeSetting.treeUrl = treeUrl
+        if (this.init) {
+          vm.zTree.destroy()
+        }
         this.zTree = $.fn.zTree.init($(`#${this.iZTreeID}`), this.treeSetting, res)
         if (this.treeSetting.showRefresh) {
           this.rootNodeAddDom(
@@ -88,6 +98,9 @@ export default {
         if (this.treeSetting.otherMenu) {
           $('.menu-actions').append(this.otherMenu)
         }
+      }).finally(_ => {
+        vm.loading = false
+        vm.init = true
       })
     },
     rootNodeAddDom: function(ztree, callback) {
@@ -104,7 +117,6 @@ export default {
       }
       const refreshIconRef = $('#tree-refresh')
       refreshIconRef.bind('click', function() {
-        ztree.destroy()
         const result = callback()
         if (result && result.then) {
           result.finally(() => {