diff --git a/src/components/SiderMenu/BaseMenu.js b/src/components/SiderMenu/BaseMenu.js index 6c8c7022219e552b1b5696c16e50eac0070ad052..9ab66ec3c03111edb1920d7d61e14dfef92838a2 100644 --- a/src/components/SiderMenu/BaseMenu.js +++ b/src/components/SiderMenu/BaseMenu.js @@ -33,13 +33,13 @@ export default class BaseMenu extends PureComponent { * 获得菜单子节点 * @memberof SiderMenu */ - getNavMenuItems = (menusData, parent) => { + getNavMenuItems = menusData => { if (!menusData) { return []; } return menusData .filter(item => item.name && !item.hideInMenu) - .map(item => this.getSubMenuOrItem(item, parent)) + .map(item => this.getSubMenuOrItem(item)) .filter(item => item); }; diff --git a/src/pages/Dashboard/Analysis.js b/src/pages/Dashboard/Analysis.js index cceab9bdcdf5ba8356f6f59462aea6529a78e2fa..07172cc826c3dc89cd8f59a458436f7a99c6975f 100644 --- a/src/pages/Dashboard/Analysis.js +++ b/src/pages/Dashboard/Analysis.js @@ -39,7 +39,6 @@ class Analysis extends Component { type: 'chart/clear', }); cancelAnimationFrame(this.reqRef); - clearTimeout(this.timeoutId); } handleChangeSalesType = e => {