From 7f28cc0aade9d6a7ee85c3741e3d2057cd109d97 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 15 Apr 2021 15:39:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(assets):=20=E4=BF=AE=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E8=B5=84=E4=BA=A7=E5=88=9B=E5=BB=BA=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue | 13 ++++++++-----
 src/components/TreeTable/index.vue     |  1 -
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index b11b11602..46d74e9ed 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -100,15 +100,19 @@ export default {
       if (this.setting.url.indexOf('?') !== -1) {
         combinator = '&'
       }
+      let url = ''
+      const query = Object.assign({}, this.$route.query)
       if (treeNode.meta.type === 'node') {
         this.currentNode = treeNode
         this.currentNodeId = treeNode.meta.node.id
-        this.$route.query['node'] = this.currentNodeId
-        this.$emit('urlChange', `${this.setting.url}${combinator}node_id=${treeNode.meta.node.id}&show_current_asset=${show_current_asset}`)
+        query['node'] = this.currentNodeId
+        url = `${this.setting.url}${combinator}node_id=${treeNode.meta.node.id}&show_current_asset=${show_current_asset}`
       } else if (treeNode.meta.type === 'asset') {
-        this.$route.query['asset'] = treeNode.meta.asset.id
-        this.$emit('urlChange', `${this.setting.url}${combinator}asset_id=${treeNode.meta.asset.id}&show_current_asset=${show_current_asset}`)
+        query['asset'] = treeNode.meta.asset.id
+        url = `${this.setting.url}${combinator}asset_id=${treeNode.meta.asset.id}&show_current_asset=${show_current_asset}`
       }
+      this.$router.push({ query })
+      this.$emit('urlChange', url)
     },
     removeTreeNode: function() {
       this.hideRMenu()
@@ -242,7 +246,6 @@ export default {
       })
     },
     refresh: function() {
-
     },
     getSelectedNodes: function() {
       return this.zTree.getSelectedNodes()
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 082c5609e..974b0bf83 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -72,7 +72,6 @@ export default {
   watch: {
     treeConfig: {
       handler(val) {
-
       },
       deep: true
     }