Optimize router
This commit is contained in:
@@ -2,7 +2,7 @@ import React from 'react'
|
||||
import Icon from '@ant-design/icons'
|
||||
import '@/assets/css/pages/home-framework.scss'
|
||||
import { COLOR_FONT_SECONDARY } from '@/constants/common.constants'
|
||||
import router from '@/router'
|
||||
import { getRouter } from '@/router'
|
||||
import LoadingMask from '@/components/common/LoadingMask'
|
||||
import HideScrollbar, { HideScrollbarElement } from '@/components/common/HideScrollbar'
|
||||
|
||||
@@ -54,7 +54,8 @@ export const HomeFrameworkContext = createContext<{
|
||||
|
||||
const HomeFramework: React.FC = () => {
|
||||
const routeId = useMatches()[1].id
|
||||
const routeChildren = router.routes[0].children?.find((value) => value.id === routeId)?.children
|
||||
const routeChildren = getRouter().routes[0].children?.find((value) => value.id === routeId)
|
||||
?.children
|
||||
|
||||
const pathname = useLocation().pathname
|
||||
|
||||
|
||||
@@ -8,8 +8,10 @@ import {
|
||||
} from '@/constants/common.constants'
|
||||
import { utcToLocalTime } from '@/util/datetime'
|
||||
import { getUserInfo, login, setToken } from '@/util/auth'
|
||||
import { AppContext } from '@/App'
|
||||
|
||||
const Login: React.FC = () => {
|
||||
const { refreshRouter } = useContext(AppContext)
|
||||
const [messageApi, contextHolder] = message.useMessage()
|
||||
const navigate = useNavigate()
|
||||
const [searchParams] = useSearchParams()
|
||||
@@ -32,6 +34,7 @@ const Login: React.FC = () => {
|
||||
navigate('/')
|
||||
}
|
||||
void getUserInfo().then((user) => {
|
||||
refreshRouter()
|
||||
notification.success({
|
||||
message: '欢迎回来',
|
||||
description: (
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react'
|
||||
import '@/assets/css/pages/system-framework.scss'
|
||||
import system from '@/router/system'
|
||||
import { getSystemRouteJson } from '@/router/system'
|
||||
import FitFullScreen from '@/components/common/FitFullScreen'
|
||||
import Sidebar from '@/components/common/sidebar'
|
||||
import SidebarItemList from '@/components/common/sidebar/SidebarItemList'
|
||||
@@ -25,7 +25,7 @@ const SystemFramework: React.FC = () => {
|
||||
}
|
||||
>
|
||||
<SidebarItemList>
|
||||
{system.map((value) => {
|
||||
{getSystemRouteJson().map((value) => {
|
||||
return value.menu ? (
|
||||
<SidebarItem
|
||||
end={value.id === 'system' ? true : undefined}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React from 'react'
|
||||
import '@/assets/css/pages/tools-framework.scss'
|
||||
import user from '@/router/user'
|
||||
import { hasPathPermission } from '@/util/auth'
|
||||
import { hasPathPermission } from '@/util/route'
|
||||
import FitFullScreen from '@/components/common/FitFullScreen'
|
||||
import Sidebar from '@/components/common/sidebar'
|
||||
import SidebarItemList from '@/components/common/sidebar/SidebarItemList'
|
||||
|
||||
Reference in New Issue
Block a user