Merge pull request dataease#1667 from dataease/dev

fit2cloudrd · web-flow · commit 6799b59e5694 · 2022-01-20T09:49:30.000+08:00
Dev
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
@@ -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());
         //增加插件中的菜单
diff --git 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
@@ -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
@@ -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
@@ -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
