github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

NavMenu: fix click el-submenu trigger childMenu pop again bug (#14443)

pull/14846/head
花裤衩 2019-03-26 15:45:02 +08:00 committed by hetech
parent 9f19298d1a
commit 56e3e1f56a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/menu/src/submenu.vue
View File

@ -178,7 +178,8 @@
} }
this.dispatch('ElMenu', 'submenu-click', this); this.dispatch('ElMenu', 'submenu-click', this);
}, },
handleMouseenter(event) { handleMouseenter(event, showTimeout = this.showTimeout) {
if (!('ActiveXObject' in window) && event.type === 'focus' && !event.relatedTarget) { if (!('ActiveXObject' in window) && event.type === 'focus' && !event.relatedTarget) {
return; return;
} }
@ -194,7 +195,7 @@
clearTimeout(this.timeout); clearTimeout(this.timeout);
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
this.rootMenu.openMenu(this.index, this.indexPath); this.rootMenu.openMenu(this.index, this.indexPath);
}, this.showTimeout); }, showTimeout);
}, },
handleMouseleave() { handleMouseleave() {
const {rootMenu} = this; const {rootMenu} = this;
@ -274,9 +275,9 @@
ref="menu" ref="menu"
v-show={opened} v-show={opened}
class={[`el-menu--${mode}`, popperClass]} class={[`el-menu--${mode}`, popperClass]}
on-mouseenter={this.handleMouseenter} on-mouseenter={($event) => this.handleMouseenter($event, 100)}
on-mouseleave={this.handleMouseleave} on-mouseleave={this.handleMouseleave}
on-focus={this.handleMouseenter}> on-focus={($event) => this.handleMouseenter($event, 100)}>
<ul <ul
role="menu" role="menu"
class={['el-menu el-menu--popup', `el-menu--popup-${currentPlacement}`]} class={['el-menu el-menu--popup', `el-menu--popup-${currentPlacement}`]}