diff --git a/.zuul.yaml b/.zuul.yaml index 4880e6a2..39ae69b1 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -601,7 +601,6 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ - - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ # markdown @@ -665,7 +664,6 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ - - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ # markdown @@ -704,7 +702,6 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ - - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ # markdown @@ -770,7 +767,6 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ - - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ # markdown diff --git a/src/layouts/Base/Menu.jsx b/src/layouts/Base/Menu.jsx index 266c63d2..307f1588 100644 --- a/src/layouts/Base/Menu.jsx +++ b/src/layouts/Base/Menu.jsx @@ -20,6 +20,7 @@ import { toJS } from 'mobx'; import { isString, isEqual } from 'lodash'; import classnames from 'classnames'; import { getPath } from 'utils/route-map'; +import { getLocalStorageItem, setLocalStorageItem } from 'utils/local-storage'; import i18n from 'core/i18n'; import styles from './index.less'; @@ -31,7 +32,7 @@ export class LayoutMenu extends Component { constructor(props) { super(props); this.state = { - collapsed: false, + collapsed: getLocalStorageItem('menuCollapsed') || false, hover: false, openKeys: [], }; @@ -93,6 +94,7 @@ export class LayoutMenu extends Component { collapsed: !collapsed, hover: false, }); + setLocalStorageItem('menuCollapsed', !collapsed); const { onCollapseChange } = this.props; onCollapseChange && onCollapseChange(!collapsed); }; diff --git a/src/layouts/Base/index.jsx b/src/layouts/Base/index.jsx index cc3ea362..6a95d53a 100644 --- a/src/layouts/Base/index.jsx +++ b/src/layouts/Base/index.jsx @@ -22,6 +22,7 @@ import checkItemPolicy from 'resources/skyline/policy'; import { Layout } from 'antd'; import GlobalHeader from 'components/Layout/GlobalHeader'; import { setRouteMap, getPath } from 'utils/route-map'; +import { getLocalStorageItem } from 'utils/local-storage'; import renderAdminMenu from '../admin-menu'; import renderMenu from '../menu'; import renderUserMenu from '../user-menu'; @@ -42,7 +43,7 @@ export class BaseLayout extends Component { constructor(props) { super(props); this.state = { - collapsed: false, + collapsed: getLocalStorageItem('menuCollapsed') || false, }; this.init(); }