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

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @yyp92-cli/template-react-mobile
 
+## 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.4.0",
   "publishConfig": {
     "access": "public"
   },

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

@@ -4,10 +4,11 @@ import NavBar from '../navBar'
 import TabBar from '../tabBar'
 import { permissionStore } from '@/store/permission'
 import { routerConfig, type RouterConfigItemProps } from '@/router/router'
-
-import styles from './index.module.scss'
 import { localCache } from '@/utils'
 import { LOGIN_TOKEN } from '@/global/constants'
+import { tokenStore } from '@/store/token'
+
+import styles from './index.module.scss'
 
 interface ContentProps {
     [key: string]: any
@@ -20,6 +21,7 @@ const Content: React.FC<ContentProps> = ({}) => {
     const {
         permissions
     } = permissionStore()
+    const {token} = tokenStore()
 
     const [currentRouter, setCurrentRouter] = useState<RouterConfigItemProps>()
 
@@ -27,7 +29,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,11 +43,9 @@ 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])
 

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/service/request/index.ts

@@ -105,7 +105,7 @@ instance.interceptors.request.use(
             addPendingRequest(config)
         }
 
-        const token = localCache.getCache(LOGIN_TOKEN)
+        const token = localCache.getCache(LOGIN_TOKEN)?.state?.token
 
         if (config.headers && token) {
             config.headers.Authorization = `Bearer ${token}`