- {!!breadcrumb.length && (
-
-
- {breadcrumb.map((node, index) => (
-
- {typeof node === 'string' ? locale[node] || node : node}
-
- ))}
-
-
- )}
diff --git a/src/locale/index.ts b/src/locale/index.ts
index 4741e37..637abbb 100644
--- a/src/locale/index.ts
+++ b/src/locale/index.ts
@@ -2,6 +2,7 @@ const i18n = {
'en-US': {
'menu.userManagement': 'User Management',
'menu.userInfo': 'User Info',
+ 'breadcrumb.home': 'Home',
'navbar.userInfo': 'User Info',
'navbar.logout': 'Logout',
'settings.title': 'Settings',
@@ -36,6 +37,7 @@ const i18n = {
'zh-CN': {
'menu.userManagement': '用户管理',
'menu.userInfo': '个人信息',
+ 'breadcrumb.home': '首页',
'navbar.userInfo': '个人信息',
'navbar.logout': '退出登录',
'settings.title': '页面配置',
diff --git a/src/main.tsx b/src/main.tsx
index f0ba4f3..b7c6a66 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -16,6 +16,7 @@ import checkLogin from './utils/checkLogin';
import changeTheme from './utils/changeTheme';
import initThemeColor from './utils/initThemeColor';
import useStorage from './utils/useStorage';
+import { setUserInfo as cacheUserInfo } from './utils/storage';
import './mock';
const store = createStore(rootReducer);
@@ -41,9 +42,22 @@ function Index() {
payload: { userLoading: true },
});
axios.get('/api/user/userInfo').then((res) => {
+ const serverUserInfo = res.data || {};
+ const mergedUserInfo = {
+ ...serverUserInfo,
+ userId: serverUserInfo.userId || serverUserInfo.id,
+ name: serverUserInfo.nickname || serverUserInfo.name,
+ };
store.dispatch({
type: 'update-userInfo',
- payload: { userInfo: res.data, userLoading: false },
+ payload: { userInfo: mergedUserInfo, userLoading: false },
+ });
+ cacheUserInfo({
+ userId: mergedUserInfo.userId,
+ username: mergedUserInfo.username,
+ nickname: mergedUserInfo.nickname || mergedUserInfo.name,
+ role: mergedUserInfo.role,
+ avatar: mergedUserInfo.avatar,
});
});
}
diff --git a/src/store/index.ts b/src/store/index.ts
index 4301f13..eae3296 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -4,12 +4,19 @@ import { TabItem, TabsState } from '@/types/tabs';
export interface GlobalState {
settings?: typeof defaultSettings;
userInfo?: {
+ // 后端 API 返回的字段（新增）
+ userId?: number;
+ username?: string;
+ nickname?: string;
+ role?: string;
+ // 原有字段（保持兼容）
name?: string;
avatar?: string;
job?: string;
organization?: string;
location?: string;
email?: string;
+ phone?: string;
permissions: Record;
};
userLoading?: boolean;
diff --git a/src/store/userStore.ts b/src/store/userStore.ts
new file mode 100644
index 0000000..4147742
--- /dev/null
+++ b/src/store/userStore.ts
@@ -0,0 +1,91 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { generatePermission } from '@/routes';
+
+export interface UserInfo {
+ userId?: number;
+ username?: string;
+ nickname?: string;
+ role?: string;
+ avatar?: string;
+ name?: string;
+ email?: string;
+ phone?: string;
+ permissions: Record;
+}
+
+interface UserState {
+ userInfo: UserInfo;
+ userLoading: boolean;
+
+ // Actions
+ setUserInfo: (info: Partial) => void;
+ updateUserInfo: (partial: Partial) => void;
+ setUserLoading: (loading: boolean) => void;
+ clearUserInfo: () => void;
+}
+
+const initialUserInfo: UserInfo = {
+ permissions: {},
+};
+
+export const useUserStore = create()(
+ persist(
+ (set, get) => ({
+ userInfo: initialUserInfo,
+ userLoading: false,
+
+ // 完全替换用户信息
+ setUserInfo: (info) => {
+ const role = info.role || 'user';
+ set({
+ userInfo: {
+ ...info,
+ permissions: info.permissions || generatePermission(role),
+ },
+ });
+ },
+
+ // 部分更新用户信息（自动保留其他字段）
+ updateUserInfo: (partial) => {
+ const current = get().userInfo;
+ const newInfo = { ...current, ...partial };
+
+ // 如果更新了 role，重新生成权限
+ if (partial.role && partial.role !== current.role) {
+ newInfo.permissions = generatePermission(partial.role);
+ }
+
+ set({ userInfo: newInfo });
+ },
+
+ setUserLoading: (loading) => set({ userLoading: loading }),
+
+ clearUserInfo: () => set({ userInfo: initialUserInfo }),
+ }),
+ {
+ name: 'user-storage', // localStorage key
+ partialize: (state) => ({
+ userInfo: {
+ userId: state.userInfo.userId,
+ username: state.userInfo.username,
+ nickname: state.userInfo.nickname,
+ role: state.userInfo.role,
+ avatar: state.userInfo.avatar,
+ name: state.userInfo.name,
+ email: state.userInfo.email,
+ phone: state.userInfo.phone,
+ // 不持久化 permissions，每次从 role 生成
+ },
+ }),
+ onRehydrateStorage: () => (state) => {
+ // 重新加载时，根据 role 重新生成 permissions
+ if (state && state.userInfo && state.userInfo.role) {
+ state.userInfo.permissions = generatePermission(state.userInfo.role);
+ }
+ },
+ }
+ )
+);
+
+export default useUserStore;