@visactor/vtable-calendar 1.23.3 → 1.24.0

package/dist/vtable-calendar.js

@@ -34921,6 +34921,8 @@
       RESIZE_COLUMN_END: "resize_column_end",
       RESIZE_ROW: "resize_row",
       RESIZE_ROW_END: "resize_row_end",
+      MERGE_CELLS: "merge_cells",
+      UNMERGE_CELLS: "unmerge_cells",
       CHANGE_HEADER_POSITION_START: "change_header_position_start",
       CHANGE_HEADER_POSITION: "change_header_position",
       CHANGING_HEADER_POSITION: "changing_header_position",
@@ -37373,7 +37375,7 @@
       }
       clearFilteredChildren(record) {
         var _a, _b;
-        record.filteredChildren = void 0;
+        record.filteredChildren = void 0, delete record.filteredChildren;
         for (let i = 0; i < (null !== (_b = null === (_a = record.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0); i++) this.clearFilteredChildren(record.children[i]);
       }
       filterRecord(record) {
@@ -37476,8 +37478,9 @@
       fieldPromiseCallBack(_index, _field, _value) {}
       recordPromiseCallBack(_index, _record) {}
       canChangeOrder(sourceIndex, targetIndex) {
-        var _a;
+        var _a, _b;
         if (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.canChangeOrder) return this.dataSourceObj.canChangeOrder(sourceIndex, targetIndex);
+        if (null === (_b = this.lastSortStates) || void 0 === _b ? void 0 : _b.some(state => "asc" === state.order || "desc" === state.order)) return !1;
         if (this.hasHierarchyStateExpand) {
           let sourceIndexs = this.currentPagerIndexedData[sourceIndex],
             targetIndexs = this.currentPagerIndexedData[targetIndex];
@@ -41480,7 +41483,7 @@
     function updateCell$1(col, row, table, addNew, isShadow, forceFastUpdate) {
       var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
       const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0);
-      if ("cell" !== oldCellGroup.role && !addNew) return;
+      if ("cell" !== oldCellGroup.role && "shadow-cell" !== oldCellGroup.role && !addNew) return;
       const cellLocation = table.getCellLocation(col, row);
       let isMerge,
         range,
@@ -48930,7 +48933,7 @@
       }), scene.tableGroup.role = "table";
       const colHeaderGroup = createContainerGroup(0, 0, !scene.table.internalProps.enableTreeStickCell);
       colHeaderGroup.role = "col-header", scene.colHeaderGroup = colHeaderGroup;
-      const cornerHeaderGroup = createContainerGroup(0, 0, !scene.table.options.enableTreeStickCell);
+      const cornerHeaderGroup = createContainerGroup(0, 0, !scene.table.internalProps.enableTreeStickCell);
       cornerHeaderGroup.role = "corner-header", scene.cornerHeaderGroup = cornerHeaderGroup;
       const rowHeaderGroup = createContainerGroup(0, 0, !0);
       rowHeaderGroup.role = "row-header", scene.rowHeaderGroup = rowHeaderGroup;
@@ -51728,13 +51731,13 @@
       setSortState(sortState) {
         const state = this;
         const sort = (sortState = !sortState || Array.isArray(sortState) ? sortState : [sortState]) && sortState.reduce((prev, item) => {
-          var _a, _b, _c;
+          var _a, _b, _c, _d, _e;
           const column = null === (_a = function (columns) {
             const result = [];
             return function flatten(cols, parentStartIndex = 0) {
               cols.forEach(col => {
                 var _a;
-                const startIndex = col.startInTotal ? null !== (_a = col.startInTotal + state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _a ? _a : 0 : parentStartIndex;
+                const startIndex = col.startInTotal ? col.startInTotal + (null !== (_a = state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _a ? _a : 0) : parentStartIndex;
                 col.columns ? flatten(col.columns, startIndex) : result.push(Object.assign(Object.assign({}, col), {
                   startIndex: startIndex
                 }));
@@ -51744,12 +51747,12 @@
           return this.table.internalProps.transpose ? prev.push({
             field: item.field,
             order: item.order,
-            row: null !== (_b = (null == column ? void 0 : column.startInTotal) + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _b ? _b : 0,
+            row: (null !== (_b = null == column ? void 0 : column.startInTotal) && void 0 !== _b ? _b : 0) + (null !== (_c = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _c ? _c : 0),
             col: null == column ? void 0 : column.level
           }) : prev.push({
             field: item.field,
             order: item.order,
-            col: null !== (_c = (null == column ? void 0 : column.startInTotal) + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _c ? _c : 0,
+            col: (null !== (_d = null == column ? void 0 : column.startInTotal) && void 0 !== _d ? _d : 0) + (null !== (_e = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _e ? _e : 0),
             row: null == column ? void 0 : column.level
           }), prev;
         }, []);
@@ -52261,13 +52264,16 @@
         this.select.selectInline = selectInline;
       }
       updateSortState(sortState) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        sortState = Array.isArray(sortState) ? sortState : [sortState];
+        var _a, _b, _c, _d, _e, _f, _g;
+        const isSame = (sortState = Array.isArray(sortState) ? sortState : [sortState]).length === this.sort.length && sortState.every((item, index) => {
+          var _a, _b;
+          return (null == item ? void 0 : item.field) === (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.field) && (null == item ? void 0 : item.order) === (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.order);
+        });
+        if (isSame) return;
         for (let index = 0; index < sortState.length; index++) {
-          if (sortState[index].field === (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.field) && sortState[sortState.length - 1].order === (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.order)) return;
-          const oldSortCol = this.table.internalProps.multipleSort ? null : (null === (_c = this.sort[index]) || void 0 === _c ? void 0 : _c.col) || null,
-            oldSortRow = this.table.internalProps.multipleSort ? null : (null === (_d = this.sort[index]) || void 0 === _d ? void 0 : _d.row) || null;
-          "asc" === (null === (_e = this.sort[index]) || void 0 === _e ? void 0 : _e.order) || null === (_f = this.sort[index]) || void 0 === _f || _f.order;
+          const oldSortCol = this.table.internalProps.multipleSort ? null : (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.col) || null,
+            oldSortRow = this.table.internalProps.multipleSort ? null : (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.row) || null;
+          "asc" === (null === (_c = this.sort[index]) || void 0 === _c ? void 0 : _c.order) || null === (_d = this.sort[index]) || void 0 === _d || _d.order;
           this.setSortState(sortState.slice(0, index + 1));
           const cellAddress = this.table.internalProps.layoutMap.getHeaderCellAddressByField(sortState[index].field);
           this.sort[index].col = cellAddress.col, this.sort[index].row = cellAddress.row;
@@ -52280,7 +52286,7 @@
             order: this.sort[index].order,
             oldSortCol: oldSortCol,
             oldSortRow: oldSortRow,
-            oldIconMark: null === (_g = this.sort[index]) || void 0 === _g ? void 0 : _g.icon
+            oldIconMark: null === (_e = this.sort[index]) || void 0 === _e ? void 0 : _e.icon
           });
         }
         const normalHeaders = [];
@@ -52294,7 +52300,7 @@
             row: null,
             iconMark: null,
             order: null,
-            oldSortCol: null !== (_h = column.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _h ? _h : 0,
+            oldSortCol: (null !== (_f = column.startInTotal) && void 0 !== _f ? _f : 0) + (null !== (_g = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _g ? _g : 0),
             oldSortRow: column.level,
             oldIconMark: null
           });
@@ -56547,7 +56553,7 @@
       }
       constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
-        if (super(), this.showFrozenIcon = !0, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.23.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.24.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         this.pluginManager = new PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
           options: options,
           container: container
@@ -57485,12 +57491,15 @@
       dispose() {
         this.release();
       }
+      clearCorrectTimer() {
+        this._scrollToRowCorrectTimer && (clearTimeout(this._scrollToRowCorrectTimer), this._scrollToRowCorrectTimer = null);
+      }
       release() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
         null === (_c = null === (_b = null === (_a = this.scenegraph) || void 0 === _a ? void 0 : _a.component) || void 0 === _b ? void 0 : _b.vScrollBar) || void 0 === _c || _c.release(), null === (_f = null === (_e = null === (_d = this.scenegraph) || void 0 === _d ? void 0 : _d.component) || void 0 === _e ? void 0 : _e.hScrollBar) || void 0 === _f || _f.release(), this.animationManager.clear(), this.animationManager.ticker.release(), null === (_j = null === (_h = null === (_g = this.scenegraph) || void 0 === _g ? void 0 : _g.stage) || void 0 === _h ? void 0 : _h.ticker) || void 0 === _j || _j.release();
         const internalProps = this.internalProps;
         if (this.isReleased) return;
-        null === (_l = null === (_k = internalProps.tooltipHandler) || void 0 === _k ? void 0 : _k.release) || void 0 === _l || _l.call(_k), null === (_o = null === (_m = internalProps.menuHandler) || void 0 === _m ? void 0 : _m.release) || void 0 === _o || _o.call(_m), null === (_p = super.release) || void 0 === _p || _p.call(this), this.pluginManager.release(), null === (_r = null === (_q = internalProps.handler) || void 0 === _q ? void 0 : _q.release) || void 0 === _r || _r.call(_q), this.eventManager.release(), null === (_t = null === (_s = internalProps.focusControl) || void 0 === _s ? void 0 : _s.release) || void 0 === _t || _t.call(_s), null === (_u = internalProps.legends) || void 0 === _u || _u.forEach(legend => {
+        this.clearCorrectTimer(), null === (_l = null === (_k = internalProps.tooltipHandler) || void 0 === _k ? void 0 : _k.release) || void 0 === _l || _l.call(_k), null === (_o = null === (_m = internalProps.menuHandler) || void 0 === _m ? void 0 : _m.release) || void 0 === _o || _o.call(_m), null === (_p = super.release) || void 0 === _p || _p.call(this), this.pluginManager.release(), null === (_r = null === (_q = internalProps.handler) || void 0 === _q ? void 0 : _q.release) || void 0 === _r || _r.call(_q), this.eventManager.release(), null === (_t = null === (_s = internalProps.focusControl) || void 0 === _s ? void 0 : _s.release) || void 0 === _t || _t.call(_s), null === (_u = internalProps.legends) || void 0 === _u || _u.forEach(legend => {
           null == legend || legend.release();
         }), null === (_v = internalProps.title) || void 0 === _v || _v.release(), internalProps.title = null, null === (_w = internalProps.emptyTip) || void 0 === _w || _w.release(), internalProps.emptyTip = null, internalProps.layoutMap.release(), internalProps.releaseList && (internalProps.releaseList.forEach(releaseObj => {
           var _a;
@@ -57795,6 +57804,30 @@
           lastSelectRange = currentSelectRanges[currentSelectRanges.length - 1];
         lastSelectRange && (lastSelectRange.end.row = rowIndex), this.stateManager.updateSelectPos(this.colCount - 1, rowIndex, !1, isCtrl, !1, makeSelectCellVisible, !0), this.stateManager.select.selecting = !1;
       }
+      changeHeaderPosition(args) {
+        var _a, _b, _c, _d, _e;
+        if (!("canMoveHeaderPosition" in this.internalProps.layoutMap) || !0 === (null === (_a = this.options.customConfig) || void 0 === _a ? void 0 : _a.notUpdateInColumnRowMove)) return !1;
+        const prevMoving = this.stateManager.columnMove.movingColumnOrRow;
+        this.stateManager.columnMove.movingColumnOrRow = args.movingColumnOrRow;
+        try {
+          if (!1 === (null === (_c = (_b = this.internalProps.layoutMap).canMoveHeaderPosition) || void 0 === _c ? void 0 : _c.call(_b, args.source, args.target))) return !1;
+          const oldSourceMergeInfo = this.getCellRange(args.source.col, args.source.row),
+            oldTargetMergeInfo = this.getCellRange(args.target.col, args.target.row),
+            moveContext = this._moveHeaderPosition(args.source, args.target);
+          if (!moveContext || moveContext.targetIndex === moveContext.sourceIndex) return !1;
+          this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.layoutMap.clearCellRangeMap();
+          const sourceMergeInfo = this.getCellRange(args.source.col, args.source.row),
+            targetMergeInfo = this.getCellRange(args.target.col, args.target.row),
+            colMin = Math.min(sourceMergeInfo.start.col, targetMergeInfo.start.col, oldSourceMergeInfo.start.col, oldTargetMergeInfo.start.col),
+            colMax = Math.max(sourceMergeInfo.end.col, targetMergeInfo.end.col, oldSourceMergeInfo.end.col, oldTargetMergeInfo.end.col),
+            rowMin = Math.min(sourceMergeInfo.start.row, targetMergeInfo.start.row, oldSourceMergeInfo.start.row, oldTargetMergeInfo.start.row);
+          let rowMax = Math.max(sourceMergeInfo.end.row, targetMergeInfo.end.row, oldSourceMergeInfo.end.row, oldTargetMergeInfo.end.row);
+          if ("row" === moveContext.moveType && "tree" === this.internalProps.layoutMap.rowHierarchyType && (rowMax = moveContext.targetIndex > moveContext.sourceIndex ? rowMax + moveContext.targetSize - 1 : rowMax + moveContext.sourceSize - 1), this.transpose || !this.isSeriesNumberInBody(args.source.col, args.source.row) && "row" !== args.movingColumnOrRow || (this.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex), this.stateManager.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex)), "column" === moveContext.moveType) for (let col = colMin; col <= colMax; col++) this._clearColRangeWidthsMap(col);else for (let row = rowMin; row <= rowMax; row++) this._clearRowRangeHeightsMap(row);
+          return this.clearCellStyleCache(), this.isSeriesNumberInBody(args.source.col, args.source.row) || "row" === args.movingColumnOrRow ? this.scenegraph.updateHeaderPosition(this.scenegraph.proxy.colStart, this.scenegraph.proxy.colEnd, this.scenegraph.proxy.rowStart, this.scenegraph.proxy.rowEnd, moveContext.moveType) : "column" === moveContext.moveType ? this.scenegraph.updateHeaderPosition(colMin, colMax, 0, -1, moveContext.moveType) : this.scenegraph.updateHeaderPosition(0, -1, rowMin, rowMax, moveContext.moveType), "adjustFrozenCount" === this.internalProps.frozenColDragHeaderMode && this.isListTable() && (this.isLeftFrozenColumn(args.target.col) && !this.isLeftFrozenColumn(args.source.col) ? this.frozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isLeftFrozenColumn(args.source.col) && !this.isLeftFrozenColumn(args.target.col) && (this.frozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1), this.isRightFrozenColumn(args.target.col) && !this.isRightFrozenColumn(args.source.col) ? this.rightFrozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isRightFrozenColumn(args.source.col) && !this.isRightFrozenColumn(args.target.col) && (this.rightFrozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1)), null === (_e = (_d = this.scenegraph).updateNextFrame) || void 0 === _e || _e.call(_d), !0;
+        } finally {
+          this.stateManager.columnMove.movingColumnOrRow = prevMoving;
+        }
+      }
       get recordsCount() {
         var _a;
         return null === (_a = this.records) || void 0 === _a ? void 0 : _a.length;
@@ -57940,7 +57973,7 @@
       getCustomMerge(col, row) {
         if (this.internalProps.customMergeCell) {
           const customMerge = this.internalProps.customMergeCell(col, row, this);
-          if (customMerge && customMerge.range && (isValid$1(customMerge.text) || customMerge.customLayout || this.customRender)) {
+          if (customMerge && customMerge.range) {
             if (customMerge.style) {
               const styleClass = this.internalProps.bodyHelper.getStyleClass("text"),
                 style = customMerge.style,
@@ -58651,12 +58684,34 @@
         this.eventManager.enableScroll();
       }
       getGroupTitleLevel(col, row) {}
+      getTargetScrollTop(row) {
+        const drawRange = this.getDrawRange(),
+          frozenHeight = this.getFrozenRowsHeight();
+        return Math.max(0, Math.min(this.getRowsHeight(0, row - 1) - frozenHeight, this.getAllRowsHeight() - drawRange.height));
+      }
+      _scheduleScrollToRowCorrect(row, delay = 0) {
+        this._scrollToRowCorrectTimer = setTimeout(() => {
+          this.clearCorrectTimer();
+          const targetScrollTop = this.getTargetScrollTop(row);
+          if (targetScrollTop !== this.scrollTop) {
+            this.scrollTop = targetScrollTop;
+            const correctedTargetScrollTop = this.getTargetScrollTop(row);
+            correctedTargetScrollTop !== this.scrollTop && (this.scrollTop = correctedTargetScrollTop);
+          }
+        }, delay);
+      }
       scrollToRow(row, animationOption) {
-        animationOption ? this.animationManager.scrollTo({
-          row: row
-        }, animationOption) : this.scrollToCell({
-          row: row
-        });
+        var _a;
+        const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+        if (this.clearCorrectTimer(), !animationOption) return this.scrollToCell({
+          row: targetRow
+        }), void this._scheduleScrollToRowCorrect(targetRow);
+        const duration = isBoolean$2(animationOption) ? 3e3 : null !== (_a = null == animationOption ? void 0 : animationOption.duration) && void 0 !== _a ? _a : 3e3;
+        this.animationManager.scrollTo({
+          row: targetRow
+        }, animationOption), this._scrollToRowCorrectTimer = setTimeout(() => {
+          this.scrollToRow(targetRow, !1);
+        }, duration);
       }
       scrollToCol(col, animationOption) {
         animationOption ? this.animationManager.scrollTo({
@@ -58675,8 +58730,8 @@
         }
         if (isValid$1(cellAddr.row) && cellAddr.row >= this.frozenRowCount) {
           const frozenHeight = this.getFrozenRowsHeight(),
-            top = this.getRowsHeight(0, cellAddr.row - 1);
-          this.scrollTop = Math.min(top - frozenHeight, this.getAllRowsHeight() - drawRange.height);
+            top = this.rowHeightsMap.getSumInRange(0, cellAddr.row - 1);
+          this.scrollTop = Math.min(top - frozenHeight, this.rowHeightsMap.getSumInRange(0, this.rowCount - 1) - drawRange.height);
         }
         this.render();
       }
@@ -59288,9 +59343,24 @@
       return layout._cellRangeMap.set(`$${col}$${row}`, cellRange), cellRange;
     }
     function getTreeTitleMerge(col, row, cellRange, layout) {
+      var _a;
       if ("tree" !== layout.rowHierarchyType) return;
-      const cellRecord = layout._table.getCellRawRecord(col, row);
-      layout._table.internalProps.groupTitleCheckbox && layout._table.internalProps.rowSeriesNumber ? (null == cellRecord ? void 0 : cellRecord.vtableMerge) && col >= layout.leftRowSeriesNumberColumnCount && (cellRange.start.col = layout.rowHeaderLevelCount + layout.leftRowSeriesNumberColumnCount, cellRange.end.col = layout.colCount - 1, cellRange.start.row = cellRange.end.row = row) : (null == cellRecord ? void 0 : cellRecord.vtableMerge) && (cellRange.start.col = layout.rowHeaderLevelCount, cellRange.end.col = layout.colCount - 1, cellRange.start.row = cellRange.end.row = row);
+      const table = layout._table,
+        internalProps = table.internalProps || {},
+        isGroupMode = !!internalProps.groupBy,
+        cellRecord = table.getCellRawRecord(col, row);
+      if (!(null == cellRecord ? void 0 : cellRecord.vtableMerge)) return;
+      const treeTitleStartCol = internalProps.groupTitleCheckbox && internalProps.rowSeriesNumber ? layout.rowHeaderLevelCount + layout.leftRowSeriesNumberColumnCount : layout.rowHeaderLevelCount;
+      if (!(col < treeTitleStartCol) && (cellRange.start.col = treeTitleStartCol, cellRange.end.col = layout.colCount - 1, cellRange.start.row = cellRange.end.row = row, isGroupMode && 1 === (null === (_a = layout.columnObjects) || void 0 === _a ? void 0 : _a.length))) {
+        const onlyColumn = layout.columnObjects[0],
+          field = null == onlyColumn ? void 0 : onlyColumn.field;
+        if (null != field) {
+          let text = cellRecord.vtableMergeName;
+          const groupTitleFieldFormat = internalProps.groupTitleFieldFormat;
+          "function" == typeof groupTitleFieldFormat && (text = groupTitleFieldFormat(cellRecord, col, row, table));
+          null == cellRecord[field] && null != text && (cellRecord[field] = text);
+        }
+      }
     }
     function getCellRangeTranspose(col, row, layout) {
       var _a, _b, _c, _d;
@@ -60207,7 +60277,7 @@
         this.listenersId.push(doubleClickEventId, clickEventId, selectedChangedEventId);
       }
       startEditCell(col, row, value, editElement) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (this.editingEditor) return;
         const editor = this.table.getEditor(col, row);
         if (editor) {
@@ -60223,7 +60293,8 @@
             col: col,
             row: row
           }), this.table._makeVisibleCell(col, row), this.editingEditor = editor;
-          const dataValue = isValid$1(value) ? value : this.table.getCellOriginValue(col, row),
+          const customMergeText = null === (_j = this.table.getCustomMerge(col, row)) || void 0 === _j ? void 0 : _j.text,
+            dataValue = isValid$1(value) ? value : isValid$1(customMergeText) ? customMergeText : this.table.getCellOriginValue(col, row),
             rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row)),
             referencePosition = {
               rect: {
@@ -60233,9 +60304,9 @@
                 height: rect.height
               }
             };
-          col === this.table.colCount - 1 ? referencePosition.rect.width = rect.width - 1 : referencePosition.rect.width = rect.width + 1, row === this.table.rowCount - 1 ? referencePosition.rect.height = rect.height - 1 : referencePosition.rect.height = rect.height + 1, editor.beginEditing, null === (_j = editor.beginEditing) || void 0 === _j || _j.call(editor, this.table.getElement(), referencePosition, dataValue), editor.bindSuccessCallback, null === (_k = editor.bindSuccessCallback) || void 0 === _k || _k.call(editor, () => {
+          col === this.table.colCount - 1 ? referencePosition.rect.width = rect.width - 1 : referencePosition.rect.width = rect.width + 1, row === this.table.rowCount - 1 ? referencePosition.rect.height = rect.height - 1 : referencePosition.rect.height = rect.height + 1, editor.beginEditing, null === (_k = editor.beginEditing) || void 0 === _k || _k.call(editor, this.table.getElement(), referencePosition, dataValue), editor.bindSuccessCallback, null === (_l = editor.bindSuccessCallback) || void 0 === _l || _l.call(editor, () => {
             this.completeEdit();
-          }), null === (_l = editor.onStart) || void 0 === _l || _l.call(editor, {
+          }), null === (_m = editor.onStart) || void 0 === _m || _m.call(editor, {
             value: dataValue,
             endEdit: () => {
               this.completeEdit();
@@ -60249,7 +60320,7 @@
         }
       }
       completeEdit(e) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.editingEditor) return !0;
         if (this.isValidatingValue) return !1;
         this.cacheLastSelectedCellEditor = {};
@@ -60263,9 +60334,10 @@
         if (this.editingEditor.getValue, this.editingEditor.validateValue) {
           this.isValidatingValue = !0;
           const newValue = this.editingEditor.getValue(),
-            oldValue = this.table.getCellOriginValue(this.editCell.col, this.editCell.row),
+            customMergeText = null === (_a = this.table.getCustomMerge(this.editCell.col, this.editCell.row)) || void 0 === _a ? void 0 : _a.text,
+            oldValue = isValid$1(customMergeText) ? customMergeText : this.table.getCellOriginValue(this.editCell.col, this.editCell.row),
             target = null == e ? void 0 : e.target,
-            maybePromiseOrValue = null === (_b = (_a = this.editingEditor).validateValue) || void 0 === _b ? void 0 : _b.call(_a, newValue, oldValue, this.editCell, this.table, !!this.table.getElement().contains(target));
+            maybePromiseOrValue = null === (_c = (_b = this.editingEditor).validateValue) || void 0 === _c ? void 0 : _c.call(_b, newValue, oldValue, this.editCell, this.table, !!this.table.getElement().contains(target));
           return isPromise(maybePromiseOrValue) ? (this.isValidatingValue = !0, new Promise((resolve, reject) => {
             maybePromiseOrValue.then(result => {
               dealWithValidateValue(result, this, oldValue, resolve);
@@ -60279,14 +60351,17 @@
       doExit() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const changedValue = null === (_b = (_a = this.editingEditor).getValue) || void 0 === _b ? void 0 : _b.call(_a),
-          range = this.table.getCellRange(this.editCell.col, this.editCell.row),
-          changedValues = [];
-        for (let row = range.start.row; row <= range.end.row; row++) {
-          const rowChangedValues = [];
-          for (let col = range.start.col; col <= range.end.col; col++) rowChangedValues.push(changedValue);
-          changedValues.push(rowChangedValues);
+          range = this.table.getCellRange(this.editCell.col, this.editCell.row);
+        if (null === (_d = (_c = this.editingEditor).beforeEnd) || void 0 === _d || _d.call(_c), range.isCustom) this.table.changeCellValue(range.start.col, range.start.row, changedValue);else {
+          const changedValues = [];
+          for (let row = range.start.row; row <= range.end.row; row++) {
+            const rowChangedValues = [];
+            for (let col = range.start.col; col <= range.end.col; col++) rowChangedValues.push(changedValue);
+            changedValues.push(rowChangedValues);
+          }
+          this.table.changeCellValues(range.start.col, range.start.row, changedValues);
         }
-        null === (_d = (_c = this.editingEditor).beforeEnd) || void 0 === _d || _d.call(_c), this.table.changeCellValues(range.start.col, range.start.row, changedValues), this.editingEditor.exit, null === (_f = (_e = this.editingEditor).exit) || void 0 === _f || _f.call(_e), null === (_h = (_g = this.editingEditor).onEnd) || void 0 === _h || _h.call(_g), this.editingEditor = null, this.isValidatingValue = !1, this.beginTriggerEditCellMode = null;
+        this.editingEditor.exit, null === (_f = (_e = this.editingEditor).exit) || void 0 === _f || _f.call(_e), null === (_h = (_g = this.editingEditor).onEnd) || void 0 === _h || _h.call(_g), this.editingEditor = null, this.isValidatingValue = !1, this.beginTriggerEditCellMode = null;
       }
       cancelEdit() {
         var _a, _b, _c, _d;
@@ -60346,7 +60421,18 @@
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
     };
+    function refreshCustomMergeCellGroups(table) {
+      var _a;
+      if (!Array.isArray(table.options.customMergeCell)) return;
+      table.internalProps.customMergeCell = getCustomMergeCellFunc(table.options.customMergeCell);
+      const merges = table.options.customMergeCell;
+      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) for (let col = r.start.col; col <= r.end.col; col++) for (let row = r.start.row; row <= r.end.row; row++) table.scenegraph.updateCellContent(col, row);
+      }
+    }
     function listTableChangeCellValue(col, row, value, workOnEditableCell, triggerEvent, table, noTriggerChangeCellValuesEvent) {
+      var _a, _b;
       if (workOnEditableCell && table.isHasEditorDefine(col, row) || !1 === workOnEditableCell) {
         const recordShowIndex = table.getRecordShowIndexByCell(col, row),
           recordIndex = recordShowIndex >= 0 ? table.dataSource.getIndexKey(recordShowIndex) : void 0,
@@ -60356,8 +60442,12 @@
           beforeChangeValue = table.getCellRawValue(col, row),
           oldValue = table.getCellOriginValue(col, row);
         table.isHeader(col, row) ? table.internalProps.layoutMap.updateColumnTitle(col, row, value) : table.dataSource.changeFieldValue(value, recordShowIndex, field, col, row, table);
-        const range = table.getCellRange(col, row),
-          aggregators = table.internalProps.layoutMap.getAggregatorsByCell(col, row);
+        const range = table.getCellRange(col, row);
+        if (range.isCustom && range.start.col === col && range.start.row === row && Array.isArray(table.options.customMergeCell) && "function" == typeof table.getCellValue) {
+          const customMerge = null === (_b = null === (_a = table.internalProps) || void 0 === _a ? void 0 : _a.customMergeCell) || void 0 === _b ? void 0 : _b.call(_a, col, row, table);
+          customMerge && (customMerge.text = value);
+        }
+        const aggregators = table.internalProps.layoutMap.getAggregatorsByCell(col, row);
         if (aggregators) {
           if (Array.isArray(aggregators)) for (let i = 0; i < (null == aggregators ? void 0 : aggregators.length); i++) aggregators[i].recalculate();else aggregators.recalculate();
           const aggregatorCells = table.internalProps.layoutMap.getAggregatorCellAddress(range.start.col, range.start.row, range.end.col, range.end.row);
@@ -60580,7 +60670,13 @@
           (void 0 === recordIndex || recordIndex > table.dataSource.sourceLength) && (recordIndex = table.dataSource.sourceLength);
           const headerCount = table.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount,
             syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords);
-          if (table.dataSource.addRecord(record, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, 1), syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
+          if (table.dataSource.addRecord(record, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, 1), syncToOriginalRecords) {
+            if (!table.transpose) {
+              const insertRowIndex = recordIndex + headerCount + table.internalProps.layoutMap.hasAggregationOnTopCount;
+              table.rowHeightsMap.insert(insertRowIndex);
+            }
+            return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(!0), !0;
+          }
           const oldRowCount = table.rowCount;
           if (table.refreshRowColCount(), 0 === table.scenegraph.proxy.totalActualBodyRowCount) return table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
           const newRowCount = table.transpose ? table.colCount : table.rowCount;
@@ -60658,7 +60754,13 @@
           void 0 === recordIndex || recordIndex > table.dataSource.sourceLength ? recordIndex = table.dataSource.sourceLength : recordIndex < 0 && (recordIndex = 0);
           const headerCount = table.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount,
             syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords);
-          if (table.dataSource.addRecords(records, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, records.length), syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
+          if (table.dataSource.addRecords(records, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, records.length), syncToOriginalRecords) {
+            if (!table.transpose) {
+              const insertRowIndex = recordIndex + headerCount + table.internalProps.layoutMap.hasAggregationOnTopCount;
+              for (let i = 0; i < records.length; i++) table.rowHeightsMap.insert(insertRowIndex);
+            }
+            return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(!0), !0;
+          }
           const oldRowCount = table.transpose ? table.colCount : table.rowCount;
           if (table.refreshRowColCount(), 0 === table.scenegraph.proxy.totalActualBodyRowCount) return table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
           const newRowCount = table.transpose ? table.colCount : table.rowCount;
@@ -60727,7 +60829,7 @@
       }
     }
     function listTableDeleteRecords(recordIndexs, table) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
       if ((null == recordIndexs ? void 0 : recordIndexs.length) > 0) if (table.internalProps.groupBy) null === (_b = (_a = table.dataSource).deleteRecordsForGroup) || void 0 === _b || _b.call(_a, recordIndexs), table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.sortState && sortRecords(table), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph();else if ("tree" === table.dataSource.rowHierarchyType) {
         const deletedRecordIndexs = null === (_d = (_c = table.dataSource).deleteRecordsForTree) || void 0 === _d ? void 0 : _d.call(_c, recordIndexs);
         if (0 === deletedRecordIndexs.length) return;
@@ -60739,8 +60841,17 @@
         const syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords),
           deletedRecordIndexs = table.dataSource.deleteRecords(recordIndexs, syncToOriginalRecords);
         if (0 === deletedRecordIndexs.length) return;
+        Array.isArray(table.options.customMergeCell) && (table.internalProps.customMergeCell = getCustomMergeCellFunc(table.options.customMergeCell));
         for (let index = 0; index < deletedRecordIndexs.length; index++) adjustCheckBoxStateMapWithDeleteRecordIndex(table, deletedRecordIndexs[index], 1);
-        if (syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph();
+        if (syncToOriginalRecords) {
+          if (!table.transpose) {
+            const headerCount = table.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount,
+              topAggregationCount = table.internalProps.layoutMap.hasAggregationOnTopCount,
+              sorted = [...deletedRecordIndexs].sort((a, b) => b - a);
+            for (let i = 0; i < sorted.length; i++) table.rowHeightsMap.delete(sorted[i] + headerCount + topAggregationCount);
+          }
+          return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph(!0);
+        }
         const oldRowCount = table.transpose ? table.colCount : table.rowCount;
         table.refreshRowColCount();
         const newRowCount = table.transpose ? table.colCount : table.rowCount,
@@ -60778,7 +60889,7 @@
               col: 0,
               row: row
             });
-            null === (_g = table.reactCustomLayout) || void 0 === _g || _g.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_h = table.reactCustomLayout) || void 0 === _h || _h.updateAllCustomCell();
+            null === (_g = table.reactCustomLayout) || void 0 === _g || _g.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_h = table.reactCustomLayout) || void 0 === _h || _h.updateAllCustomCell(), refreshCustomMergeCellGroups(table);
           }
         } else {
           const delRows = [],
@@ -60796,6 +60907,42 @@
             });
           }
           const updateRows = [];
+          if (table.internalProps.customMergeCell) {
+            const proxy = table.scenegraph.proxy,
+              deletedIndexNums = (recordIndexsMinToMax[0], recordIndexsMinToMax.map(recordIndex => recordIndex + headerCount + topAggregationCount)),
+              minIndexNum = deletedIndexNums[0];
+            let updateMin = minIndexNum,
+              updateMax = minIndexNum;
+            if (Array.isArray(table.options.customMergeCell)) {
+              const merges = table.options.customMergeCell,
+                axis = table.transpose ? "col" : "row";
+              merges.forEach(m => {
+                const r = null == m ? void 0 : m.range;
+                if ((null == r ? void 0 : r.start) && (null == r ? void 0 : r.end)) for (let i = 0; i < deletedIndexNums.length; i++) {
+                  const deleteIndex = deletedIndexNums[i];
+                  if (r.end[axis] >= deleteIndex - 1) {
+                    updateMin = Math.min(updateMin, r.start[axis]), updateMax = Math.max(updateMax, r.end[axis]);
+                    break;
+                  }
+                }
+              });
+            }
+            if (table.transpose) {
+              const start = Math.max(updateMin, null !== (_j = null == proxy ? void 0 : proxy.colStart) && void 0 !== _j ? _j : updateMin),
+                end = Math.min(updateMax, null !== (_k = null == proxy ? void 0 : proxy.colEnd) && void 0 !== _k ? _k : updateMax);
+              for (let col = start; col <= end; col++) updateRows.push({
+                col: col,
+                row: 0
+              });
+            } else {
+              const start = Math.max(updateMin, null !== (_l = null == proxy ? void 0 : proxy.rowStart) && void 0 !== _l ? _l : updateMin),
+                end = Math.min(updateMax, null !== (_m = null == proxy ? void 0 : proxy.rowEnd) && void 0 !== _m ? _m : updateMax);
+              for (let row = start; row <= end; row++) updateRows.push({
+                col: 0,
+                row: row
+              });
+            }
+          }
           for (let row = headerCount; row < headerCount + topAggregationCount; row++) table.transpose ? updateRows.push({
             col: row,
             row: 0
@@ -60810,7 +60957,7 @@
             col: 0,
             row: row
           });
-          null === (_j = table.reactCustomLayout) || void 0 === _j || _j.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_k = table.reactCustomLayout) || void 0 === _k || _k.updateAllCustomCell();
+          null === (_o = table.reactCustomLayout) || void 0 === _o || _o.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_p = table.reactCustomLayout) || void 0 === _p || _p.updateAllCustomCell(), refreshCustomMergeCellGroups(table);
         }
       }
     }
@@ -60822,7 +60969,7 @@
         const syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords),
           updateRecordIndexs = table.dataSource.updateRecords(records, recordIndexs, syncToOriginalRecords);
         if (0 === updateRecordIndexs.length) return;
-        if (syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph();
+        if (syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph(!0);
         const recordIndexsMinToMax = updateRecordIndexs.map(index => table.getBodyRowIndexByRecordIndex(index)).sort((a, b) => a - b);
         if (table.pagination) {
           const {
@@ -61145,10 +61292,33 @@
         this._hasAutoImageColumn = void 0, this.refreshHeader(), this.records && checkHasAggregationOnColumnDefine(this.internalProps.columns) && this.dataSource.processRecords(null !== (_b = null === (_a = this.dataSource.dataSourceObj) || void 0 === _a ? void 0 : _a.records) && void 0 !== _b ? _b : this.dataSource.dataSourceObj), this.internalProps.useOneRowHeightFillAll = !1, this.headerStyleCache = new Map(), this.bodyStyleCache = new Map(), this.bodyBottomStyleCache = new Map(), this._updateSize(), this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), 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]), this.internalProps._widthResizedColMap.add(resizedColIndexs[i] + toAddColumns.length));
@@ -61161,15 +61331,46 @@
         }
         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++) {
           const record = this.records[j];
           Array.isArray(record) && record.splice(deleteColIndexs[i], 1);
@@ -61185,7 +61386,9 @@
           clearRowHeightCache: !1
         }), this.fireListeners(TABLE_EVENT_TYPE.DELETE_COLUMN, {
           deleteColIndexs: deleteColIndexs,
-          columns: columns
+          columns: columns,
+          deletedColumns: deletedColumns,
+          deletedRecordValues: deletedRecordValues
         });
       }
       get columns() {
@@ -61573,9 +61776,9 @@
         }
       }
       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 {
@@ -61583,13 +61786,20 @@
             order: item.order,
             orderFn: null != sortFunc ? sortFunc : defaultOrderFn
           };
-        })), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, this.scenegraph.sortCell()), sortState.length && this.stateManager.updateSortState(sortState);
+        })), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, 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.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(), this.resize();
+        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(), this.resize();
       }
       getFilteredRecords() {
         return this.dataSource.records;
@@ -61864,30 +62074,112 @@
         traverseColumns(this.internalProps.columns), this.refreshRowColCount(), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, this.stateManager.initCheckedState(this.records), this.scenegraph.createSceneGraph(!clearRowHeightCache), null === (_k = this.internalProps.emptyTip) || void 0 === _k || _k.resetVisible(), 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, {
+        "number" == typeof recordIndex && adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, records), 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, {
@@ -61895,7 +62187,16 @@
           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, {
@@ -61999,7 +62300,12 @@
           }
         }), 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 = [], this.options.customMergeCell = this.options.customMergeCell.filter(item => {
@@ -62010,7 +62316,12 @@
           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
+        });
       }
     }