Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Conflicts: ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-ui/package.json ruoyi-ui/src/layout/components/AppMain.vue ruoyi-ui/src/layout/components/TagsView/index.vue ruoyi-ui/src/router/index.js ruoyi-ui/src/store/modules/permission.js ruoyi-ui/src/views/system/user/profile/userAvatar.vue sql/ry_20201128.sql
2020-11-30 12:41:39 +08:00 · 2020-11-30 12:41:39 +08:00 · ce438f182a
parent 6d900dc654 1147ea5f8a
commit ce438f182a
16 changed files with 159 additions and 17 deletions
--- a/pom.xml
+++ b/pom.xml
@ -43,7 +43,7 @@
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.17.RELEASE</version>
+                <version>2.1.18.RELEASE</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@ -37,7 +37,7 @@ public class GenConstants

    /** 数据库数字类型 */
    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bit", "bigint", "float", "float", "double", "decimal" };
+            "bit", "bigint", "float", "double", "decimal" };

    /** 页面不需要编辑字段 */
    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@ -54,6 +54,9 @@ public class UserConstants
    /** Layout组件标识 */
    public final static String LAYOUT = "Layout";

+    /** ParentView组件标识 */
+    public final static String PARENT_VIEW = "ParentView";
+
    /** 校验返回结果码 */
    public final static String UNIQUE = "0";
    public final static String NOT_UNIQUE = "1";
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@ -274,6 +274,10 @@ public class ExcelUtil<T>
                            val = DateUtil.getJavaDate((Double) val);
                        }
                    }
+                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
+                    {
+                        val = Convert.toBool(val, false);
+                    }
                    if (StringUtils.isNotNull(fieldType))
                    {
                        Excel attr = field.getAnnotation(Excel.class);
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
@ -204,6 +204,10 @@ public class ReflectUtils
                            args[i] = DateUtil.getJavaDate((Double) args[i]);
                        }
                    }
+                    else if (cs[i] == boolean.class || cs[i] == Boolean.class)
+                    {
+                        args[i] = Convert.toBool(args[i]);
+                    }
                }
            }
            return (E) method.invoke(obj, args);
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@ -364,6 +364,10 @@ public class SysMenuServiceImpl implements ISysMenuService
        {
            component = menu.getComponent();
        }
+        else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
+        {
+            component = UserConstants.PARENT_VIEW;
+        }
        return component;
    }

@ -379,6 +383,17 @@ public class SysMenuServiceImpl implements ISysMenuService
                && menu.getIsFrame().equals(UserConstants.NO_FRAME);
    }

