fix(Menu): Fix Menu defaultOpened fail.

uiwjs · Apr 8, 2018 · f49af35 · f49af35
1 parent 997f7e0
commit f49af35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/menu/Menu.js b/src/menu/Menu.js
@@ -52,7 +52,6 @@ export default class Menu extends Component {
   // 点击子菜单的标题事件
   handleSubmenuClick(index) {
     const isOpened = this.state.openedMenu.indexOf(index) !== -1;
-
     if (isOpened) {
       this.closeMenu(index);
       if (this.props.onClose) {
@@ -92,13 +91,15 @@ Menu.propTypes = {
   mode: PropTypes.oneOf(['vertical', 'inline', 'horizontal']),
   theme: PropTypes.oneOf(['light', 'dark']),
   defaultActive: PropTypes.string,
+  defaultOpened: PropTypes.array,
   inlineCollapsed: PropTypes.bool,
   onSelect: PropTypes.func,
 };
 
 Menu.defaultProps = {
   prefixCls: 'w-menu',
   mode: 'vertical',
+  defaultOpened: [],
   inlineCollapsed: false,
   theme: 'light',
 };
diff --git a/src/menu/SubMenu.js b/src/menu/SubMenu.js
@@ -51,6 +51,7 @@ export default class SubMenu extends MixinComponent {
   componentWillReceiveProps() {
     if (this.state.mode !== this.menu().props.mode) {
       this.unMountEvents();
+      this.menu().closeMenu(this.props.index);
       this.setState({
         mode: this.menu().props.mode,
       });
@@ -64,7 +65,6 @@ export default class SubMenu extends MixinComponent {
   }
   initEvents() {
     // 切换 mode 弹出的浮层隐藏
-    this.menu().closeMenu(this.props.index);
     // horizontal(水平) 和 vertical(垂直) 和 inline
     if (this.menu().props.mode === 'vertical') {
       this.submenu.addEventListener('click', this.handleClick);