Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
5e568ad2
Commit
5e568ad2
authored
Jan 12, 2018
by
Andreas Cederström
Committed by
偏右
Jan 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use redux connected router (#669)
parent
e4f75af5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
src/router.js
src/router.js
+4
-3
No files found.
src/router.js
View file @
5e568ad2
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';
...
@@ -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 }) {
...
@@ -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
}
>
<
Connected
Router
history
=
{
history
}
>
<
Switch
>
<
Switch
>
<
AuthorizedRoute
<
AuthorizedRoute
path
=
"
/user
"
path
=
"
/user
"
...
@@ -33,7 +34,7 @@ function RouterConfig({ history, app }) {
...
@@ -33,7 +34,7 @@ function RouterConfig({ history, app }) {
redirectPath
=
"
/user/login
"
redirectPath
=
"
/user/login
"
/>
/>
<
/Switch
>
<
/Switch
>
<
/Router
>
<
/
Connected
Router
>
<
/LocaleProvider
>
<
/LocaleProvider
>
);
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment