@visactor/vtable 1.23.3 → 1.24.0-alpha.0

package/dist/vtable.js

@@ -1307,13 +1307,13 @@
     const isDate = value => isType$1(value, "Date");
     var isDate$1 = isDate;
 
-    const isNumber$1 = (value, fuzzy = !1) => {
+    const isNumber$2 = (value, fuzzy = !1) => {
       const type = typeof value;
       return fuzzy ? "number" === type : "number" === type || isType$1(value, "Number");
     };
-    var isNumber$2 = isNumber$1;
+    var isNumber$3 = isNumber$2;
 
-    const isValidNumber = value => isNumber$2(value) && Number.isFinite(value);
+    const isValidNumber = value => isNumber$3(value) && Number.isFinite(value);
     var isValidNumber$1 = isValidNumber;
 
     const isValidUrl = value => new RegExp(/^(http(s)?:\/\/)\w+[^\s]+(\.[^\s]+){1,}$/).test(value);
@@ -1359,7 +1359,7 @@
       if (!isValid$1(value) || "object" != typeof value || ignoreWhen && ignoreWhen(value)) return value;
       const isArr = isArray$5(value),
         length = value.length;
-      result = isArr ? new Array(length) : "object" == typeof value ? {} : isBoolean$2(value) || isNumber$2(value) || isString$2(value) ? value : isDate$1(value) ? new Date(+value) : void 0;
+      result = isArr ? new Array(length) : "object" == typeof value ? {} : isBoolean$2(value) || isNumber$3(value) || isString$2(value) ? value : isDate$1(value) ? new Date(+value) : void 0;
       const props = isArr ? void 0 : Object.keys(Object(value));
       let index = -1;
       if (result) for (; ++index < (props || value).length;) {
@@ -1556,7 +1556,7 @@
     }(LoggerLevel || (LoggerLevel = {}));
     class Logger {
       static getInstance(level, method) {
-        return Logger._instance && isNumber$2(level) ? Logger._instance.level(level) : Logger._instance || (Logger._instance = new Logger(level, method)), Logger._instance;
+        return Logger._instance && isNumber$3(level) ? Logger._instance.level(level) : Logger._instance || (Logger._instance = new Logger(level, method)), Logger._instance;
       }
       static setInstance(logger) {
         return Logger._instance = logger;
@@ -1804,10 +1804,10 @@
         return this.x = x, this.y = y, this;
       }
       add(point) {
-        return isNumber$2(point) ? (this.x += point, void (this.y += point)) : (this.x += point.x, this.y += point.y, this);
+        return isNumber$3(point) ? (this.x += point, void (this.y += point)) : (this.x += point.x, this.y += point.y, this);
       }
       sub(point) {
-        return isNumber$2(point) ? (this.x -= point, void (this.y -= point)) : (this.x -= point.x, this.y -= point.y, this);
+        return isNumber$3(point) ? (this.x -= point, void (this.y -= point)) : (this.x -= point.x, this.y -= point.y, this);
       }
       multi(point) {
         throw new Error("暂不支持");
@@ -2814,10 +2814,10 @@
       return ((value = Math.max(0, Math.min(255, Math.round(value) || 0))) < 16 ? "0" : "") + value.toString(16);
     }
     function rgb(value) {
-      return isNumber$2(value) ? new RGB(value >> 16, value >> 8 & 255, 255 & value, 1) : isArray$5(value) ? new RGB(value[0], value[1], value[2]) : new RGB(255, 255, 255);
+      return isNumber$3(value) ? new RGB(value >> 16, value >> 8 & 255, 255 & value, 1) : isArray$5(value) ? new RGB(value[0], value[1], value[2]) : new RGB(255, 255, 255);
     }
     function rgba(value) {
-      return isNumber$2(value) ? new RGB(value >>> 24, value >>> 16 & 255, value >>> 8 & 255, 255 & value) : isArray$5(value) ? new RGB(value[0], value[1], value[2], value[3]) : new RGB(255, 255, 255, 1);
+      return isNumber$3(value) ? new RGB(value >>> 24, value >>> 16 & 255, value >>> 8 & 255, 255 & value) : isArray$5(value) ? new RGB(value[0], value[1], value[2], value[3]) : new RGB(255, 255, 255, 1);
     }
     function SRGBToLinear(c) {
       return c < .04045 ? .0773993808 * c : Math.pow(.9478672986 * c + .0521327014, 2.4);
@@ -5631,6 +5631,9 @@
     function isNotAroundZero(val) {
       return val > EPSILON || val < -EPSILON;
     }
+    function isNumber$1(data) {
+      return "number" == typeof data && Number.isFinite(data);
+    }
     const _v0 = [0, 0],
       _v1 = [0, 0],
       _v2 = [0, 0];
@@ -7633,13 +7636,13 @@
 
     class BaseSymbol {
       bounds(size, bounds) {
-        if (isNumber$2(size)) {
+        if (isNumber$3(size)) {
           const halfS = size / 2;
           bounds.x1 = -halfS, bounds.x2 = halfS, bounds.y1 = -halfS, bounds.y2 = halfS;
         } else bounds.x1 = -size[0] / 2, bounds.x2 = size[0] / 2, bounds.y1 = -size[1] / 2, bounds.y2 = size[1] / 2;
       }
       parseSize(size) {
-        return isNumber$2(size) ? size : Math.min(size[0], size[1]);
+        return isNumber$3(size) ? size : Math.min(size[0], size[1]);
       }
     }
 
@@ -8055,10 +8058,10 @@
         super(...arguments), this.type = "rect", this.pathStr = "M -0.5,0.25 L 0.5,0.25 L 0.5,-0.25,L -0.5,-0.25 Z";
       }
       draw(ctx, size, x, y) {
-        return isNumber$2(size) ? rectSize(ctx, size, x, y) : rectSizeArray(ctx, size, x, y);
+        return isNumber$3(size) ? rectSize(ctx, size, x, y) : rectSizeArray(ctx, size, x, y);
       }
       drawWithClipRange(ctx, size, x, y, clipRange, z, cb) {
-        isNumber$2(size) && (size = [size, size / 2]);
+        isNumber$3(size) && (size = [size, size / 2]);
         const drawLength = 2 * (size[0] + size[1]) * clipRange,
           points = [{
             x: x + size[0] / 2,
@@ -8090,7 +8093,7 @@
         return !1;
       }
       drawOffset(ctx, size, x, y, offset) {
-        return isNumber$2(size) ? rectSize(ctx, size + 2 * offset, x, y) : rectSizeArray(ctx, [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
+        return isNumber$3(size) ? rectSize(ctx, size + 2 * offset, x, y) : rectSizeArray(ctx, [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
       }
     }
     var rect = new RectSymbol();
@@ -8109,7 +8112,7 @@
         return size = this.parseSize(size), this.drawOffset(ctx, size, x, y, 0, z, cb);
       }
       parseSize(size) {
-        return isNumber$2(size) ? size : Math.min(size[0], size[1]);
+        return isNumber$3(size) ? size : Math.min(size[0], size[1]);
       }
       drawWithClipRange(ctx, size, x, y, clipRange, z, cb) {
         return size = this.parseSize(size), this.isSvg ? !!this.svgCache && (this.svgCache.forEach(item => {
@@ -8921,10 +8924,10 @@
     ColorStore.store255 = {}, ColorStore.store1 = {};
 
     function colorArrayToString(color, alphaChannel = !1) {
-      return Array.isArray(color) && isNumber$2(color[0]) ? alphaChannel ? `rgb(${Math.round(color[0])},${Math.round(color[1])},${Math.round(color[2])},${color[3].toFixed(2)})` : `rgb(${Math.round(color[0])},${Math.round(color[1])},${Math.round(color[2])})` : color;
+      return Array.isArray(color) && isNumber$3(color[0]) ? alphaChannel ? `rgb(${Math.round(color[0])},${Math.round(color[1])},${Math.round(color[2])},${color[3].toFixed(2)})` : `rgb(${Math.round(color[0])},${Math.round(color[1])},${Math.round(color[2])})` : color;
     }
     function interpolateColor(from, to, ratio, alphaChannel, cb) {
-      if (Array.isArray(from) && !isNumber$2(from[0]) || Array.isArray(to) && !isNumber$2(to[0])) {
+      if (Array.isArray(from) && !isNumber$3(from[0]) || Array.isArray(to) && !isNumber$3(to[0])) {
         return new Array(4).fill(0).map((_, index) => {
           var _a, _b;
           return _interpolateColor(isArray$5(from) ? null !== (_a = from[index]) && void 0 !== _a ? _a : from[0] : from, isArray$5(to) ? null !== (_b = to[index]) && void 0 !== _b ? _b : to[0] : to, ratio, alphaChannel);
@@ -10533,12 +10536,12 @@
           textBaseline: textBaseline
         } = attribute;
         if (null != attribute.forceBoundsHeight) {
-          const h = isNumber$2(attribute.forceBoundsHeight) ? attribute.forceBoundsHeight : attribute.forceBoundsHeight(),
+          const h = isNumber$3(attribute.forceBoundsHeight) ? attribute.forceBoundsHeight : attribute.forceBoundsHeight(),
             dy = textLayoutOffsetY(textBaseline, h, h);
           aabbBounds.set(aabbBounds.x1, dy, aabbBounds.x2, dy + h);
         }
         if (null != attribute.forceBoundsWidth) {
-          const w = isNumber$2(attribute.forceBoundsWidth) ? attribute.forceBoundsWidth : attribute.forceBoundsWidth(),
+          const w = isNumber$3(attribute.forceBoundsWidth) ? attribute.forceBoundsWidth : attribute.forceBoundsWidth(),
             dx = textDrawOffsetX(textAlign, w);
           aabbBounds.set(dx, aabbBounds.y1, dx + w, aabbBounds.y2);
         }
@@ -12470,7 +12473,7 @@
           }
         } else {
           const richTextConfig = this.combinedStyleToCharacter(textConfig[i]);
-          if (isNumber$2(richTextConfig.text) && (richTextConfig.text = `${richTextConfig.text}`), richTextConfig.text && richTextConfig.text.includes("\n")) {
+          if (isNumber$3(richTextConfig.text) && (richTextConfig.text = `${richTextConfig.text}`), richTextConfig.text && richTextConfig.text.includes("\n")) {
             const textParts = richTextConfig.text.split("\n");
             for (let j = 0; j < textParts.length; j++) if (0 === j) paragraphs.push(new Paragraph(textParts[j], !1, richTextConfig, ascentDescentMode));else if (textParts[j] || i === textConfig.length - 1) paragraphs.push(new Paragraph(textParts[j], !0, richTextConfig, ascentDescentMode));else {
               const nextRichTextConfig = this.combinedStyleToCharacter(textConfig[i + 1]);
@@ -12661,7 +12664,7 @@
         } = this.attribute;
         if (outerRadius += outerPadding, innerRadius -= innerPadding, 0 === cornerRadius || "0%" === cornerRadius) return 0;
         const deltaRadius = Math.abs(outerRadius - innerRadius),
-          parseCR = cornerRadius => Math.min(isNumber$2(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
+          parseCR = cornerRadius => Math.min(isNumber$3(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
         if (isArray$5(cornerRadius)) {
           const crList = cornerRadius.map(cr => parseCR(cr) || 0);
           return 0 === crList.length ? [crList[0], crList[0], crList[0], crList[0]] : 2 === crList.length ? [crList[0], crList[1], crList[0], crList[1]] : (3 === crList.length && crList.push(0), crList);
@@ -13452,7 +13455,7 @@
     const halfPi = pi / 2;
     function createRectPath(path, x, y, width, height, rectCornerRadius, roundCorner = !0, edgeCb) {
       let cornerRadius;
-      if (Array.isArray(roundCorner) && (edgeCb = roundCorner, roundCorner = !0), width < 0 && (x += width, width = -width), height < 0 && (y += height, height = -height), isNumber$2(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius = abs(rectCornerRadius), rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
+      if (Array.isArray(roundCorner) && (edgeCb = roundCorner, roundCorner = !0), width < 0 && (x += width, width = -width), height < 0 && (y += height, height = -height), isNumber$3(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius = abs(rectCornerRadius), rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
         const cornerRadiusArr = rectCornerRadius;
         let cr0, cr1;
         switch (cornerRadiusArr.length) {
@@ -17583,6 +17586,77 @@
       return diffObj;
     }
 
+    function isIdentityMatrix(matrix) {
+      return 1 === matrix.a && 0 === matrix.b && 0 === matrix.c && 1 === matrix.d && 0 === matrix.e && 0 === matrix.f;
+    }
+    function createEventTransformer(containerElement, getMatrix, getRect, transformPoint) {
+      return event => {
+        if (!(event instanceof MouseEvent || event instanceof TouchEvent || event instanceof PointerEvent)) return event;
+        const transformMatrix = getMatrix();
+        if (isIdentityMatrix(transformMatrix)) return event;
+        const containerRect = getRect(),
+          transformedEvent = new event.constructor(event.type, event);
+        if (Object.defineProperties(transformedEvent, {
+          target: {
+            value: event.target
+          },
+          currentTarget: {
+            value: event.currentTarget
+          }
+        }), event instanceof MouseEvent || event instanceof PointerEvent) transformPoint(event.clientX, event.clientY, transformMatrix, containerRect, transformedEvent);else if (event instanceof TouchEvent) {
+          if (event.touches.length > 0) {
+            const touch = transformedEvent.touches[0];
+            transformPoint(touch.clientX, touch.clientY, transformMatrix, containerRect, touch);
+          }
+          if (event.changedTouches.length > 0) {
+            const touch = transformedEvent.changedTouches[0];
+            transformPoint(touch.clientX, touch.clientY, transformMatrix, containerRect, touch);
+          }
+        }
+        return transformedEvent;
+      };
+    }
+    function registerWindowEventTransformer(window, container, getMatrix, getRect, transformPoint) {
+      const transformer = createEventTransformer(container, getMatrix, getRect, transformPoint);
+      window.setEventListenerTransformer(transformer);
+    }
+    function registerGlobalEventTransformer(global, container, getMatrix, getRect, transformPoint) {
+      const transformer = createEventTransformer(container, getMatrix, getRect, transformPoint);
+      global.setEventListenerTransformer(transformer);
+    }
+    function transformPointForCanvas(clientX, clientY, matrix, rect, transformedEvent) {
+      const transformedPoint = {
+        x: clientX,
+        y: clientY
+      };
+      matrix.transformPoint(transformedPoint, transformedPoint), Object.defineProperties(transformedEvent, {
+        _canvasX: {
+          value: transformedPoint.x
+        },
+        _canvasY: {
+          value: transformedPoint.y
+        }
+      });
+    }
+    function mapToCanvasPointForCanvas(nativeEvent) {
+      var _a;
+      if (isNumber$1(nativeEvent._canvasX) && isNumber$1(nativeEvent._canvasY)) return {
+        x: nativeEvent._canvasX,
+        y: nativeEvent._canvasY
+      };
+      if (nativeEvent.changedTouches) {
+        const data = null !== (_a = nativeEvent.changedTouches[0]) && void 0 !== _a ? _a : {};
+        return {
+          x: data._canvasX,
+          y: data._canvasY
+        };
+      }
+      return {
+        x: nativeEvent._canvasX || 0,
+        y: nativeEvent._canvasY || 0
+      };
+    }
+
     let loadArcModule = !1;
     const arcModule = new ContainerModule(bind => {
       loadArcModule || (loadArcModule = !0, bind(DefaultCanvasArcRender).toSelf().inSingletonScope(), bind(ArcRender).to(DefaultCanvasArcRender).inSingletonScope(), bind(GraphicRender).toService(ArcRender), bind(ArcRenderContribution).toService(DefaultBaseInteractiveRenderContribution), bindContributionProvider(bind, ArcRenderContribution));
@@ -19795,7 +19869,7 @@
           x += point.x, y += point.y, pickContext.setTransformForCurrent();
         } else x = 0, y = 0, onlyTranslate = !1, pickContext.transformFromMatrix(rect.transMatrix, !0);
         let picked = !0;
-        if (!onlyTranslate || rect.shadowRoot || isNumber$2(cornerRadius, !0) && 0 !== cornerRadius || isArray$5(cornerRadius) && cornerRadius.some(num => 0 !== num)) picked = !1, this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, (context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, rectAttribute, themeAttribute) => {
+        if (!onlyTranslate || rect.shadowRoot || isNumber$3(cornerRadius, !0) && 0 !== cornerRadius || isArray$5(cornerRadius) && cornerRadius.some(num => 0 !== num)) picked = !1, this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, (context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, rectAttribute, themeAttribute) => {
           if (picked) return !0;
           const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth,
             pickStrokeBuffer = rectAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer,
@@ -21712,7 +21786,7 @@
           shapeStyle = __rest$3(shape, ["visible"]);
         if (isBoolean$2(shapeVisible)) {
           const size = (null == shapeStyle ? void 0 : shapeStyle.size) || 10,
-            maxSize = isNumber$2(size) ? size : Math.max(size[0], size[1]);
+            maxSize = isNumber$3(size) ? size : Math.max(size[0], size[1]);
           symbol = group.createOrUpdateChild("tag-shape", Object.assign(Object.assign({
             symbolType: "circle",
             size: size,
@@ -21752,7 +21826,7 @@
         }
         tagWidth += textWidth;
         const size = null !== (_c = shape.size) && void 0 !== _c ? _c : 10,
-          maxSize = isNumber$2(size) ? size : Math.max(size[0], size[1]);
+          maxSize = isNumber$3(size) ? size : Math.max(size[0], size[1]);
         tagHeight += Math.max(textHeight, shape.visible ? maxSize : 0);
         const {
           textAlign: textAlign,
@@ -25211,7 +25285,7 @@
       growAngleInOverall = (graphic, options, animationParameters) => {
         const attrs = graphic.getFinalAttribute();
         if (options && "anticlockwise" === options.orient) {
-          const overallValue = isNumber$2(options.overall) ? options.overall : 2 * Math.PI;
+          const overallValue = isNumber$3(options.overall) ? options.overall : 2 * Math.PI;
           return {
             from: {
               startAngle: overallValue,
@@ -25223,7 +25297,7 @@
             }
           };
         }
-        const overallValue = isNumber$2(null == options ? void 0 : options.overall) ? options.overall : 0;
+        const overallValue = isNumber$3(null == options ? void 0 : options.overall) ? options.overall : 0;
         return {
           from: {
             startAngle: overallValue,
@@ -25260,7 +25334,7 @@
       growAngleOutOverall = (graphic, options, animationParameters) => {
         const attrs = graphic.attribute;
         if (options && "anticlockwise" === options.orient) {
-          const overallValue = isNumber$2(options.overall) ? options.overall : 2 * Math.PI;
+          const overallValue = isNumber$3(options.overall) ? options.overall : 2 * Math.PI;
           return {
             from: {
               startAngle: attrs.startAngle,
@@ -25272,7 +25346,7 @@
             }
           };
         }
-        const overallValue = isNumber$2(null == options ? void 0 : options.overall) ? options.overall : 0;
+        const overallValue = isNumber$3(null == options ? void 0 : options.overall) ? options.overall : 0;
         return {
           from: {
             startAngle: attrs.startAngle,
@@ -25548,7 +25622,7 @@
         y1 = attrs.y1,
         height = attrs.height;
       let overallValue;
-      return options && "negative" === options.orient ? isNumber$2(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_c = null !== (_a = animationParameters.groupHeight) && void 0 !== _a ? _a : null === (_b = options.layoutRect) || void 0 === _b ? void 0 : _b.height) && void 0 !== _c ? _c : animationParameters.group.getBounds().height(), animationParameters.groupHeight = overallValue) : overallValue = animationParameters.height : overallValue = isNumber$2(null == options ? void 0 : options.overall) ? options.overall : 0, {
+      return options && "negative" === options.orient ? isNumber$3(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_c = null !== (_a = animationParameters.groupHeight) && void 0 !== _a ? _a : null === (_b = options.layoutRect) || void 0 === _b ? void 0 : _b.height) && void 0 !== _c ? _c : animationParameters.group.getBounds().height(), animationParameters.groupHeight = overallValue) : overallValue = animationParameters.height : overallValue = isNumber$3(null == options ? void 0 : options.overall) ? options.overall : 0, {
         from: {
           y: overallValue,
           y1: isNil$1(y1) ? void 0 : overallValue,
@@ -25621,7 +25695,7 @@
         y1 = attrs.y1,
         height = attrs.height;
       let overallValue;
-      return options && "negative" === options.orient ? isNumber$2(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_c = null !== (_a = animationParameters.groupHeight) && void 0 !== _a ? _a : null === (_b = options.layoutRect) || void 0 === _b ? void 0 : _b.height) && void 0 !== _c ? _c : animationParameters.group.getBounds().height(), animationParameters.groupHeight = overallValue) : overallValue = animationParameters.height : overallValue = isNumber$2(null == options ? void 0 : options.overall) ? options.overall : 0, {
+      return options && "negative" === options.orient ? isNumber$3(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_c = null !== (_a = animationParameters.groupHeight) && void 0 !== _a ? _a : null === (_b = options.layoutRect) || void 0 === _b ? void 0 : _b.height) && void 0 !== _c ? _c : animationParameters.group.getBounds().height(), animationParameters.groupHeight = overallValue) : overallValue = animationParameters.height : overallValue = isNumber$3(null == options ? void 0 : options.overall) ? options.overall : 0, {
         to: {
           y: overallValue,
           y1: isNil$1(y1) ? void 0 : overallValue,
@@ -25867,7 +25941,7 @@
       },
       growRadiusInOverall = (graphic, options, animationParameters) => {
         const attrs = graphic.getFinalAttribute(),
-          overallValue = isNumber$2(null == options ? void 0 : options.overall) ? options.overall : 0;
+          overallValue = isNumber$3(null == options ? void 0 : options.overall) ? options.overall : 0;
         return {
           from: {
             innerRadius: overallValue,
@@ -25903,7 +25977,7 @@
       },
       growRadiusOutOverall = (graphic, options, animationParameters) => {
         const attrs = graphic.getFinalAttribute(),
-          overallValue = isNumber$2(null == options ? void 0 : options.overall) ? options.overall : 0;
+          overallValue = isNumber$3(null == options ? void 0 : options.overall) ? options.overall : 0;
         return {
           from: {
             innerRadius: null == attrs ? void 0 : attrs.innerRadius,
@@ -25992,7 +26066,7 @@
         x1 = attrs.x1,
         width = attrs.width;
       let overallValue;
-      return options && "negative" === options.orient ? isNumber$2(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_a = animationParameters.groupWidth) && void 0 !== _a ? _a : animationParameters.group.getBounds().width(), animationParameters.groupWidth = overallValue) : overallValue = animationParameters.width : overallValue = isNumber$2(null == options ? void 0 : options.overall) ? null == options ? void 0 : options.overall : 0, {
+      return options && "negative" === options.orient ? isNumber$3(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_a = animationParameters.groupWidth) && void 0 !== _a ? _a : animationParameters.group.getBounds().width(), animationParameters.groupWidth = overallValue) : overallValue = animationParameters.width : overallValue = isNumber$3(null == options ? void 0 : options.overall) ? null == options ? void 0 : options.overall : 0, {
         from: {
           x: overallValue,
           x1: isNil$1(x1) ? void 0 : overallValue,
@@ -26039,7 +26113,7 @@
         x1 = attrs.x1,
         width = attrs.width;
       let overallValue;
-      return options && "negative" === options.orient ? isNumber$2(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_a = animationParameters.groupWidth) && void 0 !== _a ? _a : animationParameters.group.getBounds().width(), animationParameters.groupWidth = overallValue) : overallValue = animationParameters.width : overallValue = isNumber$2(null == options ? void 0 : options.overall) ? options.overall : 0, {
+      return options && "negative" === options.orient ? isNumber$3(options.overall) ? overallValue = options.overall : animationParameters.group ? (overallValue = null !== (_a = animationParameters.groupWidth) && void 0 !== _a ? _a : animationParameters.group.getBounds().width(), animationParameters.groupWidth = overallValue) : overallValue = animationParameters.width : overallValue = isNumber$3(null == options ? void 0 : options.overall) ? options.overall : 0, {
         to: {
           x: overallValue,
           x1: isNil$1(x1) ? void 0 : overallValue,
@@ -30191,7 +30265,7 @@
         return this._isFixed && !!this._bandwidth;
       }
       _isBandwidthFixedByUser() {
-        return this._isFixed && this._userBandwidth && isNumber$2(this._userBandwidth);
+        return this._isFixed && this._userBandwidth && isNumber$3(this._userBandwidth);
       }
       clone() {
         var _a, _b, _c;
@@ -30455,13 +30529,13 @@
       }
     }
     function parseNiceOptions(originalDomain, option) {
-      const hasForceMin = isNumber$2(option.forceMin),
-        hasForceMax = isNumber$2(option.forceMax);
+      const hasForceMin = isNumber$3(option.forceMin),
+        hasForceMax = isNumber$3(option.forceMax);
       let niceType = null;
       const niceMinMax = [];
       let niceDomain = null;
       const domainValidator = hasForceMin && hasForceMax ? x => x >= option.forceMin && x <= option.forceMax : hasForceMin ? x => x >= option.forceMin : hasForceMax ? x => x <= option.forceMax : null;
-      return hasForceMin ? niceMinMax[0] = option.forceMin : isNumber$2(option.min) && option.min <= Math.min(originalDomain[0], originalDomain[originalDomain.length - 1]) && (niceMinMax[0] = option.min), hasForceMax ? niceMinMax[1] = option.forceMax : isNumber$2(option.max) && option.max >= Math.max(originalDomain[0], originalDomain[originalDomain.length - 1]) && (niceMinMax[1] = option.max), isNumber$2(niceMinMax[0]) && isNumber$2(niceMinMax[1]) ? (niceDomain = originalDomain.slice(), niceDomain[0] = niceMinMax[0], niceDomain[niceDomain.length - 1] = niceMinMax[1]) : niceType = isNumber$2(niceMinMax[0]) || isNumber$2(niceMinMax[1]) ? isNumber$2(niceMinMax[0]) ? "max" : "min" : "all", {
+      return hasForceMin ? niceMinMax[0] = option.forceMin : isNumber$3(option.min) && option.min <= Math.min(originalDomain[0], originalDomain[originalDomain.length - 1]) && (niceMinMax[0] = option.min), hasForceMax ? niceMinMax[1] = option.forceMax : isNumber$3(option.max) && option.max >= Math.max(originalDomain[0], originalDomain[originalDomain.length - 1]) && (niceMinMax[1] = option.max), isNumber$3(niceMinMax[0]) && isNumber$3(niceMinMax[1]) ? (niceDomain = originalDomain.slice(), niceDomain[0] = niceMinMax[0], niceDomain[niceDomain.length - 1] = niceMinMax[1]) : niceType = isNumber$3(niceMinMax[0]) || isNumber$3(niceMinMax[1]) ? isNumber$3(niceMinMax[0]) ? "max" : "min" : "all", {
         niceType: niceType,
         niceDomain: niceDomain,
         niceMinMax: niceMinMax,
@@ -31150,8 +31224,8 @@
             textAlign: "center",
             textBaseline: "middle"
           }, textStyle), null === (_c = null === (_b = this.stage) || void 0 === _b ? void 0 : _b.getTheme()) || void 0 === _c ? void 0 : _c.text),
-          handlerSizeX = isNumber$2(handlerSize) ? handlerSize : handlerSize[0],
-          handlerSizeY = isNumber$2(handlerSize) ? handlerSize : handlerSize[1],
+          handlerSizeX = isNumber$3(handlerSize) ? handlerSize : handlerSize[0],
+          handlerSizeY = isNumber$3(handlerSize) ? handlerSize : handlerSize[1],
           text = graphicCreator.text(Object.assign({
             x: isHorizontal ? handlerSizeX / 2 + handlerSpace + maxTextWidth / 2 : 0,
             y: isHorizontal ? 0 : handlerSizeY / 2 + handlerSpace + maxTextHeight / 2,
@@ -36481,6 +36555,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',
@@ -39616,6 +39692,7 @@
         }
         clearFilteredChildren(record) {
             record.filteredChildren = undefined;
+            delete record.filteredChildren;
             for (let i = 0; i < (record.children?.length ?? 0); i++) {
                 this.clearFilteredChildren(record.children[i]);
             }
@@ -39823,6 +39900,9 @@
             if ((this.dataSourceObj?.canChangeOrder)) {
                 return this.dataSourceObj.canChangeOrder(sourceIndex, targetIndex);
             }
+            if (this.lastSortStates?.some(state => state.order === 'asc' || state.order === 'desc')) {
+                return false;
+            }
             if (this.hasHierarchyStateExpand) {
                 let sourceIndexs = this.currentPagerIndexedData[sourceIndex];
                 let targetIndexs = this.currentPagerIndexedData[targetIndex];
@@ -40054,10 +40134,10 @@
     }
     function sortRecordIndexs(recordIndexs, sort) {
         const result = recordIndexs.sort((a, b) => {
-            if (isNumber$2(a)) {
+            if (isNumber$3(a)) {
                 a = [a];
             }
-            if (isNumber$2(b)) {
+            if (isNumber$3(b)) {
                 b = [b];
             }
             const length = Math.max(a.length, b.length);
@@ -41326,7 +41406,7 @@
             this._fieldCache = {};
         }
         getOriginalRecord(index) {
-            if (isNumber$2(index) && this._recordCache && this._recordCache[index]) {
+            if (isNumber$3(index) && this._recordCache && this._recordCache[index]) {
                 return this._recordCache[index];
             }
             return super.getOriginalRecord(index);
@@ -41344,7 +41424,7 @@
                     return this.beforeChangedRecordsMap?.get(index.toString());
                 }
             }
-            if (isNumber$2(index) && this._recordCache && this._recordCache[index]) {
+            if (isNumber$3(index) && this._recordCache && this._recordCache[index]) {
                 return this._recordCache[index];
             }
             let data;
@@ -41475,7 +41555,7 @@
             const recordIndexsMaxToMin = sortRecordIndexs(recordIndexs, -1);
             for (let index = 0; index < recordIndexsMaxToMin.length; index++) {
                 const recordIndex = recordIndexsMaxToMin[index];
-                if (isNumber$2(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
+                if (isNumber$3(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
                     continue;
                 }
                 const originRecordIndex = this.getOriginRecordIndexForGroup(recordIndex);
@@ -41489,7 +41569,7 @@
         updateRecordsForGroup(records, recordIndexs) {
             for (let index = 0; index < recordIndexs.length; index++) {
                 const recordIndex = recordIndexs[index];
-                if (isNumber$2(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
+                if (isNumber$3(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
                     continue;
                 }
                 const originRecordIndex = this.getOriginRecordIndexForGroup(recordIndex);
@@ -41503,7 +41583,7 @@
                 return;
             }
             this.adjustBeforeChangedRecordsMap(recordIndex, recordArr.length);
-            if (isNumber$2(recordIndex)) {
+            if (isNumber$3(recordIndex)) {
                 this.dataSourceObj.records.splice(recordIndex, 0, ...recordArr);
             }
             else {
@@ -41528,11 +41608,11 @@
             const deletedRecordIndexs = [];
             for (let index = 0; index < recordIndexsMaxToMin.length; index++) {
                 const recordIndex = recordIndexsMaxToMin[index];
-                if (isNumber$2(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
+                if (isNumber$3(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
                     continue;
                 }
                 this.beforeChangedRecordsMap.delete(recordIndex.toString());
-                if (isNumber$2(recordIndex)) {
+                if (isNumber$3(recordIndex)) {
                     this.dataSourceObj.records.splice(recordIndex, 1);
                 }
                 else {
@@ -41552,11 +41632,11 @@
             for (let index = 0; index < recordIndexs.length; index++) {
                 const recordIndex = recordIndexs[index];
                 const record = records[index];
-                if (isNumber$2(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
+                if (isNumber$3(recordIndex) && (recordIndex >= this.sourceLength || recordIndex < 0)) {
                     continue;
                 }
                 this.beforeChangedRecordsMap.delete(recordIndex.toString());
-                if (isNumber$2(recordIndex)) {
+                if (isNumber$3(recordIndex)) {
                     this.dataSourceObj.records.splice(recordIndex, 1, record);
                 }
                 else {
@@ -41572,7 +41652,7 @@
         adjustBeforeChangedRecordsMap(insertIndex, insertCount, type = 'add') {
             if (this.rowHierarchyType === 'tree') {
                 let insertIndexArr;
-                if (isNumber$2(insertIndex)) {
+                if (isNumber$3(insertIndex)) {
                     insertIndexArr = [insertIndex];
                 }
                 else {
@@ -41622,7 +41702,7 @@
             let i = 1;
             for (; recordIndexLength > parentRecordIndexLength; i++) {
                 const index = this.dataSource.currentIndexedData[showIndex - i];
-                recordIndexLength = isNumber$2(index) ? 1 : index.length;
+                recordIndexLength = isNumber$3(index) ? 1 : index.length;
             }
             return i - 1;
         }
@@ -41845,7 +41925,7 @@
     }
 
     function getQuadProps(paddingOrigin) {
-        if (isNumber$2(paddingOrigin) || isString$2(paddingOrigin) || isArray$5(paddingOrigin)) {
+        if (isNumber$3(paddingOrigin) || isString$2(paddingOrigin) || isArray$5(paddingOrigin)) {
             let padding = parsePadding(paddingOrigin);
             if (typeof padding === 'number' || typeof padding === 'string') {
                 padding = [padding, padding, padding, padding];
@@ -42111,7 +42191,7 @@
         if (isNil$1(v)) {
             return false;
         }
-        if (isNumber$2(v)) {
+        if (isNumber$3(v)) {
             return true;
         }
         return +v === +v;
@@ -44449,7 +44529,7 @@
                     ? getHierarchyOffset(range.start.col, range.start.row, table)
                     : getHierarchyOffset(cellGroup.col, cellGroup.row, table);
                 let _contentOffset = 0;
-                if (isNumber$2(table.theme._contentOffset)) {
+                if (isNumber$3(table.theme._contentOffset)) {
                     if (textAlign === 'left') {
                         _contentOffset = table.theme._contentOffset;
                     }
@@ -44495,7 +44575,7 @@
             let textMark;
             if (inlineFrontIcons.length === 0 && inlineEndIcons.length === 0) {
                 let _contentOffset = 0;
-                if (isNumber$2(table.theme._contentOffset)) {
+                if (isNumber$3(table.theme._contentOffset)) {
                     if (textAlign === 'left') {
                         _contentOffset = table.theme._contentOffset;
                     }
@@ -44682,8 +44762,8 @@
         iconAttribute.isGif = icon.isGif;
         let hierarchyOffset = 0;
         if ((!dealWithIconComputeVar || dealWithIconComputeVar?.addedHierarchyOffset === 0) &&
-            isNumber$2(col) &&
-            isNumber$2(row) &&
+            isNumber$3(col) &&
+            isNumber$3(row) &&
             table &&
             (icon.funcType === IconFuncTypeEnum.collapse ||
                 icon.funcType === IconFuncTypeEnum.expand ||
@@ -45656,7 +45736,7 @@
     }
     function updateCell$1(col, row, table, addNew, isShadow, forceFastUpdate) {
         const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);
-        if (oldCellGroup.role !== 'cell' && !addNew) {
+        if (oldCellGroup.role !== 'cell' && oldCellGroup.role !== 'shadow-cell' && !addNew) {
             return undefined;
         }
         const cellLocation = table.getCellLocation(col, row);
@@ -45879,7 +45959,7 @@
                 const reactGroup = oldCellGroup.getChildByName(CUSTOM_CONTAINER_NAME);
                 if (reactGroup) {
                     const { col, row } = reactGroup;
-                    if (isNumber$2(col) && isNumber$2(row)) {
+                    if (isNumber$3(col) && isNumber$3(row)) {
                         table.reactCustomLayout.removeCustomCell(col, row);
                     }
                 }
@@ -46061,10 +46141,10 @@
 
     function isMergeCellGroup(cellGroup) {
         if (cellGroup.role === 'cell' &&
-            isNumber$2(cellGroup.mergeStartCol) &&
-            isNumber$2(cellGroup.mergeStartRow) &&
-            isNumber$2(cellGroup.mergeEndCol) &&
-            isNumber$2(cellGroup.mergeEndRow)) {
+            isNumber$3(cellGroup.mergeStartCol) &&
+            isNumber$3(cellGroup.mergeStartRow) &&
+            isNumber$3(cellGroup.mergeEndCol) &&
+            isNumber$3(cellGroup.mergeEndRow)) {
             return true;
         }
         return false;
@@ -46143,12 +46223,12 @@
         const cellWidth = table.getColsWidth(col, endCol);
         const size = getProp('size', actStyle, col, row, table);
         let outerRadius = getProp('outerRadius', actStyle, col, row, table);
-        const circleSize = isNumber$2(outerRadius) ? outerRadius * 2 : size;
+        const circleSize = isNumber$3(outerRadius) ? outerRadius * 2 : size;
         let maxHeight = 0;
         if (autoWrapText) {
             const spaceBetweenTextAndIcon = getProp('spaceBetweenTextAndIcon', actStyle, col, row, table);
             const maxLineWidth = cellWidth - (padding[1] + padding[3]) - iconWidth - circleSize - spaceBetweenTextAndIcon;
-            if (!isNumber$2(outerRadius)) {
+            if (!isNumber$3(outerRadius)) {
                 outerRadius = Math.round(size / 2);
             }
             utilRadioMark.setAttributes({
@@ -46675,7 +46755,7 @@
             }
             else {
                 const defaultHeight = table.getDefaultRowHeight(row);
-                if (isNumber$2(defaultHeight)) {
+                if (isNumber$3(defaultHeight)) {
                     return defaultHeight;
                 }
             }
@@ -46713,7 +46793,7 @@
             return maxHeight;
         }
         const defaultHeight = table.getDefaultRowHeight(row);
-        return isNumber$2(defaultHeight) ? defaultHeight : table.defaultRowHeight;
+        return isNumber$3(defaultHeight) ? defaultHeight : table.defaultRowHeight;
     }
     function checkFixedStyleAndNoWrap(table, rowStart) {
         const { layoutMap } = table.internalProps;
@@ -50040,13 +50120,13 @@
                 const chartCellStyle = layout._table._getCellStyle(col, row + 1);
                 const bodyChartCellPadding = getQuadProps(getProp('padding', chartCellStyle, col, row + 1, layout._table));
                 const { range, ticks, axisOption, targetTicks, targetRange, index, theme } = axisRange;
-                if (isNumber$2(axisOption?.min)) {
+                if (isNumber$3(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
                     }
                 }
-                if (isNumber$2(axisOption?.max)) {
+                if (isNumber$3(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -50087,7 +50167,7 @@
                 const chartCellStyle = layout._table._getCellStyle(col, row - 1);
                 const bodyChartCellPadding = getQuadProps(getProp('padding', chartCellStyle, col, row - 1, layout._table));
                 const { range, ticks, axisOption, index, targetTicks, targetRange, theme } = axisRange;
-                if (isNumber$2(axisOption?.max)) {
+                if (isNumber$3(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -50096,7 +50176,7 @@
                 else if (chartType === 'boxPlot') {
                     range.max += (range.max - range.min) / 20;
                 }
-                if (isNumber$2(axisOption?.min)) {
+                if (isNumber$3(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
@@ -50188,7 +50268,7 @@
                 const chartCellStyle = layout._table._getCellStyle(col + 1, row);
                 const bodyChartCellPadding = getQuadProps(getProp('padding', chartCellStyle, col + 1, row, layout._table));
                 const { range, ticks, axisOption, index, targetTicks, targetRange, theme } = axisRange;
-                if (isNumber$2(axisOption?.max)) {
+                if (isNumber$3(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -50197,7 +50277,7 @@
                 else if (chartType === 'boxPlot') {
                     range.max += (range.max - range.min) / 20;
                 }
-                if (isNumber$2(axisOption?.min)) {
+                if (isNumber$3(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
@@ -50251,13 +50331,13 @@
                 const chartCellStyle = layout._table._getCellStyle(col - 1, row);
                 const bodyChartCellPadding = getQuadProps(getProp('padding', chartCellStyle, col - 1, row, layout._table));
                 const { range, ticks, index, targetTicks, targetRange, theme } = axisRange;
-                if (isNumber$2(axisOption?.min)) {
+                if (isNumber$3(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
                     }
                 }
-                if (isNumber$2(axisOption?.max)) {
+                if (isNumber$3(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -50339,7 +50419,7 @@
             });
             if (axisOption) {
                 if (axisOption.zero) {
-                    if (isNumber$2(axisOption.range?.min)) {
+                    if (isNumber$3(axisOption.range?.min)) {
                         axisOption.zero = false;
                     }
                 }
@@ -50377,7 +50457,7 @@
             return axisOption.orient === orient;
         }) ?? {};
         if (axisOption.zero) {
-            if (isNumber$2(axisOption.range?.min)) {
+            if (isNumber$3(axisOption.range?.min)) {
                 axisOption.zero = false;
             }
         }
@@ -50675,10 +50755,10 @@
             range.max = axisRange[1];
         }
         const ticks = selfTicks;
-        if (isNumber$2(axisOption?.min)) {
+        if (isNumber$3(axisOption?.min)) {
             range.min = axisOption.min;
         }
-        if (isNumber$2(axisOption?.max)) {
+        if (isNumber$3(axisOption?.max)) {
             range.max = axisOption.max;
         }
         return {
@@ -53293,7 +53373,7 @@
         else if (cellType === 'radio') {
             const size = getProp('size', actStyle, col, row, table);
             const outerRadius = getProp('outerRadius', actStyle, col, row, table);
-            const circleSize = isNumber$2(outerRadius) ? outerRadius * 2 : size;
+            const circleSize = isNumber$3(outerRadius) ? outerRadius * 2 : size;
             const spaceBetweenTextAndIcon = getProp('spaceBetweenTextAndIcon', actStyle, col, row, table);
             if (isArray$5(cellValue)) {
                 const define = table.getBodyColumnDefine(col, row);
@@ -53782,7 +53862,7 @@
             columnGroup.role = 'column';
             columnGroup.col = i;
             containerGroup.addChild(columnGroup);
-            const { width: default2Width, height: default2Height } = createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, table.scenegraph.mergeMap, cellLocation === 'columnHeader' && isNumber$2(defaultHeaderRowHeight)
+            const { width: default2Width, height: default2Height } = createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, table.scenegraph.mergeMap, cellLocation === 'columnHeader' && isNumber$3(defaultHeaderRowHeight)
                 ? defaultHeaderRowHeight
                 : defaultRowHeight, table, rowLimit);
             x += default2Width;
@@ -54738,10 +54818,10 @@
         }
     }
     function adjustCellContentVerticalLayout(cellGroup, minTop, maxTop, changedCells, textStickBaseOnAlign, table) {
-        if (isNumber$2(cellGroup.mergeStartCol) &&
-            isNumber$2(cellGroup.mergeStartRow) &&
-            isNumber$2(cellGroup.mergeEndCol) &&
-            isNumber$2(cellGroup.mergeEndRow)) {
+        if (isNumber$3(cellGroup.mergeStartCol) &&
+            isNumber$3(cellGroup.mergeStartRow) &&
+            isNumber$3(cellGroup.mergeEndCol) &&
+            isNumber$3(cellGroup.mergeEndRow)) {
             const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
             for (let col = colStart; col <= colEnd; col++) {
                 for (let row = rowStart; row <= rowEnd; row++) {
@@ -54823,10 +54903,10 @@
         }
     }
     function adjustCellContentHorizontalLayout(cellGroup, minLeft, maxLeft, changedCells, textStickBaseOnAlign, table) {
-        if (isNumber$2(cellGroup.mergeStartCol) &&
-            isNumber$2(cellGroup.mergeStartRow) &&
-            isNumber$2(cellGroup.mergeEndCol) &&
-            isNumber$2(cellGroup.mergeEndRow)) {
+        if (isNumber$3(cellGroup.mergeStartCol) &&
+            isNumber$3(cellGroup.mergeStartRow) &&
+            isNumber$3(cellGroup.mergeEndCol) &&
+            isNumber$3(cellGroup.mergeEndRow)) {
             const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
             for (let col = colStart; col <= colEnd; col++) {
                 for (let row = rowStart; row <= rowEnd; row++) {
@@ -55172,7 +55252,7 @@
             this.colEnd = endCol;
             for (let row = 0; row < this.table.rowCount; row++) {
                 const cellGroup = this.highPerformanceGetCell(this.currentCol, row);
-                if (cellGroup.role === 'cell' && isNumber$2(cellGroup.mergeStartCol) && cellGroup.mergeStartCol > this.currentCol) {
+                if (cellGroup.role === 'cell' && isNumber$3(cellGroup.mergeStartCol) && cellGroup.mergeStartCol > this.currentCol) {
                     this.table.scenegraph.updateCellContent(cellGroup.col, cellGroup.row);
                 }
             }
@@ -56303,7 +56383,7 @@
             const pos = _getUpdateRowIndex(beforeRow, afterRow, scene);
             rowUpdatePos = isValid$1(rowUpdatePos) ? (isValid$1(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos) : pos;
         }
-        if (isNumber$2(updateAfter)) {
+        if (isNumber$3(updateAfter)) {
             for (let col = 0; col < Math.max(table.colCount, table.internalProps._oldColCount ?? table.colCount); col++) {
                 for (let row = updateAfter; row < Math.max(table.rowCount, table.internalProps._oldRowCount ?? table.rowCount); row++) {
                     const cellGroup = scene.highPerformanceGetCell(col, row, true);
@@ -56316,9 +56396,9 @@
                     : rowUpdatePos
                 : updateAfter;
         }
-        isNumber$2(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
+        isNumber$3(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
         if (addRows.length) {
-            if (!isNumber$2(updateAfter)) {
+            if (!isNumber$3(updateAfter)) {
                 const minRow = Math.min(...addRows);
                 scene.proxy.rowUpdatePos = Math.min(minRow, scene.proxy.rowUpdatePos);
             }
@@ -57698,7 +57778,7 @@
         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, true);
@@ -58106,7 +58186,7 @@
                 }
             }
         });
-        if (isNumber$2(updateAfter)) {
+        if (isNumber$3(updateAfter)) {
             for (let col = updateAfter; col < Math.max(table.colCount, table.internalProps._oldColCount ?? table.colCount); col++) {
                 for (let row = 0; row < Math.max(table.rowCount, table.internalProps._oldRowCount ?? table.rowCount); row++) {
                     const cellGroup = scene.highPerformanceGetCell(col, row, true);
@@ -58116,7 +58196,7 @@
             scene.proxy.colUpdatePos = updateAfter;
         }
         if (addCols.length) {
-            if (!isNumber$2(updateAfter)) {
+            if (!isNumber$3(updateAfter)) {
                 const minCol = Math.min(...addCols);
                 scene.proxy.colUpdatePos = minCol;
             }
@@ -61647,7 +61727,7 @@
         if (recordIndex >= 0) {
             const dataIndex = state.table.dataSource.getIndexKey(recordIndex);
             if (type === 'column') {
-                if (isNumber$2(indexInCell)) {
+                if (isNumber$3(indexInCell)) {
                     state.radioState[field] = {};
                     state.radioState[field][dataIndex] = indexInCell;
                 }
@@ -61659,7 +61739,7 @@
                 if (!state.radioState[field]) {
                     state.radioState[field] = {};
                 }
-                if (isNumber$2(indexInCell)) {
+                if (isNumber$3(indexInCell)) {
                     state.radioState[field][dataIndex] = indexInCell;
                 }
                 else {
@@ -61675,14 +61755,14 @@
         if (isValid$1(field) && cellType === 'radio') {
             const dataIndex = table.dataSource.getIndexKey(table.getRecordShowIndexByCell(col, row));
             const columnState = table.stateManager.radioState?.[field];
-            if (isNumber$2(columnState)) {
+            if (isNumber$3(columnState)) {
                 if (columnState === dataIndex) {
                     return true;
                 }
             }
             else if (isObject$7(columnState)) {
                 const cellState = columnState[dataIndex];
-                if (isNumber$2(cellState)) {
+                if (isNumber$3(cellState)) {
                     return cellState;
                 }
             }
@@ -61695,7 +61775,7 @@
             const dataIndex = state.table.dataSource.getIndexKey(recordIndex);
             if (type === 'column') {
                 if (!isValid$1(state.radioState[field]) && isChecked) {
-                    if (isNumber$2(indexInCell)) {
+                    if (isNumber$3(indexInCell)) {
                         state.radioState[field] = {};
                         state.radioState[field][dataIndex] = indexInCell;
                     }
@@ -61704,23 +61784,23 @@
                     }
                     return true;
                 }
-                else if (isNumber$2(state.radioState[field]) && !isNumber$2(indexInCell)) {
+                else if (isNumber$3(state.radioState[field]) && !isNumber$3(indexInCell)) {
                     return state.radioState[field] === dataIndex;
                 }
-                else if (isNumber$2(state.radioState[field]) && isNumber$2(indexInCell)) {
+                else if (isNumber$3(state.radioState[field]) && isNumber$3(indexInCell)) {
                     return false;
                 }
-                else if (isObject$7(state.radioState[field]) && !isNumber$2(indexInCell)) {
+                else if (isObject$7(state.radioState[field]) && !isNumber$3(indexInCell)) {
                     return false;
                 }
-                else if (isObject$7(state.radioState[field]) && isNumber$2(indexInCell)) {
+                else if (isObject$7(state.radioState[field]) && isNumber$3(indexInCell)) {
                     return state.radioState[field][dataIndex] === indexInCell;
                 }
             }
             else if (type === 'cell') {
                 if (!isValid$1(state.radioState[field]) && isChecked) {
                     state.radioState[field] = {};
-                    if (isNumber$2(indexInCell)) {
+                    if (isNumber$3(indexInCell)) {
                         state.radioState[field][dataIndex] = indexInCell;
                     }
                     else {
@@ -61729,7 +61809,7 @@
                     return true;
                 }
                 else if (!isValid$1(state.radioState[field]?.[dataIndex]) && isChecked) {
-                    if (isNumber$2(indexInCell)) {
+                    if (isNumber$3(indexInCell)) {
                         state.radioState[field][dataIndex] = indexInCell;
                     }
                     else {
@@ -61737,16 +61817,16 @@
                     }
                     return true;
                 }
-                else if (isBoolean$2(state.radioState[field]?.[dataIndex]) && !isNumber$2(indexInCell)) {
+                else if (isBoolean$2(state.radioState[field]?.[dataIndex]) && !isNumber$3(indexInCell)) {
                     return state.radioState[field][dataIndex];
                 }
-                else if (isBoolean$2(state.radioState[field]?.[dataIndex]) && isNumber$2(indexInCell)) {
+                else if (isBoolean$2(state.radioState[field]?.[dataIndex]) && isNumber$3(indexInCell)) {
                     return false;
                 }
-                else if (isNumber$2(state.radioState[field]?.[dataIndex]) && !isNumber$2(indexInCell)) {
+                else if (isNumber$3(state.radioState[field]?.[dataIndex]) && !isNumber$3(indexInCell)) {
                     return false;
                 }
-                else if (isNumber$2(state.radioState[field]?.[dataIndex]) && isNumber$2(indexInCell)) {
+                else if (isNumber$3(state.radioState[field]?.[dataIndex]) && isNumber$3(indexInCell)) {
                     return state.radioState[field][dataIndex] === indexInCell;
                 }
             }
@@ -61758,7 +61838,7 @@
         if (!cellGoup) {
             return;
         }
-        if (isNumber$2(index)) {
+        if (isNumber$3(index)) {
             const radio = cellGoup.getChildAt(index);
             radio?._handlePointerUp();
         }
@@ -62054,7 +62134,7 @@
             source = table.isPivotTable() ? undefined : table.getRecordIndexByCell(0, sourceIndex);
             target = table.isPivotTable() ? undefined : table.getRecordIndexByCell(0, targetIndex);
         }
-        if (isNumber$2(source) && isNumber$2(target)) {
+        if (isNumber$3(source) && isNumber$3(target)) {
             sourceIndex = source;
             targetIndex = target;
             if (sourceIndex > targetIndex) {
@@ -62701,7 +62781,7 @@
                 function flatten(cols, parentStartIndex = 0) {
                     cols.forEach((col) => {
                         const startIndex = col.startInTotal
-                            ? col.startInTotal + state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0
+                            ? col.startInTotal + (state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0)
                             : parentStartIndex;
                         if (col.columns) {
                             flatten(col.columns, startIndex);
@@ -62724,7 +62804,7 @@
                         prev.push({
                             field: item.field,
                             order: item.order,
-                            row: column?.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0,
+                            row: (column?.startInTotal ?? 0) + (this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0),
                             col: column?.level
                         });
                     }
@@ -62732,7 +62812,7 @@
                         prev.push({
                             field: item.field,
                             order: item.order,
-                            col: column?.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0,
+                            col: (column?.startInTotal ?? 0) + (this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0),
                             row: column?.level
                         });
                     }
@@ -63537,11 +63617,12 @@
         }
         updateSortState(sortState) {
             sortState = Array.isArray(sortState) ? sortState : [sortState];
+            const isSame = sortState.length === this.sort.length &&
+                sortState.every((item, index) => item?.field === this.sort[index]?.field && item?.order === this.sort[index]?.order);
+            if (isSame) {
+                return;
+            }
             for (let index = 0; index < sortState.length; index++) {
-                if (sortState[index].field === this.sort[index]?.field &&
-                    sortState[sortState.length - 1].order === this.sort[index]?.order) {
-                    return;
-                }
                 const oldSortCol = this.table.internalProps.multipleSort ? null : this.sort[index]?.col || null;
                 const oldSortRow = this.table.internalProps.multipleSort ? null : this.sort[index]?.row || null;
                 this.sort[index]?.order === 'asc'
@@ -63585,7 +63666,7 @@
                     row: null,
                     iconMark: null,
                     order: null,
-                    oldSortCol: column.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0,
+                    oldSortCol: (column.startInTotal ?? 0) + (this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0),
                     oldSortRow: column.level,
                     oldIconMark: null
                 });
@@ -65878,7 +65959,7 @@
             const indexedData = table.dataSource.currentPagerIndexedData;
             const titleShowIndex = table.getRecordShowIndexByCell(col, row);
             let titleIndex = indexedData[titleShowIndex];
-            if (isNumber$2(titleIndex)) {
+            if (isNumber$3(titleIndex)) {
                 titleIndex = [titleIndex];
             }
             if (record.vtableMerge || record.children?.length) {
@@ -65929,7 +66010,7 @@
             const indexedData = table.dataSource.currentPagerIndexedData;
             const titleShowIndex = table.getRecordShowIndexByCell(col, row);
             let titleIndex = indexedData[titleShowIndex];
-            if (isNumber$2(titleIndex)) {
+            if (isNumber$3(titleIndex)) {
                 titleIndex = [titleIndex];
             }
             if (record.vtableMerge || record.children?.length) {
@@ -65978,7 +66059,7 @@
             let i = titleShowIndex - 1;
             while (parentLength > 0 && i >= 0) {
                 if ((isArray$5(indexedData[i]) && indexedData[i]?.length === parentLength) ||
-                    (parentLength === 1 && isNumber$2(indexedData[i]))) {
+                    (parentLength === 1 && isNumber$3(indexedData[i]))) {
                     const row = table.columnHeaderLevelCount + i;
                     updateParentCheckboxState(col, row, indexedData[i], table, field);
                     parentLength--;
@@ -70864,10 +70945,16 @@
             if (this.from.x !== this.to.x) {
                 const x = end ? this.to.x : this.from.x + Math.floor((this.to.x - this.from.x) * ratio);
                 this.params.table.scrollLeft = x;
+                if (ratio === 1 && this.to.targetCol !== -1) {
+                    this.params.table.scrollToCol(this.to.targetCol, false);
+                }
             }
             if (this.from.y !== this.to.y) {
                 const y = end ? this.to.y : this.from.y + Math.floor((this.to.y - this.from.y) * ratio);
                 this.params.table.scrollTop = y;
+                if (ratio === 1 && this.to.targetRow !== -1) {
+                    this.params.table.scrollToRow(this.to.targetRow, false);
+                }
             }
         }
     }
@@ -70896,11 +70983,11 @@
             let rowInt = row;
             let colDecimal;
             let rowDecimal;
-            if (isNumber$2(col) && !isInteger(col)) {
+            if (isNumber$3(col) && !isInteger(col)) {
                 colInt = Math.floor(col);
                 colDecimal = col - colInt;
             }
-            if (isNumber$2(row) && !isInteger(row)) {
+            if (isNumber$3(row) && !isInteger(row)) {
                 rowInt = Math.floor(row);
                 rowDecimal = row - rowInt;
             }
@@ -70913,8 +71000,10 @@
                 top += rowDecimal * cellRect.height;
             }
             const to = {
-                x: isNumber$2(col) ? left - this.table.getFrozenColsWidth() : this.table.scrollLeft,
-                y: isNumber$2(row) ? top - this.table.getFrozenRowsHeight() : this.table.scrollTop
+                x: isNumber$3(col) ? left - this.table.getFrozenColsWidth() : this.table.scrollLeft,
+                y: isNumber$3(row) ? top - this.table.getFrozenRowsHeight() : this.table.scrollTop,
+                targetRow: rowInt ?? -1,
+                targetCol: colInt ?? -1
             };
             const duration = !isBoolean$2(animationOption) ? animationOption?.duration ?? 3000 : animationOption ? 3000 : 0;
             const easing = !isBoolean$2(animationOption) ? animationOption?.easing ?? 'linear' : animationOption ? 'linear' : '';
@@ -71014,6 +71103,7 @@
     class BaseTable extends EventTarget$1 {
         internalProps;
         showFrozenIcon = true;
+        _scrollToRowCorrectTimer = null;
         padding;
         globalDropDownMenu;
         tableNoFrameWidth;
@@ -71048,7 +71138,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.23.3";
+        version = "1.24.0-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -71135,8 +71225,8 @@
             this.tableNoFrameHeight = 0;
             this.contentOffsetX = translateX ?? 0;
             this.contentOffsetY = translateY ?? 0;
-            this.canvasWidth = isNumber$2(canvasWidth) ? canvasWidth : undefined;
-            this.canvasHeight = isNumber$2(canvasHeight) ? canvasHeight : undefined;
+            this.canvasWidth = isNumber$3(canvasWidth) ? canvasWidth : undefined;
+            this.canvasHeight = isNumber$3(canvasHeight) ? canvasHeight : undefined;
             this.columnWidthComputeMode = options.columnWidthComputeMode ?? 'normal';
             const internalProps = (this.internalProps = {});
             showFrozenIcon !== undefined && (this.showFrozenIcon = showFrozenIcon);
@@ -71163,7 +71253,7 @@
                 }
             }
             internalProps.handler = new EventHandler();
-            if (isNumber$2(this.options.resizeTime)) {
+            if (isNumber$3(this.options.resizeTime)) {
                 internalProps.handler.resizeTime = this.options.resizeTime;
             }
             internalProps.pixelRatio = pixelRatio;
@@ -71509,7 +71599,7 @@
             this.scenegraph.dealWidthBottomFrozen(bottomFrozenRowCount);
         }
         get defaultRowHeight() {
-            if (isNumber$2(this.internalProps.defaultRowHeight)) {
+            if (isNumber$3(this.internalProps.defaultRowHeight)) {
                 return this.internalProps.defaultRowHeight;
             }
             return 40;
@@ -71948,7 +72038,7 @@
                 return this.rowHeightsMap.get(row);
             }
             const defaultHeight = this.getDefaultRowHeight(row);
-            if (isNumber$2(defaultHeight)) {
+            if (isNumber$3(defaultHeight)) {
                 return defaultHeight;
             }
             return this.defaultRowHeight;
@@ -72639,6 +72729,12 @@
         dispose() {
             this.release();
         }
+        clearCorrectTimer() {
+            if (this._scrollToRowCorrectTimer) {
+                clearTimeout(this._scrollToRowCorrectTimer);
+                this._scrollToRowCorrectTimer = null;
+            }
+        }
         release() {
             this.scenegraph?.component?.vScrollBar?.release();
             this.scenegraph?.component?.hScrollBar?.release();
@@ -72649,6 +72745,7 @@
             if (this.isReleased) {
                 return;
             }
+            this.clearCorrectTimer();
             internalProps.tooltipHandler?.release?.();
             internalProps.menuHandler?.release?.();
             super.release?.();
@@ -72738,8 +72835,8 @@
             this.customRender = customRender;
             this.contentOffsetX = translateX ?? 0;
             this.contentOffsetY = translateY ?? 0;
-            this.canvasWidth = isNumber$2(canvasWidth) ? canvasWidth : undefined;
-            this.canvasHeight = isNumber$2(canvasHeight) ? canvasHeight : undefined;
+            this.canvasWidth = isNumber$3(canvasWidth) ? canvasWidth : undefined;
+            this.canvasHeight = isNumber$3(canvasHeight) ? canvasHeight : undefined;
             const internalProps = this.internalProps;
             if (Env.mode !== 'node' && !options.canvas) {
                 updateRootElementPadding(internalProps.element, this.padding);
@@ -73112,6 +73209,86 @@
             this.stateManager.updateSelectPos(this.colCount - 1, rowIndex, false, isCtrl, false, makeSelectCellVisible, true);
             this.stateManager.select.selecting = false;
         }
+        changeHeaderPosition(args) {
+            if (!('canMoveHeaderPosition' in this.internalProps.layoutMap) ||
+                this.options.customConfig?.notUpdateInColumnRowMove === true) {
+                return false;
+            }
+            const prevMoving = this.stateManager.columnMove.movingColumnOrRow;
+            this.stateManager.columnMove.movingColumnOrRow = args.movingColumnOrRow;
+            try {
+                if (this.internalProps.layoutMap.canMoveHeaderPosition?.(args.source, args.target) === false) {
+                    return false;
+                }
+                const oldSourceMergeInfo = this.getCellRange(args.source.col, args.source.row);
+                const oldTargetMergeInfo = this.getCellRange(args.target.col, args.target.row);
+                const moveContext = this._moveHeaderPosition(args.source, args.target);
+                if (!moveContext || moveContext.targetIndex === moveContext.sourceIndex) {
+                    return false;
+                }
+                this.internalProps.useOneRowHeightFillAll = false;
+                this.internalProps.layoutMap.clearCellRangeMap();
+                const sourceMergeInfo = this.getCellRange(args.source.col, args.source.row);
+                const targetMergeInfo = this.getCellRange(args.target.col, args.target.row);
+                const colMin = Math.min(sourceMergeInfo.start.col, targetMergeInfo.start.col, oldSourceMergeInfo.start.col, oldTargetMergeInfo.start.col);
+                const colMax = Math.max(sourceMergeInfo.end.col, targetMergeInfo.end.col, oldSourceMergeInfo.end.col, oldTargetMergeInfo.end.col);
+                const 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 (moveContext.moveType === 'row' &&
+                    this.internalProps.layoutMap.rowHierarchyType === 'tree') {
+                    if (moveContext.targetIndex > moveContext.sourceIndex) {
+                        rowMax = rowMax + moveContext.targetSize - 1;
+                    }
+                    else {
+                        rowMax = rowMax + moveContext.sourceSize - 1;
+                    }
+                }
+                if (!this.transpose &&
+                    (this.isSeriesNumberInBody(args.source.col, args.source.row) || args.movingColumnOrRow === 'row')) {
+                    this.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex);
+                    this.stateManager.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex);
+                }
+                if (moveContext.moveType === 'column') {
+                    for (let col = colMin; col <= colMax; col++) {
+                        this._clearColRangeWidthsMap(col);
+                    }
+                }
+                else {
+                    for (let row = rowMin; row <= rowMax; row++) {
+                        this._clearRowRangeHeightsMap(row);
+                    }
+                }
+                this.clearCellStyleCache();
+                if (this.isSeriesNumberInBody(args.source.col, args.source.row) || args.movingColumnOrRow === 'row') {
+                    this.scenegraph.updateHeaderPosition(this.scenegraph.proxy.colStart, this.scenegraph.proxy.colEnd, this.scenegraph.proxy.rowStart, this.scenegraph.proxy.rowEnd, moveContext.moveType);
+                }
+                else if (moveContext.moveType === 'column') {
+                    this.scenegraph.updateHeaderPosition(colMin, colMax, 0, -1, moveContext.moveType);
+                }
+                else {
+                    this.scenegraph.updateHeaderPosition(0, -1, rowMin, rowMax, moveContext.moveType);
+                }
+                if (this.internalProps.frozenColDragHeaderMode === 'adjustFrozenCount' && this.isListTable()) {
+                    if (this.isLeftFrozenColumn(args.target.col) && !this.isLeftFrozenColumn(args.source.col)) {
+                        this.frozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                    else if (this.isLeftFrozenColumn(args.source.col) && !this.isLeftFrozenColumn(args.target.col)) {
+                        this.frozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                    if (this.isRightFrozenColumn(args.target.col) && !this.isRightFrozenColumn(args.source.col)) {
+                        this.rightFrozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                    else if (this.isRightFrozenColumn(args.source.col) && !this.isRightFrozenColumn(args.target.col)) {
+                        this.rightFrozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                }
+                this.scenegraph.updateNextFrame?.();
+                return true;
+            }
+            finally {
+                this.stateManager.columnMove.movingColumnOrRow = prevMoving;
+            }
+        }
         get recordsCount() {
             return this.records?.length;
         }
@@ -73297,8 +73474,7 @@
             if (this.internalProps.customMergeCell) {
                 const customMerge = this.internalProps.customMergeCell(col, row, this);
                 if (customMerge &&
-                    customMerge.range &&
-                    (isValid$1(customMerge.text) || customMerge.customLayout || this.customRender)) {
+                    customMerge.range) {
                     if (customMerge.style) {
                         const styleClass = this.internalProps.bodyHelper.getStyleClass('text');
                         const style = customMerge.style;
@@ -74246,12 +74422,39 @@
         getGroupTitleLevel(col, row) {
             return undefined;
         }
+        getTargetScrollTop(row) {
+            const drawRange = this.getDrawRange();
+            const frozenHeight = this.getFrozenRowsHeight();
+            const rowsHeight = Math.ceil(this.rowHeightsMap.getSumInRange(0, row - 1));
+            const allRowsHeight = this.getAllRowsHeight();
+            return Math.max(0, Math.min(rowsHeight - frozenHeight, allRowsHeight - 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);
+                    if (correctedTargetScrollTop !== this.scrollTop) {
+                        this.scrollTop = correctedTargetScrollTop;
+                    }
+                }
+            }, delay);
+        }
         scrollToRow(row, animationOption) {
+            const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+            this.clearCorrectTimer();
             if (!animationOption) {
-                this.scrollToCell({ row });
+                this.scrollToCell({ row: targetRow });
+                this._scheduleScrollToRowCorrect(targetRow);
                 return;
             }
-            this.animationManager.scrollTo({ row }, animationOption);
+            const duration = !isBoolean$2(animationOption) ? animationOption?.duration ?? 3000 : 3000;
+            this.animationManager.scrollTo({ row: targetRow }, animationOption);
+            this._scrollToRowCorrectTimer = setTimeout(() => {
+                this.scrollToRow(targetRow, false);
+            }, duration);
         }
         scrollToCol(col, animationOption) {
             if (!animationOption) {
@@ -74273,8 +74476,8 @@
             }
             if (isValid$1(cellAddr.row) && cellAddr.row >= this.frozenRowCount) {
                 const frozenHeight = this.getFrozenRowsHeight();
-                const top = this.getRowsHeight(0, cellAddr.row - 1);
-                this.scrollTop = Math.min(top - frozenHeight, this.getAllRowsHeight() - drawRange.height);
+                const 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();
         }
@@ -75193,13 +75396,13 @@
             const colPath = layout.getColKeysPath(col, row);
             indicatorKeys.forEach((key, index) => {
                 const { range, targetTicks, targetRange, axisOption, chartType } = getAxisRangeAndTicks(col, row, index, index === 0 ? 'bottom' : 'top', index === 0 ? 'top' : 'bottom', indicatorKeys, colPath, layout);
-                if (isNumber$2(axisOption?.max)) {
+                if (isNumber$3(axisOption?.max)) {
                     range.max = axisOption.max;
                 }
                 else if (chartType === 'boxPlot') {
                     range.max += (range.max - range.min) / 20;
                 }
-                if (isNumber$2(axisOption?.min)) {
+                if (isNumber$3(axisOption?.min)) {
                     range.min = axisOption.min;
                 }
                 else if (chartType === 'boxPlot') {
@@ -75263,13 +75466,13 @@
             indicatorKeys.forEach((key, index) => {
                 const { range, targetTicks, targetRange, axisOption } = getAxisRangeAndTicks(col, row, index, index === 0 ? 'left' : 'right', index === 0 ? 'right' : 'left', indicatorKeys, rowPath, layout);
                 const { chartType } = getAxisOption(col, row, index === 0 ? 'left' : 'right', layout);
-                if (isNumber$2(axisOption?.max)) {
+                if (isNumber$3(axisOption?.max)) {
                     range.max = axisOption.max;
                 }
                 else if (chartType === 'boxPlot') {
                     range.max += (range.max - range.min) / 20;
                 }
-                if (isNumber$2(axisOption?.min)) {
+                if (isNumber$3(axisOption?.min)) {
                     range.min = axisOption.min;
                 }
                 else if (chartType === 'boxPlot') {
@@ -75497,19 +75700,35 @@
         if (layout.rowHierarchyType !== 'tree') {
             return;
         }
-        const cellRecord = layout._table.getCellRawRecord(col, row);
-        if (layout._table.internalProps.groupTitleCheckbox && layout._table.internalProps.rowSeriesNumber) {
-            if (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;
-            }
+        const table = layout._table;
+        const internalProps = table.internalProps || {};
+        const isGroupMode = !!internalProps.groupBy;
+        const cellRecord = table.getCellRawRecord(col, row);
+        if (!cellRecord?.vtableMerge) {
+            return;
         }
-        else {
-            if (cellRecord?.vtableMerge) {
-                cellRange.start.col = layout.rowHeaderLevelCount;
-                cellRange.end.col = layout.colCount - 1;
-                cellRange.start.row = cellRange.end.row = row;
+        const treeTitleStartCol = internalProps.groupTitleCheckbox && internalProps.rowSeriesNumber
+            ? layout.rowHeaderLevelCount + layout.leftRowSeriesNumberColumnCount
+            : layout.rowHeaderLevelCount;
+        if (col < treeTitleStartCol) {
+            return;
+        }
+        cellRange.start.col = treeTitleStartCol;
+        cellRange.end.col = layout.colCount - 1;
+        cellRange.start.row = cellRange.end.row = row;
+        if (isGroupMode && layout.columnObjects?.length === 1) {
+            const onlyColumn = layout.columnObjects[0];
+            const field = onlyColumn?.field;
+            if (field != null) {
+                let text = cellRecord.vtableMergeName;
+                const groupTitleFieldFormat = internalProps.groupTitleFieldFormat;
+                if (typeof groupTitleFieldFormat === 'function') {
+                    text = groupTitleFieldFormat(cellRecord, col, row, table);
+                }
+                const current = cellRecord[field];
+                if (current == null && text != null) {
+                    cellRecord[field] = text;
+                }
             }
         }
     }
@@ -76981,7 +77200,12 @@
                 }
                 this.table._makeVisibleCell(col, row);
                 this.editingEditor = editor;
-                const dataValue = isValid$1(value) ? value : this.table.getCellOriginValue(col, row);
+                const customMergeText = this.table.getCustomMerge(col, row)?.text;
+                const dataValue = isValid$1(value)
+                    ? value
+                    : isValid$1(customMergeText)
+                        ? customMergeText
+                        : this.table.getCellOriginValue(col, row);
                 const rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row));
                 const referencePosition = { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } };
                 if (col === this.table.colCount - 1) {
@@ -77039,7 +77263,10 @@
             if (this.editingEditor.validateValue) {
                 this.isValidatingValue = true;
                 const newValue = this.editingEditor.getValue();
-                const oldValue = this.table.getCellOriginValue(this.editCell.col, this.editCell.row);
+                const customMergeText = this.table.getCustomMerge(this.editCell.col, this.editCell.row)?.text;
+                const oldValue = isValid$1(customMergeText)
+                    ? customMergeText
+                    : this.table.getCellOriginValue(this.editCell.col, this.editCell.row);
                 const target = e?.target;
                 const maybePromiseOrValue = this.editingEditor.validateValue?.(newValue, oldValue, this.editCell, this.table, !!this.table.getElement().contains(target));
                 if (isPromise(maybePromiseOrValue)) {
@@ -77063,16 +77290,21 @@
         doExit() {
             const changedValue = this.editingEditor.getValue?.();
             const range = this.table.getCellRange(this.editCell.col, this.editCell.row);
-            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);
+            this.editingEditor.beforeEnd?.();
+            if (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);
                 }
-                changedValues.push(rowChangedValues);
+                this.table.changeCellValues(range.start.col, range.start.row, changedValues);
             }
-            this.editingEditor.beforeEnd?.();
-            this.table.changeCellValues(range.start.col, range.start.row, changedValues);
             this.editingEditor.exit && (void 0);
             this.editingEditor.exit?.();
             this.editingEditor.onEnd?.();
@@ -77141,6 +77373,24 @@
         return { addRecordRule };
     }
 
+    function refreshCustomMergeCellGroups(table) {
+        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 = merges[i]?.range;
+            if (!r?.start) {
+                continue;
+            }
+            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) {
         if ((workOnEditableCell && table.isHasEditorDefine(col, row)) || workOnEditableCell === false) {
             const recordShowIndex = table.getRecordShowIndexByCell(col, row);
@@ -77155,6 +77405,16 @@
                 table.dataSource.changeFieldValue(value, recordShowIndex, field, col, row, table);
             }
             const range = table.getCellRange(col, row);
+            if (range.isCustom &&
+                range.start.col === col &&
+                range.start.row === row &&
+                Array.isArray(table.options.customMergeCell) &&
+                typeof table.getCellValue === 'function') {
+                const customMerge = table.internalProps?.customMergeCell?.(col, row, table);
+                if (customMerge) {
+                    customMerge.text = value;
+                }
+            }
             const aggregators = table.internalProps.layoutMap.getAggregatorsByCell(col, row);
             if (aggregators) {
                 if (Array.isArray(aggregators)) {
@@ -77534,10 +77794,15 @@
                 table.dataSource.addRecord(record, recordIndex, syncToOriginalRecords);
                 adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, 1);
                 if (syncToOriginalRecords) {
+                    if (!table.transpose) {
+                        const topAggregationCount = table.internalProps.layoutMap.hasAggregationOnTopCount;
+                        const insertRowIndex = recordIndex + headerCount + topAggregationCount;
+                        table.rowHeightsMap.insert(insertRowIndex);
+                    }
                     table.refreshRowColCount();
                     table.internalProps.layoutMap.clearCellRangeMap();
                     table.scenegraph.clearCells();
-                    table.scenegraph.createSceneGraph();
+                    table.scenegraph.createSceneGraph(true);
                     return true;
                 }
                 const oldRowCount = table.rowCount;
@@ -77676,10 +77941,17 @@
                 table.dataSource.addRecords(records, recordIndex, syncToOriginalRecords);
                 adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, records.length);
                 if (syncToOriginalRecords) {
+                    if (!table.transpose) {
+                        const topAggregationCount = table.internalProps.layoutMap.hasAggregationOnTopCount;
+                        const insertRowIndex = recordIndex + headerCount + topAggregationCount;
+                        for (let i = 0; i < records.length; i++) {
+                            table.rowHeightsMap.insert(insertRowIndex);
+                        }
+                    }
                     table.refreshRowColCount();
                     table.internalProps.layoutMap.clearCellRangeMap();
                     table.scenegraph.clearCells();
-                    table.scenegraph.createSceneGraph();
+                    table.scenegraph.createSceneGraph(true);
                     return true;
                 }
                 const oldRowCount = table.transpose ? table.colCount : table.rowCount;
@@ -77815,14 +78087,25 @@
                 if (deletedRecordIndexs.length === 0) {
                     return;
                 }
+                if (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) {
+                    if (!table.transpose) {
+                        const headerCount = table.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount;
+                        const topAggregationCount = table.internalProps.layoutMap.hasAggregationOnTopCount;
+                        const sorted = [...deletedRecordIndexs].sort((a, b) => b - a);
+                        for (let i = 0; i < sorted.length; i++) {
+                            table.rowHeightsMap.delete(sorted[i] + headerCount + topAggregationCount);
+                        }
+                    }
                     table.refreshRowColCount();
                     table.internalProps.layoutMap.clearCellRangeMap();
                     table.scenegraph.clearCells();
-                    table.scenegraph.createSceneGraph();
+                    table.scenegraph.createSceneGraph(true);
                     return;
                 }
                 const oldRowCount = table.transpose ? table.colCount : table.rowCount;
@@ -77879,6 +78162,7 @@
                                 ? table.scenegraph.updateCol(delRows, [], updateRows)
                                 : table.scenegraph.updateRow(delRows, [], updateRows);
                             table.reactCustomLayout?.updateAllCustomCell();
+                            refreshCustomMergeCellGroups(table);
                         }
                     }
                 }
@@ -77898,6 +78182,46 @@
                         }
                     }
                     const updateRows = [];
+                    if (table.internalProps.customMergeCell) {
+                        const proxy = table.scenegraph.proxy;
+                        recordIndexsMinToMax[0];
+                        const deletedIndexNums = recordIndexsMinToMax.map(recordIndex => recordIndex + headerCount + topAggregationCount);
+                        const minIndexNum = deletedIndexNums[0];
+                        let updateMin = minIndexNum;
+                        let updateMax = minIndexNum;
+                        if (Array.isArray(table.options.customMergeCell)) {
+                            const merges = table.options.customMergeCell;
+                            const axis = table.transpose ? 'col' : 'row';
+                            merges.forEach(m => {
+                                const r = m?.range;
+                                if (!r?.start || !r?.end) {
+                                    return;
+                                }
+                                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, proxy?.colStart ?? updateMin);
+                            const end = Math.min(updateMax, proxy?.colEnd ?? updateMax);
+                            for (let col = start; col <= end; col++) {
+                                updateRows.push({ col, row: 0 });
+                            }
+                        }
+                        else {
+                            const start = Math.max(updateMin, proxy?.rowStart ?? updateMin);
+                            const end = Math.min(updateMax, proxy?.rowEnd ?? updateMax);
+                            for (let row = start; row <= end; row++) {
+                                updateRows.push({ col: 0, row });
+                            }
+                        }
+                    }
                     for (let row = headerCount; row < headerCount + topAggregationCount; row++) {
                         if (table.transpose) {
                             updateRows.push({ col: row, row: 0 });
@@ -77919,6 +78243,7 @@
                         ? table.scenegraph.updateCol(delRows, [], updateRows)
                         : table.scenegraph.updateRow(delRows, [], updateRows);
                     table.reactCustomLayout?.updateAllCustomCell();
+                    refreshCustomMergeCellGroups(table);
                 }
             }
         }
@@ -77964,7 +78289,7 @@
                     table.refreshRowColCount();
                     table.internalProps.layoutMap.clearCellRangeMap();
                     table.scenegraph.clearCells();
-                    table.scenegraph.createSceneGraph();
+                    table.scenegraph.createSceneGraph(true);
                     return;
                 }
                 const bodyRowIndex = updateRecordIndexs.map((index) => table.getBodyRowIndexByRecordIndex(index));
@@ -78055,7 +78380,7 @@
         }
         if (table.dataSource.rowHierarchyType === 'tree') {
             let toOperateIndexArr;
-            if (isNumber$2(recordIndex)) {
+            if (isNumber$3(recordIndex)) {
                 toOperateIndexArr = [recordIndex];
             }
             else {
@@ -78146,7 +78471,7 @@
         }
         if (table.dataSource.rowHierarchyType === 'tree') {
             let toOperateIndexArr;
-            if (isNumber$2(recordIndex)) {
+            if (isNumber$3(recordIndex)) {
                 toOperateIndexArr = [recordIndex];
             }
             else {
@@ -78416,6 +78741,53 @@
         }
         addColumns(toAddColumns, colIndex, isMaintainArrayData = true) {
             const columns = this.options.columns;
+            if (Array.isArray(this.options.customMergeCell) && toAddColumns?.length) {
+                const axis = this.transpose ? 'row' : 'col';
+                let insertIndex = colIndex;
+                if (insertIndex === undefined) {
+                    insertIndex = columns.length;
+                }
+                else if (insertIndex < 0) {
+                    insertIndex = 0;
+                }
+                else if (insertIndex > columns.length) {
+                    insertIndex = columns.length;
+                }
+                const toAddCount = toAddColumns.length;
+                const merges = this.options.customMergeCell.map(m => ({
+                    ...m,
+                    range: { start: { ...m.range.start }, end: { ...m.range.end } }
+                }));
+                for (let i = 0; i < merges.length; i++) {
+                    const r = merges[i]?.range;
+                    if (!r?.start || !r?.end) {
+                        continue;
+                    }
+                    const start = r.start[axis];
+                    const end = r.end[axis];
+                    if (end < insertIndex) {
+                        continue;
+                    }
+                    if (start > insertIndex) {
+                        r.start[axis] = start + toAddCount;
+                        r.end[axis] = end + toAddCount;
+                    }
+                    else {
+                        r.end[axis] = end + toAddCount;
+                    }
+                }
+                this.options.customMergeCell = merges.filter((m) => {
+                    const r = m?.range;
+                    if (!r?.start || !r?.end) {
+                        return false;
+                    }
+                    if (r.end.row < r.start.row || r.end.col < r.start.col) {
+                        return false;
+                    }
+                    return !(r.start.row === r.end.row && r.start.col === r.end.col);
+                });
+                this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+            }
             if (colIndex === undefined) {
                 colIndex = columns.length;
                 columns.push(...toAddColumns);
@@ -78446,6 +78818,21 @@
                 }
             }
             this.updateColumns(columns, { clearRowHeightCache: false });
+            if (Array.isArray(this.options.customMergeCell)) {
+                this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+                this.options.customMergeCell.forEach(m => {
+                    const r = m?.range;
+                    if (!r?.start) {
+                        return;
+                    }
+                    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,
@@ -78455,6 +78842,65 @@
         deleteColumns(deleteColIndexs, isMaintainArrayData = true) {
             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) && deleteColIndexs?.length) {
+                const axis = this.transpose ? 'row' : 'col';
+                const deleteIndexNums = deleteColIndexs
+                    .slice()
+                    .sort((a, b) => a - b)
+                    .map((idx, i) => idx - i);
+                const merges = this.options.customMergeCell.map(m => ({
+                    ...m,
+                    range: {
+                        start: { ...m.range.start },
+                        end: { ...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 = merges[j]?.range;
+                        if (!r?.start || !r?.end) {
+                            continue;
+                        }
+                        const start = r.start[axis];
+                        const end = r.end[axis];
+                        if (end < deleteIndex) {
+                            continue;
+                        }
+                        if (start > deleteIndex) {
+                            r.start[axis] = start - 1;
+                            r.end[axis] = end - 1;
+                        }
+                        else {
+                            r.end[axis] = end - 1;
+                        }
+                    }
+                }
+                this.options.customMergeCell = merges.filter((m) => {
+                    const r = m?.range;
+                    if (!r?.start || !r?.end) {
+                        return false;
+                    }
+                    if (r.end.row < r.start.row || r.end.col < r.start.col) {
+                        return false;
+                    }
+                    return !(r.start.row === r.end.row && r.start.col === r.end.col);
+                });
+                this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+            }
+            if (isMaintainArrayData && Array.isArray(this.records) && this.records.length) {
+                deletedRecordValues = this.records.map(record => {
+                    if (Array.isArray(record)) {
+                        return deleteColIndexs.map(idx => record[idx]);
+                    }
+                    return [];
+                });
+                if (deletedRecordValues.every(v => v.length === 0)) {
+                    deletedRecordValues = undefined;
+                }
+            }
             for (let i = 0; i < deleteColIndexs.length; i++) {
                 columns.splice(deleteColIndexs[i], 1);
                 this.colWidthsMap.delAndReorder(deleteColIndexs[i]);
@@ -78487,7 +78933,9 @@
             this.updateColumns(columns, { clearRowHeightCache: false });
             this.fireListeners(TABLE_EVENT_TYPE.DELETE_COLUMN, {
                 deleteColIndexs: deleteColIndexs,
-                columns
+                columns,
+                deletedColumns,
+                deletedRecordValues
             });
         }
         get columns() {
@@ -79104,47 +79552,54 @@
             return undefined;
         }
         updateSortState(sortState, executeSort = true) {
-            if (!sortState) {
-                if (this.internalProps.sortState) {
-                    if (Array.isArray(this.internalProps.sortState)) {
-                        for (let i = 0; i < this.internalProps.sortState.length; i++) {
-                            sortState = this.internalProps.sortState?.[i];
-                            sortState && (sortState.order = 'normal');
-                        }
-                    }
-                    else {
-                        this.internalProps.sortState.order = 'normal';
-                        sortState = this.internalProps.sortState;
-                    }
-                }
-            }
-            else {
+            const nextSortState = Array.isArray(sortState) ? sortState : sortState ? [sortState] : [];
+            const normalizedSortState = nextSortState.filter(Boolean);
+            if (normalizedSortState.length) {
                 this.internalProps.sortState = sortState;
             }
-            sortState = Array.isArray(sortState) ? sortState : [sortState];
-            if (sortState.some((item) => item.field) && executeSort) {
-                if (this.internalProps.layoutMap.headerObjects.some(item => item.define.sort !== false)) {
-                    this.dataSource.sort(sortState.map((item) => {
-                        const sortFunc = this._getSortFuncFromHeaderOption(this.internalProps.columns, item.field);
-                        this.internalProps.layoutMap.headerObjects.find((col) => col && col.field === item.field);
-                        return {
-                            field: item.field,
-                            order: item.order,
-                            orderFn: sortFunc ?? defaultOrderFn
-                        };
-                    }));
+            else {
+                this.internalProps.sortState = null;
+            }
+            if (executeSort) {
+                if (normalizedSortState.length) {
+                    if (this.internalProps.layoutMap.headerObjects.some(item => item.define.sort !== false)) {
+                        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 {
+                                field: item.field,
+                                order: item.order,
+                                orderFn: sortFunc ?? defaultOrderFn
+                            };
+                        }));
+                        this.internalProps.layoutMap.clearCellRangeMap();
+                        this.internalProps.useOneRowHeightFillAll = false;
+                        this.scenegraph.sortCell();
+                    }
+                }
+                else {
+                    const ds = this.dataSource;
+                    const sourceLength = ds?.sourceLength ?? ds?._sourceLength ?? ds?.length ?? 0;
+                    if (ds?.sortedIndexMap?.clear) {
+                        ds.sortedIndexMap.clear();
+                    }
+                    if (typeof ds.currentIndexedData !== 'undefined') {
+                        ds.currentIndexedData = Array.from({ length: sourceLength }, (_, i) => i);
+                    }
+                    ds.lastSortStates = [];
+                    ds.updatePagination?.(ds.pagination);
                     this.internalProps.layoutMap.clearCellRangeMap();
                     this.internalProps.useOneRowHeightFillAll = false;
                     this.scenegraph.sortCell();
                 }
             }
-            if (sortState.length) {
-                this.stateManager.updateSortState(sortState);
-            }
+            this.stateManager.updateSortState(normalizedSortState);
         }
         updateFilterRules(filterRules, options = { clearRowHeightCache: true }) {
             this.scenegraph.clearCells();
-            this.dataSource.clearForceVisibleRecords?.();
+            if (options?.clearForceVisibleRecords !== false) {
+                this.dataSource.clearForceVisibleRecords?.();
+            }
             if (this.sortState) {
                 this.dataSource.updateFilterRulesForSorted(filterRules);
                 sortRecords(this);
@@ -79548,9 +80003,70 @@
             this.resize();
         }
         addRecord(record, recordIndex, triggerEvent = true) {
+            if (Array.isArray(this.options.customMergeCell) && typeof recordIndex === 'number') {
+                const axis = this.transpose ? 'col' : 'row';
+                const headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount;
+                const topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount;
+                let insertIndex = recordIndex;
+                if (insertIndex === undefined || insertIndex > this.dataSource.sourceLength) {
+                    insertIndex = this.dataSource.sourceLength;
+                }
+                else if (insertIndex < 0) {
+                    insertIndex = 0;
+                }
+                const insertIndexNum = insertIndex + headerCount + topAggregationCount;
+                const merges = this.options.customMergeCell.map(m => ({
+                    ...m,
+                    range: { start: { ...m.range.start }, end: { ...m.range.end } }
+                }));
+                for (let i = 0; i < merges.length; i++) {
+                    const r = merges[i]?.range;
+                    if (!r?.start || !r?.end) {
+                        continue;
+                    }
+                    const start = r.start[axis];
+                    const end = r.end[axis];
+                    if (end < insertIndexNum) {
+                        continue;
+                    }
+                    if (start > insertIndexNum) {
+                        r.start[axis] = start + 1;
+                        r.end[axis] = end + 1;
+                    }
+                    else {
+                        r.end[axis] = end + 1;
+                    }
+                }
+                this.options.customMergeCell = merges.filter((m) => {
+                    const r = m?.range;
+                    if (!r?.start || !r?.end) {
+                        return false;
+                    }
+                    if (r.end.row < r.start.row || r.end.col < r.start.col) {
+                        return false;
+                    }
+                    return !(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]);
             this.internalProps.emptyTip?.resetVisible();
+            if (success && Array.isArray(this.options.customMergeCell)) {
+                this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+                this.options.customMergeCell.forEach(m => {
+                    const r = m?.range;
+                    if (!r?.start) {
+                        return;
+                    }
+                    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();
+            }
             if (triggerEvent && success) {
                 this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
                     records: [record],
@@ -79560,11 +80076,73 @@
             }
         }
         addRecords(records, recordIndex, triggerEvent = true) {
+            if (Array.isArray(this.options.customMergeCell) && typeof recordIndex === 'number' && records?.length) {
+                const axis = this.transpose ? 'col' : 'row';
+                const headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount;
+                const topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount;
+                let insertIndex = recordIndex;
+                if (insertIndex === undefined || insertIndex > this.dataSource.sourceLength) {
+                    insertIndex = this.dataSource.sourceLength;
+                }
+                else if (insertIndex < 0) {
+                    insertIndex = 0;
+                }
+                const insertIndexNum = insertIndex + headerCount + topAggregationCount;
+                const toAddCount = records.length;
+                const merges = this.options.customMergeCell.map(m => ({
+                    ...m,
+                    range: { start: { ...m.range.start }, end: { ...m.range.end } }
+                }));
+                for (let i = 0; i < merges.length; i++) {
+                    const r = merges[i]?.range;
+                    if (!r?.start || !r?.end) {
+                        continue;
+                    }
+                    const start = r.start[axis];
+                    const end = r.end[axis];
+                    if (end < insertIndexNum) {
+                        continue;
+                    }
+                    if (start > insertIndexNum) {
+                        r.start[axis] = start + toAddCount;
+                        r.end[axis] = end + toAddCount;
+                    }
+                    else {
+                        r.end[axis] = end + toAddCount;
+                    }
+                }
+                this.options.customMergeCell = merges.filter((m) => {
+                    const r = m?.range;
+                    if (!r?.start || !r?.end) {
+                        return false;
+                    }
+                    if (r.end.row < r.start.row || r.end.col < r.start.col) {
+                        return false;
+                    }
+                    return !(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);
             if (typeof recordIndex === 'number') {
                 adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, records);
             }
             this.internalProps.emptyTip?.resetVisible();
+            if (success && Array.isArray(this.options.customMergeCell)) {
+                this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+                this.options.customMergeCell.forEach(m => {
+                    const r = m?.range;
+                    if (!r?.start) {
+                        return;
+                    }
+                    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();
+            }
             if (triggerEvent && success) {
                 this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
                     records,
@@ -79574,6 +80152,15 @@
             }
         }
         deleteRecords(recordIndexs, triggerEvent = true) {
+            const prevMergeRanges = Array.isArray(this.options.customMergeCell)
+                ? this.options.customMergeCell
+                    .map(m => m?.range)
+                    .filter(Boolean)
+                    .map((r) => ({
+                    start: { ...r.start },
+                    end: { ...r.end }
+                }))
+                : [];
             const deletedRecords = [];
             if (recordIndexs?.length > 0) {
                 recordIndexs.forEach(index => {
@@ -79587,6 +80174,47 @@
                     deletedRecords.push(record);
                 });
             }
+            if (Array.isArray(this.options.customMergeCell) && recordIndexs?.length && typeof recordIndexs[0] === 'number') {
+                const axis = this.transpose ? 'col' : 'row';
+                const headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount;
+                const topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount;
+                const deleteIndexNums = recordIndexs
+                    .slice()
+                    .sort((a, b) => a - b)
+                    .map((index, i) => index + headerCount + topAggregationCount - i);
+                const 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 = merges[j]?.range;
+                        if (!r?.start || !r?.end) {
+                            continue;
+                        }
+                        const start = r.start[axis];
+                        const end = r.end[axis];
+                        if (end < deleteIndex) {
+                            continue;
+                        }
+                        if (start > deleteIndex) {
+                            r.start[axis] = start - 1;
+                            r.end[axis] = end - 1;
+                        }
+                        else {
+                            r.end[axis] = end - 1;
+                        }
+                    }
+                }
+                this.options.customMergeCell = merges.filter((m) => {
+                    const r = m?.range;
+                    if (!r?.start || !r?.end) {
+                        return false;
+                    }
+                    if (r.end.row < r.start.row || r.end.col < r.start.col) {
+                        return false;
+                    }
+                    return !(r.start.row === r.end.row && r.start.col === r.end.col);
+                });
+            }
             listTableDeleteRecords(recordIndexs, this);
             adjustHeightResizedRowMapWithDeleteRecordIndex(this, recordIndexs);
             this.internalProps.emptyTip?.resetVisible();
@@ -79604,6 +80232,46 @@
                         : recordIndexs.length
                 });
             }
+            if (Array.isArray(this.options.customMergeCell)) {
+                this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+                this.options.customMergeCell.forEach(m => {
+                    const r = m?.range;
+                    if (!r?.start) {
+                        return;
+                    }
+                    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;
+                    }
+                    if (Array.isArray(this.options.customMergeCell)) {
+                        this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+                    }
+                    const refreshRanges = [
+                        ...prevMergeRanges,
+                        ...(Array.isArray(this.options.customMergeCell)
+                            ? this.options.customMergeCell.map(m => m?.range)
+                            : [])
+                    ].filter(Boolean);
+                    refreshRanges.forEach(r => {
+                        if (!r?.start) {
+                            return;
+                        }
+                        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 = true) {
             listTableUpdateRecords(records, recordIndexs, this);
@@ -79760,6 +80428,7 @@
                 }
             }
             this.scenegraph.updateNextFrame();
+            this.fireListeners(TABLE_EVENT_TYPE.MERGE_CELLS, { startCol, startRow, endCol, endRow });
         }
         unmergeCells(startCol, startRow, endCol, endRow) {
             if (!this.options.customMergeCell) {
@@ -79779,6 +80448,7 @@
                 }
             }
             this.scenegraph.updateNextFrame();
+            this.fireListeners(TABLE_EVENT_TYPE.UNMERGE_CELLS, { startCol, startRow, endCol, endRow });
         }
     }
 
@@ -83556,13 +84226,13 @@
         const checkedStroke = getProp('checkedStroke', style, col, row, table);
         const disableCheckedFill = getProp('disableCheckedFill', style, col, row, table);
         const disableCheckedStroke = getProp('disableCheckedStroke', style, col, row, table);
-        if (isNumber$2(outerRadius)) {
+        if (isNumber$3(outerRadius)) {
             size = outerRadius * 2;
         }
         else {
             outerRadius = Math.round(size / 2);
         }
-        if (!isNumber$2(innerRadius) || innerRadius < 0) {
+        if (!isNumber$3(innerRadius) || innerRadius < 0) {
             innerRadius = Math.round((outerRadius / 7) * 3);
         }
         const value = table.getCellValue(col, row);
@@ -84657,7 +85327,7 @@
         let contentWidth = width;
         let contentHeight = height;
         let _contentOffset = 0;
-        if (isNumber$2(table.theme._contentOffset)) {
+        if (isNumber$3(table.theme._contentOffset)) {
             _contentOffset = table.theme._contentOffset;
         }
         const percentCompleteBarGroup = new Group$1({
@@ -85116,10 +85786,10 @@
                 max = domainMax + (domainMax - domainMin) * axisOption.expand.max;
             }
         }
-        if (isNumber$2(axisOption?.min)) {
+        if (isNumber$3(axisOption?.min)) {
             min = axisOption.min;
         }
-        if (isNumber$2(axisOption?.max)) {
+        if (isNumber$3(axisOption?.max)) {
             max = axisOption.max;
         }
         let scale;
@@ -85167,7 +85837,7 @@
             scaleTicks = scale.forceTicks(target?.targetTicks?.length ?? axisOption?.tick?.forceTickCount);
         }
         else {
-            scaleTicks = scale.ticks(isNumber$2(axisOption?.tick?.tickCount) ? axisOption.tick.tickCount : DEFAULT_CONTINUOUS_TICK_COUNT, {
+            scaleTicks = scale.ticks(isNumber$3(axisOption?.tick?.tickCount) ? axisOption.tick.tickCount : DEFAULT_CONTINUOUS_TICK_COUNT, {
                 noDecimals: axisOption?.tick?.noDecimals
             });
         }
@@ -92068,10 +92738,11 @@
             }
             this.dataset.updateSortRules(sortRules);
             this._changePivotSortStateBySortRules();
+            this._filterHideIndicatorNode();
             const { layoutMap } = this.internalProps;
             layoutMap.resetHeaderTree();
             this.scenegraph.clearCells();
-            if (isNumber$2(col) && isNumber$2(row)) {
+            if (isNumber$3(col) && isNumber$3(row)) {
                 if (this.isRowHeader(col, row)) {
                     this.setMinMaxLimitWidth(true);
                     this.internalProps._widthResizedColMap.clear();
@@ -92134,6 +92805,15 @@
                 });
             }
         }
+        _filterHideIndicatorNode() {
+            const options = this.options;
+            if (options.indicatorsAsCol !== false && options.indicators && this.dataset.colHeaderTree) {
+                deleteHideIndicatorNode(this.dataset.colHeaderTree, options.indicators, false, this);
+            }
+            if (options.indicatorsAsCol === false && this.dataset.rowHeaderTree && options.indicators) {
+                deleteHideIndicatorNode(this.dataset.rowHeaderTree, options.indicators, false, this);
+            }
+        }
         updatePivotSortState(pivotSortStateConfig) {
             this.pivotSortState = pivotSortStateConfig;
         }
@@ -92877,6 +93557,7 @@
             this.internalProps.dataConfig.filterRules = filterRules;
             if (isResetTree) {
                 this.dataset.updateFilterRules(filterRules, true);
+                this._filterHideIndicatorNode();
                 this.internalProps.layoutMap.resetHeaderTree();
             }
             else {
@@ -93898,7 +94579,7 @@
             this.render();
         }
         clearChartCacheImage(col, row) {
-            if (isNumber$2(col) && isNumber$2(row)) {
+            if (isNumber$3(col) && isNumber$3(row)) {
                 clearCellChartCacheImage(col, row, this.scenegraph);
             }
             else {
@@ -94820,7 +95501,7 @@
     }
 
     registerForVrender();
-    const version = "1.23.3";
+    const version = "1.24.0-alpha.0";
     function getIcons() {
         return get$2();
     }
@@ -94833,6 +95514,7 @@
     exports.CustomLayout = index;
     exports.DataStatistics = DataStatistics;
     exports.EventTarget = EventTarget$1;
+    exports.Group = Group$2;
     exports.Icon = Icon$1;
     exports.ListTable = ListTableAll;
     exports.ListTableSimple = ListTableSimple;
@@ -94866,6 +95548,8 @@
     exports.getTargetCell = getTargetCell;
     exports.graphicUtil = graphicUtil;
     exports.jsx = jsx;
+    exports.mapToCanvasPointForCanvas = mapToCanvasPointForCanvas;
+    exports.matrixAllocate = matrixAllocate;
     exports.pluginsDefinition = index$1;
     exports.register = register$1;
     exports.registerAnimation = registerAnimation;
@@ -94874,6 +95558,7 @@
     exports.registerChartCell = registerChartCell;
     exports.registerCheckboxCell = registerCheckboxCell;
     exports.registerEmptyTip = registerEmptyTip;
+    exports.registerGlobalEventTransformer = registerGlobalEventTransformer;
     exports.registerImageCell = registerImageCell;
     exports.registerLegend = registerLegend;
     exports.registerMenu = registerMenu;
@@ -94885,13 +95570,16 @@
     exports.registerTitle = registerTitle;
     exports.registerTooltip = registerTooltip;
     exports.registerVideoCell = registerVideoCell;
+    exports.registerWindowEventTransformer = registerWindowEventTransformer;
     exports.renderChart = renderChart;
     exports.restoreMeasureText = restoreMeasureText;
     exports.setCustomAlphabetCharSet = setCustomAlphabetCharSet;
     exports.textMeasure = textMeasure;
     exports.themes = themes$1;
     exports.toBoxArray = toBoxArray$1;
+    exports.transformPointForCanvas = transformPointForCanvas;
     exports.updateCell = updateCell$1;
     exports.version = version;
+    exports.vglobal = vglobal;
 
 }));