From ee917eeab3e337f47ed6f061a250be2b1970b4d4 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 12 Jan 2022 11:26:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A6=E4=BE=A7tree?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=8F=B3=E4=BE=A7=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=8A=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/store/getters.js                 |  1 +
 frontend/src/views/chart/group/Group.vue      |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue   | 10 +++++-----
 frontend/src/views/dataset/data/ViewTable.vue | 20 +++++++++++--------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js
index 6e40c8f092..f336da0de7 100644
--- a/frontend/src/store/getters.js
+++ b/frontend/src/store/getters.js
@@ -16,6 +16,7 @@ const getters = {
   errorLogs: state => state.errorLog.logs,
   sceneData: state => state.dataset.sceneData,
   table: state => state.dataset.table,
+  chartTable: state => state.chart.table,
   hideCustomDs: state => state.dataset.hideCustomDs,
   loadingMap: state => state.request.loadingMap,
   currentPath: state => state.permission.currentPath,
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index f9cb7d2c9b..ce6df9f42e 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -558,7 +558,7 @@ export default {
               showClose: true
             })
             this.treeNode()
-            this.$store.dispatch('chart/setTable', null)
+            this.$store.dispatch('chart/setTable', new Date().getTime())
           })
         } else {
           // this.$message({
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e76b1c5fd5..9e06993987 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1,6 +1,7 @@
 <template>
   <el-row v-loading="loading" style="height: 100%;overflow-y: hidden;width: 100%;">
     <el-row style="height: 40px;" class="padding-lr">
+      <span v-show="false">{{ refreshPage }}</span>
       <span class="title-text" style="line-height: 40px;">{{ view.name }}</span>
       <el-popover
         placement="right-start"
@@ -1105,11 +1106,10 @@ export default {
     }
   },
   computed: {
-    // vId() {
-    //   // console.log(this.$store.state.chart.viewId);
-    //   this.getData(this.$store.state.chart.viewId)
-    //   return this.$store.state.chart.viewId
-    // }
+    refreshPage: function() {
+      this.getChart(this.param.id)
+      return this.$store.getters.chartTable
+    },
     chartType() {
       return this.chart.type
     }
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index e8c3d57d85..9642558444 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-    <!--    <span v-show="false">{{ tableRefresh }}</span>-->
+    <span v-show="false">{{ refreshPage }}</span>
     <el-row style="height: 26px;">
       <span class="title-text" style="line-height: 26px;">
         {{ table.name }}
@@ -57,7 +57,7 @@
         <update-info v-if="tabActive=='updateInfo'" :param="param" :table="table" />
       </el-tab-pane>
       <el-tab-pane v-if="isPluginLoaded && hasDataPermission('manage',param.privileges)" :lazy="true" :label="$t('dataset.row_permissions')" name="rowPermissions">
-        <plugin-com v-if="isPluginLoaded && tabActive=='rowPermissions'" ref="RowPermissions" component-name="RowPermissions" :obj="table"/>
+        <plugin-com v-if="isPluginLoaded && tabActive=='rowPermissions'" ref="RowPermissions" component-name="RowPermissions" :obj="table" />
       </el-tab-pane>
     </el-tabs>
   </el-row>
@@ -75,7 +75,7 @@ import PluginCom from '@/views/system/plugin/PluginCom'
 
 export default {
   name: 'ViewTable',
-  components: {FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview, PluginCom },
+  components: { FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview, PluginCom },
   props: {
     param: {
       type: Object,
@@ -102,14 +102,13 @@ export default {
       isPluginLoaded: false
     }
   },
-  beforeCreate() {
-    pluginLoaded().then(res => {
-      this.isPluginLoaded = res.success && res.data
-    })
-  },
   computed: {
     hideCustomDs: function() {
       return this.$store.getters.hideCustomDs
+    },
+    refreshPage: function() {
+      this.initTable(this.param.id)
+      return this.$store.getters.table
     }
   },
   watch: {
@@ -118,6 +117,11 @@ export default {
       this.initTable(this.param.id)
     }
   },
+  beforeCreate() {
+    pluginLoaded().then(res => {
+      this.isPluginLoaded = res.success && res.data
+    })
+  },
   created() {
 
   },