FatttSnake/oxygen-ui
1
0
Fork 0
Code Pull Requests Activity

Add ToolsFramework #32

Merged
FatttSnake merged 26 commits from FatttSnake into dev 2023-10-14 18:36:50 +08:00
Conversation 0 Commits 26 Files Changed 37 +5 -4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d84a8eed4 - Show all commits

9
src/AuthRoute.tsx
View File

@@ -1,8 +1,9 @@
import { getLoginStatus } from '@/utils/auth.ts' import { getLoginStatus } from '@/utils/auth.ts'
const AuthRoute = () => { const AuthRoute = () => {
const match = useMatches()[1] const matches = useMatches()
const handle = match.handle as RouteHandle const lastMatch = matches.reduce((_, second) => second)
const handle = lastMatch.handle as RouteHandle
const outlet = useOutlet() const outlet = useOutlet()
const isLogin = getLoginStatus() const isLogin = getLoginStatus()
@@ -10,11 +11,11 @@ const AuthRoute = () => {
if (handle?.auth && !isLogin) { if (handle?.auth && !isLogin) {
return <Navigate to="/login" /> return <Navigate to="/login" />
} }
if (isLogin && match.pathname === '/login') { if (isLogin && lastMatch.pathname === '/login') {
return <Navigate to="/" /> return <Navigate to="/" />
} }
return outlet return outlet
}, [handle?.auth, isLogin, match.pathname, outlet]) }, [handle?.auth, isLogin, lastMatch.pathname, outlet])
} }
export default AuthRoute export default AuthRoute