diff --git a/package.json b/package.json index 784610a759f642209214a599a3c5370df841b95f..840d1f3615e17ad00d511c0ef230119cd71aef5d 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "stylelint-config-standard": "^18.0.0", "umi": "^2.1.1", "umi-plugin-react": "^1.1.1", - "umi-plugin-ga": "^1.1.2" + "umi-plugin-ga": "^1.1.3" }, "optionalDependencies": { "puppeteer": "^1.9.0" diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index df33f326bbb2e3af8d3522c6f9b266f7c201bc9a..ea849599262996a20369c0539f51e217299e92ec 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -21,7 +21,7 @@ import Exception403 from '../pages/Exception/403'; const { Content } = Layout; // Conversion router to menu. -function formatter(data, parentPath = '', parentAuthority, parentName) { +function formatter(data, parentAuthority, parentName) { return data .map(item => { let locale = 'menu'; @@ -39,12 +39,7 @@ function formatter(data, parentPath = '', parentAuthority, parentName) { authority: item.authority || parentAuthority, }; if (item.routes) { - const children = formatter( - item.routes, - `${parentPath}${item.path}/`, - item.authority, - locale - ); + const children = formatter(item.routes, item.authority, locale); // Reduce memory usage result.children = children; } @@ -176,7 +171,7 @@ class BasicLayout extends React.PureComponent { const pathKey = Object.keys(this.breadcrumbNameMap).find(key => pathToRegexp(key).test(pathname) ); - return this.breadcrumbNameMap[pathKey]; + return this.breadcrumbNameMap[pathKey] || {}; }; getPageTitle = pathname => {