From 1846b282d6e4cb140e4f1ebce94fdd63315f4e7c Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 19 Jan 2022 17:46:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BA=A4=E4=BA=92=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue      | 2 +-
 frontend/src/views/chart/view/ChartEdit.vue   | 5 -----
 frontend/src/views/dataset/data/ViewTable.vue | 5 -----
 frontend/src/views/dataset/group/Group.vue    | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index ce6df9f42e..8699cabcf3 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', new Date().getTime())
+            this.$emit('switchComponent', { name: '' })
           })
         } else {
           // this.$message({
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 9e06993987..4dd3c6b274 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1,7 +1,6 @@
 <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"
@@ -1106,10 +1105,6 @@ export default {
     }
   },
   computed: {
-    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 99183cb218..816b129141 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -1,6 +1,5 @@
 <template>
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-    <span v-show="false">{{ refreshPage }}</span>
     <el-row style="height: 26px;">
       <span class="title-text" style="line-height: 26px;">
         {{ table.name }}
@@ -108,10 +107,6 @@ export default {
   computed: {
     hideCustomDs: function() {
       return this.$store.getters.hideCustomDs
-    },
-    refreshPage: function() {
-      this.initTable(this.param.id)
-      return this.$store.getters.table
     }
   },
   watch: {
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index bee55202fd..58064ec647 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -436,7 +436,7 @@ export default {
             _this.expandedArray.push(table.sceneId)
             _this.$refs.datasetTreeRef.setCurrentKey(table.id)
             _this.treeNode()
-            this.$store.dispatch('dataset/setTable', new Date().getTime())
+            this.$emit('switchComponent', { name: '' })
           })
         } else {
           return false

From 27a23cb956929b64e48d794b5599a1110f4b4bd3 Mon Sep 17 00:00:00 2001
From: ziliang-wan <wzl_nj16@163.com>
Date: Wed, 19 Jan 2022 22:45:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/service/impl/DynamicMenuServiceImpl.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java
index bb33a2cc6c..cafeebae7f 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java
@@ -36,10 +36,6 @@ public class DynamicMenuServiceImpl implements DynamicMenuService {
 
     @Override
     public List<DynamicMenuDto> load(String userId) {
-//        SysMenuExample sysMenuExample = new SysMenuExample();
-//        sysMenuExample.createCriteria().andTypeLessThanOrEqualTo(1);
-//        sysMenuExample.setOrderByClause(" menu_sort ");
-//        List<SysMenu> sysMenus = sysMenuMapper.selectByExample(sysMenuExample);
         List<SysMenu> sysMenus = extSysMenuMapper.querySysMenu();
         List<DynamicMenuDto> dynamicMenuDtos = sysMenus.stream().map(this::convert).collect(Collectors.toList());
         //增加插件中的菜单