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

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @yyp92-cli/template-react-pc
 
+## 1.4.0
+
+### Minor Changes
+
+- 路由修改
+
 ## 1.3.0
 
 ### Minor Changes

package/package.json

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

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

@@ -6,6 +6,8 @@ import {Footer} from '../footer'
 import {routerConfig} from '@/router/router'
 import type {RouterConfigItemProps} from '@/router/router'
 import { permissionStore } from '@/store/permission'
+import { tokenStore } from '@/store/token'
+import { menusStore } from '@/store/menus'
 
 import styles from './index.module.scss'
 
@@ -21,6 +23,8 @@ const Content: React.FC<ContentProps> = ({}) => {
     const {
         permissions
     } = permissionStore()
+    const {token} = tokenStore()
+    const {menus} = menusStore()
 
     const [currentRouter, setCurrentRouter] = useState<RouterConfigItemProps | any>()
 
@@ -28,7 +32,10 @@ const Content: React.FC<ContentProps> = ({}) => {
         const {pathname} = location ?? {}
         const newPathname = pathname.slice(1)
 
-        if (newPathname !== '') {
+        if (!token) {
+            navigate('/login')
+        }
+        else if (newPathname !== '') {
             const pathnameList = newPathname.split('/')
             const getCcondition = () => {
                 if (pathnameList.length === 1) {
@@ -67,6 +74,9 @@ const Content: React.FC<ContentProps> = ({}) => {
                 navigate('/403')
             }
         }
+        else {
+            navigate(`/${menus[0]?.key}/${menus[0]?.children?.[0]?.key}`)
+        }
     }, [location])
 
 

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

@@ -4,8 +4,7 @@ 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 { tokenStore } from '@/store/token'
 
 import styles from './index.module.scss'
 
@@ -21,6 +20,7 @@ export const Side: React.FC<SideProps> = () => {
     const location = useLocation()
     const navigate = useNavigate()
     const {menus} = menusStore()
+    const {token} = tokenStore()
 
     // 激活的父菜单
     const [openKeys, setOpenKeys] = React.useState<string[]>([])
@@ -45,32 +45,16 @@ export const Side: React.FC<SideProps> = () => {
         const {pathname} = location ?? {}
         const newPathname = pathname.slice(1)
 
-        if (newPathname === '') {
-            const token = localCache.getCache(LOGIN_TOKEN)
+        
+        const pathnameList = newPathname.split('/')
 
-            if (token) {
-                const openKey = menus[0]?.key
-                const selectedKey = menus[0]?.children?.[0]?.key
-
-                setOpenKeys([openKey])
-                setSelectedKeys([selectedKey])
-                navigate(`/${menus[0]?.key}/${menus[0]?.children?.[0]?.key}`)
-            }
-            else {
-                navigate('/login')
-            }
+        if (pathnameList.length === 1) {
+            setOpenKeys([])
+            setSelectedKeys([pathnameList[0]])
         }
-        else {
-            const pathnameList = newPathname.split('/')
-
-            if (pathnameList.length === 1) {
-                setOpenKeys([])
-                setSelectedKeys([pathnameList[0]])
-            }
-            else if (pathnameList.length === 2 || pathnameList.length === 3) {
-                setOpenKeys([pathnameList[0]])
-                setSelectedKeys([pathnameList[1]])
-            }
+        else if (pathnameList.length === 2 || pathnameList.length === 3) {
+            setOpenKeys([pathnameList[0]])
+            setSelectedKeys([pathnameList[1]])
         }
     }, [])
 

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

@@ -6,6 +6,8 @@ import { Footer } from '../footer'
 import { routerConfig } from '@/router/router'
 import type { RouterConfigItemProps } from '@/router/router'
 import { permissionStore } from '@/store/permission'
+import { tokenStore } from '@/store/token'
+import { menusStore } from '@/store/menus'
 
 import styles from './index.module.scss'
 
@@ -17,6 +19,8 @@ interface ContentProps {
 const Content: React.FC<ContentProps> = ({ }) => {
     const location = useLocation()
     const navigate = useNavigate()
+    const {token} = tokenStore()
+    const {menus} = menusStore()
     const {
         permissions
     } = permissionStore()
@@ -27,7 +31,10 @@ const Content: React.FC<ContentProps> = ({ }) => {
         const { pathname } = location ?? {}
         const newPathname = pathname.slice(1)
 
-        if (newPathname !== '') {
+       if (!token) {
+            navigate('/login')
+        }
+        else if (newPathname !== '') {
             const pathnameList = newPathname.split('/')
             const getCcondition = () => {
                 if (pathnameList.length === 1) {
@@ -66,6 +73,9 @@ const Content: React.FC<ContentProps> = ({ }) => {
                 navigate('/403')
             }
         }
+        else {
+            navigate(`/${menus[0]?.key}/${menus[0]?.children?.[0]?.key}`)
+        }
     }, [location])
 
     // ********** 渲染 **********

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

@@ -44,33 +44,15 @@ export const Side: React.FC<SideProps> = ({}) => {
     useEffect(() => {
         const {pathname} = location ?? {}
         const newPathname = pathname.slice(1)
+        const pathnameList = newPathname.split('/')
 
-        if (newPathname === '') {
-            const token = localCache.getCache(LOGIN_TOKEN)
-
-            if (token) {
-                const openKey = menus[0]?.key
-                const selectedKey = menus[0]?.children?.[0]?.key
-
-                // setOpenKeys([openKey])
-                setSelectedKeys([selectedKey])
-                navigate(`/${menus[0]?.key}/${menus[0]?.children?.[0]?.key}`)
-            }
-            else {
-                navigate('/login')
-            }
+        if (pathnameList.length === 1) {
+            setOpenKeys([])
+            setSelectedKeys([pathnameList[0]])
         }
-        else {
-            const pathnameList = newPathname.split('/')
-
-            if (pathnameList.length === 1) {
-                setOpenKeys([])
-                setSelectedKeys([pathnameList[0]])
-            }
-            else if (pathnameList.length === 2 || pathnameList.length === 3) {
-                // setOpenKeys([pathnameList[0]])
-                setSelectedKeys([pathnameList[1]])
-            }
+        else if (pathnameList.length === 2 || pathnameList.length === 3) {
+            // setOpenKeys([pathnameList[0]])
+            setSelectedKeys([pathnameList[1]])
         }
     }, [])
 

package/template/src/router/router.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 import {createBrowserRouter} from 'react-router-dom'
 import { AppstoreOutlined, MailOutlined, NodeCollapseOutlined, SettingOutlined } from '@ant-design/icons';
-// import Layout from '@/components/layout'
-import Layout from '@/components/layout-horizontal'
+import Layout from '@/components/layout'
+// import Layout from '@/components/layout-horizontal'
 import Home from '@/pages/home'
 import { Page403 } from '@/components/403'
 import { Page404 } from '@/components/404'

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

@@ -103,7 +103,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}`