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

Table: avoid doLayout continuous executing

pull/7900/merge
Leopoldthecoder 2017-10-31 18:24:56 +08:00 committed by 杨奕
parent 80e60efc0a
commit c1155b3be0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/table/src/table.vue
View File

@ -345,6 +345,7 @@
this.updateScrollY(); this.updateScrollY();
this.layout.update(); this.layout.update();
this.$nextTick(() => { this.$nextTick(() => {
if (this.destroyed) return;
if (this.height) { if (this.height) {
this.layout.setHeight(this.height); this.layout.setHeight(this.height);
} else if (this.maxHeight) { } else if (this.maxHeight) {
@ -355,7 +356,7 @@
if (this.$el) { if (this.$el) {
this.isHidden = this.$el.clientWidth === 0; this.isHidden = this.$el.clientWidth === 0;
if (this.isHidden && this.layout.bodyWidth) { if (this.isHidden && this.layout.bodyWidth) {
setTimeout(() => this.doLayout()); setTimeout(() => this.debouncedLayout());
} }
} }
}); });
@ -496,6 +497,7 @@
}, },
destroyed() { destroyed() {
this.destroyed = true;
if (this.windowResizeListener) removeResizeListener(this.$el, this.windowResizeListener); if (this.windowResizeListener) removeResizeListener(this.$el, this.windowResizeListener);
}, },
@ -536,7 +538,8 @@
resizeProxyVisible: false, resizeProxyVisible: false,
// 是否拥有多级表头 // 是否拥有多级表头
isGroup: false, isGroup: false,
scrollPosition: 'left' scrollPosition: 'left',
destroyed: false
}; };
} }
}; };