@visactor/vtable 1.23.3 → 1.24.0-alpha.0

package/es/ListTable.d.ts

@@ -71,6 +71,7 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     updateSortState(sortState: SortState[] | SortState | null, executeSort?: boolean): void;
     updateFilterRules(filterRules: FilterRules, options?: {
         clearRowHeightCache?: boolean;
+        clearForceVisibleRecords?: boolean;
         onFilterRecordsEnd?: (records: any[]) => any[];
     }): void;
     getFilteredRecords(): any[];

package/es/ListTable.js

@@ -129,10 +129,32 @@ export class ListTable extends BaseTable {
         this.renderAsync(), this.eventManager.updateEventBinder();
     }
     addColumns(toAddColumns, colIndex, isMaintainArrayData = !0) {
-        var _a;
+        var _a, _b;
         const columns = this.options.columns;
+        if (Array.isArray(this.options.customMergeCell) && (null == toAddColumns ? void 0 : toAddColumns.length)) {
+            const axis = this.transpose ? "row" : "col";
+            let insertIndex = colIndex;
+            void 0 === insertIndex ? insertIndex = columns.length : insertIndex < 0 ? insertIndex = 0 : insertIndex > columns.length && (insertIndex = columns.length);
+            const toAddCount = toAddColumns.length, merges = this.options.customMergeCell.map((m => Object.assign(Object.assign({}, m), {
+                range: {
+                    start: Object.assign({}, m.range.start),
+                    end: Object.assign({}, m.range.end)
+                }
+            })));
+            for (let i = 0; i < merges.length; i++) {
+                const r = null === (_a = merges[i]) || void 0 === _a ? void 0 : _a.range;
+                if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+                const start = r.start[axis], end = r.end[axis];
+                end < insertIndex || (start > insertIndex ? (r.start[axis] = start + toAddCount, 
+                r.end[axis] = end + toAddCount) : r.end[axis] = end + toAddCount);
+            }
+            this.options.customMergeCell = merges.filter((m => {
+                const r = null == m ? void 0 : m.range;
+                return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && (!(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col));
+            })), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
         void 0 === colIndex ? (colIndex = columns.length, columns.push(...toAddColumns)) : columns.splice(colIndex, 0, ...toAddColumns);
-        for (let i = 0; i < toAddColumns.length; i++) this.colWidthsMap.addAndReorder(colIndex + i, null !== (_a = toAddColumns[i].width) && void 0 !== _a ? _a : this.internalProps.defaultColWidth);
+        for (let i = 0; i < toAddColumns.length; i++) this.colWidthsMap.addAndReorder(colIndex + i, null !== (_b = toAddColumns[i].width) && void 0 !== _b ? _b : this.internalProps.defaultColWidth);
         this.internalProps._colRangeWidthsMap.clear();
         const resizedColIndexs = Array.from(this.internalProps._widthResizedColMap.keys());
         for (let i = 0; i < resizedColIndexs.length; i++) resizedColIndexs[i] >= colIndex && (this.internalProps._widthResizedColMap.delete(resizedColIndexs[i]), 
@@ -146,15 +168,45 @@ export class ListTable extends BaseTable {
         }
         this.updateColumns(columns, {
             clearRowHeightCache: !1
-        }), this.fireListeners(TABLE_EVENT_TYPE.ADD_COLUMN, {
+        }), Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), 
+        this.options.customMergeCell.forEach((m => {
+            const r = null == m ? void 0 : m.range;
+            if (null == r ? void 0 : r.start) for (let col = r.start.col; col <= r.end.col; col++) for (let row = r.start.row; row <= r.end.row; row++) this.scenegraph.updateCellContent(col, row);
+        })), this.scenegraph.updateNextFrame()), this.fireListeners(TABLE_EVENT_TYPE.ADD_COLUMN, {
             columnIndex: colIndex,
             columnCount: toAddColumns.length,
             columns: columns
         });
     }
     deleteColumns(deleteColIndexs, isMaintainArrayData = !0) {
+        var _a;
         const columns = this.options.columns;
         deleteColIndexs.sort(((a, b) => b - a));
+        const deletedColumns = deleteColIndexs.map((idx => cloneDeepSpec(columns[idx], [ "children" ])));
+        let deletedRecordValues;
+        if (Array.isArray(this.options.customMergeCell) && (null == deleteColIndexs ? void 0 : deleteColIndexs.length)) {
+            const axis = this.transpose ? "row" : "col", deleteIndexNums = deleteColIndexs.slice().sort(((a, b) => a - b)).map(((idx, i) => idx - i)), merges = this.options.customMergeCell.map((m => Object.assign(Object.assign({}, m), {
+                range: {
+                    start: Object.assign({}, m.range.start),
+                    end: Object.assign({}, m.range.end)
+                }
+            })));
+            for (let i = 0; i < deleteIndexNums.length; i++) {
+                const deleteIndex = deleteIndexNums[i];
+                for (let j = 0; j < merges.length; j++) {
+                    const r = null === (_a = merges[j]) || void 0 === _a ? void 0 : _a.range;
+                    if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+                    const start = r.start[axis], end = r.end[axis];
+                    end < deleteIndex || (start > deleteIndex ? (r.start[axis] = start - 1, r.end[axis] = end - 1) : r.end[axis] = end - 1);
+                }
+            }
+            this.options.customMergeCell = merges.filter((m => {
+                const r = null == m ? void 0 : m.range;
+                return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && (!(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col));
+            })), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
+        isMaintainArrayData && Array.isArray(this.records) && this.records.length && (deletedRecordValues = this.records.map((record => Array.isArray(record) ? deleteColIndexs.map((idx => record[idx])) : [])), 
+        deletedRecordValues.every((v => 0 === v.length)) && (deletedRecordValues = void 0));
         for (let i = 0; i < deleteColIndexs.length; i++) if (columns.splice(deleteColIndexs[i], 1), 
         this.colWidthsMap.delAndReorder(deleteColIndexs[i]), this.internalProps._widthResizedColMap.delete(deleteColIndexs[i]), 
         isMaintainArrayData) for (let j = 0; j < this.records.length; j++) {
@@ -172,7 +224,9 @@ export class ListTable extends BaseTable {
             clearRowHeightCache: !1
         }), this.fireListeners(TABLE_EVENT_TYPE.DELETE_COLUMN, {
             deleteColIndexs: deleteColIndexs,
-            columns: columns
+            columns: columns,
+            deletedColumns: deletedColumns,
+            deletedRecordValues: deletedRecordValues
         });
     }
     get columns() {
@@ -554,10 +608,10 @@ export class ListTable extends BaseTable {
         }
     }
     updateSortState(sortState, executeSort = !0) {
-        var _a;
-        if (sortState) this.internalProps.sortState = sortState; else if (this.internalProps.sortState) if (Array.isArray(this.internalProps.sortState)) for (let i = 0; i < this.internalProps.sortState.length; i++) (sortState = null === (_a = this.internalProps.sortState) || void 0 === _a ? void 0 : _a[i]) && (sortState.order = "normal"); else this.internalProps.sortState.order = "normal", 
-        sortState = this.internalProps.sortState;
-        (sortState = Array.isArray(sortState) ? sortState : [ sortState ]).some((item => item.field)) && executeSort && this.internalProps.layoutMap.headerObjects.some((item => !1 !== item.define.sort)) && (this.dataSource.sort(sortState.map((item => {
+        var _a, _b, _c, _d, _e;
+        const normalizedSortState = (Array.isArray(sortState) ? sortState : sortState ? [ sortState ] : []).filter(Boolean);
+        if (normalizedSortState.length ? this.internalProps.sortState = sortState : this.internalProps.sortState = null, 
+        executeSort) if (normalizedSortState.length) this.internalProps.layoutMap.headerObjects.some((item => !1 !== item.define.sort)) && (this.dataSource.sort(normalizedSortState.map((item => {
             const sortFunc = this._getSortFuncFromHeaderOption(this.internalProps.columns, item.field);
             this.internalProps.layoutMap.headerObjects.find((col => col && col.field === item.field));
             return {
@@ -566,13 +620,22 @@ export class ListTable extends BaseTable {
                 orderFn: null != sortFunc ? sortFunc : defaultOrderFn
             };
         }))), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, 
-        this.scenegraph.sortCell()), sortState.length && this.stateManager.updateSortState(sortState);
+        this.scenegraph.sortCell()); else {
+            const ds = this.dataSource, sourceLength = null !== (_c = null !== (_b = null !== (_a = null == ds ? void 0 : ds.sourceLength) && void 0 !== _a ? _a : null == ds ? void 0 : ds._sourceLength) && void 0 !== _b ? _b : null == ds ? void 0 : ds.length) && void 0 !== _c ? _c : 0;
+            (null === (_d = null == ds ? void 0 : ds.sortedIndexMap) || void 0 === _d ? void 0 : _d.clear) && ds.sortedIndexMap.clear(), 
+            void 0 !== ds.currentIndexedData && (ds.currentIndexedData = Array.from({
+                length: sourceLength
+            }, ((_, i) => i))), ds.lastSortStates = [], null === (_e = ds.updatePagination) || void 0 === _e || _e.call(ds, ds.pagination), 
+            this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, 
+            this.scenegraph.sortCell();
+        }
+        this.stateManager.updateSortState(normalizedSortState);
     }
     updateFilterRules(filterRules, options = {
         clearRowHeightCache: !0
     }) {
         var _a, _b, _c;
-        this.scenegraph.clearCells(), null === (_b = (_a = this.dataSource).clearForceVisibleRecords) || void 0 === _b || _b.call(_a), 
+        this.scenegraph.clearCells(), !1 !== (null == options ? void 0 : options.clearForceVisibleRecords) && (null === (_b = (_a = this.dataSource).clearForceVisibleRecords) || void 0 === _b || _b.call(_a)), 
         this.sortState ? (this.dataSource.updateFilterRulesForSorted(filterRules), sortRecords(this)) : this.dataSource.updateFilterRules(filterRules, null == options ? void 0 : options.onFilterRecordsEnd), 
         this.refreshRowColCount(), this.stateManager.initCheckedState(this.records), this.scenegraph.createSceneGraph(!(null == options ? void 0 : options.clearRowHeightCache)), 
         null === (_c = this.internalProps.emptyTip) || void 0 === _c || _c.resetVisible(), 
@@ -842,34 +905,104 @@ export class ListTable extends BaseTable {
         this.resize();
     }
     addRecord(record, recordIndex, triggerEvent = !0) {
-        var _a;
+        var _a, _b;
+        if (Array.isArray(this.options.customMergeCell) && "number" == typeof recordIndex) {
+            const axis = this.transpose ? "col" : "row", headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount, topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount;
+            let insertIndex = recordIndex;
+            void 0 === insertIndex || insertIndex > this.dataSource.sourceLength ? insertIndex = this.dataSource.sourceLength : insertIndex < 0 && (insertIndex = 0);
+            const insertIndexNum = insertIndex + headerCount + topAggregationCount, merges = this.options.customMergeCell.map((m => Object.assign(Object.assign({}, m), {
+                range: {
+                    start: Object.assign({}, m.range.start),
+                    end: Object.assign({}, m.range.end)
+                }
+            })));
+            for (let i = 0; i < merges.length; i++) {
+                const r = null === (_a = merges[i]) || void 0 === _a ? void 0 : _a.range;
+                if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+                const start = r.start[axis], end = r.end[axis];
+                end < insertIndexNum || (start > insertIndexNum ? (r.start[axis] = start + 1, r.end[axis] = end + 1) : r.end[axis] = end + 1);
+            }
+            this.options.customMergeCell = merges.filter((m => {
+                const r = null == m ? void 0 : m.range;
+                return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && (!(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col));
+            })), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
         const success = listTableAddRecord(record, recordIndex, this);
-        adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, [ record ]), null === (_a = this.internalProps.emptyTip) || void 0 === _a || _a.resetVisible(), 
-        triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
+        adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, [ record ]), null === (_b = this.internalProps.emptyTip) || void 0 === _b || _b.resetVisible(), 
+        success && Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), 
+        this.options.customMergeCell.forEach((m => {
+            const r = null == m ? void 0 : m.range;
+            if (null == r ? void 0 : r.start) for (let col = r.start.col; col <= r.end.col; col++) for (let row = r.start.row; row <= r.end.row; row++) this.scenegraph.updateCellContent(col, row);
+        })), this.scenegraph.updateNextFrame()), triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
             records: [ record ],
             recordIndex: recordIndex,
             recordCount: 1
         });
     }
     addRecords(records, recordIndex, triggerEvent = !0) {
-        var _a;
+        var _a, _b;
+        if (Array.isArray(this.options.customMergeCell) && "number" == typeof recordIndex && (null == records ? void 0 : records.length)) {
+            const axis = this.transpose ? "col" : "row", headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount, topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount;
+            let insertIndex = recordIndex;
+            void 0 === insertIndex || insertIndex > this.dataSource.sourceLength ? insertIndex = this.dataSource.sourceLength : insertIndex < 0 && (insertIndex = 0);
+            const insertIndexNum = insertIndex + headerCount + topAggregationCount, toAddCount = records.length, merges = this.options.customMergeCell.map((m => Object.assign(Object.assign({}, m), {
+                range: {
+                    start: Object.assign({}, m.range.start),
+                    end: Object.assign({}, m.range.end)
+                }
+            })));
+            for (let i = 0; i < merges.length; i++) {
+                const r = null === (_a = merges[i]) || void 0 === _a ? void 0 : _a.range;
+                if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+                const start = r.start[axis], end = r.end[axis];
+                end < insertIndexNum || (start > insertIndexNum ? (r.start[axis] = start + toAddCount, 
+                r.end[axis] = end + toAddCount) : r.end[axis] = end + toAddCount);
+            }
+            this.options.customMergeCell = merges.filter((m => {
+                const r = null == m ? void 0 : m.range;
+                return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && (!(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col));
+            })), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
         const success = listTableAddRecords(records, recordIndex, this);
         "number" == typeof recordIndex && adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, records), 
-        null === (_a = this.internalProps.emptyTip) || void 0 === _a || _a.resetVisible(), 
-        triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
+        null === (_b = this.internalProps.emptyTip) || void 0 === _b || _b.resetVisible(), 
+        success && Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), 
+        this.options.customMergeCell.forEach((m => {
+            const r = null == m ? void 0 : m.range;
+            if (null == r ? void 0 : r.start) for (let col = r.start.col; col <= r.end.col; col++) for (let row = r.start.row; row <= r.end.row; row++) this.scenegraph.updateCellContent(col, row);
+        })), this.scenegraph.updateNextFrame()), triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
             records: records,
             recordIndex: recordIndex,
             recordCount: records.length
         });
     }
     deleteRecords(recordIndexs, triggerEvent = !0) {
-        var _a;
-        const deletedRecords = [];
-        (null == recordIndexs ? void 0 : recordIndexs.length) > 0 && recordIndexs.forEach((index => {
+        var _a, _b;
+        const prevMergeRanges = Array.isArray(this.options.customMergeCell) ? this.options.customMergeCell.map((m => null == m ? void 0 : m.range)).filter(Boolean).map((r => ({
+            start: Object.assign({}, r.start),
+            end: Object.assign({}, r.end)
+        }))) : [], deletedRecords = [];
+        if ((null == recordIndexs ? void 0 : recordIndexs.length) > 0 && recordIndexs.forEach((index => {
             let record = null;
             record = "number" == typeof index ? this.dataSource.get(index) : [], deletedRecords.push(record);
-        })), listTableDeleteRecords(recordIndexs, this), adjustHeightResizedRowMapWithDeleteRecordIndex(this, recordIndexs), 
-        null === (_a = this.internalProps.emptyTip) || void 0 === _a || _a.resetVisible();
+        })), Array.isArray(this.options.customMergeCell) && (null == recordIndexs ? void 0 : recordIndexs.length) && "number" == typeof recordIndexs[0]) {
+            const axis = this.transpose ? "col" : "row", headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount, topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount, deleteIndexNums = recordIndexs.slice().sort(((a, b) => a - b)).map(((index, i) => index + headerCount + topAggregationCount - i)), merges = this.options.customMergeCell;
+            for (let i = 0; i < deleteIndexNums.length; i++) {
+                const deleteIndex = deleteIndexNums[i];
+                for (let j = 0; j < merges.length; j++) {
+                    const r = null === (_a = merges[j]) || void 0 === _a ? void 0 : _a.range;
+                    if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+                    const start = r.start[axis], end = r.end[axis];
+                    end < deleteIndex || (start > deleteIndex ? (r.start[axis] = start - 1, r.end[axis] = end - 1) : r.end[axis] = end - 1);
+                }
+            }
+            this.options.customMergeCell = merges.filter((m => {
+                const r = null == m ? void 0 : m.range;
+                return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && (!(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col));
+            }));
+        }
+        listTableDeleteRecords(recordIndexs, this), adjustHeightResizedRowMapWithDeleteRecordIndex(this, recordIndexs), 
+        null === (_b = this.internalProps.emptyTip) || void 0 === _b || _b.resetVisible();
         const rowIndexs = [];
         for (let i = 0; i < recordIndexs.length; i++) rowIndexs.push(this.getBodyRowIndexByRecordIndex(recordIndexs[i]) + this.columnHeaderLevelCount);
         triggerEvent && this.fireListeners(TABLE_EVENT_TYPE.DELETE_RECORD, {
@@ -877,7 +1010,17 @@ export class ListTable extends BaseTable {
             records: deletedRecords,
             rowIndexs: rowIndexs,
             deletedCount: (Array.isArray(recordIndexs[0]), recordIndexs.length)
-        });
+        }), Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), 
+        this.options.customMergeCell.forEach((m => {
+            const r = null == m ? void 0 : m.range;
+            if (null == r ? void 0 : r.start) for (let col = r.start.col; col <= r.end.col; col++) for (let row = r.start.row; row <= r.end.row; row++) this.scenegraph.updateCellContent(col, row);
+        })), this.scenegraph.updateNextFrame(), setTimeout((() => {
+            if (!this.internalProps || !this.options || !this.scenegraph) return;
+            Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell));
+            [ ...prevMergeRanges, ...Array.isArray(this.options.customMergeCell) ? this.options.customMergeCell.map((m => null == m ? void 0 : m.range)) : [] ].filter(Boolean).forEach((r => {
+                if (null == r ? void 0 : r.start) for (let col = r.start.col; col <= r.end.col; col++) for (let row = r.start.row; row <= r.end.row; row++) this.scenegraph.updateCellContent(col, row);
+            })), this.scenegraph.updateNextFrame();
+        }), 0));
     }
     updateRecords(records, recordIndexs, triggerEvent = !0) {
         listTableUpdateRecords(records, recordIndexs, this), triggerEvent && this.fireListeners(TABLE_EVENT_TYPE.UPDATE_RECORD, {
@@ -981,7 +1124,12 @@ export class ListTable extends BaseTable {
             }
         }), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
         for (let i = startCol; i <= endCol; i++) for (let j = startRow; j <= endRow; j++) this.scenegraph.updateCellContent(i, j);
-        this.scenegraph.updateNextFrame();
+        this.scenegraph.updateNextFrame(), this.fireListeners(TABLE_EVENT_TYPE.MERGE_CELLS, {
+            startCol: startCol,
+            startRow: startRow,
+            endCol: endCol,
+            endRow: endRow
+        });
     }
     unmergeCells(startCol, startRow, endCol, endRow) {
         this.options.customMergeCell ? "function" == typeof this.options.customMergeCell && (this.options.customMergeCell = []) : this.options.customMergeCell = [], 
@@ -990,7 +1138,12 @@ export class ListTable extends BaseTable {
             return !(start.col === startCol && start.row === startRow && end.col === endCol && end.row === endRow);
         })), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
         for (let i = startCol; i <= endCol; i++) for (let j = startRow; j <= endRow; j++) this.scenegraph.updateCellContent(i, j);
-        this.scenegraph.updateNextFrame();
+        this.scenegraph.updateNextFrame(), this.fireListeners(TABLE_EVENT_TYPE.UNMERGE_CELLS, {
+            startCol: startCol,
+            startRow: startRow,
+            endCol: endCol,
+            endRow: endRow
+        });
     }
 }
 //# sourceMappingURL=ListTable.js.map