diff --git a/.roadhogrc b/.roadhogrc index c039a47c810b9030d47884ab56a09525b411e94f..f4e2e958aa3ca7a04a32bfe5110d1859570b977d 100755 --- a/.roadhogrc +++ b/.roadhogrc @@ -21,9 +21,9 @@ "font-size-base": "14px", "badge-font-size": "12px", "btn-font-size-lg": "@font-size-base", - "@menu-dark-bg": "#000B14", - "@menu-dark-submenu-bg": "#00182E", - "@layout-sider-background": "#000B14", - "layout-body-background": "#f5f5f5" + "@menu-dark-bg": "#00182E", + "@menu-dark-submenu-bg": "#000B14", + "@layout-sider-background": "#00182E", + "layout-body-background": "#f0f2f5" } } diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 0a0a285248c183014c5360ec3b47fadccca5679c..3e1e78bba0fd05ecf72ad2b99f8cfbb46bcd75aa 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -136,7 +136,7 @@ class BasicLayout extends React.PureComponent { return groupBy(newNotices, 'type'); } handleOpenChange = (openKeys) => { - const latestOpenKey = openKeys.find(key => this.state.openKeys.find(key)); + const latestOpenKey = openKeys.find(key => this.state.openKeys.indexOf(key) === -1); this.setState({ openKeys: latestOpenKey ? [latestOpenKey] : [], }); @@ -198,7 +198,6 @@ class BasicLayout extends React.PureComponent {