Rename LoadingMask to FullscreenLoadingMask

This commit is contained in:
2023-12-05 18:14:05 +08:00
parent d3bdbd0199
commit f19e08bdcd
9 changed files with 27 additions and 17 deletions

View File

@@ -1,6 +1,6 @@
import React from 'react' import React from 'react'
import { getRouter } from '@/router' import { getRouter } from '@/router'
import LoadingMask from '@/components/common/LoadingMask' import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
export const AppContext = createContext<{ refreshRouter: () => void }>({ export const AppContext = createContext<{ refreshRouter: () => void }>({
refreshRouter: () => undefined refreshRouter: () => undefined
@@ -18,7 +18,7 @@ const App: React.FC = () => {
} }
}} }}
> >
<Suspense fallback={<LoadingMask />}> <Suspense fallback={<FullscreenLoadingMask />}>
<RouterProvider router={routerState} /> <RouterProvider router={routerState} />
</Suspense> </Suspense>
</AppContext.Provider> </AppContext.Provider>

View File

@@ -0,0 +1,10 @@
.fullscreen-loading-mask {
position: absolute;
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
z-index: 100;
background-color: rgba(200, 200, 200, 0.2);
}

View File

@@ -1,10 +1,10 @@
import React from 'react' import React from 'react'
import Icon from '@ant-design/icons' import Icon from '@ant-design/icons'
import '@/assets/css/components/common/loading-mask.scss' import '@/assets/css/components/common/fullscreen-loading-mask.scss'
import { COLOR_FONT_MAIN } from '@/constants/common.constants' import { COLOR_FONT_MAIN } from '@/constants/common.constants'
import FitFullScreen from '@/components/common/FitFullScreen' import FitFullScreen from '@/components/common/FitFullScreen'
const LoadingMask: React.FC = () => { const FullscreenLoadingMask: React.FC = () => {
const loadingIcon = ( const loadingIcon = (
<> <>
<Icon <Icon
@@ -17,7 +17,7 @@ const LoadingMask: React.FC = () => {
return ( return (
<> <>
<FitFullScreen> <FitFullScreen>
<div className={'loading-mask'}> <div className={'fullscreen-loading-mask'}>
<AntdSpin indicator={loadingIcon} /> <AntdSpin indicator={loadingIcon} />
</div> </div>
</FitFullScreen> </FitFullScreen>
@@ -25,4 +25,4 @@ const LoadingMask: React.FC = () => {
) )
} }
export default LoadingMask export default FullscreenLoadingMask

View File

@@ -3,7 +3,7 @@ import Icon from '@ant-design/icons'
import '@/assets/css/pages/home-framework.scss' import '@/assets/css/pages/home-framework.scss'
import { COLOR_FONT_SECONDARY } from '@/constants/common.constants' import { COLOR_FONT_SECONDARY } from '@/constants/common.constants'
import { getRouter } from '@/router' import { getRouter } from '@/router'
import LoadingMask from '@/components/common/LoadingMask' import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
import HideScrollbar, { HideScrollbarElement } from '@/components/common/HideScrollbar' import HideScrollbar, { HideScrollbarElement } from '@/components/common/HideScrollbar'
export const HomeFrameworkContext = createContext<{ export const HomeFrameworkContext = createContext<{
@@ -206,7 +206,7 @@ const HomeFramework: React.FC = () => {
<Suspense <Suspense
fallback={ fallback={
<> <>
<LoadingMask /> <FullscreenLoadingMask />
</> </>
} }
> >

View File

@@ -5,7 +5,7 @@ import FitFullScreen from '@/components/common/FitFullScreen'
import Sidebar from '@/components/common/sidebar' import Sidebar from '@/components/common/sidebar'
import SidebarItemList from '@/components/common/sidebar/SidebarItemList' import SidebarItemList from '@/components/common/sidebar/SidebarItemList'
import SidebarItem from '@/components/common/sidebar/SidebarItem' import SidebarItem from '@/components/common/sidebar/SidebarItem'
import LoadingMask from '@/components/common/LoadingMask' import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
const SystemFramework: React.FC = () => { const SystemFramework: React.FC = () => {
return ( return (
@@ -32,7 +32,7 @@ const SystemFramework: React.FC = () => {
<Suspense <Suspense
fallback={ fallback={
<> <>
<LoadingMask /> <FullscreenLoadingMask />
</> </>
} }
> >

View File

@@ -7,7 +7,7 @@ import Sidebar from '@/components/common/sidebar'
import SidebarItemList from '@/components/common/sidebar/SidebarItemList' import SidebarItemList from '@/components/common/sidebar/SidebarItemList'
import SidebarItem from '@/components/common/sidebar/SidebarItem' import SidebarItem from '@/components/common/sidebar/SidebarItem'
import SidebarSeparate from '@/components/common/sidebar/SidebarSeparate' import SidebarSeparate from '@/components/common/sidebar/SidebarSeparate'
import LoadingMask from '@/components/common/LoadingMask' import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
const ToolsFramework: React.FC = () => { const ToolsFramework: React.FC = () => {
const sidebarScrollRef = useRef<SidebarScrollElement>(null) const sidebarScrollRef = useRef<SidebarScrollElement>(null)
@@ -67,7 +67,7 @@ const ToolsFramework: React.FC = () => {
<Suspense <Suspense
fallback={ fallback={
<> <>
<LoadingMask /> <FullscreenLoadingMask />
</> </>
} }
> >

View File

@@ -6,7 +6,7 @@ import FitFullScreen from '@/components/common/FitFullScreen'
import Sidebar from '@/components/common/sidebar' import Sidebar from '@/components/common/sidebar'
import SidebarItemList from '@/components/common/sidebar/SidebarItemList' import SidebarItemList from '@/components/common/sidebar/SidebarItemList'
import SidebarItem from '@/components/common/sidebar/SidebarItem' import SidebarItem from '@/components/common/sidebar/SidebarItem'
import LoadingMask from '@/components/common/LoadingMask' import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
const ToolsFramework: React.FC = () => { const ToolsFramework: React.FC = () => {
return ( return (
@@ -46,7 +46,7 @@ const ToolsFramework: React.FC = () => {
<Suspense <Suspense
fallback={ fallback={
<> <>
<LoadingMask /> <FullscreenLoadingMask />
</> </>
} }
> >

View File

@@ -22,7 +22,7 @@ const root: RouteJsonObject[] = [
path: 'loading', path: 'loading',
absolutePath: '/loading', absolutePath: '/loading',
id: 'loading', id: 'loading',
component: React.lazy(() => import('@/components/common/LoadingMask')) component: React.lazy(() => import('@/components/common/FullscreenLoadingMask'))
}, },
{ {
path: 'tools', path: 'tools',

View File

@@ -1,5 +1,5 @@
import ReactDOM from 'react-dom/client' import ReactDOM from 'react-dom/client'
import LoadingMask from '@/components/common/LoadingMask' import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
export const randomInt = (start: number, end: number) => { export const randomInt = (start: number, end: number) => {
if (start > end) { if (start > end) {
@@ -46,7 +46,7 @@ export const showLoadingMask = (id: string) => {
'position: fixed; width: 100vw; height: 100vh; z-index: 10000; left: 0; top: 0;' 'position: fixed; width: 100vw; height: 100vh; z-index: 10000; left: 0; top: 0;'
) )
return ReactDOM.createRoot(container).render(<LoadingMask />) return ReactDOM.createRoot(container).render(<FullscreenLoadingMask />)
} }
export const removeLoadingMask = (id: string) => { export const removeLoadingMask = (id: string) => {