From a9f31fc477af066f7272fe8e9d37d1b0d1081c51 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Fri, 21 Sep 2018 21:46:42 +0800 Subject: [PATCH] fix: menu trigger inlineCollapsed not have animation #200 --- components/menu/index.jsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/menu/index.jsx b/components/menu/index.jsx index 9832bc9f1..36fe4ec01 100644 --- a/components/menu/index.jsx +++ b/components/menu/index.jsx @@ -50,7 +50,7 @@ const Menu = { prop: 'selectedKeys', event: 'selectChange', }, - mounted () { + created () { this.preProps = { ...this.$props } }, watch: { @@ -63,6 +63,7 @@ const Menu = { } if (hasProp(this, 'openKeys')) { this.setState({ sOpenKeys: nextProps.openKeys }) + this.preProps = { ...nextProps } return } if (nextProps.inlineCollapsed && !preProps.inlineCollapsed) { @@ -108,10 +109,11 @@ const Menu = { this.leaveAnimationExecutedWhenInlineCollapsed = false this.inlineOpenKeys = [] let sOpenKeys - if (hasProp(this, 'defaultOpenKeys')) { - sOpenKeys = props.defaultOpenKeys - } else if (hasProp(this, 'openKeys')) { + + if (hasProp(this, 'openKeys')) { sOpenKeys = props.openKeys + } else if (hasProp(this, 'defaultOpenKeys')) { + sOpenKeys = props.defaultOpenKeys } return { sOpenKeys,