+    /**
+     * 是否为parent_view组件
+     *
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public boolean isParentView(SysMenu menu)
+    {
+        return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
+    }
+
    /**
     * 根据父节点的ID获取所有子节点
     * 
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -45,7 +45,7 @@
    "clipboard": "2.0.4",
    "core-js": "3.6.5",
    "echarts": "4.2.1",
-    "element-ui": "2.13.2",
+    "element-ui": "2.14.1",
    "file-saver": "2.0.1",
    "js-beautify": "1.10.2",
    "fuse.js": "3.4.4",
--- a/ruoyi-ui/src/components/ParentView/index.vue
+++ b/ruoyi-ui/src/components/ParentView/index.vue
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@ -1,7 +1,8 @@
+<!-- @author ruoyi 20201128 支持三级以上菜单缓存 -->
 <template>
  <section class="app-main">
    <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
+      <keep-alive :max="20" :exclude="notCacheName">
        <router-view :key="key" />
      </keep-alive>
    </transition>
@ -9,17 +10,119 @@
 </template>

 <script>
+import Global from "@/layout/components/global.js";
+
 export default {
  name: 'AppMain',
  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+    notCacheName() {
+      var visitedViews = this.$store.state.tagsView.visitedViews;
+      var noCacheViews = [];
+      Object.keys(visitedViews).some((index) => {
+        if (visitedViews[index].meta.noCache) {
+          noCacheViews.push(visitedViews[index].name);
+        }
+      });
+      return noCacheViews;
    },
    key() {
-      return this.$route.path
+      return this.$route.path;
+    },
+  },
+  mounted() {
+    // 关闭标签触发
+    Global.$on("removeCache", (name, view) => {
+      this.removeCache(name, view);
+    });
+  },
+  methods: {
+    // 获取有keep-alive子节点的Vnode
+    getVnode() {
+      // 判断子集非空
+      if (this.$children.length == 0) return false;
+      let vnode;
+      for (let item of this.$children) {
+        // 如果data中有key则代表找到了keep-alive下面的子集，这个key就是router-view上的key
+        if (item.$vnode.data.key) {
+          vnode = item.$vnode;
+          break;
        }
      }
-}
+      return vnode ? vnode : false;
+    },
+    // 移除keep-alive缓存
+    removeCache(name, view = {}) {
+      let vnode = this.getVnode();
+      if (!vnode) return false;
+      let componentInstance = vnode.parent.componentInstance;
+      // 这个key是用来获取前缀用来后面正则匹配用的
+      let keyStart = vnode.key.split("/")[0];
+      let thisKey = `${keyStart}${view.fullPath}`;
+      let regKey = `${keyStart}${view.path}`;
+
+      this[name]({ componentInstance, thisKey, regKey });
+    },
+    // 移除其他
+    closeOthersTags({ componentInstance, thisKey }) {
+      Object.keys(componentInstance.cache).forEach((key, index) => {
+        if (key != thisKey) {
+          // 销毁实例(这里存在多个key指向一个缓存的情况可能前面一个已经清除掉了所有要加判断)
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 删除缓存
+          delete componentInstance.cache[key];
+          // 移除key中对应的key
+          componentInstance.keys.splice(index, 1);
+        }
+      });
+    },
+    // 移除所有缓存
+    closeAllTags({ componentInstance }) {
+      // 销毁实例
+      Object.keys(componentInstance.cache).forEach((key) => {
+        if (componentInstance.cache[key]) {
+          componentInstance.cache[key].componentInstance.$destroy();
+        }
+      });
+      // 删除缓存
+      componentInstance.cache = {};
+      // 移除key中对应的key
+      componentInstance.keys = [];
+    },
+    // 移除单个缓存
+    closeSelectedTag({ componentInstance, regKey }) {
+      let reg = new RegExp(`^${regKey}`);
+      Object.keys(componentInstance.cache).forEach((key, i) => {
+        if (reg.test(key)) {
+          // 销毁实例
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 删除缓存
+          delete componentInstance.cache[key];
+          // 移除key中对应的key
+          componentInstance.keys.splice(i, 1);
+        }
+      });
+    },
+    // 刷新单个缓存
+    refreshSelectedTag({ componentInstance, thisKey }) {
+      Object.keys(componentInstance.cache).forEach((key, index) => {
+        if (null != thisKey && key.replace("/redirect", "") == thisKey) {
+          // 1 销毁实例(这里存在多个key指向一个缓存的情况可能前面一个已经清除掉了所有要加判断)
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 2 删除缓存
+          delete componentInstance.cache[key];
+          // 3 移除key中对应的key
+          componentInstance.keys.splice(index, 1);
+        }
+      });
+    },
+  },
+};
 </script>

 <style lang="scss" scoped>
@ -31,7 +134,7 @@ export default {
  overflow: hidden;
 }

-.fixed-header+.app-main {
+.fixed-header + .app-main {
  padding-top: 50px;
 }

@ -41,7 +144,7 @@ export default {
    min-height: calc(100vh - 84px);
  }

-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
    padding-top: 84px;
  }
 }
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@ -29,6 +29,7 @@
 <script>
 import ScrollPane from './ScrollPane'
 import path from 'path'
+import Global from "@/layout/components/global.js";

 export default {
  components: { ScrollPane },
@ -144,6 +145,7 @@ export default {
          })
        })
      })
+      Global.$emit("removeCache", "refreshSelectedTag", this.selectedTag);
    },
    closeSelectedTag(view) {
      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
@ -151,12 +153,14 @@ export default {
          this.toLastView(visitedViews, view)
        }
      })
+      Global.$emit("removeCache", "closeSelectedTag", view);
    },
    closeOthersTags() {
      this.$router.push(this.selectedTag)
      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
        this.moveToCurrentTag()
      })
+      Global.$emit("removeCache", "closeOthersTags", this.selectedTag);
    },
    closeAllTags(view) {
      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
@ -165,6 +169,7 @@ export default {
        }
        this.toLastView(visitedViews, view)
      })
+      Global.$emit("removeCache", "closeAllTags");
    },
    toLastView(visitedViews, view) {
      const latestView = visitedViews.slice(-1)[0]
--- a/ruoyi-ui/src/layout/components/global.js
+++ b/ruoyi-ui/src/layout/components/global.js
@ -0,0 +1,3 @@
+import Vue from 'vue'
+const global = new Vue()
+export default global
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@ -5,6 +5,7 @@ Vue.use(Router)

 /* Layout */
 import Layout from '@/layout'
