@visactor/vtable 1.26.4-alpha.0 → 1.26.5

package/es/ListTable.d.ts

@@ -45,7 +45,6 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
         clearColWidthCache?: boolean;
         clearRowHeightCache?: boolean;
     }): Promise<unknown>;
-    private _refreshCurrentRecordsForOptionUpdate;
     updatePagination(pagination: IPagination): void;
     refreshHeader(): void;
     refreshRowColCount(): void;
@@ -59,6 +58,7 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
         moveType: "row" | "column";
     };
     private syncColumnsStateFromLayoutMap;
+    private mergeHiddenColumnsWithVisibleOrder;
     changeRecordOrder(sourceIndex: number, targetIndex: number): void;
     getCellAddress(findTargetRecord: any | ((record: any) => boolean), field: FieldDef): CellAddress;
     getCellRangeByField(field: FieldDef, index: number): CellRange | null;

package/es/ListTable.js

@@ -4,7 +4,7 @@ import { SimpleHeaderLayoutMap } from "./layout";
 
 import { isArray, isValid } from "@visactor/vutils";
 
-import { _setRecords, checkHasAggregationOnColumnDefine, generateAggregationForColumn, getHierarchyExpandLevel, getListTableRowHierarchyType } from "./core/tableHelper";
+import { _setRecords, checkHasAggregationOnColumnDefine, generateAggregationForColumn } from "./core/tableHelper";
 
 import { BaseTable } from "./core";
 
@@ -30,7 +30,7 @@ import { Factory } from "./core/factory";
 
 import { getGroupByDataConfig } from "./core/group-helper";
 
-import { CachedDataSource, DataSource } from "./data";
+import { DataSource } from "./data";
 
 import { getValueFromDeepArray } from "./data/DataSource";
 
@@ -44,6 +44,17 @@ import { getCustomMergeCellFunc } from "./core/utils/get-custom-merge-cell-func"
 
 import { adjustHeightResizedRowMap, adjustHeightResizedRowMapWithAddRecordIndex, adjustHeightResizedRowMapWithDeleteRecordIndex, adjustWidthResizedColMap } from "./state/cell-move/adjust-header";
 
