@yyp92-cli/template-react-pc 1.4.0 → 2.1.0

package/template/src/components/layout/index.tsx

@@ -1,9 +1,10 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 import { ConfigProvider } from 'antd'
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
-import zhCN from 'antd/locale/zh_CN';
-import { lightToken } from '@/antdTheme/lightTheme'
+import zhCN from 'antd/locale/zh_CN'
+import { antdTokenStore } from '@/store/antdToken'
+import { getDarkTheme } from '@/utils'
 import Content from './content'
 
 import styles from './index.module.scss'
@@ -13,36 +14,23 @@ interface LayoutProps {
 }
 
 const Layout: React.FC<LayoutProps> = ({ }) => {
+    const {antdToken} =  antdTokenStore()
+
     useEffect(() => {
-        getDarkTheme(0)
+        getDarkTheme(false)
         dayjs.locale('zh-cn')
     }, [])
 
 
     // ********** 操作 **********
-    // 主题切换
-    const getDarkTheme = (theme: number) => {
-        // 获取根元素
-        const root = document.documentElement;
-
-        if (theme != 1) {
-            // 修改 data-theme 属性的值为 "light"
-            root.setAttribute('data-theme', 'light');
-            return
-        }
-
-        // 修改 data-theme 属性的值为 "dark"
-        root.setAttribute('data-theme', 'dark');
-    }
 
 
     // ********** 渲染 **********
-
     return (
         <div className={styles.layout}>
             <ConfigProvider
                 // 主题
-                theme={lightToken}
+                theme={antdToken}
                 locale={zhCN}
 
                 button={{

package/template/src/components/layout/side/index.tsx

@@ -88,7 +88,7 @@ export const Side: React.FC<SideProps> = () => {
                     alt="logo"
                 />
 
-                <span>财务系统</span>
+                <span>后台管理系统</span>
             </div>
 
             <Menu

package/template/src/components/layout-horizontal/header/index.tsx

@@ -3,8 +3,12 @@ import {useNavigate} from 'react-router-dom'
 import { Avatar, Button, Dropdown, Switch, Tooltip } from 'antd'
 import type { MenuProps } from 'antd'
 import { FullscreenExitOutlined, FullscreenOutlined, UserOutlined } from '@ant-design/icons'
-import { localCache, getDarkTheme } from '@/utils'
-import { LOGIN_TOKEN, USER_INFO, MENUS, PERMISSION } from '@/global/constants'
+import { getDarkTheme } from '@/utils'
+import { userInfoStore } from '@/store/login'
+import { antdTokenStore } from '@/store/antdToken'
+import { tokenStore } from '@/store/token'
+import { menusStore } from '@/store/menus'
+import { permissionStore } from '@/store/permission'
 import {Side} from '../side'
 
 import styles from './index.module.scss'
@@ -15,15 +19,20 @@ interface HeaderProps {
 
 export const Header: React.FC<HeaderProps> = ({}) => {
     const navigate = useNavigate()
+    const {clearUserInfo} = userInfoStore()
+    const {setAntdToken} = antdTokenStore()
+    const {clearToken} = tokenStore()
+    const {clearMenus} = menusStore()
+    const {clearPermissions} = permissionStore()
     const [isFullScreen, setIsFullScreen] = useState<boolean>(false)
 
 
     // ********* 操作 *********
     const handleLogout = () => {
-        localCache.removeCache(LOGIN_TOKEN)
-        localCache.removeCache(USER_INFO)
-        localCache.removeCache(MENUS)
-        localCache.removeCache(PERMISSION)
+        clearToken()
+        clearUserInfo()
+        clearMenus()
+        clearPermissions()
 
         navigate('/login')
     }
@@ -45,6 +54,7 @@ export const Header: React.FC<HeaderProps> = ({}) => {
 
     const handleChangeTheme = (checked: boolean) => {
         getDarkTheme(checked)
+        setAntdToken(checked)
     }
 
 

package/template/src/components/layout-horizontal/index.tsx

@@ -3,7 +3,8 @@ import { ConfigProvider } from 'antd'
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 import zhCN from 'antd/locale/zh_CN';
-import { lightToken } from '@/antdTheme/lightTheme'
+import { getDarkTheme } from '@/utils'
+import { antdTokenStore } from '@/store/antdToken'
 import Content from './content'
 
 import styles from './index.module.scss'
@@ -13,27 +14,15 @@ interface LayoutProps {
 }
 
 const Layout: React.FC<LayoutProps> = ({ }) => {
+    const {antdToken} =  antdTokenStore()
+
     useEffect(() => {
-        getDarkTheme(0)
+        getDarkTheme(false)
         dayjs.locale('zh-cn')
     }, [])
 
 
     // ********** 操作 **********
-    // 主题切换
-    const getDarkTheme = (theme: number) => {
-        // 获取根元素
-        const root = document.documentElement;
-
-        if (theme != 1) {
-            // 修改 data-theme 属性的值为 "light"
-            root.setAttribute('data-theme', 'light');
-            return
-        }
-
-        // 修改 data-theme 属性的值为 "dark"
-        root.setAttribute('data-theme', 'dark');
-    }
 
 
     // ********** 渲染 **********
@@ -42,7 +31,7 @@ const Layout: React.FC<LayoutProps> = ({ }) => {
         <div className={styles.layout}>
             <ConfigProvider
                 // 主题
-                theme={lightToken}
+                theme={antdToken}
                 locale={zhCN}
 
                 button={{

package/template/src/components/layout-horizontal/side/index.tsx

@@ -4,8 +4,6 @@ import type { MenuProps } from 'antd';
 import {useNavigate, useLocation} from 'react-router-dom'
 import {ComponentMap} from '@/router/router'
 import { menusStore } from '@/store/menus'
-import { localCache } from '@/utils'
-import { LOGIN_TOKEN } from '@/global/constants'
 
 import styles from './index.module.scss'
 
@@ -86,7 +84,7 @@ export const Side: React.FC<SideProps> = ({}) => {
                     alt="logo"
                 />
 
-                <span>财务系统</span>
+                <span>后台管理系统</span>
             </div>
 
             <Menu

package/template/src/components/login/index.tsx

@@ -52,11 +52,11 @@ const Login: React.FC<LoginProps> = ({}) => {
     const onFinish = async (values: any) => {
         console.log('Success:', values)
 
-        if (values.username === 'yang' && values.password === '123456') {
+        if (values.username === 'admin' && values.password === '123456') {
             setPermissions(defaultList)
             setToken('111')
             setUserInfo({
-                userName: 'yang',
+                userName: 'admin',
                 userId: '001'
             })
             

package/template/src/global/constants.ts

@@ -2,3 +2,4 @@ export const LOGIN_TOKEN = 'login/token'
 export const USER_INFO = 'userInfo'
 export const MENUS = 'menus'
 export const PERMISSION = 'permission'
+export const ANTDTOKEN = 'antd/token'

package/template/src/pages/home/index.tsx

@@ -41,7 +41,7 @@ const Home: React.FC<HomeProps> = () => {
             <Button onClick={() => navigate('/login')}>login</Button>
 
             <div style={{ marginTop: 20 }}>
-                <div>姓名：{userInfo.userName}</div>
+                <div>姓名：{userInfo?.userName}</div>
 
                 <Button
                     type="primary"

package/template/src/service/request/index.ts

@@ -2,9 +2,11 @@ import axios from 'axios'
 import { notification, message } from 'antd'
 import type { AxiosRequestConfig, AxiosError, AxiosResponse } from 'axios'
 import type { MyInternalAxiosRequestConfig } from './type'
-import { localCache } from '@/utils/cache'
-import { LOGIN_TOKEN, USER_INFO, PERMISSION, MENUS } from '@/global/constants'
 import router from '@/router/router'
+import { userInfoStore } from '@/store/login'
+import { tokenStore } from '@/store/token'
+import { menusStore } from '@/store/menus'
+import { permissionStore } from '@/store/permission'
 
 // * 存储待取消的请求：key 是请求唯一标识，value 是 AbortController 实例
 const pendingRequests = new Map()
@@ -67,10 +69,10 @@ const removePendingRequest = (config: AxiosRequestConfig) => {
 // * Token 过期处理函数
 function handleTokenExpired() {
     // 1. 清除本地存储的 Token（避免死循环）
-    localCache.removeCache(LOGIN_TOKEN)
-    localCache.removeCache(USER_INFO)
-    localCache.removeCache(PERMISSION)
-    localCache.removeCache(MENUS)
+    userInfoStore.getState().clearUserInfo()
+    tokenStore.getState().clearToken()
+    menusStore.getState().clearMenus()
+    permissionStore.getState().clearPermissions()
 
     // 排除登录页，避免死循环
     const currentPath = window.location.pathname
@@ -103,7 +105,7 @@ instance.interceptors.request.use(
             addPendingRequest(config)
         }
 
-        const token = localCache.getCache(LOGIN_TOKEN)?.state?.token
+        const token = tokenStore.getState().token
 
         if (config.headers && token) {
             config.headers.Authorization = `Bearer ${token}`

package/template/src/store/antdToken.ts

@@ -0,0 +1,35 @@
+/**
+ * * 用户信息
+ */
+import { create } from 'zustand'
+import { persist } from 'zustand/middleware'
+import { ANTDTOKEN} from '@/global/constants'
+import { lightToken } from '@/antdTheme/lightTheme'
+import { darkToken } from '@/antdTheme/darkTheme'
+
+type AntdTokenStoreState = {
+    antdToken: any
+}
+
+type AntdTokenStoreActions = {
+    setAntdToken: (
+        antdToken: AntdTokenStoreState['antdToken']
+    ) => void,
+}
+
+type AntdTokenStore = AntdTokenStoreState & AntdTokenStoreActions
+
+export const antdTokenStore = create<AntdTokenStore>()(
+    persist(
+        (set) => ({
+            antdToken: {},
+            setAntdToken: (isDark) => {
+                const antdToken = isDark ? darkToken : lightToken
+                return set({antdToken})
+            },
+        }),
+        {
+            name: ANTDTOKEN
+        }
+    )
+)

package/template/src/store/login.ts

@@ -7,15 +7,16 @@ import { USER_INFO} from '@/global/constants'
 
 type UserInfoStoreState = {
     userInfo: {
-        userId: string,
-        userName: string
+        userId?: string,
+        userName?: string
     }
 }
 
 type UserInfoStoreActions = {
     setUserInfo: (
         userInfo: UserInfoStoreState['userInfo']
-    ) => void
+    ) => void,
+    clearUserInfo: () => void
 }
 
 type UserInfoStore = UserInfoStoreState & UserInfoStoreActions
@@ -28,6 +29,7 @@ export const userInfoStore = create<UserInfoStore>()(
                 userId: '111'
             },
             setUserInfo: (userInfo) => set({userInfo}),
+            clearUserInfo: () => set({userInfo: {}})
         }),
         {
             name: USER_INFO

package/template/src/store/menus.ts

@@ -11,6 +11,7 @@ type MenusStoreState = {
 
 type MenusStoreActions = {
     setMenus: (menus: string[]) => void,
+    clearMenus: () => void
 }
 
 type MenusStore = MenusStoreState & MenusStoreActions
@@ -19,7 +20,8 @@ export const menusStore = create<MenusStore>()(
     persist(
         (set) => ({
             menus: [],
-            setMenus: (menus) => set({menus})
+            setMenus: (menus) => set({menus}),
+            clearMenus: () => set({menus: []}),
         }),
         {
             name: MENUS

package/template/src/store/permission.ts

@@ -11,6 +11,7 @@ type PermissionStoreState = {
 
 type PermissionStoreActions = {
     setPermissions: (permissions: string[]) => void,
+    clearPermissions: () => void
 }
 
 type PermissionStore = PermissionStoreState & PermissionStoreActions
@@ -19,7 +20,8 @@ export const permissionStore = create<PermissionStore>()(
     persist(
         (set) => ({
             permissions: [],
-            setPermissions: (permissions) => set({permissions})
+            setPermissions: (permissions) => set({permissions}),
+            clearPermissions: () => set({permissions: []}),
         }),
         {
             name: PERMISSION

package/template/src/store/token.ts

@@ -10,7 +10,8 @@ type UserInfoStoreState = {
 }
 
 type UserInfoStoreActions = {
-    setToken: (token: string) => void
+    setToken: (token: string) => void,
+    clearToken: () => void
 }
 
 type UserInfoStore = UserInfoStoreState & UserInfoStoreActions
@@ -19,7 +20,8 @@ export const tokenStore = create<UserInfoStore>()(
     persist(
         (set) => ({
             token: '',
-            setToken: (token) => set({token})
+            setToken: (token) => set({token}),
+            clearToken: () => set({token: ''})
         }),
         {
             name: LOGIN_TOKEN