缓存当前角色

src/layout/components/header-tools.vue

@@ -88,6 +88,7 @@ import { logout } from '@/utils/page-tab-util';
 import { userLogout } from '@/api/system/user';
 
 import router from '@/router/index';
+import { getCurrentUser,setCurrentUser } from '@/utils/token-util';
 
 export default {
   components: { HeaderNotice, PasswordModal, SettingDrawer, I18nIcon },
@@ -110,7 +111,7 @@ export default {
     };
   },
   created() {
-    this.currentUser = JSON.parse(sessionStorage['currentUser']);
+    this.currentUser = getCurrentUser()
     this.groupId =  this.currentUser.currentGroupId;
     this.roleId =  this.currentUser.currentRoleId;
   },
@@ -139,7 +140,7 @@ export default {
       this.roleId = val;
       this.currentUser.currentGroupId = this.groupId;
       this.currentUser.currentRoleId = val;
-      sessionStorage['currentUser']=JSON.stringify(this.currentUser)
+      setCurrentUser(this.currentUser)
       this.$store
         .dispatch('user/fetchUserInfo')
         .then(({ menus, homePath, authoritiesRouter }) => {

src/router/index.js

@@ -6,7 +6,7 @@ import NProgress from 'nprogress';
 import VueRouter from 'vue-router';
 import { WHITE_LIST, REDIRECT_PATH, LAYOUT_PATH } from '@/config/setting';
 import store from '@/store';
-import { getToken, setToken } from '@/utils/token-util';
+import { getToken, setToken, getCurrentUser  } from '@/utils/token-util';
 import { routes, getMenuRoutes } from './routes';
 import { SYSTEM_NAME } from '@/config/setting';
 import { getLoginUser } from '@/api/login';
@@ -129,8 +129,7 @@ router.afterEach((to) => {
   }
 });
 router.roleChange = async ({ menus, homePath, authoritiesRouter }) => {
-  const currentUser = JSON.parse(sessionStorage['currentUser']);
-
+  const currentUser = getCurrentUser()
   if (menus && menus.length > 0) {
     router.addRoute(getMenuRoutes([...menus, ...authoritiesRouter], homePath));
     if (router.currentRoute.path != (menus[0].redirect || menus[0].path)) {

src/store/modules/user.js

@@ -5,6 +5,7 @@ import { formatMenus, toTreeData, formatTreeData } from 'ele-admin';
 import { USER_MENUS } from '@/config/setting';
 import { getResourcesTree } from '@/api/layout';
 import { getCurrentUserAuthorityDeptAPI } from '@/api/system/organization';
+import { getCurrentUser,setCurrentUser } from '@/utils/token-util';
 
 const formatRouter = (list) => {
   let menuList = []; // menuType
@@ -127,7 +128,7 @@ export default {
     // },
     //动态路由
     async fetchUserInfo({ commit, state }) {
-      let currentUser = JSON.parse(sessionStorage['currentUser']);
+      let currentUser = getCurrentUser()
       const result = await getResourcesTree({
         groupId: currentUser.currentGroupId,
         roleId: currentUser.currentRoleId

src/utils/page-tab-util.js

@@ -4,7 +4,7 @@
 import store from '@/store';
 import router from '@/router';
 import { Message } from 'element-ui';
-import { removeToken } from '@/utils/token-util';
+import { removeToken,removeCurrentUser } from '@/utils/token-util';
 import { setDocumentTitle } from '@/utils/document-title-util';
 import {
   HOME_PATH,
@@ -12,6 +12,7 @@ import {
   REDIRECT_PATH,
   REPEATABLE_TABS
 } from '@/config/setting';
+
 const HOME_ROUTE = HOME_PATH || LAYOUT_PATH;
 const BASE_URL = process.env.BASE_URL;
 
@@ -239,6 +240,7 @@ export function goHomeRoute(from) {
  */
 export function logout(route, from) {
   removeToken();
+  removeCurrentUser();
   if (route) {
     router.push({
       path: '/login',

src/utils/token-util.js

@@ -29,7 +29,32 @@ export function setToken(token, remember) {
     }
   }
 }
+/**
+ * 获取缓存的 当前登陆角色
+ */
+export function getCurrentUser() {
+  let currentUser = sessionStorage.getItem('currentUser');
+  if (!currentUser) {
+    currentUser = localStorage.getItem('currentUser');
+  }
+  return JSON.parse(currentUser);
+}
 
+/**
+ * 缓存 当前登陆角色
+ * @param token token
+ * @param remember 是否永久存储
+ */
+export function setCurrentUser(currentUser, remember) {
+  removeCurrentUser()
+  if (currentUser) {
+    if (remember) {
+      localStorage.setItem('currentUser', JSON.stringify(currentUser));
+    } else {
+      sessionStorage.setItem('currentUser', JSON.stringify(currentUser));
+    }
+  }
+}
 /**
  * 移除 token
  */
@@ -37,3 +62,10 @@ export function removeToken() {
   localStorage.removeItem(TOKEN_STORE_NAME);
   sessionStorage.removeItem(TOKEN_STORE_NAME);
 }
+/**
+ * 移除 currentUser
+ */
+export function removeCurrentUser() {
+  localStorage.removeItem('currentUser');
+  sessionStorage.removeItem('currentUser');
+}

src/views/login/index.vue

@@ -110,6 +110,7 @@
 import I18nIcon from '@/layout/components/i18n-icon.vue';
 import { getToken } from '@/utils/token-util';
 import { login, getCaptcha, sub } from '@/api/login';
+import { setCurrentUser } from '@/utils/token-util';
 
 export default {
   // eslint-disable-next-line vue/multi-word-component-names
@@ -183,12 +184,15 @@ export default {
             localStorage.setItem('userId', res.data.userId);
             // 用户信息
             if (res.data?.loginChangeGroupVOList.length > 0) {
-              sessionStorage['currentUser'] = JSON.stringify({
-                currentGroupId: res.data.loginChangeGroupVOList[0].groupId,
-                currentRoleId:
-                  res.data.loginChangeGroupVOList[0].loginChangeRoleVOList[0]
-                    .roleId
-              });
+              setCurrentUser(
+                  {
+                    currentGroupId: res.data.loginChangeGroupVOList[0].groupId,
+                    currentRoleId:
+                      res.data.loginChangeGroupVOList[0]
+                        .loginChangeRoleVOList[0].roleId
+                  },
+                  this.form.remember
+                );
             }
             this.$store.commit('user/setUserInfo', res.data);
             this.loading = false;