Browse Source

🎟 更新tabs

master
wangxiang 3 years ago
parent
commit
6667f8dd68
  1. 6
      kicc-ui/src/api/sys/model/userModel.ts
  2. 16
      kicc-ui/src/store/modules/user.ts
  3. 4
      kicc-ui/src/utils/cache/persistent.ts
  4. 4
      kicc-ui/types/store.d.ts

6
kicc-ui/src/api/sys/model/userModel.ts

@ -12,7 +12,7 @@ export interface LoginParams { @@ -12,7 +12,7 @@ export interface LoginParams {
export interface UserInfo {
accountNonExpired: boolean;
accountNonLocked: boolean;
authorities: Recordable;
authorities: Recordable[];
credentialsNonExpired: boolean;
deptId: string;
enabled: boolean;
@ -58,9 +58,9 @@ export interface GetUserInfoModel { @@ -58,9 +58,9 @@ export interface GetUserInfoModel {
// 邮箱
email: string;
// 菜单按钮权限
permissions: Recordable;
permissions: Recordable[];
// 角色ID权限
roleIds: Recordable;
roleIds: Recordable[];
// 手机号
phone: string;
// 备注信息

16
kicc-ui/src/store/modules/user.ts

@ -22,8 +22,8 @@ import {RouteRecordRaw} from 'vue-router'; @@ -22,8 +22,8 @@ import {RouteRecordRaw} from 'vue-router';
interface UserState {
userInfo: Nullable<UserInfo>;
sessionTimeout: boolean;
roleIds: Recordable;
permissions: Recordable;
roleIds: Recordable[];
permissions: Recordable[];
access_token?: string;
refresh_token?: string;
}
@ -36,9 +36,9 @@ export const useUserStore = defineStore({ @@ -36,9 +36,9 @@ export const useUserStore = defineStore({
// 登录是否过期
sessionTimeout: false,
// 角色ID用于权限校验
roleIds: getAuthCache<Recordable>(ROLE_IDS_KEY),
roleIds: getAuthCache<Recordable[]>(ROLE_IDS_KEY),
// 按钮权限标识用于权限校验
permissions: getAuthCache<Recordable>(PERMISSIONS_KEY),
permissions: getAuthCache<Recordable[]>(PERMISSIONS_KEY),
// 访问令牌
access_token: getAuthCache<string>(ACCESS_TOKEN_KEY),
// 刷新令牌
@ -57,19 +57,19 @@ export const useUserStore = defineStore({ @@ -57,19 +57,19 @@ export const useUserStore = defineStore({
getSessionTimeout(): boolean {
return !!this.sessionTimeout;
},
getRoleIds(): Recordable {
getRoleIds(): Recordable[] {
return this.roleIds;
},
getPermissions(): Recordable {
getPermissions(): Recordable[] {
return this.permissions;
},
},
actions: {
setRoleIds(roleIds: Recordable) {
setRoleIds(roleIds: Recordable[]) {
this.roleIds = roleIds;
setAuthCache(ROLE_IDS_KEY, roleIds);
},
setPermissions(permissions: Recordable) {
setPermissions(permissions: Recordable[]) {
this.permissions = permissions;
},
setAccessToken(accessToken: string) {

4
kicc-ui/src/utils/cache/persistent.ts vendored

@ -28,8 +28,8 @@ import { pick, omit } from 'lodash-es'; @@ -28,8 +28,8 @@ import { pick, omit } from 'lodash-es';
interface BasicStore {
[ACCESS_TOKEN_KEY]: string | number | null | undefined;
[REFRESH_TOKEN_KEY]: string | number | null | undefined;
[ROLE_IDS_KEY]: Recordable;
[PERMISSIONS_KEY]: Recordable;
[ROLE_IDS_KEY]: Recordable[];
[PERMISSIONS_KEY]: Recordable[];
[USER_INFO_KEY]: UserInfo;
[LOCK_INFO_KEY]: LockInfo;
[PROJ_CFG_KEY]: ProjectConfig;

4
kicc-ui/types/store.d.ts vendored

@ -31,9 +31,9 @@ export interface UserInfo { @@ -31,9 +31,9 @@ export interface UserInfo {
// 邮箱
email: string;
// 菜单按钮权限
permissions: Recordable;
permissions: Recordable[];
// 角色ID权限
roleIds: Recordable;
roleIds: Recordable[];
// 手机号
phone: string;
// 备注信息

Loading…
Cancel
Save