@visactor/vtable 1.26.4 → 1.26.5

package/cjs/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/cjs/ListTable.js

@@ -29,7 +29,16 @@ 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"), data_1 = require("./data"), DataSource_1 = require("./data/DataSource"), 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"), get_custom_merge_cell_func_1 = require("./core/utils/get-custom-merge-cell-func"), adjust_header_1 = require("./state/cell-move/adjust-header");
+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"), DataSource_1 = require("./data/DataSource"), 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"), get_custom_merge_cell_func_1 = require("./core/utils/get-custom-merge-cell-func"), adjust_header_1 = require("./state/cell-move/adjust-header"), 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);
+    }));
+}
 
 class ListTable extends core_1.BaseTable {
     constructor(container, options) {
@@ -457,13 +466,20 @@ class ListTable extends core_1.BaseTable {
         moveContext) : null;
     }
     syncColumnsStateFromLayoutMap() {
-        const nextColumns = (0, vutils_extension_1.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 = (0, 
+        vutils_extension_1.cloneDeepSpec)(nextColumns, [ "children" ]);
+        clearLayoutColumnState(publicColumns), this.internalProps.columns = (0, vutils_extension_1.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),