k-vtable 1.0.14 → 1.0.16

package/es/ListTable.d.ts

@@ -22,7 +22,8 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
         clearColWidthCache?: boolean;
     }): void;
     private _recreateSceneForStateChange;
-    addColumn(column: ColumnDefine): void;
+    addColumn(column: ColumnDefine, colIndex?: number, isMaintainArrayData?: boolean): void;
+    deleteColumn(colIndex: number): void;
     get columns(): ColumnsDefine;
     get header(): ColumnsDefine;
     set header(header: ColumnsDefine);
@@ -39,7 +40,10 @@ 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?: {
+        clearColWidthCache?: boolean;
+        clearRowHeightCache?: boolean;
+    }): Promise<unknown>;
     updatePagination(pagination: IPagination): void;
     refreshHeader(): void;
     refreshRowColCount(): void;
@@ -102,4 +106,6 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     release(): void;
     expandAllTreeNode(): void;
     collapseAllTreeNode(): void;
+    mergeCells(startCol: number, startRow: number, endCol: number, endRow: number): void;
+    unmergeCells(startCol: number, startRow: number, endCol: number, endRow: number): void;
 }

package/es/ListTable.js

@@ -38,6 +38,8 @@ import { fixUpdateRowRange } from "./tools/update-row";
 
 import { clearChartRenderQueue } from "./scenegraph/graphic/contributions/chart-render-helper";
 
