|
@@ -111,17 +111,13 @@ export const useUserStore = defineStore({
|
|
if (!this.getToken) return null;
|
|
if (!this.getToken) return null;
|
|
// get user info
|
|
// get user info
|
|
const userInfo = await this.getUserInfoAction();
|
|
const userInfo = await this.getUserInfoAction();
|
|
- console.log('afterLoginActionuserInfo',userInfo)
|
|
|
|
const sessionTimeout = this.sessionTimeout;
|
|
const sessionTimeout = this.sessionTimeout;
|
|
- console.log('afterLoginActionsessionTimeout',sessionTimeout)
|
|
|
|
if (sessionTimeout) {
|
|
if (sessionTimeout) {
|
|
this.setSessionTimeout(false);
|
|
this.setSessionTimeout(false);
|
|
} else {
|
|
} else {
|
|
const permissionStore = usePermissionStore();
|
|
const permissionStore = usePermissionStore();
|
|
- console.log('isDynamicAddedRoute',permissionStore.isDynamicAddedRoute)
|
|
|
|
if (!permissionStore.isDynamicAddedRoute) {
|
|
if (!permissionStore.isDynamicAddedRoute) {
|
|
const routes = await permissionStore.buildRoutesAction();
|
|
const routes = await permissionStore.buildRoutesAction();
|
|
- console.log('isDynamicAddedRouteroutes',routes)
|
|
|
|
routes.forEach((route) => {
|
|
routes.forEach((route) => {
|
|
router.addRoute(route as unknown as RouteRecordRaw);
|
|
router.addRoute(route as unknown as RouteRecordRaw);
|
|
});
|
|
});
|
|
@@ -135,7 +131,6 @@ export const useUserStore = defineStore({
|
|
async getUserInfoAction(): Promise<UserInfo | null> {
|
|
async getUserInfoAction(): Promise<UserInfo | null> {
|
|
if (!this.getToken) return null;
|
|
if (!this.getToken) return null;
|
|
const userInfo = await getUserInfo();
|
|
const userInfo = await getUserInfo();
|
|
- console.log('userInfo',userInfo)
|
|
|
|
const { roleId } = userInfo;
|
|
const { roleId } = userInfo;
|
|
if (isArray(roleId)) {
|
|
if (isArray(roleId)) {
|
|
const roleList = roleId.map((item) => item.value) as RoleEnum[];
|
|
const roleList = roleId.map((item) => item.value) as RoleEnum[];
|