@visactor/vtable 1.18.2-alpha.1 → 1.18.2-alpha.2

package/cjs/ListTable.d.ts

@@ -36,7 +36,9 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     getCellOriginRecord(col: number, row: number): MaybePromiseOrUndefined;
     getCellRawRecord(col: number, row: number): MaybePromiseOrUndefined;
     _canResizeColumn(col: number, row: number): boolean;
-    updateOption(options: ListTableConstructorOptions): Promise<unknown>;
+    updateOption(options: ListTableConstructorOptions, updateConfig?: {
+        keepData?: boolean;
+    }): Promise<unknown>;
     updatePagination(pagination: IPagination): void;
     refreshHeader(): void;
     refreshRowColCount(): void;

package/cjs/ListTable.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ListTable = void 0;
 
-const ts_types_1 = require("./ts-types"), layout_1 = require("./layout"), vutils_1 = require("@visactor/vutils"), tableHelper_1 = require("./core/tableHelper"), core_1 = require("./core"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE"), env_1 = require("./tools/env"), editors = __importStar(require("./edit/editors")), edit_manager_1 = require("./edit/edit-manager"), compute_row_height_1 = require("./scenegraph/layout/compute-row-height"), util_1 = require("./tools/util"), radio_1 = require("./state/radio/radio"), vutils_extension_1 = require("@visactor/vutils-extension"), checkbox_1 = require("./state/checkbox/checkbox"), factory_1 = require("./core/factory"), group_helper_1 = require("./core/group-helper"), record_helper_1 = require("./core/record-helper"), update_row_1 = require("./tools/update-row"), chart_render_helper_1 = require("./scenegraph/graphic/contributions/chart-render-helper");
+const ts_types_1 = require("./ts-types"), layout_1 = require("./layout"), vutils_1 = require("@visactor/vutils"), tableHelper_1 = require("./core/tableHelper"), core_1 = require("./core"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE"), env_1 = require("./tools/env"), editors = __importStar(require("./edit/editors")), edit_manager_1 = require("./edit/edit-manager"), compute_row_height_1 = require("./scenegraph/layout/compute-row-height"), util_1 = require("./tools/util"), radio_1 = require("./state/radio/radio"), vutils_extension_1 = require("@visactor/vutils-extension"), checkbox_1 = require("./state/checkbox/checkbox"), factory_1 = require("./core/factory"), group_helper_1 = require("./core/group-helper"), data_1 = require("./data"), record_helper_1 = require("./core/record-helper"), update_row_1 = require("./tools/update-row"), chart_render_helper_1 = require("./scenegraph/graphic/contributions/chart-render-helper");
 
 class ListTable extends core_1.BaseTable {
     constructor(container, options) {
@@ -85,6 +85,7 @@ class ListTable extends core_1.BaseTable {
     }
     updateColumns(columns) {
         var _a, _b, _c, _d;
+        this.scenegraph.clearCells();
         const oldHoverState = {
             col: this.stateManager.hover.cellPos.col,
             row: this.stateManager.hover.cellPos.row
@@ -94,7 +95,7 @@ class ListTable extends core_1.BaseTable {
         this.internalProps.headerHelper.setTableColumnsEditor(), this._hasAutoImageColumn = void 0, 
         this.refreshHeader(), null === (_b = (_a = this.dataSource).updateColumns) || void 0 === _b || _b.call(_a, this.internalProps.columns), 
         this.records && (0, tableHelper_1.checkHasAggregationOnColumnDefine)(columns) && this.dataSource.processRecords(null !== (_d = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records) && void 0 !== _d ? _d : this.dataSource.dataSourceObj), 
-        this.internalProps.useOneRowHeightFillAll = !1, this.scenegraph.clearCells(), this.headerStyleCache = new Map, 
+        this.internalProps.useOneRowHeightFillAll = !1, this.headerStyleCache = new Map, 
         this.bodyStyleCache = new Map, this.bodyBottomStyleCache = new Map, this.scenegraph.createSceneGraph(), 
         this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.renderAsync(), 
         this.eventManager.updateEventBinder();
@@ -139,7 +140,7 @@ class ListTable extends core_1.BaseTable {
             if (this.options.groupBy) {
                 const record = table.getCellRawRecord(col, row);
                 if (null == record ? void 0 : record.vtableMerge) return "";
-                value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount);
+                table.internalProps.layoutMap.isAggregation(col, row) || (value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount));
             } else value = row - this.columnHeaderLevelCount + 1;
             const {format: format} = table.internalProps.layoutMap.getSeriesNumberBody(col, row);
             return "function" == typeof format ? format(col, row, this, value) : value;
@@ -242,8 +243,10 @@ class ListTable extends core_1.BaseTable {
         }
         return ifCan;
     }
-    updateOption(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    updateOption(options, updateConfig = {
+        keepData: !1
+    }) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const internalProps = this.internalProps;
         if (super.updateOption(options), internalProps.frozenColDragHeaderMode = null !== (_b = null === (_a = options.dragOrder) || void 0 === _a ? void 0 : _a.frozenColDragHeaderMode) && void 0 !== _b ? _b : options.frozenColDragHeaderMode, 
         this.pagination = options.pagination, internalProps.sortState = options.sortState, 
@@ -255,21 +258,23 @@ class ListTable extends core_1.BaseTable {
         vutils_1.isValid)(options.groupBy)) && void 0 !== _e && _e, this.internalProps.headerHelper.setTableColumnsEditor(), 
         this.transpose = null !== (_f = options.transpose) && void 0 !== _f && _f, this.refreshHeader(), 
         this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.columnWidthConfig = options.columnWidthConfig, 
-        internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
-            var _a;
-            return null === (_a = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _a ? void 0 : _a.call(releaseObj);
-        })), internalProps.releaseList = null), options.dataSource ? this.dataSource = options.dataSource : options.records ? this.setRecords(options.records, {
+        internalProps.releaseList) for (let i = internalProps.releaseList.length - 1; i >= 0; i--) {
+            const releaseObj = internalProps.releaseList[i];
+            updateConfig.keepData && releaseObj instanceof data_1.DataSource ? releaseObj.updateColumns(this.internalProps.columns) : (null === (_g = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _g || _g.call(releaseObj), 
+            internalProps.releaseList.splice(i, 1));
+        }
+        if (options.dataSource && this.dataSource !== options.dataSource ? this.dataSource = options.dataSource : options.records ? this.setRecords(options.records, {
             sortState: options.sortState
-        }) : (this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), this.render()), 
-        options.title) {
+        }) : (this.refreshRowColCount(), this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), 
+        this.render()), options.title) {
             const Title = factory_1.Factory.getComponent("title");
             internalProps.title = new Title(options.title, this), this.scenegraph.resize();
         }
-        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_g = this.internalProps.emptyTip) || void 0 === _g || _g.resetVisible(); else {
+        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible(); else {
             const EmptyTip = factory_1.Factory.getComponent("emptyTip");
-            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible();
+            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_j = this.internalProps.emptyTip) || void 0 === _j || _j.resetVisible();
         }
-        return this.pluginManager.updatePlugins(options.plugins), new Promise((resolve => {
+        return new Promise((resolve => {
             setTimeout(resolve, 0);
         }));
     }