From 5a86a3f6c4fe90c3e6c99cf469333ea8200a6622 Mon Sep 17 00:00:00 2001 From: Jinke Li Date: Thu, 2 Sep 2021 15:14:54 +0800 Subject: [PATCH] fix(pivot-table): optmize render func logic --- packages/s2-core/src/sheet-type/index.ts | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/s2-core/src/sheet-type/index.ts b/packages/s2-core/src/sheet-type/index.ts index d417cf6b85..e75a0f2849 100644 --- a/packages/s2-core/src/sheet-type/index.ts +++ b/packages/s2-core/src/sheet-type/index.ts @@ -259,14 +259,11 @@ export class SpreadSheet extends EE { this.options = merge(this.options, options); } - public render(reloadData = true): Promise { - return new Promise((resolve) => { - if (reloadData) { - this.dataSet.setDataCfg(this.dataCfg); - } - this.buildFacet(); - resolve(); - }); + public render(reloadData = true) { + if (reloadData) { + this.dataSet.setDataCfg(this.dataCfg); + } + this.buildFacet(); } public destroy() { @@ -585,10 +582,9 @@ export class SpreadSheet extends EE { collapsedRows: options.style.collapsedRows, }); this.setOptions(options); - this.render(false).then(() => { - this.emit(S2Event.LAYOUT_AFTER_COLLAPSE_ROWS, { - collapsedRows: options.style.collapsedRows, - }); + this.render(false); + this.emit(S2Event.LAYOUT_AFTER_COLLAPSE_ROWS, { + collapsedRows: options.style.collapsedRows, }); }