@visactor/vtable 1.26.4 → 1.26.5

package/es/ListTable.d.ts

@@ -58,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

@@ -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;
@@ -463,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),