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
aa675880
Unverified
Commit
aa675880
authored
Mar 16, 2018
by
ddcat1115
Committed by
GitHub
Mar 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix redirect loop (#1103)
* fix redirect loop #1098 * remove useless param
parent
5519345b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
src/layouts/BasicLayout.js
src/layouts/BasicLayout.js
+6
-2
No files found.
src/layouts/BasicLayout.js
View file @
aa675880
...
...
@@ -17,7 +17,7 @@ import { getMenuData } from '../common/menu';
import
logo
from
'
../assets/logo.svg
'
;
const
{
Content
,
Header
,
Footer
}
=
Layout
;
const
{
AuthorizedRoute
}
=
Authorized
;
const
{
AuthorizedRoute
,
check
}
=
Authorized
;
/**
* 根据菜单取得重定向地址.
...
...
@@ -109,7 +109,11 @@ class BasicLayout extends React.PureComponent {
urlParams
.
searchParams
.
delete
(
'
redirect
'
);
window
.
history
.
replaceState
(
null
,
'
redirect
'
,
urlParams
.
href
);
}
else
{
return
'
/dashboard/analysis
'
;
const
{
routerData
}
=
this
.
props
;
// get the first authorized route path in routerData
const
authorizedPath
=
Object
.
keys
(
routerData
).
find
(
item
=>
check
(
routerData
[
item
].
authority
,
item
)
&&
item
!==
'
/
'
);
return
authorizedPath
;
}
return
redirect
;
}
...
...
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