+import { getCustomMergeCellFunc } from "./core/utils/get-custom-merge-cell-func";
+
 export class ListTable extends BaseTable {
     constructor(container, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -45,8 +47,10 @@ export class ListTable extends BaseTable {
         const internalProps = this.internalProps;
         if (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.multipleSort = !!options.multipleSort, internalProps.dataConfig = this.internalProps.groupBy ? getGroupByDataConfig(this.internalProps.groupBy, this.internalProps.customDealGroupData) : {}, 
-        internalProps.columns = options.columns ? cloneDeepSpec(options.columns, [ "children" ]) : options.header ? cloneDeepSpec(options.header, [ "children" ]) : [], 
+        internalProps.multipleSort = !!options.multipleSort, internalProps.dataConfig = this.internalProps.groupBy ? getGroupByDataConfig(this.internalProps.groupBy, options.addRecordRule, this.internalProps.customDealGroupData) : {
+            addRecordRule: options.addRecordRule,
+            customDealGroupData: this.internalProps.customDealGroupData
+        }, internalProps.columns = options.columns ? cloneDeepSpec(options.columns, [ "children" ]) : options.header ? cloneDeepSpec(options.header, [ "children" ]) : [], 
         generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_d = null !== (_c = options.enableTreeNodeMerge) && void 0 !== _c ? _c : isValid(this.internalProps.groupBy)) && void 0 !== _d && _d, 
         this.internalProps.headerHelper.setTableColumnsEditor(), this.showHeader = null === (_e = options.showHeader) || void 0 === _e || _e, 
         this.internalProps.columnWidthConfig = options.columnWidthConfig, this.transpose = null !== (_f = options.transpose) && void 0 !== _f && _f, 
@@ -118,9 +122,21 @@ export class ListTable extends BaseTable {
         this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), 
         this.renderAsync(), this.eventManager.updateEventBinder();
     }
-    addColumn(column) {
+    addColumn(column, colIndex, isMaintainArrayData = !0) {
         const columns = this.options.columns;
-        columns.push(column), this.updateColumns(columns);
+        if (void 0 === colIndex) columns.push(column); else {
+            if (isMaintainArrayData) for (let i = 0; i < columns.length; i++) "number" == typeof columns[i].field && columns[i].field >= colIndex && (columns[i].field = columns[i].field + 1);
+            columns.splice(colIndex, 0, column);
+        }
+        if (isMaintainArrayData) for (let i = 0; i < this.records.length; i++) {
+            const record = this.records[i];
+            Array.isArray(record) && record.splice(colIndex, 0, void 0);
+        }
+        this.updateColumns(columns);
+    }
+    deleteColumn(colIndex) {
+        const columns = this.options.columns;
+        columns.splice(colIndex, 1), this.updateColumns(columns);
     }
     get columns() {
         return this.internalProps.layoutMap.columnTree.getCopiedTree();
@@ -161,7 +177,7 @@ export class ListTable extends BaseTable {
                 table.internalProps.layoutMap.isAggregation(col, row) || (value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount));
             } else {
                 const define = table.getBodyColumnDefine(col, row), checkboxSeriesNumberStyle = table.getFieldData(define.field, col, row);
-                value = "string" == typeof checkboxSeriesNumberStyle ? checkboxSeriesNumberStyle : (null == checkboxSeriesNumberStyle ? void 0 : checkboxSeriesNumberStyle.text) ? null !== (_a = checkboxSeriesNumberStyle.text) && void 0 !== _a ? _a : "" : row - this.columnHeaderLevelCount + 1;
+                value = [ "number", "string" ].includes(typeof checkboxSeriesNumberStyle) ? checkboxSeriesNumberStyle : (null == checkboxSeriesNumberStyle ? void 0 : checkboxSeriesNumberStyle.text) ? null !== (_a = checkboxSeriesNumberStyle.text) && void 0 !== _a ? _a : "" : row - this.columnHeaderLevelCount + 1;
             }
             const {format: format} = table.internalProps.layoutMap.getSeriesNumberBody(col, row);
             return "function" == typeof format ? format(col, row, this, value) : value;
@@ -264,13 +280,18 @@ export class ListTable extends BaseTable {
         }
         return ifCan;
     }
-    updateOption(options) {
+    updateOption(options, updateConfig = {
+        clearColWidthCache: !0,
+        clearRowHeightCache: !0
+    }) {
         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, 
+        if (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, this.internalProps.customDealGroupData) : {}, 
-        this.showHeader = null === (_c = options.showHeader) || void 0 === _c || _c, internalProps.columns = options.columns ? cloneDeepSpec(options.columns, [ "children" ]) : options.header ? cloneDeepSpec(options.header, [ "children" ]) : [], 
+        internalProps.dataConfig = this.internalProps.groupBy ? getGroupByDataConfig(this.internalProps.groupBy, options.addRecordRule, this.internalProps.customDealGroupData) : {
+            addRecordRule: options.addRecordRule
+        }, this.showHeader = null === (_c = options.showHeader) || void 0 === _c || _c, 
+        internalProps.columns = options.columns ? cloneDeepSpec(options.columns, [ "children" ]) : options.header ? cloneDeepSpec(options.header, [ "children" ]) : [], 
         generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_e = null !== (_d = options.enableTreeNodeMerge) && void 0 !== _d ? _d : isValid(this.internalProps.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, 
@@ -290,7 +311,9 @@ export class ListTable extends BaseTable {
             const EmptyTip = Factory.getComponent("emptyTip");
             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 this.pluginManager.updatePlugins(options.plugins), setTimeout((() => {
+            this.fireListeners(TABLE_EVENT_TYPE.UPDATED, null);
+        }), 0), new Promise((resolve => {
             setTimeout(resolve, 0);
         }));
     }
@@ -322,7 +345,7 @@ export class ListTable extends BaseTable {
         table.rowCount = layoutMap.recordsCount * layoutMap.bodyRowSpanCount + layoutMap.headerLevelCount, 
         this.internalProps.frozenColCount = null !== (_o = this.options.frozenColCount) && void 0 !== _o ? _o : 0, 
         this.options.frozenColCount >= this.colCount && (this.internalProps.frozenColCount = 0), 
-        table.frozenRowCount = Math.max(layoutMap.headerLevelCount, null !== (_p = this.options.frozenRowCount) && void 0 !== _p ? _p : 0), 
+        table._setFrozenRowCount(Math.max(layoutMap.headerLevelCount, null !== (_p = this.options.frozenRowCount) && void 0 !== _p ? _p : 0)), 
         table.bottomFrozenRowCount !== (null !== (_q = this.options.bottomFrozenRowCount) && void 0 !== _q ? _q : 0) && (table.bottomFrozenRowCount = null !== (_r = this.options.bottomFrozenRowCount) && void 0 !== _r ? _r : 0), 
         table.rightFrozenColCount !== (null !== (_s = this.options.rightFrozenColCount) && void 0 !== _s ? _s : 0) && (table.rightFrozenColCount = null !== (_t = this.options.rightFrozenColCount) && void 0 !== _t ? _t : 0)), 
         this.stateManager.setFrozenCol(this.internalProps.frozenColCount);
@@ -738,5 +761,36 @@ export class ListTable extends BaseTable {
             }
         }));
     }
+    mergeCells(startCol, startRow, endCol, endRow) {
+        for (let i = startCol; i <= endCol; i++) for (let j = startRow; j <= endRow; j++) {
+            const cellRange = this.getCellRange(i, j);
+            if (cellRange.start.col !== cellRange.end.col || cellRange.start.row !== cellRange.end.row) return;
+        }
+        this.options.customMergeCell ? "function" == typeof this.options.customMergeCell && (this.options.customMergeCell = []) : this.options.customMergeCell = [], 
+        this.options.customMergeCell.push({
+            text: this.getCellValue(startCol, startRow),
+            range: {
+                start: {
+                    col: startCol,
+                    row: startRow
+                },
+                end: {
+                    col: endCol,
+                    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();
+    }
+    unmergeCells(startCol, startRow, endCol, endRow) {
+        this.options.customMergeCell ? "function" == typeof this.options.customMergeCell && (this.options.customMergeCell = []) : this.options.customMergeCell = [], 
+        this.options.customMergeCell = this.options.customMergeCell.filter((item => {
+            const {start: start, end: end} = item.range;
+            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();
+    }
 }
 //# sourceMappingURL=ListTable.js.map