diff --git a/src/components/SiderMenu/BaseMenu.js b/src/components/SiderMenu/BaseMenu.js index 3fd4abf36b9ebfb1b9c3ad3f37e4ba21cf978bda..76c21bc0b81689e06206d8657c417e5e82a609ce 100644 --- a/src/components/SiderMenu/BaseMenu.js +++ b/src/components/SiderMenu/BaseMenu.js @@ -80,7 +80,7 @@ export default class BaseMenu extends PureComponent { getSubMenuOrItem = item => { // doc: add hideChildrenInMenu if (item.children && !item.hideChildrenInMenu && item.children.some(child => child.name)) { - const name = formatMessage({ id: item.locale }); + const name = item.locale ? formatMessage({ id: item.locale }) : item.name; return ( { - const name = formatMessage({ id: item.locale }); + const name = item.locale ? formatMessage({ id: item.locale }) : item.name; const itemPath = this.conversionPath(item.path); const icon = getIcon(item.icon); const { target } = item; diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 9d09d19cd2f1a922133e312cf8f43d7a5b74e0ac..df33f326bbb2e3af8d3522c6f9b266f7c201bc9a 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -22,28 +22,39 @@ const { Content } = Layout; // Conversion router to menu. function formatter(data, parentPath = '', parentAuthority, parentName) { - return data.map(item => { - let locale = 'menu'; - if (parentName && item.name) { - locale = `${parentName}.${item.name}`; - } else if (item.name) { - locale = `menu.${item.name}`; - } else if (parentName) { - locale = parentName; - } - const result = { - ...item, - locale, - authority: item.authority || parentAuthority, - }; - if (item.routes) { - const children = formatter(item.routes, `${parentPath}${item.path}/`, item.authority, locale); - // Reduce memory usage - result.children = children; - } - delete result.routes; - return result; - }); + return data + .map(item => { + let locale = 'menu'; + if (parentName && item.name) { + locale = `${parentName}.${item.name}`; + } else if (item.name) { + locale = `menu.${item.name}`; + } else if (parentName) { + locale = parentName; + } + if (item.path) { + const result = { + ...item, + locale, + authority: item.authority || parentAuthority, + }; + if (item.routes) { + const children = formatter( + item.routes, + `${parentPath}${item.path}/`, + item.authority, + locale + ); + // Reduce memory usage + result.children = children; + } + delete result.routes; + return result; + } + + return null; + }) + .filter(item => item); } const memoizeOneFormatter = memoizeOne(formatter, isEqual); @@ -85,6 +96,7 @@ class BasicLayout extends React.PureComponent { state = { rendering: true, isMobile: false, + menuData: this.getMenuData(), }; componentDidMount() { @@ -224,9 +236,8 @@ class BasicLayout extends React.PureComponent { children, location: { pathname }, } = this.props; - const { isMobile } = this.state; + const { isMobile, menuData } = this.state; const isTop = PropsLayout === 'topmenu'; - const menuData = this.getMenuData(); const routerConfig = this.matchParamsPath(pathname); const layout = (