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

疯狂的狮子Li

2022-03-25 9d1d74c022fd6d826c8084d1dbf248f31c51debd

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


 Conflicts:

	README.md

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

	ruoyi-ui/src/layout/components/Sidebar/Item.vue

	ruoyi-ui/src/layout/index.vue

	ruoyi-ui/src/store/modules/app.js

	ruoyi-ui/src/store/modules/user.js

	ruoyi-ui/src/views/index.vue

 README.md

@@ -5,7 +5,7 @@
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
<br>
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.0.1-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.6-blue.svg)]()
[![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()


 ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -21,7 +21,11 @@
    }

    if (title) {
      vnodes.push(<span slot='title'>{(title)}</span>)
      if (title.length > 5) {
        vnodes.push(<span slot='title' title={(title)}>{(title)}</span>)
      } else {
        vnodes.push(<span slot='title'>{(title)}</span>)
      }
    }
    return vnodes
  }

 ruoyi-ui/src/layout/index.vue

@@ -101,6 +101,10 @@
    width: calc(100% - 54px);
  }

  .sidebarHide .fixed-header {
    width: 100%;
  }

  .mobile .fixed-header {
    width: 100%;
  }

 ruoyi-ui/src/store/modules/app.js

@@ -12,6 +12,9 @@

const mutations = {
  TOGGLE_SIDEBAR: state => {
    if (state.sidebar.hide) {
      return false;
    }
    state.sidebar.opened = !state.sidebar.opened
    state.sidebar.withoutAnimation = false
    if (state.sidebar.opened) {

 ruoyi-ui/src/store/modules/user.js

@@ -51,7 +51,7 @@
      return new Promise((resolve, reject) => {
        getInfo().then(res => {
          const user = res.data.user
          const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
          if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
            commit('SET_ROLES', res.data.roles)
            commit('SET_PERMISSIONS', res.data.permissions)