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

fix fast click on submenu collapse bug

pull/2369/head
baiyaaaaa 2017-01-12 01:14:38 +08:00 committed by 杨奕
parent 9ed9336dcb
commit 5753b452af
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/theme-default/src/tree.css
View File

@ -90,8 +90,6 @@
& > .el-tree-node__children { & > .el-tree-node__children {
overflow: hidden; overflow: hidden;
background-color: transparent; background-color: transparent;
/** padding-left: 16px; */
display: none;
} }
&.is-expanded > .el-tree-node__children { &.is-expanded > .el-tree-node__children {

12
src/transitions/collapse-transition.js
View File

@ -1,9 +1,10 @@
class Transition { class Transition {
beforeEnter(el) { beforeEnter(el) {
if (!el.dataset) el.dataset = {}; if (!el.dataset) el.dataset = {};
el.dataset.oldPaddingTop = el.style.paddingTop; el.dataset.oldPaddingTop = el.style.paddingTop;
el.dataset.oldPaddingBottom = el.style.paddingBottom; el.dataset.oldPaddingBottom = el.style.paddingBottom;
el.dataset.oldDisplay = el.style.display;
el.style.height = '0'; el.style.height = '0';
el.style.paddingTop = 0; el.style.paddingTop = 0;
el.style.paddingBottom = 0; el.style.paddingBottom = 0;
@ -11,8 +12,6 @@ class Transition {
enter(el) { enter(el) {
el.dataset.oldOverflow = el.style.overflow; el.dataset.oldOverflow = el.style.overflow;
el.style.display = 'block';
if (el.scrollHeight !== 0) { if (el.scrollHeight !== 0) {
el.style.height = el.scrollHeight + 'px'; el.style.height = el.scrollHeight + 'px';
el.style.paddingTop = el.dataset.oldPaddingTop; el.style.paddingTop = el.dataset.oldPaddingTop;
@ -27,7 +26,6 @@ class Transition {
} }
afterEnter(el) { afterEnter(el) {
el.style.display = '';
el.style.height = ''; el.style.height = '';
el.style.overflow = el.dataset.oldOverflow; el.style.overflow = el.dataset.oldOverflow;
} }
@ -38,25 +36,19 @@ class Transition {
el.dataset.oldPaddingBottom = el.style.paddingBottom; el.dataset.oldPaddingBottom = el.style.paddingBottom;
el.dataset.oldOverflow = el.style.overflow; el.dataset.oldOverflow = el.style.overflow;
el.style.display = 'block';
if (el.scrollHeight !== 0) {
el.style.height = el.scrollHeight + 'px'; el.style.height = el.scrollHeight + 'px';
}
el.style.overflow = 'hidden'; el.style.overflow = 'hidden';
} }
leave(el) { leave(el) {
if (el.scrollHeight !== 0) { if (el.scrollHeight !== 0) {
setTimeout(() => {
el.style.height = 0; el.style.height = 0;
el.style.paddingTop = 0; el.style.paddingTop = 0;
el.style.paddingBottom = 0; el.style.paddingBottom = 0;
});
} }
} }
afterLeave(el) { afterLeave(el) {
el.style.display = el.dataset.oldDisplay;
el.style.height = ''; el.style.height = '';
el.style.overflow = el.dataset.oldOverflow; el.style.overflow = el.dataset.oldOverflow;
el.style.paddingTop = el.dataset.oldPaddingTop; el.style.paddingTop = el.dataset.oldPaddingTop;