+import ParentView from '@/components/ParentView';

 /**
 * Note: 路由配置项
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@ -1,6 +1,7 @@
 import { constantRoutes } from '@/router'
 import { getRouters } from '@/api/menu'
 import Layout from '@/layout/index'
+import ParentView from '@/components/ParentView';

 const permission = {
  state: {
@ -33,9 +34,11 @@ const permission = {
 function filterAsyncRouter(asyncRouterMap) {
  return asyncRouterMap.filter(route => {
    if (route.component) {
-      // Layout组件特殊处理
+      // Layout ParentView 组件特殊处理
      if (route.component === 'Layout') {
        route.component = Layout
+      } else if (route.component === 'ParentView') {
+        route.component = ParentView
      } else {
        route.component = loadView(route.component)
      }
--- a/ruoyi-ui/src/views/monitor/cache/index.vue
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@ -117,14 +117,14 @@ export default {
        this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons");
        this.usedmemory.setOption({
          tooltip: {
-            formatter: "{b} <br/>{a} : {c}M",
+            formatter: "{b} <br/>{a} : {c}K",
          },
          series: [
            {
              name: "峰值",
              type: "gauge",
              detail: {
-                formatter: "{value}M",
+                formatter: "{value}K",
              },
              data: [
                {
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@ -144,6 +144,7 @@ export default {
 .user-info-head {
  position: relative;
  display: inline-block;
+  height: 120px;
 }

 .user-info-head:hover:after {
--- a/sql/ry_20201128.sql
+++ b/sql/ry_20201128.sql
@ -169,7 +169,7 @@ insert into sys_menu values('104',  '岗位管理', '1',   '5', 'post',       's
 insert into sys_menu values('105',  '字典管理', '1',   '6', 'dict',       'system/dict/index',        1, 0, 'C', '0', '0', 'system:dict:list',        'dict',          'admin', sysdate(), '', null, '字典管理菜单');
 insert into sys_menu values('106',  '参数设置', '1',   '7', 'config',     'system/config/index',      1, 0, 'C', '0', '0', 'system:config:list',      'edit',          'admin', sysdate(), '', null, '参数设置菜单');
 insert into sys_menu values('107',  '通知公告', '1',   '8', 'notice',     'system/notice/index',      1, 0, 'C', '0', '0', 'system:notice:list',      'message',       'admin', sysdate(), '', null, '通知公告菜单');
-insert into sys_menu values('108',  '日志管理', '1',   '9', 'log',        'system/log/index',         1, 0, 'M', '0', '0', '',                        'log',           'admin', sysdate(), '', null, '日志管理菜单');
+insert into sys_menu values('108',  '日志管理', '1',   '9', 'log',        '',                         1, 0, 'M', '0', '0', '',                        'log',           'admin', sysdate(), '', null, '日志管理菜单');
 insert into sys_menu values('109',  '在线用户', '2',   '1', 'online',     'monitor/online/index',     1, 0, 'C', '0', '0', 'monitor:online:list',     'online',        'admin', sysdate(), '', null, '在线用户菜单');
 insert into sys_menu values('110',  '定时任务', '2',   '2', 'job',        'monitor/job/index',        1, 0, 'C', '0', '0', 'monitor:job:list',        'job',           'admin', sysdate(), '', null, '定时任务菜单');
 insert into sys_menu values('111',  '数据监控', '2',   '3', 'druid',      'monitor/druid/index',      1, 0, 'C', '0', '0', 'monitor:druid:list',      'druid',         'admin', sysdate(), '', null, '数据监控菜单');