diff --git a/src/common/menu.js b/src/common/menu.js index cf9a4e72f0ec0ff851c788109986e0f019abbabb..109856a91d57e67985a5456ae126c41e4eec5c22 100644 --- a/src/common/menu.js +++ b/src/common/menu.js @@ -32,28 +32,27 @@ const menuData = [{ icon: 'table', path: 'list', children: [{ + name: '查询表格', + path: 'table-list', + }, { + name: '标准列表', + path: 'basic-list', + }, { + name: '卡片列表', + path: 'card-list', + }, { name: '搜索列表', - icon: 'search', path: 'search', children: [{ + name: '搜索列表(文章)', + path: 'articles', + }, { name: '搜索列表(项目)', path: 'projects', }, { name: '搜索列表(应用)', path: 'applications', - }, { - name: '搜索列表(文章)', - path: 'articles', }], - }, { - name: '查询表格', - path: 'table-list', - }, { - name: '标准列表', - path: 'basic-list', - }, { - name: '卡片列表', - path: 'card-list', }], }, { name: '详情页', diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index a5380d288cbc1b6f78d42329923903d8b349cc23..3593b4d592ff0fd3098f3939e876c0558ed40ba0 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -11,9 +11,29 @@ import GlobalFooter from '../components/GlobalFooter'; import SiderMenu from '../components/SiderMenu'; import NotFound from '../routes/Exception/404'; import { getRoutes } from '../utils/utils'; +import { getMenuData } from '../common/menu'; -const { Content } = Layout; +/** + * 根据菜单取得重定向地址. + */ +const redirectData = []; +const getRedirect = (item) => { + if (item && item.children) { + if (item.children[0] && item.children[0].path) { + redirectData.push({ + from: `/${item.path}`, + to: `/${item.children[0].path}`, + }); + item.children.forEach((children) => { + getRedirect(children); + }); + } + } +}; +getMenuData().forEach(getRedirect); + +const { Content } = Layout; const query = { 'screen-xs': { maxWidth: 575, @@ -79,17 +99,20 @@ class BasicLayout extends React.PureComponent {
{ - getRoutes(match.path, routerData).map(item => - ( - - ) + redirectData.map(item => + ) } + { + getRoutes(match.path, routerData).map(item => ( + + )) + } diff --git a/src/routes/List/List.js b/src/routes/List/List.js index e7b10a699123e17d801c44a00fa93e86de536747..0d039194e47467443a5f1ca7859cf02052e165cd 100644 --- a/src/routes/List/List.js +++ b/src/routes/List/List.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { routerRedux, Route, Switch, Redirect } from 'dva/router'; +import { routerRedux, Route, Switch } from 'dva/router'; import { connect } from 'dva'; import { Input } from 'antd'; import PageHeaderLayout from '../../layouts/PageHeaderLayout'; @@ -72,7 +72,6 @@ export default class SearchList extends Component { ) ) } - );