LOADING
@@ -15,6 +18,7 @@ const Loader = ({ spinning }) => {
Loader.propTypes = {
spinning: PropTypes.bool,
+ fullScreen: PropTypes.bool,
}
export default Loader
diff --git a/src/components/Loader/Loader.less b/src/components/Loader/Loader.less
index ba3685a..723402d 100644
--- a/src/components/Loader/Loader.less
+++ b/src/components/Loader/Loader.less
@@ -1,8 +1,12 @@
+.loader_fullScreen {
+ position: fixed !important;
+}
+
.loader {
display: block;
background-color: #fff;
width: 100%;
- position: fixed;
+ position: absolute;
top: 0;
bottom: 0;
left: 0;
diff --git a/src/router.js b/src/router.js
index 0813662..4aef55a 100644
--- a/src/router.js
+++ b/src/router.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
import { Router, Switch, Route, Redirect, routerRedux } from 'dva/router'
import dynamic from 'dva/dynamic'
import App from 'routes/app'
+import { Loader } from 'components'
const { ConnectedRouter } = routerRedux
@@ -72,7 +73,11 @@ const Routers = function ({ history, app }) {
()} />
{
routes.map(({ path, ...dynamics }, key) => (
-
+ (),
+ ...dynamics
+ })} />
))
}
diff --git a/src/routes/app.js b/src/routes/app.js
index 3ec5dbb..5569caa 100644
--- a/src/routes/app.js
+++ b/src/routes/app.js
@@ -41,16 +41,16 @@ const App = ({ children, dispatch, app, loading, location }) => {
isNavbar,
menuPopoverVisible,
navOpenKeys,
- switchMenuPopover () {
+ switchMenuPopover() {
dispatch({ type: 'app/switchMenuPopver' })
},
- logout () {
+ logout() {
dispatch({ type: 'app/logout' })
},
- switchSider () {
+ switchSider() {
dispatch({ type: 'app/switchSider' })
},
- changeOpenKeys (openKeys) {
+ changeOpenKeys(openKeys) {
dispatch({ type: 'app/handleNavOpenKeys', payload: { navOpenKeys: openKeys } })
},
}
@@ -61,10 +61,10 @@ const App = ({ children, dispatch, app, loading, location }) => {
siderFold,
darkTheme,
navOpenKeys,
- changeTheme () {
+ changeTheme() {
dispatch({ type: 'app/switchTheme' })
},
- changeOpenKeys (openKeys) {
+ changeOpenKeys(openKeys) {
window.localStorage.setItem(`${prefix}navOpenKeys`, JSON.stringify(openKeys))
dispatch({ type: 'app/handleNavOpenKeys', payload: { navOpenKeys: openKeys } })
},
@@ -76,13 +76,13 @@ const App = ({ children, dispatch, app, loading, location }) => {
}
if (openPages && openPages.includes(pathname)) {
return (
-
+
{children}
)
}
return (
-
+
ANTD ADMIN