|
|
@ -1,5 +1,5 @@ |
|
|
import React from 'react'; |
|
|
import React from 'react'; |
|
|
import { Router, Switch } from 'dva/router'; |
|
|
import { routerRedux, Switch } from 'dva/router'; |
|
|
import { LocaleProvider, Spin } from 'antd'; |
|
|
import { LocaleProvider, Spin } from 'antd'; |
|
|
import zhCN from 'antd/lib/locale-provider/zh_CN'; |
|
|
import zhCN from 'antd/lib/locale-provider/zh_CN'; |
|
|
import dynamic from 'dva/dynamic'; |
|
|
import dynamic from 'dva/dynamic'; |
|
|
@ -7,6 +7,7 @@ import { getRouterData } from './common/router'; |
|
|
import Authorized from './utils/Authorized'; |
|
|
import Authorized from './utils/Authorized'; |
|
|
import styles from './index.less'; |
|
|
import styles from './index.less'; |
|
|
|
|
|
|
|
|
|
|
|
const { ConnectedRouter } = routerRedux; |
|
|
const { AuthorizedRoute } = Authorized; |
|
|
const { AuthorizedRoute } = Authorized; |
|
|
dynamic.setDefaultLoadingComponent(() => { |
|
|
dynamic.setDefaultLoadingComponent(() => { |
|
|
return <Spin size="large" className={styles.globalSpin} />; |
|
|
return <Spin size="large" className={styles.globalSpin} />; |
|
|
@ -18,7 +19,7 @@ function RouterConfig({ history, app }) { |
|
|
const BasicLayout = routerData['/'].component; |
|
|
const BasicLayout = routerData['/'].component; |
|
|
return ( |
|
|
return ( |
|
|
<LocaleProvider locale={zhCN}> |
|
|
<LocaleProvider locale={zhCN}> |
|
|
<Router history={history}> |
|
|
<ConnectedRouter history={history}> |
|
|
<Switch> |
|
|
<Switch> |
|
|
<AuthorizedRoute |
|
|
<AuthorizedRoute |
|
|
path="/user" |
|
|
path="/user" |
|
|
@ -33,7 +34,7 @@ function RouterConfig({ history, app }) { |
|
|
redirectPath="/user/login" |
|
|
redirectPath="/user/login" |
|
|
/> |
|
|
/> |
|
|
</Switch> |
|
|
</Switch> |
|
|
</Router> |
|
|
</ConnectedRouter> |
|
|
</LocaleProvider> |
|
|
</LocaleProvider> |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
|