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

 Conflicts:

	README.md

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

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

	ruoyi-ui/src/views/index.vue

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

@@ -21,7 +21,11 @@ export default {
     }
 
     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 @@ export default {
     width: calc(100% - 54px);
   }
 
+  .sidebarHide .fixed-header {
+    width: calc(100%);
+  }
+
   .mobile .fixed-header {
     width: 100%;
   }

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

@@ -12,6 +12,9 @@ const state = {
 
 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

@@ -57,7 +57,7 @@ const user = {
       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)