From 1663560f90c1cbf50ac57d04ef9c91fc612b7474 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 23 Jun 2021 17:44:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=86=E5=9B=BE=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=B9=E9=94=99=EF=BC=9B=E6=95=B0=E6=8D=AE=E9=9B=86tree?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E3=80=81=E5=88=A0=E9=99=A4=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E4=BE=A7=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/provider/doris/DorisQueryProvider.java   |  4 ++++
 frontend/src/api/dataset/dataset.js                   |  5 +++--
 frontend/src/views/dataset/data/ViewTable.vue         | 11 ++++++++++-
 frontend/src/views/dataset/group/Group.vue            |  8 ++++----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
index eb2b7be871..61078a9da0 100644
--- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
@@ -6,6 +6,7 @@ import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.provider.QueryProvider;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -366,6 +367,9 @@ public class DorisQueryProvider extends QueryProvider {
         for (ChartCustomFilterDTO request : requestList) {
             String value = request.getValue();
             DatasetTableField field = request.getField();
+            if (ObjectUtils.isEmpty(field)) {
+                continue;
+            }
             if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
                 filter.append(" AND FROM_UNIXTIME(cast(")
                         .append(field.getDataeaseName())
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 610b9981f2..7045b0b9da 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -68,11 +68,12 @@ export function listDatasource() {
   })
 }
 
-export function getTable(id) {
+export function getTable(id, hideMsg = false) {
   return request({
     url: '/dataset/table/get/' + id,
     loading: true,
-    method: 'post'
+    method: 'post',
+    hideMsg: hideMsg
   })
 }
 
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 4f24f2e784..ee41a2b5af 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -1,5 +1,6 @@
 <template>
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
+    <span v-show="false">{{ tableRefresh }}</span>
     <el-row style="height: 26px;">
       <el-popover
         placement="right-start"
@@ -92,6 +93,12 @@ export default {
       tabStatus: false
     }
   },
+  computed: {
+    tableRefresh() {
+      this.initTable(this.param)
+      return this.$store.state.dataset.table
+    }
+  },
   watch: {
     'param': function() {
       this.initTable(this.param)
@@ -107,9 +114,11 @@ export default {
       if (id !== null) {
         this.fields = []
         this.data = []
-        getTable(id).then(response => {
+        getTable(id, true).then(response => {
           this.table = response.data
           this.initPreviewData(this.page)
+        }).catch(res => {
+          this.$emit('switchComponent', { name: '' })
         })
       }
     },
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 5a7be6b59b..27859b5136 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -561,8 +561,8 @@ export default {
             // this.tableTree()
             this.refreshNodeBy(table.sceneId)
             // this.$router.push('/dataset/home')
-            this.$emit('switchComponent', { name: '' })
-            this.$store.dispatch('dataset/setTable', null)
+            // this.$emit('switchComponent', { name: 'ViewTable', param: table.id })
+            this.$store.dispatch('dataset/setTable', new Date().getTime())
           })
         } else {
           // this.$message({
@@ -609,8 +609,8 @@ export default {
           // this.tableTree()
           this.refreshNodeBy(data.sceneId)
           // this.$router.push('/dataset/home')
-          this.$emit('switchComponent', { name: '' })
-          this.$store.dispatch('dataset/setTable', null)
+          // this.$emit('switchComponent', { name: '' })
+          this.$store.dispatch('dataset/setTable', new Date().getTime())
         })
       }).catch(() => {
       })