|
|
@ -174,6 +174,11 @@ class BasicLayout extends React.PureComponent { |
|
|
<Content style={{ margin: '24px 24px 0', height: '100%' }}> |
|
|
<Content style={{ margin: '24px 24px 0', height: '100%' }}> |
|
|
<div style={{ minHeight: 'calc(100vh - 260px)' }}> |
|
|
<div style={{ minHeight: 'calc(100vh - 260px)' }}> |
|
|
<Switch> |
|
|
<Switch> |
|
|
|
|
|
{ |
|
|
|
|
|
redirectData.map(item => |
|
|
|
|
|
<Redirect key={item.from} exact from={item.from} to={item.to} /> |
|
|
|
|
|
) |
|
|
|
|
|
} |
|
|
{ |
|
|
{ |
|
|
getRoutes(match.path, routerData).map(item => |
|
|
getRoutes(match.path, routerData).map(item => |
|
|
( |
|
|
( |
|
|
@ -188,11 +193,6 @@ class BasicLayout extends React.PureComponent { |
|
|
) |
|
|
) |
|
|
) |
|
|
) |
|
|
} |
|
|
} |
|
|
{ |
|
|
|
|
|
redirectData.map(item => |
|
|
|
|
|
<Redirect key={item.from} exact from={item.from} to={item.to} /> |
|
|
|
|
|
) |
|
|
|
|
|
} |
|
|
|
|
|
<Redirect exact from="/" to={bashRedirect} /> |
|
|
<Redirect exact from="/" to={bashRedirect} /> |
|
|
<Route render={NotFound} /> |
|
|
<Route render={NotFound} /> |
|
|
</Switch> |
|
|
</Switch> |
|
|
|