+const LAYOUT_COLUMN_STATE_KEYS = [ "level", "startIndex", "id", "levelSpan", "size", "startInTotal", "hierarchyState" ];
+
+function clearLayoutColumnState(columns) {
+    null == columns || columns.forEach((column => {
+        var _a;
+        LAYOUT_COLUMN_STATE_KEYS.forEach((key => {
+            delete column[key];
+        })), clearLayoutColumnState(null !== (_a = column.children) && void 0 !== _a ? _a : column.columns);
+    }));
+}
+
 export class ListTable extends BaseTable {
     constructor(container, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -376,10 +387,9 @@ export class ListTable extends BaseTable {
         clearRowHeightCache: !0
     }) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        const internalProps = this.internalProps, prevSortState = internalProps.sortState, hasActiveSortState = (Array.isArray(options.sortState) ? options.sortState : options.sortState ? [ options.sortState ] : []).some((item => (null == item ? void 0 : item.field) && (null == item ? void 0 : item.order) && "normal" !== item.order)), shouldSkipInitialClearCells = Boolean(options.records) || !!options.dataSource && this.dataSource !== options.dataSource;
-        if (this.pluginManager.removeOrAddPlugins(options.plugins), super.updateOption(options, Object.assign(Object.assign({}, updateConfig), {
-            skipClearCells: shouldSkipInitialClearCells
-        })), internalProps.frozenColDragHeaderMode = null !== (_b = null === (_a = options.dragOrder) || void 0 === _a ? void 0 : _a.frozenColDragHeaderMode) && void 0 !== _b ? _b : options.frozenColDragHeaderMode, 
+        const internalProps = this.internalProps;
+        if (this.pluginManager.removeOrAddPlugins(options.plugins), super.updateOption(options, updateConfig), 
+        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, 
         internalProps.dataConfig = this.internalProps.groupBy ? getGroupByDataConfig(this.internalProps.groupBy, options.addRecordRule) : {
             addRecordRule: options.addRecordRule
@@ -393,7 +403,7 @@ export class ListTable extends BaseTable {
             releaseObj instanceof 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 && options.records === internalProps.records && options.sortState === prevSortState && !hasActiveSortState && this.dataSource instanceof CachedDataSource ? this._refreshCurrentRecordsForOptionUpdate(options.records) : options.records ? this.setRecords(options.records, {
+        if (options.dataSource && this.dataSource !== options.dataSource ? this.dataSource = options.dataSource : options.records ? this.setRecords(options.records, {
             sortState: options.sortState
         }) : (this.refreshRowColCount(), this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), 
         this.render()), options.title) {
@@ -410,25 +420,6 @@ export class ListTable extends BaseTable {
             setTimeout(resolve, 0);
         }));
     }
-    _refreshCurrentRecordsForOptionUpdate(records) {
-        var _a;
-        const dataSource = this.dataSource;
-        this.stateManager.endResizeIfResizing(), clearChartRenderQueue();
-        const oldHoverState = {
-            col: this.stateManager.hover.cellPos.col,
-            row: this.stateManager.hover.cellPos.row
-        };
-        this.scenegraph.clearCells(), this.internalProps.records = records, dataSource.refreshRecords(records, this.internalProps.dataConfig, this.pagination, this.internalProps.columns, getListTableRowHierarchyType(this), getHierarchyExpandLevel(this)), 
-        this.refreshRowColCount(), this.stateManager.initCheckedState(records), this.clearCellStyleCache(), 
-        this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), 
-        this._updateSize();
-        (null !== (_a = this.options.componentLayoutOrder) && void 0 !== _a ? _a : [ "legend", "title" ]).forEach((component => {
-            var _a, _b;
-            "legend" === component ? null === (_a = this.internalProps.legends) || void 0 === _a || _a.forEach((legend => {
-                null == legend || legend.resize();
-            })) : "title" === component && (null === (_b = this.internalProps.title) || void 0 === _b || _b.resize());
-        })), this.scenegraph.resize(), this.render();
-    }
     updatePagination(pagination) {
         this.pagination && ("number" == typeof pagination.currentPage && pagination.currentPage >= 0 && (this.pagination.currentPage = pagination.currentPage), 
         pagination.perPageCount && (this.pagination.perPageCount = pagination.perPageCount || this.pagination.perPageCount), 
@@ -483,13 +474,19 @@ export class ListTable extends BaseTable {
         moveContext) : null;
     }
     syncColumnsStateFromLayoutMap() {
-        const nextColumns = cloneDeepSpec(this.internalProps.columns, [ "children" ]), cleanColumns = columns => {
-            columns.forEach((col => {
-                delete col.level, delete col.size, delete col.startInTotal, delete col.startIndex, 
-                delete col.id, delete col.hierarchyState, col.columns && cleanColumns(col.columns);
-            }));
-        };
-        cleanColumns(nextColumns), this.options.columns = nextColumns, this.options.header && (this.options.header = nextColumns);
+        var _a;
+        const sourceColumns = null !== (_a = this.options.columns) && void 0 !== _a ? _a : this.internalProps.columns, nextColumns = sourceColumns.some((column => !0 === column.hide)) ? this.mergeHiddenColumnsWithVisibleOrder(sourceColumns) : this.columns, publicColumns = cloneDeepSpec(nextColumns, [ "children" ]);
+        clearLayoutColumnState(publicColumns), this.internalProps.columns = cloneDeepSpec(publicColumns, [ "children" ]), 
+        this.options.columns = publicColumns, this.options.header && (this.options.header = publicColumns);
+    }
+    mergeHiddenColumnsWithVisibleOrder(sourceColumns) {
+        const visibleColumns = this.internalProps.layoutMap.columnObjects.map((column => column.define));
+        let visibleIndex = 0;
+        return sourceColumns.map((column => {
+            if (!0 === column.hide) return column;
+            const nextVisibleColumn = visibleColumns[visibleIndex];
+            return visibleIndex += 1, null != nextVisibleColumn ? nextVisibleColumn : column;
+        }));
     }
     changeRecordOrder(sourceIndex, targetIndex) {
         this.transpose ? (sourceIndex = this.getRecordShowIndexByCell(sourceIndex, 0), targetIndex = this.getRecordShowIndexByCell(targetIndex, 0)) : (sourceIndex = this.getRecordShowIndexByCell(0, sourceIndex),