@yyp92-cli/template-react-mobile 1.3.0 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @yyp92-cli/template-react-mobile
 
+## 1.5.0
+
+### Minor Changes
+
+- react 模板 去掉手动存储本地
+
+## 1.4.0
+
+### Minor Changes
+
+- 路由修改
+
 ## 1.3.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yyp92-cli/template-react-mobile",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "publishConfig": {
     "access": "public"
   },

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

@@ -4,10 +4,9 @@ import NavBar from '../navBar'
 import TabBar from '../tabBar'
 import { permissionStore } from '@/store/permission'
 import { routerConfig, type RouterConfigItemProps } from '@/router/router'
+import { tokenStore } from '@/store/token'
 
 import styles from './index.module.scss'
-import { localCache } from '@/utils'
-import { LOGIN_TOKEN } from '@/global/constants'
 
 interface ContentProps {
     [key: string]: any
@@ -20,6 +19,7 @@ const Content: React.FC<ContentProps> = ({}) => {
     const {
         permissions
     } = permissionStore()
+    const {token} = tokenStore()
 
     const [currentRouter, setCurrentRouter] = useState<RouterConfigItemProps>()
 
@@ -27,7 +27,10 @@ const Content: React.FC<ContentProps> = ({}) => {
         const {pathname} = location ?? {}
         const newPathname = pathname.slice(1)
 
-        if (newPathname !== '') {
+        if (!token) {
+            navigate('/login')
+        }
+        else if (newPathname !== '') {
             if (permissions.includes(newPathname)) {
                 const newCurrentRouter: any = routerConfig[0]?.children?.find((group: any) => group.key === newPathname) ?? {}
 
@@ -38,19 +41,15 @@ const Content: React.FC<ContentProps> = ({}) => {
             }
         }
         else {
-            const token = localCache.getCache(LOGIN_TOKEN)
-
-            if (!token) {
-                navigate('/login')
-            }
+            const newCurrentRouter: any = routerConfig[0]?.children?.find((group: any) => permissions.includes(group.key) ) ?? {}
+            setCurrentRouter(newCurrentRouter)
+            navigate(newCurrentRouter.path)
         }
     }, [location])
 
 
     // ********** 渲染 **********
     const renderContent = () => {
-        const token = localCache.getCache(LOGIN_TOKEN)
-
         if (!token || !currentRouter) {
             return null
         }

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

@@ -1,7 +1,7 @@
-import React, {FC, useState, useEffect, useLayoutEffect} from 'react'
-import {useNavigate, useLocation} from 'react-router-dom'
+import {FC, useState, useEffect, useLayoutEffect} from 'react'
+import {useNavigate} from 'react-router-dom'
 import {TabBar as AntTabBar} from 'antd-mobile'
-import routerConfig, { ComponentMap } from '@/router/router'
+import { ComponentMap } from '@/router/router'
 import styles from './index.module.scss'
 import { menusStore } from '@/store/menus'
 
@@ -9,7 +9,6 @@ interface TabBarProps {}
 
 const TabBar: FC<TabBarProps> = () => {
     const navigate = useNavigate()
-    const newLocation = useLocation()
     const {menus} = menusStore()
 
     const [tabs, setTabs] = useState<any[]>([])

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

@@ -1,18 +1,23 @@
-import React from 'react'
 import {useNavigate} from 'react-router-dom'
 import {Button, Input} from 'antd-mobile'
-import { LOGIN_TOKEN, USER_INFO, MENUS, PERMISSION } from '@/global/constants'
-import { localCache } from '@/utils/cache'
+import { userInfoStore } from '@/store/login'
+import { tokenStore } from '@/store/token'
+import { menusStore } from '@/store/menus'
+import { permissionStore } from '@/store/permission'
 import styles from './index.module.scss'
 
 const Mine = () => {
     const navigate = useNavigate()
+    const {clearUserInfo} = userInfoStore()
+    const {clearToken} = tokenStore()
+    const {clearMenus} = menusStore()
+    const {clearPermissions} = permissionStore()
 
     const handleLogout = () => {
-        localCache.removeCache(LOGIN_TOKEN)
-        localCache.removeCache(USER_INFO)
-        localCache.removeCache(MENUS)
-        localCache.removeCache(PERMISSION)
+        clearToken()
+        clearUserInfo()
+        clearMenus()
+        clearPermissions()
 
         navigate('/login')
     }

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

@@ -2,9 +2,11 @@ import axios from 'axios'
 import { Toast } from 'antd-mobile'
 import type { AxiosRequestConfig, AxiosError, AxiosResponse } from 'axios'
 import type { MyInternalAxiosRequestConfig } from './type'
-import { localCache } from '@/utils/cache'
-import { LOGIN_TOKEN, USER_INFO, MENUS, PERMISSION } 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(MENUS)
-    localCache.removeCache(PERMISSION)
+    userInfoStore.getState().clearUserInfo()
+    tokenStore.getState().clearToken()
+    menusStore.getState().clearMenus()
+    permissionStore.getState().clearPermissions()
 
     // 排除登录页，避免死循环
     const currentPath = window.location.pathname
@@ -105,7 +107,7 @@ instance.interceptors.request.use(
             addPendingRequest(config)
         }
 
-        const token = localCache.getCache(LOGIN_TOKEN)
+        const token = tokenStore.getState().token
 
         if (config.headers && token) {
             config.headers.Authorization = `Bearer ${token}`

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: (
         nextUserInfo: 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