@visactor/vtable 0.18.4 → 0.19.0

package/dist/vtable.js

@@ -1329,14 +1329,14 @@
     const isDate = value => isType$1(value, "Date");
     var isDate$1 = isDate;
 
-    const isNumber$2 = function (value) {
+    const isNumber$1 = function (value) {
       let fuzzy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
       const type = typeof value;
       return fuzzy ? "number" === type : "number" === type || isType$1(value, "Number");
     };
-    var isNumber$3 = isNumber$2;
+    var isNumber$2 = isNumber$1;
 
-    const isValidNumber = value => isNumber$3(value) && Number.isFinite(value);
+    const isValidNumber = value => isNumber$2(value) && Number.isFinite(value);
     var isValidNumber$1 = isValidNumber;
 
     const isValidUrl = value => new RegExp(/^(http(s)?:\/\/)\w+[^\s]+(\.[^\s]+){1,}$/).test(value);
@@ -1382,7 +1382,7 @@
       if (!isValid$1(value) || "object" != typeof value) return value;
       const isArr = isArray$1(value),
         length = value.length;
-      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;
+      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;
       const props = isArr ? void 0 : Object.keys(Object(value));
       let index = -1;
       if (result) for (; ++index < (props || value).length;) {
@@ -1767,10 +1767,10 @@
         return this.x = x, this.y = y, this;
       }
       add(point) {
-        return isNumber$3(point) ? (this.x += point, void (this.y += point)) : (this.x += point.x, this.y += point.y, this);
+        return isNumber$2(point) ? (this.x += point, void (this.y += point)) : (this.x += point.x, this.y += point.y, this);
       }
       sub(point) {
-        return isNumber$3(point) ? (this.x -= point, void (this.y -= point)) : (this.x -= point.x, this.y -= point.y, this);
+        return isNumber$2(point) ? (this.x -= point, void (this.y -= point)) : (this.x -= point.x, this.y -= point.y, this);
       }
       multi(point) {
         throw new Error("暂不支持");
@@ -2357,10 +2357,10 @@
       return ((value = Math.max(0, Math.min(255, Math.round(value) || 0))) < 16 ? "0" : "") + value.toString(16);
     }
     function rgb(value) {
-      return isNumber$3(value) ? new RGB(value >> 16, value >> 8 & 255, 255 & value, 1) : isArray$1(value) ? new RGB(value[0], value[1], value[2]) : new RGB(255, 255, 255);
+      return isNumber$2(value) ? new RGB(value >> 16, value >> 8 & 255, 255 & value, 1) : isArray$1(value) ? new RGB(value[0], value[1], value[2]) : new RGB(255, 255, 255);
     }
     function rgba(value) {
-      return isNumber$3(value) ? new RGB(value >>> 24, value >>> 16 & 255, value >>> 8 & 255, 255 & value) : isArray$1(value) ? new RGB(value[0], value[1], value[2], value[3]) : new RGB(255, 255, 255, 1);
+      return isNumber$2(value) ? new RGB(value >>> 24, value >>> 16 & 255, value >>> 8 & 255, 255 & value) : isArray$1(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);
@@ -2929,7 +2929,7 @@
     }(LoggerLevel || (LoggerLevel = {}));
     class Logger {
       static getInstance(level, method) {
-        return Logger._instance && isNumber$3(level) ? Logger._instance.level(level) : Logger._instance || (Logger._instance = new Logger(level, method)), Logger._instance;
+        return Logger._instance && isNumber$2(level) ? Logger._instance.level(level) : Logger._instance || (Logger._instance = new Logger(level, method)), Logger._instance;
       }
       static setInstance(logger) {
         return Logger._instance = logger;
@@ -4726,9 +4726,6 @@
     function wrapCanvas(params) {
       return container.getNamed(CanvasFactory, application.global.env)(params);
     }
-    function isNumber$1(data) {
-      return "number" == typeof data && Number.isFinite(data);
-    }
 
     class DefaultCanvasAllocate {
       constructor() {
@@ -5154,7 +5151,7 @@
     }
     const globalTheme = new Theme();
     function getTheme(graphic, theme) {
-      return graphic.glyphHost ? getTheme(graphic.glyphHost) : theme ? (graphic.isContainer, theme) : getThemeFromGroup(graphic) || globalTheme.getTheme();
+      return graphic.glyphHost ? getTheme(graphic.glyphHost) : theme ? (graphic.isContainer, theme) : getThemeFromGroup(graphic) || graphic.attachedThemeGraphic && getTheme(graphic.attachedThemeGraphic) || globalTheme.getTheme();
     }
     function getThemeFromGroup(graphic) {
       let g;
@@ -5324,7 +5321,7 @@
         let child = this._firstChild;
         for (; child;) {
           const next = child._next;
-          child.parent = null, child._prev = null, child._next = null, child = next;
+          child.parent = null, child._prev = null, child._next = null, child = child._next, child = next;
         }
         this._firstChild = null, this._lastChild = null, this._idMap.clear(), this._structEdit = !0, this.setCount(1 - this._count);
       }
@@ -7236,7 +7233,7 @@
         if (!this.valid) return this._AABBBounds.clear(), this._AABBBounds;
         application.graphicService.beforeUpdateAABBBounds(this, this.stage, !0, this._AABBBounds);
         const bounds = this.doUpdateAABBBounds(full);
-        return this.addUpdateLayoutTag(), application.graphicService.afterUpdateAABBBounds(this, this.stage, this._AABBBounds, this, !0), bounds;
+        return application.graphicService.afterUpdateAABBBounds(this, this.stage, this._AABBBounds, this, !0), bounds;
       }
       combindShadowAABBBounds(bounds) {
         if (this.shadowRoot) {
@@ -9534,7 +9531,7 @@
 
     class BaseSymbol {
       bounds(size, bounds) {
-        if (isNumber$3(size)) {
+        if (isNumber$2(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;
@@ -9965,10 +9962,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$3(size) ? rectSize(ctx, size, x, y) : rectSizeArray(ctx, size, x, y);
+        return isNumber$2(size) ? rectSize(ctx, size, x, y) : rectSizeArray(ctx, size, x, y);
       }
       drawOffset(ctx, size, x, y, offset) {
-        return isNumber$3(size) ? rectSize(ctx, size + 2 * offset, x, y) : rectSizeArray(ctx, [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
+        return isNumber$2(size) ? rectSize(ctx, size + 2 * offset, x, y) : rectSizeArray(ctx, [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
       }
     }
     var rect = new RectSymbol();
@@ -10446,16 +10443,7 @@
             deltaY = -height;
         }
         let deltaX = 0;
-        switch (this.globalAlign) {
-          case "left":
-            deltaX = 0;
-            break;
-          case "center":
-            deltaX = -width / 2;
-            break;
-          case "right":
-            deltaX = -width;
-        }
+        "right" === this.globalAlign || "end" === this.globalAlign ? deltaX = -width : "center" === this.globalAlign && (deltaX = -width / 2);
         let frameHeight = this[this.directionKey.height];
         this.singleLine && (frameHeight = this.lines[0].height + 1);
         let lastLineTag = !1;
@@ -10604,9 +10592,9 @@
         let direction = this.direction;
         if (this.verticalEllipsis) text = "...", direction = "vertical", baseline -= this.ellipsisWidth / 2;else {
           if ("hide" === this.ellipsis) return;
-          if ("add" === this.ellipsis) text += "...", "right" === textAlign && (left -= this.ellipsisWidth);else if ("replace" === this.ellipsis) {
+          if ("add" === this.ellipsis) text += "...", "right" !== textAlign && "end" !== textAlign || (left -= this.ellipsisWidth);else if ("replace" === this.ellipsis) {
             const index = getStrByWithCanvas(text, ("vertical" === direction ? this.height : this.width) - this.ellipsisWidth + this.ellipsisOtherParagraphWidth, this.character, text.length - 1);
-            if (text = text.slice(0, index), text += "...", "right" === textAlign) {
+            if (text = text.slice(0, index), text += "...", "right" === textAlign || "end" === textAlign) {
               const {
                 width: width
               } = measureTextCanvas(this.text.slice(index), this.character);
@@ -10797,17 +10785,7 @@
           maxHeight = this.height;
         let x = this.left,
           spacing = 0;
-        if (this.actualWidth < width && !isWidthMax) switch (this.textAlign) {
-          case "right":
-            x = width - this.actualWidth;
-            break;
-          case "center":
-            x = (width - this.actualWidth) / 2;
-            break;
-          case "justify":
-            this.paragraphs.length < 2 ? x = (width - this.actualWidth) / 2 : spacing = (width - this.actualWidth) / (this.paragraphs.length - 1);
-        }
-        this.paragraphs.map(function (paragraph) {
+        this.actualWidth < width && !isWidthMax && ("right" === this.textAlign || "end" === this.textAlign ? x = width - this.actualWidth : "center" === this.textAlign ? x = (width - this.actualWidth) / 2 : "justify" === this.textAlign && (this.paragraphs.length < 2 ? x = (width - this.actualWidth) / 2 : spacing = (width - this.actualWidth) / (this.paragraphs.length - 1))), this.paragraphs.map(function (paragraph) {
           paragraph instanceof RichTextIcon ? (paragraph["_" + directionKey.x] = x, x += paragraph[directionKey.width] + spacing, paragraph["_" + directionKey.y] = "top" === paragraph.attribute.textBaseline ? 0 : "bottom" === paragraph.attribute.textBaseline ? maxHeight - paragraph.height : (maxHeight - paragraph.height) / 2) : (paragraph[directionKey.left] = x, x += paragraph[directionKey.width] + spacing);
         });
       }
@@ -11031,10 +11009,10 @@
           }
         } else {
           const richTextConfig = textConfig[i];
-          if (isNumber$3(richTextConfig.text) && (richTextConfig.text = `${richTextConfig.text}`), richTextConfig.text.includes("\n")) {
+          if (isNumber$2(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++) paragraphs.push(new Paragraph(textParts[j], 0 !== j, richTextConfig));
-          } else paragraphs.push(new Paragraph(richTextConfig.text, !1, richTextConfig));
+          } else richTextConfig.text && paragraphs.push(new Paragraph(richTextConfig.text, !1, richTextConfig));
         }
         const maxWidthFinite = "number" == typeof maxWidth && Number.isFinite(maxWidth) && maxWidth > 0,
           maxHeightFinite = "number" == typeof maxHeight && Number.isFinite(maxHeight) && maxHeight > 0,
@@ -11279,7 +11257,7 @@
           } = this.attribute;
         if (0 === cornerRadius || "0%" === cornerRadius) return 0;
         const deltaRadius = Math.abs(outerRadius - innerRadius);
-        return Math.min(isNumber$3(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
+        return Math.min(isNumber$2(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
       }
       getParsedAngle() {
         const arcTheme = getTheme(this).arc;
@@ -13120,7 +13098,7 @@
     const halfPi = pi / 2;
     function createRectPath(path, x, y, width, height, rectCornerRadius) {
       let cornerRadius;
-      if (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)) {
+      if (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)) {
         const cornerRadiusArr = rectCornerRadius;
         let cr0, cr1;
         switch (cornerRadiusArr.length) {
@@ -13228,7 +13206,7 @@
         y = bounds.y1,
         width = bounds.width(),
         height = bounds.height();
-      return isNumber$3(boundsPadding) ? (x += boundsPadding, y += boundsPadding, width -= 2 * boundsPadding, height -= 2 * boundsPadding) : (x += boundsPadding[3], y += boundsPadding[0], width -= boundsPadding[1] + boundsPadding[3], height -= boundsPadding[0] + boundsPadding[2]), {
+      return isNumber$2(boundsPadding) ? (x += boundsPadding, y += boundsPadding, width -= 2 * boundsPadding, height -= 2 * boundsPadding) : (x += boundsPadding[3], y += boundsPadding[0], width -= boundsPadding[1] + boundsPadding[3], height -= boundsPadding[0] + boundsPadding[2]), {
         x: x,
         y: y,
         width: width,
@@ -15741,20 +15719,26 @@
           height: height
         } = drawContext;
         if (!context) return;
+        if (drawContext.keepMatrix) {
+          if (context.nativeContext && context.nativeContext.getTransform) {
+            const t = context.nativeContext.getTransform();
+            context.setTransformFromMatrix(t, !0, 1);
+          }
+        } else context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0);
         const dirtyBounds = this.dirtyBounds.setValue(0, 0, width, height);
         if (stage.dirtyBounds && !stage.dirtyBounds.empty()) {
           const b = getRectIntersect(dirtyBounds, stage.dirtyBounds, !1);
           dirtyBounds.x1 = Math.floor(b.x1), dirtyBounds.y1 = Math.floor(b.y1), dirtyBounds.x2 = Math.ceil(b.x2), dirtyBounds.y2 = Math.ceil(b.y2);
         }
         const d = context.dpr % 1;
-        (d || .5 !== d) && (dirtyBounds.x1 = Math.floor(dirtyBounds.x1 * context.dpr) / context.dpr, dirtyBounds.y1 = Math.floor(dirtyBounds.y1 * context.dpr) / context.dpr, dirtyBounds.x2 = Math.ceil(dirtyBounds.x2 * context.dpr) / context.dpr, dirtyBounds.y2 = Math.ceil(dirtyBounds.y2 * context.dpr) / context.dpr), this.backupDirtyBounds.copy(dirtyBounds), context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0);
+        (d || .5 !== d) && (dirtyBounds.x1 = Math.floor(dirtyBounds.x1 * context.dpr) / context.dpr, dirtyBounds.y1 = Math.floor(dirtyBounds.y1 * context.dpr) / context.dpr, dirtyBounds.x2 = Math.ceil(dirtyBounds.x2 * context.dpr) / context.dpr, dirtyBounds.y2 = Math.ceil(dirtyBounds.y2 * context.dpr) / context.dpr), this.backupDirtyBounds.copy(dirtyBounds);
         const drawInArea = dirtyBounds.width() * context.dpr < context.canvas.width || dirtyBounds.height() * context.dpr < context.canvas.height;
-        context.save(), context.translate(x, y, !0), drawInArea && (context.beginPath(), context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height()), context.clip()), stage.camera && (this.dirtyBounds.clear(), this.backupDirtyBounds.clear()), this.clearScreen(renderService, context, drawContext), context.save(), renderService.renderTreeRoots.sort((a, b) => {
+        context.save(), context.translate(x, y, !0), drawInArea && (context.beginPath(), context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height()), context.clip()), stage.camera && (this.dirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), this.backupDirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0)), this.clearScreen(renderService, context, drawContext), context.save(), renderService.renderTreeRoots.sort((a, b) => {
           var _a, _b;
           return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : DefaultAttribute.zIndex);
         }).forEach(group => {
           group.isContainer ? this.renderGroup(group, drawContext, matrixAllocate.allocate(1, 0, 0, 1, 0, 0)) : this.renderItem(group, drawContext);
-        }), context.restore(), context.restore(), context.draw(), context.inuse = !1;
+        }), context.restore(), context.restore(), context.draw(), drawContext.keepMatrix || (context.inuse = !1);
       }
       doRegister() {
         throw new Error("暂不支持");
@@ -15807,7 +15791,7 @@
         }, subLayers.set(group._uid, incrementalLayer));
         const incrementalContext = incrementalLayer.layer.getNativeHandler().getContext(),
           idc = incrementalLayer.drawContribution || container.get(IncrementalDrawContribution);
-        idc.dirtyBounds.clear(), idc.backupDirtyBounds.clear(), idc.draw(this.currentRenderService, Object.assign(Object.assign({}, drawContext), {
+        idc.dirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), idc.backupDirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), idc.draw(this.currentRenderService, Object.assign(Object.assign({}, drawContext), {
           drawContribution: idc,
           clear: "transparent",
           layer: incrementalLayer.layer,
@@ -16155,14 +16139,22 @@
             x = 0,
             y = 0
           } = drawContext;
-          context && (context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0), context.save(), drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext), context.translate(x, y, !0), context.save(), renderService.renderTreeRoots.sort((a, b) => {
-            var _a, _b;
-            return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : DefaultAttribute.zIndex);
-          }).forEach(group => {
-            this.renderGroup(group, drawContext);
-          }), this.hooks.completeDraw.tap("top-draw", () => {
-            context.restore(), context.restore(), context.draw(), context.inuse = !1, this.rendering = !1;
-          }));
+          if (context) {
+            if (drawContext.keepMatrix) {
+              if (context.nativeContext && context.nativeContext.getTransform) {
+                const t = context.nativeContext.getTransform();
+                context.setTransformFromMatrix(t, !0, 1);
+              }
+            } else context.inuse = !0, context.clearMatrix();
+            context.setTransformForCurrent(!0), context.save(), drawContext.restartIncremental && this.clearScreen(this.currentRenderService, context, drawContext), context.translate(x, y, !0), context.save(), renderService.renderTreeRoots.sort((a, b) => {
+              var _a, _b;
+              return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : DefaultAttribute.zIndex);
+            }).forEach(group => {
+              this.renderGroup(group, drawContext);
+            }), this.hooks.completeDraw.tap("top-draw", () => {
+              context.restore(), context.restore(), context.draw(), drawContext.keepMatrix || (context.inuse = !1), this.rendering = !1;
+            });
+          }
         });
       }
       _increaseRender(group, drawContext) {
@@ -16463,34 +16455,48 @@
       constructor() {
         this.name = "FlexLayoutPlugin", this.activeEvent = "onRegister", this.id = Generator.GenAutoIncrementId(), this.key = this.name + this.id, this.tempBounds = new AABBBounds();
       }
+      pauseLayout(p) {
+        this.pause = p;
+      }
+      tryLayoutChildren(graphic) {
+        graphic.firstChild && this.tryLayout(graphic.firstChild);
+      }
       tryLayout(graphic) {
-        if (this.layouting) return;
-        this.layouting = !0;
+        let force = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
+        if (this.pause) return;
         const p = graphic.parent;
-        if (!p || !graphic.needUpdateLayout()) return;
+        if (!(force || p && graphic.needUpdateLayout())) return;
         const theme = getTheme(p).group,
           {
             display = theme.display
           } = p.attribute;
         if ("flex" !== display) return;
         const {
-          flexDirection = theme.flexDirection,
-          flexWrap = theme.flexWrap,
-          justifyContent = theme.justifyContent,
-          alignItems = theme.alignItems,
-          alignContent = theme.alignContent,
-          clip = theme.clip
+            flexDirection = theme.flexDirection,
+            flexWrap = theme.flexWrap,
+            alignItems = theme.alignItems,
+            clip = theme.clip
+          } = p.attribute,
+          {
+            alignContent = null != alignItems ? alignItems : theme.alignContent
+          } = p.attribute;
+        let {
+          width: width,
+          height: height,
+          justifyContent = theme.justifyContent
         } = p.attribute;
-        let childrenWidth = 0,
-          childrenHeight = 0,
-          boundsLegal = 0;
-        if (p.forEachChildren(child => {
-          const bounds = child.AABBBounds;
-          "column" === flexDirection || "column-reverse" === flexDirection ? (childrenHeight += bounds.height(), childrenWidth = Math.max(childrenWidth, bounds.width())) : (childrenWidth += bounds.width(), childrenHeight = Math.max(childrenHeight, bounds.height())), boundsLegal += bounds.x1, boundsLegal += bounds.y1, boundsLegal += bounds.x2, boundsLegal += bounds.y2;
-        }), !isFinite(boundsLegal)) return;
-        const width = p.attribute.width || childrenWidth,
-          height = p.attribute.height || childrenHeight;
-        p.attribute.width || (p.attribute.width = 0), p.attribute.height || (p.attribute.height = 0), this.tempBounds.copy(p._AABBBounds);
+        const children = p.getChildren();
+        if (null == width || null == height) {
+          let childrenWidth = 0,
+            childrenHeight = 0,
+            boundsLegal = 0;
+          if (children.forEach(child => {
+            const bounds = this.getAABBBounds(child);
+            bounds.empty() || ("column" === flexDirection || "column-reverse" === flexDirection ? (childrenHeight += bounds.height(), childrenWidth = Math.max(childrenWidth, bounds.width())) : (childrenWidth += bounds.width(), childrenHeight = Math.max(childrenHeight, bounds.height())), boundsLegal += bounds.x1, boundsLegal += bounds.y1, boundsLegal += bounds.x2, boundsLegal += bounds.y2);
+          }), !isFinite(boundsLegal)) return;
+          width = childrenWidth, height = childrenHeight;
+        }
+        p.attribute.width = width, p.attribute.height = height, this.tempBounds.copy(p._AABBBounds);
         const result = {
             main: {
               len: width,
@@ -16499,18 +16505,18 @@
             cross: {
               len: height,
               field: "y"
-            },
-            dir: 1
+            }
           },
           main = result.main,
           cross = result.cross;
-        "row-reverse" === flexDirection ? result.dir = -1 : "column" === flexDirection ? (main.len = height, cross.len = width, main.field = "y", cross.field = "x") : "column-reverse" === flexDirection && (main.len = height, cross.len = width, main.field = "y", cross.field = "x", result.dir = -1);
+        "column" !== flexDirection && "column-reverse" !== flexDirection || (main.len = height, cross.len = width, main.field = "y", cross.field = "x"), "row-reverse" !== flexDirection && "column-reverse" !== flexDirection || ("flex-start" === justifyContent ? justifyContent = "flex-end" : "flex-end" === justifyContent ? justifyContent = "flex-start" : children.reverse());
         let mainLen = 0,
           crossLen = 0;
         const mianLenArray = [];
-        p.forEachChildren(c => {
-          const b = c.AABBBounds,
-            ml = "x" === main.field ? b.width() : b.height(),
+        children.forEach(c => {
+          const b = this.getAABBBounds(c);
+          if (b.empty()) return;
+          const ml = "x" === main.field ? b.width() : b.height(),
             cl = "x" === cross.field ? b.width() : b.height();
           mianLenArray.push({
             mainLen: ml,
@@ -16545,107 +16551,168 @@
           mainLen: mainLen,
           crossLen: crossLen
         });
-        const children = p.getChildren();
         let lastIdx = 0;
         if (mainList.forEach(s => {
           this.layoutMain(p, children, justifyContent, main, mianLenArray, lastIdx, s), lastIdx = s.idx + 1;
         }), crossLen = mainList.reduce((a, b) => a + b.crossLen, 0), 1 === mainList.length) {
-          if ("flex-end" === alignItems) {
-            const anchorPos = cross.len;
-            this.layoutCross(children, alignItems, cross, anchorPos, mianLenArray, mainList[0], 0);
-          } else if ("center" === alignItems) {
-            const anchorPos = cross.len / 2;
-            this.layoutCross(children, alignItems, cross, anchorPos, mianLenArray, mainList[0], 0);
-          } else children.forEach(child => {
-            child.attribute[cross.field] = getPadding(child, cross.field);
-          });
+          const anchorPosMap = {
+            "flex-start": 0,
+            "flex-end": cross.len,
+            center: cross.len / 2
+          };
+          this.layoutCross(children, alignItems, cross, anchorPosMap, mianLenArray, mainList[0], 0);
         } else if ("flex-start" === alignContent) {
           lastIdx = 0;
           let anchorPos = 0;
           mainList.forEach((s, i) => {
-            this.layoutCross(children, "flex-start", cross, anchorPos, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen;
+            const anchorPosMap = {
+              "flex-start": anchorPos,
+              "flex-end": anchorPos + s.crossLen,
+              center: anchorPos + s.crossLen / 2
+            };
+            this.layoutCross(children, "flex-start", cross, anchorPosMap, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen;
           });
         } else if ("center" === alignContent) {
           lastIdx = 0;
           let anchorPos = Math.max(0, (cross.len - crossLen) / 2);
           mainList.forEach((s, i) => {
-            this.layoutCross(children, "center", cross, anchorPos + s.crossLen / 2, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen;
+            const anchorPosMap = {
+              "flex-start": anchorPos,
+              "flex-end": anchorPos + s.crossLen,
+              center: anchorPos + s.crossLen / 2
+            };
+            this.layoutCross(children, "center", cross, anchorPosMap, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen;
           });
         } else if ("space-around" === alignContent) {
           lastIdx = 0;
           const padding = Math.max(0, (cross.len - crossLen) / mainList.length / 2);
           let anchorPos = padding;
           mainList.forEach((s, i) => {
-            this.layoutCross(children, "flex-start", cross, anchorPos, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen + 2 * padding;
+            const anchorPosMap = {
+              "flex-start": anchorPos,
+              "flex-end": anchorPos + s.crossLen,
+              center: anchorPos + s.crossLen / 2
+            };
+            this.layoutCross(children, "flex-start", cross, anchorPosMap, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen + 2 * padding;
           });
         } else if ("space-between" === alignContent) {
           lastIdx = 0;
           const padding = Math.max(0, (cross.len - crossLen) / (2 * mainList.length - 2));
           let anchorPos = 0;
           mainList.forEach((s, i) => {
-            this.layoutCross(children, "flex-start", cross, anchorPos, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen + 2 * padding;
+            const anchorPosMap = {
+              "flex-start": anchorPos,
+              "flex-end": anchorPos + s.crossLen,
+              center: anchorPos + s.crossLen / 2
+            };
+            this.layoutCross(children, "flex-start", cross, anchorPosMap, mianLenArray, mainList[i], lastIdx), lastIdx = s.idx + 1, anchorPos += s.crossLen + 2 * padding;
           });
         }
         children.forEach((child, idx) => {
           child.addUpdateBoundTag(), child.addUpdatePositionTag(), child.clearUpdateLayoutTag();
-        }), p.addUpdateLayoutTag(), clip || this.tempBounds.equals(p.AABBBounds) || (this.tryLayout(p), this.layouting = !1);
+        }), p.addUpdateLayoutTag();
+        const b = this.getAABBBounds(p);
+        clip || this.tempBounds.equals(b) || this.tryLayout(p, !1);
+      }
+      getAABBBounds(graphic) {
+        this.skipBoundsTrigger = !0;
+        const b = graphic.AABBBounds;
+        return this.skipBoundsTrigger = !1, b;
+      }
+      updateChildPos(posBaseLeftTop, lastP, lastBP) {
+        return posBaseLeftTop + (null != lastP ? lastP : 0) - lastBP;
       }
       layoutMain(p, children, justifyContent, main, mianLenArray, lastIdx, currSeg) {
         if ("flex-start" === justifyContent) {
           let pos = 0;
-          for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[main.field] = pos + getPadding(children[i], main.field), pos += mianLenArray[i].mainLen;
+          for (let i = lastIdx; i <= currSeg.idx; i++) {
+            const posBaseLeftTop = pos + getPadding(children[i], main.field),
+              b = this.getAABBBounds(children[i]);
+            !b.empty() && (children[i].attribute[main.field] = this.updateChildPos(posBaseLeftTop, children[i].attribute[main.field], b[`${main.field}1`])), pos += mianLenArray[i].mainLen;
+          }
         } else if ("flex-end" === justifyContent) {
           let pos = main.len;
-          for (let i = lastIdx; i <= currSeg.idx; i++) pos -= mianLenArray[i].mainLen, children[i].attribute[main.field] = pos + getPadding(children[i], main.field);
+          for (let i = lastIdx; i <= currSeg.idx; i++) {
+            pos -= mianLenArray[i].mainLen;
+            const posBaseLeftTop = pos + getPadding(children[i], main.field),
+              b = this.getAABBBounds(children[i]);
+            !b.empty() && (children[i].attribute[main.field] = this.updateChildPos(posBaseLeftTop, children[i].attribute[main.field], b[`${main.field}1`]));
+          }
         } else if ("space-around" === justifyContent) {
           if (currSeg.mainLen >= main.len) {
             let pos = 0;
-            for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[main.field] = pos + getPadding(children[i], main.field), pos += mianLenArray[i].mainLen;
+            for (let i = lastIdx; i <= currSeg.idx; i++) {
+              const posBaseLeftTop = pos + getPadding(children[i], main.field),
+                b = this.getAABBBounds(children[i]);
+              !b.empty() && (children[i].attribute[main.field] = this.updateChildPos(posBaseLeftTop, children[i].attribute[main.field], b[`${main.field}1`])), pos += mianLenArray[i].mainLen;
+            }
           } else {
             const size = currSeg.idx - lastIdx + 1,
               padding = (main.len - currSeg.mainLen) / size / 2;
             let pos = padding;
-            for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[main.field] = pos + getPadding(children[i], main.field), pos += mianLenArray[i].mainLen + 2 * padding;
+            for (let i = lastIdx; i <= currSeg.idx; i++) {
+              const posBaseLeftTop = pos + getPadding(children[i], main.field),
+                b = this.getAABBBounds(children[i]);
+              !b.empty() && (children[i].attribute[main.field] = this.updateChildPos(posBaseLeftTop, children[i].attribute[main.field], b[`${main.field}1`])), pos += mianLenArray[i].mainLen + 2 * padding;
+            }
           }
         } else if ("space-between" === justifyContent) {
           if (currSeg.mainLen >= main.len) {
             let pos = 0;
-            for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[main.field] = pos + getPadding(children[i], main.field), pos += mianLenArray[i].mainLen;
+            for (let i = lastIdx; i <= currSeg.idx; i++) {
+              const posBaseLeftTop = pos + getPadding(children[i], main.field),
+                b = this.getAABBBounds(children[i]);
+              !b.empty() && (children[i].attribute[main.field] = this.updateChildPos(posBaseLeftTop, children[i].attribute[main.field], b[`${main.field}1`])), pos += mianLenArray[i].mainLen;
+            }
           } else {
             const size = currSeg.idx - lastIdx + 1,
               padding = (main.len - currSeg.mainLen) / (2 * size - 2);
             let pos = 0;
-            for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[main.field] = pos + getPadding(children[i], main.field), pos += mianLenArray[i].mainLen + 2 * padding;
+            for (let i = lastIdx; i <= currSeg.idx; i++) {
+              const posBaseLeftTop = pos + getPadding(children[i], main.field),
+                b = this.getAABBBounds(children[i]);
+              !b.empty() && (children[i].attribute[main.field] = this.updateChildPos(posBaseLeftTop, children[i].attribute[main.field], b[`${main.field}1`])), pos += mianLenArray[i].mainLen + 2 * padding;
+            }
           }
         } else if ("center" === justifyContent) {
           let pos = (main.len - currSeg.mainLen) / 2;
-          for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[main.field] = pos + getPadding(children[i], main.field), pos += mianLenArray[i].mainLen;
+          for (let i = lastIdx; i <= currSeg.idx; i++) {
+            const posBaseLeftTop = pos + getPadding(children[i], main.field),
+              b = this.getAABBBounds(children[i]);
+            !b.empty() && (children[i].attribute[main.field] = this.updateChildPos(posBaseLeftTop, children[i].attribute[main.field], b[`${main.field}1`])), pos += mianLenArray[i].mainLen;
+          }
         }
       }
-      layoutCross(children, alignItem, cross, anchorPos, lenArray, currSeg, lastIdx) {
-        if ("flex-end" === alignItem) for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[cross.field] = anchorPos - lenArray[i].crossLen + getPadding(children[i], cross.field);else if ("center" === alignItem) for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[cross.field] = anchorPos - lenArray[i].crossLen / 2 + getPadding(children[i], cross.field);else for (let i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[cross.field] = anchorPos + getPadding(children[i], cross.field);
+      layoutCross(children, alignItem, cross, anchorPosMap, lenArray, currSeg, lastIdx) {
+        var _a;
+        for (let i = lastIdx; i <= currSeg.idx; i++) {
+          const child = children[i];
+          let {
+            alignSelf: alignSelf
+          } = child.attribute;
+          alignSelf && "auto" !== alignSelf || (alignSelf = alignItem);
+          const b = this.getAABBBounds(child),
+            anchorPos = null !== (_a = anchorPosMap[alignSelf]) && void 0 !== _a ? _a : anchorPosMap["flex-start"];
+          "flex-end" === alignSelf ? !b.empty() && (child.attribute[cross.field] = this.updateChildPos(anchorPos - lenArray[i].crossLen + getPadding(child, cross.field), child.attribute[cross.field], b[`${cross.field}1`])) : "center" === alignSelf ? !b.empty() && (child.attribute[cross.field] = this.updateChildPos(anchorPos - lenArray[i].crossLen / 2 + getPadding(child, cross.field), child.attribute[cross.field], b[`${cross.field}1`])) : !b.empty() && (child.attribute[cross.field] = this.updateChildPos(anchorPos + getPadding(child, cross.field), child.attribute[cross.field], b[`${cross.field}1`]));
+        }
       }
       activate(context) {
         this.pluginService = context, application.graphicService.hooks.onAttributeUpdate.tap(this.key, graphic => {
-          graphic.glyphHost && (graphic = graphic.glyphHost), this.tryLayout(graphic), this.layouting = !1;
+          graphic.glyphHost && (graphic = graphic.glyphHost), graphic.stage && graphic.stage === this.pluginService.stage && this.tryLayout(graphic, !1);
         }), application.graphicService.hooks.beforeUpdateAABBBounds.tap(this.key, (graphic, stage, willUpdate, bounds) => {
-          graphic.glyphHost && (graphic = graphic.glyphHost), stage && stage === this.pluginService.stage && graphic.isContainer && _tempBounds.copy(bounds);
+          graphic.glyphHost && (graphic = graphic.glyphHost), stage && stage === this.pluginService.stage && graphic.isContainer && !this.skipBoundsTrigger && _tempBounds.copy(bounds);
         }), application.graphicService.hooks.afterUpdateAABBBounds.tap(this.key, (graphic, stage, bounds, params, selfChange) => {
-          stage && stage === this.pluginService.stage && graphic.isContainer && (_tempBounds.equals(bounds) || (this.tryLayout(graphic), this.layouting = !1));
+          stage && stage === this.pluginService.stage && graphic.isContainer && !this.skipBoundsTrigger && (_tempBounds.equals(bounds) || this.tryLayout(graphic, !1));
         }), application.graphicService.hooks.onSetStage.tap(this.key, graphic => {
-          graphic.glyphHost && (graphic = graphic.glyphHost), this.tryLayout(graphic), this.layouting = !1;
+          graphic.glyphHost && (graphic = graphic.glyphHost), this.tryLayout(graphic, !1);
         });
       }
       deactivate(context) {
-        application.graphicService.hooks.onAttributeUpdate.taps = application.graphicService.hooks.onAttributeUpdate.taps.filter(item => item.name !== this.key), application.graphicService.hooks.onSetStage.taps = application.graphicService.hooks.onSetStage.taps.filter(item => item.name !== this.key);
+        application.graphicService.hooks.onAttributeUpdate.taps = application.graphicService.hooks.onAttributeUpdate.taps.filter(item => item.name !== this.key), application.graphicService.hooks.beforeUpdateAABBBounds.taps = application.graphicService.hooks.beforeUpdateAABBBounds.taps.filter(item => item.name !== this.key), application.graphicService.hooks.afterUpdateAABBBounds.taps = application.graphicService.hooks.afterUpdateAABBBounds.taps.filter(item => item.name !== this.key), application.graphicService.hooks.onSetStage.taps = application.graphicService.hooks.onSetStage.taps.filter(item => item.name !== this.key);
       }
     }
     function getPadding(graphic, field) {
-      if (!graphic.attribute.boundsPadding) return 0;
-      if (isNumber$1(graphic.attribute.boundsPadding)) return graphic.attribute.boundsPadding;
-      if (isArray$1(graphic.attribute.boundsPadding) && 1 === graphic.attribute.boundsPadding.length) return graphic.attribute.boundsPadding[0];
-      const paddingArray = parsePadding(graphic.attribute.boundsPadding);
-      return "x" === field ? paddingArray[3] : "y" === field ? paddingArray[0] : 0;
+      return 0;
     }
 
     const defaultTicker = new DefaultTicker();
@@ -17064,6 +17131,9 @@
           this.pluginService.unRegister(plugin);
         }));
       }
+      getPluginsByName(name) {
+        return this.pluginService.findPluginsByName(name);
+      }
       tryUpdateAABBBounds() {
         const viewBox = this._viewBox;
         return this._AABBBounds.setValue(viewBox.x1, viewBox.y1, viewBox.x2, viewBox.y2), this._AABBBounds;
@@ -17097,7 +17167,7 @@
       render(layers, params) {
         this.ticker.start(), this.timeline.resume();
         const state = this.state;
-        this.state = "rendering", this.layerService.prepareStageLayer(this), this._skipRender || (this.lastRenderparams = params, this.hooks.beforeRender.call(this), this.renderLayerList(this.children), this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear(), this.hooks.afterRender.call(this)), this.state = state, this._skipRender && this._skipRender++;
+        this.state = "rendering", this.layerService.prepareStageLayer(this), this._skipRender || (this.lastRenderparams = params, this.hooks.beforeRender.call(this), this.renderLayerList(this.children, params), this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear(), this.hooks.afterRender.call(this)), this.state = state, this._skipRender && this._skipRender++;
       }
       combineLayersToWindow() {}
       renderNextFrame(layers, force) {
@@ -17124,7 +17194,8 @@
             background: layer === this.defaultLayer ? this.background : void 0,
             updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty())
           }, Object.assign({
-            renderStyle: this.renderStyle
+            renderStyle: this.renderStyle,
+            keepMatrix: this.params.renderKeepMatrix
           }, params)));
         }), this.interactiveLayer && !layerList.includes(this.interactiveLayer) && this.interactiveLayer.render({
           renderService: this.renderService,
@@ -17507,11 +17578,17 @@
           if (!params.bounds.contains(point.x, point.y)) return result;
           offsetX = params.bounds.x1, offsetY = params.bounds.y1;
         }
-        this.pickContext && (this.pickContext.inuse = !0), params.pickContext = this.pickContext, this.pickContext && this.pickContext.clearMatrix(!0, 1);
+        if (this.pickContext) if (params.keepMatrix) {
+          if (this.pickContext.nativeContext && this.pickContext.nativeContext.getTransform) {
+            const t = this.pickContext.nativeContext.getTransform();
+            this.pickContext.setTransformFromMatrix(t, !0, 1);
+          }
+        } else this.pickContext.inuse = !0, this.pickContext.clearMatrix(!0, 1);
+        params.pickContext = this.pickContext;
         const parentMatrix = new Matrix(1, 0, 0, 1, offsetX, offsetY);
         let group;
         for (let i = graphics.length - 1; i >= 0 && (result = graphics[i].isContainer ? this.pickGroup(graphics[i], point, parentMatrix, params) : this.pickItem(graphics[i], point, parentMatrix, params), !result.graphic); i--) group || (group = result.group);
-        if (result.graphic || (result.group = group), this.pickContext && (this.pickContext.inuse = !1), result.graphic) {
+        if (result.graphic || (result.group = group), this.pickContext && !params.keepMatrix && (this.pickContext.inuse = !1), result.graphic) {
           let g = result.graphic;
           for (; g.parent;) g = g.parent;
           g.shadowHost && (result.params = {
@@ -20039,7 +20116,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$3(cornerRadius, !0) && 0 !== cornerRadius || isArray$1(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$2(cornerRadius, !0) && 0 !== cornerRadius || isArray$1(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;
@@ -20107,7 +20184,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 || isNumber$3(cornerRadius, !0) && 0 !== cornerRadius || isArray$1(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 || isNumber$2(cornerRadius, !0) && 0 !== cornerRadius || isArray$1(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;
@@ -22393,6 +22470,15 @@
         const pattern = /^-?\d+(\.\d+)?$/;
         return pattern.test(str);
     }
+    function deduplication$1(array) {
+        const result = [];
+        for (let i = 0; i < array.length; i++) {
+            if (result.indexOf(array[i]) === -1) {
+                result.push(array[i]);
+            }
+        }
+        return result;
+    }
 
     const isNode = typeof window === 'undefined' || typeof window.window === 'undefined';
     let arrayFind;
@@ -22955,7 +23041,7 @@
         }
     }
 
-    const indexFirst = (arr, elm) => {
+    const indexFirst$1 = (arr, elm) => {
         let low = 0;
         let high = arr.length - 1;
         while (low <= high) {
@@ -23001,7 +23087,7 @@
             }
             if (sourceIndex > targetIndex) {
                 const sourceVals = [];
-                for (let i = indexFirst(keys, sourceIndex + moveCount - 1); i >= 0; i--) {
+                for (let i = indexFirst$1(keys, sourceIndex + moveCount - 1); i >= 0; i--) {
                     const key = keys[i];
                     if (key >= sourceIndex) {
                         sourceVals.push(this.get(key));
@@ -23020,7 +23106,7 @@
             const { length } = keys;
             if (sourceIndex < targetIndex) {
                 const sourceVals = [];
-                for (let i = indexFirst(keys, sourceIndex); i < length; i++) {
+                for (let i = indexFirst$1(keys, sourceIndex); i < length; i++) {
                     const key = keys[i];
                     if (key >= sourceIndex && key < sourceIndex + moveCount) {
                         sourceVals.push(this.get(key));
@@ -23075,7 +23161,7 @@
                 });
                 this._sorted = true;
             }
-            for (let i = indexFirst(keys, keyFrom); i < length; i++) {
+            for (let i = indexFirst$1(keys, keyFrom); i < length; i++) {
                 const key = keys[i];
                 if (keyFrom <= key && key <= keyTo) {
                     const callRes = fn(this.get(key), key);
@@ -24682,6 +24768,14 @@
         height: bounds.height()
       };
     }
+    function isRichText(attributes) {
+      let typeKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "type";
+      return typeKey in attributes && "rich" === attributes[typeKey] || isObject$4(attributes.text) && "rich" === attributes.text.type;
+    }
+    function richTextAttributeTransform(attributes) {
+      var _a, _b;
+      return attributes.width = null !== (_a = attributes.width) && void 0 !== _a ? _a : 0, attributes.height = null !== (_b = attributes.height) && void 0 !== _b ? _b : 0, attributes.maxWidth = attributes.maxLineWidth, attributes.textConfig = attributes.text.text || attributes.text, attributes;
+    }
 
     function loadTagComponent() {
       registerGroup(), registerRect(), registerSymbol(), registerRichtext(), registerText();
@@ -24702,7 +24796,7 @@
         super((null == options ? void 0 : options.skipDefault) ? attributes : merge({}, Tag.defaultAttributes, attributes)), this.name = "tag";
       }
       render() {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const {
             text = "",
             textStyle = {},
@@ -24734,7 +24828,7 @@
           shapeStyle = __rest$3(shape, ["visible"]);
         if (isBoolean$2(shapeVisible)) {
           const size = (null == shapeStyle ? void 0 : shapeStyle.size) || 10,
-            maxSize = isNumber$3(size) ? size : Math.max(size[0], size[1]);
+            maxSize = isNumber$2(size) ? size : Math.max(size[0], size[1]);
           symbol = group.createOrUpdateChild("tag-shape", Object.assign(Object.assign({
             symbolType: "circle",
             size: size,
@@ -24746,39 +24840,15 @@
           }), "symbol"), isEmpty(null == state ? void 0 : state.shape) || (symbol.states = state.shape), shapeVisible && (symbolPlaceWidth = maxSize + space);
         }
         let textShape;
-        if (tagWidth += symbolPlaceWidth, textX += symbolPlaceWidth, "rich" === type) {
-          const richTextAttrs = Object.assign(Object.assign({
-            textConfig: text,
-            visible: isValid$1(text) && !1 !== visible
-          }, textStyle), {
-            x: textX,
-            y: 0,
-            width: null !== (_a = textStyle.width) && void 0 !== _a ? _a : 0,
-            height: null !== (_b = textStyle.height) && void 0 !== _b ? _b : 0
-          });
-          textShape = group.createOrUpdateChild("tag-text", richTextAttrs, "richtext");
-          const {
-              visible: bgVisible
-            } = panel,
-            backgroundStyle = __rest$3(panel, ["visible"]);
-          if (visible && isBoolean$2(bgVisible)) {
-            const bgRect = this.createOrUpdateChild("tag-panel", Object.assign(Object.assign({}, backgroundStyle), {
-              visible: bgVisible && !!text,
-              x: textShape.AABBBounds.x1,
-              y: textShape.AABBBounds.y1,
-              width: textShape.AABBBounds.width(),
-              height: textShape.AABBBounds.height()
-            }), "rect");
-            isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel);
-          }
-        } else if ("html" === type) {
-          const richTextAttrs = Object.assign(Object.assign({
-            textConfig: [],
+        tagWidth += symbolPlaceWidth, textX += symbolPlaceWidth;
+        if (isRichText({
+          text: text
+        }) || "rich" === type) {
+          const richTextAttrs = Object.assign(Object.assign(Object.assign({}, richTextAttributeTransform(Object.assign({
+            type: type,
+            text: text
+          }, textStyle))), textStyle), {
             visible: isValid$1(text) && !1 !== visible,
-            html: Object.assign(Object.assign({
-              dom: text
-            }, DEFAULT_HTML_TEXT_SPEC), textStyle)
-          }, textStyle), {
             x: textX,
             y: 0
           });
@@ -24799,7 +24869,7 @@
           }
         } else {
           const textAttrs = Object.assign(Object.assign({
-            text: text,
+            text: isObject$4(text) && "type" in text && "text" === text.type ? text.text : text,
             visible: isValid$1(text) && !1 !== visible,
             lineHeight: null == textStyle ? void 0 : textStyle.fontSize
           }, textStyle), {
@@ -24807,12 +24877,12 @@
             y: 0
           });
           isNil$1(textAttrs.lineHeight) && (textAttrs.lineHeight = textStyle.fontSize), textShape = group.createOrUpdateChild("tag-text", textAttrs, "text"), isEmpty(null == state ? void 0 : state.text) || (textShape.states = state.text);
-          const textBounds = measureTextSize(textAttrs.text, textStyle, null === (_c = this.stage) || void 0 === _c ? void 0 : _c.getTheme().text.fontFamily),
+          const textBounds = measureTextSize(textAttrs.text, textStyle, null === (_a = this.stage) || void 0 === _a ? void 0 : _a.getTheme().text.fontFamily),
             textWidth = textBounds.width,
             textHeight = textBounds.height;
           tagWidth += textWidth;
-          const size = null !== (_d = shape.size) && void 0 !== _d ? _d : 10,
-            maxSize = isNumber$3(size) ? size : Math.max(size[0], size[1]);
+          const size = null !== (_b = shape.size) && void 0 !== _b ? _b : 10,
+            maxSize = isNumber$2(size) ? size : Math.max(size[0], size[1]);
           tagHeight += Math.max(textHeight, shape.visible ? maxSize : 0);
           const {
             textAlign: textAlign,
@@ -24820,11 +24890,21 @@
           } = textStyle;
           (isValid$1(minWidth) || isValid$1(maxWidth)) && (isValid$1(minWidth) && tagWidth < minWidth && (tagWidth = minWidth), isValid$1(maxWidth) && tagWidth > maxWidth && (tagWidth = maxWidth, textShape.setAttribute("maxLineWidth", maxWidth - parsedPadding[1] - parsedPadding[2])));
           let x = 0,
-            y = 0;
-          "center" === textAlign ? (x -= tagWidth / 2, symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth / 2), group.setAttribute("x", -symbolPlaceWidth / 2)) : "right" === textAlign || "end" === textAlign ? (x -= tagWidth, symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth), group.setAttribute("x", -parsedPadding[1] - symbolPlaceWidth)) : "left" !== textAlign && "start" !== textAlign || group.setAttribute("x", parsedPadding[3]), !textAlwaysCenter || "left" !== textAlign && "start" !== textAlign || textShape.setAttributes({
-            x: textX + tagWidth / 2,
-            textAlign: "center"
-          }), "middle" === textBaseline ? (y -= tagHeight / 2, symbol && symbol.setAttribute("y", 0)) : "bottom" === textBaseline ? (y -= tagHeight, symbol && symbol.setAttribute("y", -textHeight / 2), group.setAttribute("y", -parsedPadding[2])) : "top" === textBaseline && (group.setAttribute("y", parsedPadding[0]), symbol && symbol.setAttribute("y", textHeight / 2));
+            y = 0,
+            flag = 0;
+          if ("left" === textAlign || "start" === textAlign ? flag = 1 : "right" === textAlign || "end" === textAlign ? flag = -1 : "center" === textAlign && (flag = 0), flag ? flag < 0 ? (x -= tagWidth, symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth), group.setAttribute("x", -parsedPadding[1] - symbolPlaceWidth)) : flag > 0 && group.setAttribute("x", parsedPadding[3]) : (x -= tagWidth / 2, symbol && symbol.setAttribute("x", (symbol.attribute.x || 0) - textWidth / 2), group.setAttribute("x", -symbolPlaceWidth / 2)), textAlwaysCenter && flag) {
+            const containerWidth = tagWidth - parsedPadding[1] - parsedPadding[3],
+              tsWidth = textWidth + symbolPlaceWidth,
+              textX = (containerWidth - tsWidth) / 2 + symbolPlaceWidth + textWidth / 2,
+              symbolX = (containerWidth - tsWidth) / 2 + maxSize / 2;
+            textShape.setAttributes({
+              x: textX * flag,
+              textAlign: "center"
+            }), null == symbol || symbol.setAttributes({
+              x: symbolX * flag
+            }), group.setAttribute("x", parsedPadding[2 + flag] * flag);
+          }
+          "middle" === textBaseline ? (y -= tagHeight / 2, symbol && symbol.setAttribute("y", 0)) : "bottom" === textBaseline ? (y -= tagHeight, symbol && symbol.setAttribute("y", -textHeight / 2), group.setAttribute("y", -parsedPadding[2])) : "top" === textBaseline && (group.setAttribute("y", parsedPadding[0]), symbol && symbol.setAttribute("y", textHeight / 2));
           const {
               visible: bgVisible
             } = panel,
@@ -25668,12 +25748,10 @@
             pickable: !1
           });
         return labelGroup.name = `${AXIS_ELEMENT_NAME.labelContainer}-layer-${layer}`, labelGroup.id = this._getNodeId(`label-container-layer-${layer}`), container.add(labelGroup), data.forEach((item, index) => {
-          var _a, _b, _c;
+          var _a;
           const labelStyle = this._getLabelAttribute(item, index, data, layer);
           let text;
-          if ("rich" === labelStyle.type ? (labelStyle.textConfig = labelStyle.text, labelStyle.width = null !== (_a = labelStyle.width) && void 0 !== _a ? _a : 0, labelStyle.height = null !== (_b = labelStyle.height) && void 0 !== _b ? _b : 0, text = graphicCreator$1.richtext(labelStyle)) : "html" === labelStyle.type ? (labelStyle.textConfig = [], labelStyle.html = Object.assign(Object.assign({
-            dom: labelStyle.text
-          }, DEFAULT_HTML_TEXT_SPEC), labelStyle), text = graphicCreator$1.richtext(labelStyle)) : text = graphicCreator$1.text(labelStyle), text.name = AXIS_ELEMENT_NAME.label, text.id = this._getNodeId(`layer${layer}-label-${item.id}`), isEmpty(null === (_c = this.attribute.label) || void 0 === _c ? void 0 : _c.state)) text.states = DEFAULT_STATES$2;else {
+          if (text = isRichText(labelStyle) ? graphicCreator$1.richtext(richTextAttributeTransform(labelStyle)) : graphicCreator$1.text(labelStyle), text.name = AXIS_ELEMENT_NAME.label, text.id = this._getNodeId(`layer${layer}-label-${item.id}`), isEmpty(null === (_a = this.attribute.label) || void 0 === _a ? void 0 : _a.state)) text.states = DEFAULT_STATES$2;else {
             const labelState = merge({}, DEFAULT_STATES$2, this.attribute.label.state);
             Object.keys(labelState).forEach(key => {
               isFunction$1(labelState[key]) && (labelState[key] = labelState[key](item, index, data, layer));
@@ -26521,8 +26599,8 @@
             textAlign: "center",
             textBaseline: "middle"
           }, textStyle), null === (_b = this.stage) || void 0 === _b ? void 0 : _b.getTheme().text.fontFamily),
-          handlerSizeX = isNumber$3(handlerSize) ? handlerSize : handlerSize[0],
-          handlerSizeY = isNumber$3(handlerSize) ? handlerSize : handlerSize[1],
+          handlerSizeX = isNumber$2(handlerSize) ? handlerSize : handlerSize[0],
+          handlerSizeY = isNumber$2(handlerSize) ? handlerSize : handlerSize[1],
           text = graphicCreator$1.text(Object.assign({
             x: isHorizontal ? handlerSizeX / 2 + handlerSpace + maxTextWidth / 2 : 0,
             y: isHorizontal ? 0 : handlerSizeY / 2 + handlerSpace + maxTextHeight / 2,
@@ -26851,7 +26929,8 @@
             shape.fill && isNil$1(shapeStyle.state[key].fill) && color && (shapeStyle.state[key].fill = color), shape.stroke && isNil$1(shapeStyle.state[key].stroke) && color && (shapeStyle.state[key].stroke = color);
           }), this._appendDataToShape(itemShape, LEGEND_ELEMENT_NAME.itemShape, item, itemGroup, shapeStyle.state), itemShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), innerGroup.add(itemShape);
         }
-        let focusSpace = 0;
+        let labelShape,
+          focusSpace = 0;
         if (focus) {
           const focusSize = get$5(focusIconStyle, "size", DEFAULT_SHAPE_SIZE);
           focusShape = graphicCreator$1.symbol(Object.assign(Object.assign({
@@ -26864,29 +26943,32 @@
             boundsPadding: parsedPadding
           })), this._appendDataToShape(focusShape, LEGEND_ELEMENT_NAME.focus, item, itemGroup), focusSpace = focusSize;
         }
-        const labelShape = graphicCreator$1.text(Object.assign(Object.assign({
-          x: shapeSize / 2 + shapeSpace,
-          y: 0,
-          textAlign: "start",
-          textBaseline: "middle",
-          lineHeight: null === (_b = labelStyle.style) || void 0 === _b ? void 0 : _b.fontSize
-        }, labelStyle.style), {
-          text: labelAttr.formatMethod ? labelAttr.formatMethod(label, item, index) : label
-        }));
-        this._appendDataToShape(labelShape, LEGEND_ELEMENT_NAME.itemLabel, item, itemGroup, labelStyle.state), labelShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), innerGroup.add(labelShape);
+        const text = labelAttr.formatMethod ? labelAttr.formatMethod(label, item, index) : label,
+          labelAttributes = Object.assign(Object.assign({
+            x: shapeSize / 2 + shapeSpace,
+            y: 0,
+            textAlign: "start",
+            textBaseline: "middle",
+            lineHeight: null === (_b = labelStyle.style) || void 0 === _b ? void 0 : _b.fontSize
+          }, labelStyle.style), {
+            text: text
+          });
+        labelShape = isRichText(labelAttributes) ? graphicCreator$1.richtext(richTextAttributeTransform(labelAttributes)) : graphicCreator$1.text(labelAttributes), this._appendDataToShape(labelShape, LEGEND_ELEMENT_NAME.itemLabel, item, itemGroup, labelStyle.state), labelShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), innerGroup.add(labelShape);
         const labelSpace = get$5(labelAttr, "space", DEFAULT_LABEL_SPACE);
         if (isValid$1(value)) {
           const valueSpace = get$5(valueAttr, "space", focus ? DEFAULT_VALUE_SPACE : 0),
-            valueShape = graphicCreator$1.text(Object.assign(Object.assign({
+            valueText = valueAttr.formatMethod ? valueAttr.formatMethod(value, item, index) : value,
+            valueAttributes = Object.assign(Object.assign({
               x: 0,
               y: 0,
               textAlign: "start",
               textBaseline: "middle",
               lineHeight: valueStyle.style.fontSize
             }, valueStyle.style), {
-              text: valueAttr.formatMethod ? valueAttr.formatMethod(value, item, index) : value
-            }));
-          if (this._appendDataToShape(valueShape, LEGEND_ELEMENT_NAME.itemValue, item, itemGroup, valueStyle.state), valueShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), this._itemWidthByUser) {
+              text: valueText
+            });
+          let valueShape;
+          if (valueShape = isRichText(valueAttributes) ? graphicCreator$1.richtext(richTextAttributeTransform(valueAttributes)) : graphicCreator$1.text(valueAttributes), this._appendDataToShape(valueShape, LEGEND_ELEMENT_NAME.itemValue, item, itemGroup, valueStyle.state), valueShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), this._itemWidthByUser) {
             const layoutWidth = this._itemWidthByUser - parsedPadding[1] - parsedPadding[3] - shapeSize - shapeSpace - labelSpace - focusSpace - valueSpace,
               valueBounds = valueShape.AABBBounds,
               labelBounds = labelShape.AABBBounds,
@@ -27566,7 +27648,7 @@
         return this._isFixed && !!this._bandwidth;
       }
       _isBandwidthFixedByUser() {
-        return this._isFixed && this._userBandwidth && isNumber$3(this._userBandwidth);
+        return this._isFixed && this._userBandwidth && isNumber$2(this._userBandwidth);
       }
       clone() {
         var _a, _b, _c;
@@ -27834,13 +27916,13 @@
       }
     }
     function parseNiceOptions(originalDomain, option) {
-      const hasForceMin = isNumber$3(option.forceMin),
-        hasForceMax = isNumber$3(option.forceMax);
+      const hasForceMin = isNumber$2(option.forceMin),
+        hasForceMax = isNumber$2(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$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", {
+      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", {
         niceType: niceType,
         niceDomain: niceDomain,
         niceMinMax: niceMinMax,
@@ -31668,7 +31750,7 @@
     }
 
     function getQuadProps(paddingOrigin) {
-        if (isNumber$3(paddingOrigin) || isString$2(paddingOrigin) || isArray$1(paddingOrigin)) {
+        if (isNumber$2(paddingOrigin) || isString$2(paddingOrigin) || isArray$1(paddingOrigin)) {
             let padding = parsePadding(paddingOrigin);
             if (typeof padding === 'number' || typeof padding === 'string') {
                 padding = [padding, padding, padding, padding];
@@ -31934,7 +32016,7 @@
         if (isNil$1(v)) {
             return false;
         }
-        if (isNumber$3(v)) {
+        if (isNumber$2(v)) {
             return true;
         }
         return +v === +v;
@@ -32900,6 +32982,16 @@
                 cursor: 'pointer'
             };
         },
+        get loading_pic() {
+            return {
+                type: 'svg',
+                svg: '<svg viewBox="0 0 400 300" fill="none" xmlns="http://www.w3.org/2000/svg"><mask id="a" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="50" y="65" width="301" height="170"><path d="M350.3 65H50v169.8h300.3V65Z" fill="#fff"/></mask><g mask="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M58.3 233.2h32.8v-36.8H58.3v36.8Z" fill="#C7DEFF"/><path d="M91.1 224.5v8.8H58.3M82.4 196.2H58.3" stroke="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M305.4 182.5s-2.7 12.6 0 17.4c2.7 4.8 8.3 6.7 12.4 4.4 4.2-2.4 5.3-8.1 2.6-12.9-2.7-4.8-15-8.9-15-8.9ZM336 204.7c4.3 2 9.7-.4 12-5.4 2.3-5-1.5-17.3-1.5-17.3s-11.8 5.1-14.1 10.1c-2.3 5-.7 10.6 3.6 12.6Z" fill="#00E4E5"/><path fill-rule="evenodd" clip-rule="evenodd" d="M326.7 174s-10 11.8-10 18.6c0 6.7 4.5 12.2 10 12.2s10-5.5 10-12.3c0-6.8-10-18.5-10-18.5Z" fill="#00E4E5"/><path d="M332.3 181.5c2.3 3.6 4.4 7.8 4.4 10.9M316.7 192.5c0-3.1 2.1-7.2 4.3-10.8" stroke="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M343.1 227.3v-9.7h-34v9.7c0 3.7 3 6.6 6.6 6.6h20.9c3.6 0 6.5-2.9 6.5-6.6Z" fill="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M350.4 220.8V198H302v22.8c0 5.9 4.8 10.7 10.7 10.7h26.9c5.9 0 10.7-4.8 10.8-10.7Z" fill="#C7DEFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M331.7 74.2H117.8L87.4 203h213.8l30.5-128.8Z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M337 74.2h-6.2l-30.6 129.2h6.2L337 74.2Z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M303.8 203.5h2.4l30.7-129.3h-1.8l-31.3 129.3Z" fill="#C7DEFF"/><path d="m337 74.2-30.6 129.2h-5.9" stroke="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M229.9 202.1h-47.6l2 9.6h47.3l-1.7-9.6Z" fill="#C7DEFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M94.7 172.6 87.4 203h213.1l7.8-30.4H94.7Z" fill="#006EFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M94.7 172.6 87.4 203h213.1l7.8-30.4H94.7Z" fill="#006EFF"/><path d="M138.5 74.2h193.2l-23.4 98.6M94.5 172.7l11-46.3M104.8 155.4l-2.3 11.5h6.7M316 112.1l1.1-4.5" stroke="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M148.3 138.1h97V119h-97v19.1Z" fill="#00E4E5"/><path d="M303.1 80.6h20.3l-4.6 19.6M228.3 234.3c3.6 0 6.3-3.2 5.7-6.8l-4.1-24.1" stroke="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M226.2 229.5h-68.9v1.2c0 2 1.6 3.7 3.7 3.7h60.1c2.8 0 5-2.2 5.1-4.9Z" fill="#C7DEFF"/><path d="M180.699 226.8h-19.9c-2.8 0-4.6 3-3.3 5.5m0 0c.6 1.2 1.9 2 3.3 2h57.8M175.9 203.4l3.6 17.6M241.2 234.3h65.1M104.6 234.3h41.3" stroke="#071F4D"/><path d="M206.2 234.3h14.9c3.1 0 5.5-2.8 5-5.9l-4.3-24.9M160.7 226.8h46M62.2 226.1h-9.5c-1.2 0-2.2-1-2.2-2.2v-18.3c0-1.2 1-2.2 2.2-2.2h9.5" stroke="#071F4D"/><path d="M53.4 171.7H68c2.1 0 3.7 1.7 3.7 3.7v16.1M79.1 192v-21.8c0-2.5 2-4.6 4.6-4.6h2.2c2.5 0 4.5-2 4.5-4.5m0 0c0-2.5-2-4.5-4.5-4.5H56.1c-2.4 0-4.3-1.9-4.3-4.3V148M71.2 165.2h-18M64 181.7v10.1" stroke="#C7DEFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M85.7 120H124c4.3 0 7.7-3.5 7.7-7.7V65.5H94.2c-4.7 0-8.5 4.9-8.5 11V120Z" fill="#C7DEFF"/><path d="M85.7 110.7V73c0-4.1 3.4-7.5 7.5-7.5h38.5M146.2 73.8v-2.5c0-3.2-2-5.8-5.8-5.8-2.8 0-6 1.1-6 5.8v42.4c0 4.7-3.8 8.5-8.5 8.5h-15.6" stroke="#071F4D"/><path d="M119.7 122.3H87c-6.1 0-11.1-5-11.1-11.1m0 0h39M126.1 122.3c-6.1 0-11.1-5-11.1-11.1" stroke="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M85.4 122.1h37.2c-6.5-1.8-8-10.5-8-10.5H76.2c.6 8.8 9.2 10.5 9.2 10.5Z" fill="#071F4D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M95.8 102.9h4.8V83.6h-4.8v19.3ZM106.6 102.9h4.8V77.6h-4.8v25.3ZM117.3 102.9h4.8V89.1h-4.8v13.8Z" fill="#fff"/><path d="M273.2 195.9h16.9M261.2 195.9h5" stroke="#fff"/><path d="M62.4 201.9v2.9M62.4 224.5v2.9" stroke="#071F4D"/><path d="m153.6 138.1 9.7-19.1M168.8 138.1l9.7-19.1M184.1 138.1l9.7-19.1M199.4 138.1l9.7-19.1M214.6 138.1l9.8-19.1M229.9 138.1l9.7-19.1" stroke="#fff"/><path d="M148.3 138.1h121.6V119H148.3v19.1Z" stroke="#071F4D"/></g></svg>',
+                width: 400,
+                height: 300,
+                name: 'loading_pic',
+                positionType: IconPosition.left
+            };
+        },
         get expand() {
             return {
                 type: 'svg',
@@ -32972,15 +33064,21 @@
     }
 
     function calcKeepAspectRatioSize(width, height, maxWidth, maxHeight) {
-        let newWidth = width;
-        let newHeight = height;
-        if (newWidth > maxWidth) {
-            newWidth = maxWidth;
-            newHeight = (newWidth * height) / width;
+        const rectWidth = width;
+        const rectHeight = height;
+        const containerWidth = maxWidth;
+        const containerHeight = maxHeight;
+        const containerRatio = containerWidth / containerHeight;
+        const rectRatio = rectWidth / rectHeight;
+        let newWidth;
+        let newHeight;
+        if (rectRatio > containerRatio) {
+            newWidth = containerWidth;
+            newHeight = newWidth / rectRatio;
         }
-        if (newHeight > maxHeight) {
-            newHeight = maxHeight;
-            newWidth = (newHeight * width) / height;
+        else {
+            newHeight = containerHeight;
+            newWidth = newHeight * rectRatio;
         }
         return {
             width: newWidth,
@@ -33008,7 +33106,6 @@
         return { x, y };
     }
 
-    get$1();
     function createImageCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme) {
         const headerStyle = table._getCellStyle(col, row);
         const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);
@@ -33052,31 +33149,29 @@
         image.name = 'image';
         image.keepAspectRatio = keepAspectRatio;
         if (keepAspectRatio || imageAutoSizing) {
-            image.successCallback = () => {
-                const originImage = image.resources.get(image.attribute.image).data;
-                if (imageAutoSizing) {
-                    _adjustWidthHeight(col, row, originImage.width, originImage.height, table.scenegraph, padding);
-                }
-                if (keepAspectRatio) {
-                    const { width: cellWidth, height: cellHeight, isMerge } = getCellRange(cellGroup, table);
-                    const { width: imageWidth, height: imageHeight } = calcKeepAspectRatioSize(originImage.width, originImage.height, cellWidth - padding[1] - padding[3], cellHeight - padding[0] - padding[2]);
-                    const pos = calcStartPosition(0, 0, cellWidth, cellHeight, imageWidth, imageHeight, textAlign, textBaseline, padding);
-                    image.setAttributes({
-                        x: pos.x,
-                        y: pos.y,
-                        width: imageWidth,
-                        height: imageHeight,
-                        dx: isMerge ? -table.getColsWidth(cellGroup.mergeStartCol, col - 1) : 0,
-                        dy: isMerge ? -table.getRowsHeight(cellGroup.mergeStartRow, row - 1) : 0
-                    });
-                }
-                table.scenegraph.updateNextFrame();
-            };
+            if (image.resources &&
+                image.resources.has(image.attribute.image) &&
+                image.resources.get(image.attribute.image).state === 'success') {
+                updateAutoSizingAndKeepAspectRatio(imageAutoSizing, keepAspectRatio, padding, textAlign, textBaseline, image, cellGroup, table);
+            }
+            else {
+                image.successCallback = () => {
+                    updateAutoSizingAndKeepAspectRatio(imageAutoSizing, keepAspectRatio, padding, textAlign, textBaseline, image, cellGroup, table);
+                    table.scenegraph.updateNextFrame();
+                };
+            }
         }
         else {
-            image.successCallback = () => {
+            if (image.resources &&
+                image.resources.has(image.attribute.image) &&
+                image.resources.get(image.attribute.image).state === 'success') {
                 updateImageCellContentWhileResize(cellGroup, col, row, table);
-            };
+            }
+            else {
+                image.successCallback = () => {
+                    updateImageCellContentWhileResize(cellGroup, col, row, table);
+                };
+            }
         }
         image.failCallback = () => {
             const regedIcons = get$1();
@@ -33189,6 +33284,47 @@
             isMerge: false
         };
     }
+    function updateImageDxDy(startCol, endCol, startRow, endRow, table) {
+        for (let col = startCol; col <= endCol; col++) {
+            for (let row = startRow; row <= endRow; row++) {
+                const cellGroup = table.scenegraph.getCell(col, row);
+                if (cellGroup) {
+                    const image = cellGroup.getChildByName('image');
+                    if (image) {
+                        image.setAttributes({
+                            dx: -table.getColsWidth(cellGroup.mergeStartCol, col - 1),
+                            dy: -table.getRowsHeight(cellGroup.mergeStartRow, row - 1)
+                        });
+                    }
+                }
+            }
+        }
+    }
+    function updateAutoSizingAndKeepAspectRatio(imageAutoSizing, keepAspectRatio, padding, textAlign, textBaseline, image, cellGroup, table) {
+        const originImage = image.resources.get(image.attribute.image).data;
+        const { col, row } = cellGroup;
+        if (imageAutoSizing && !isDamagePic(image)) {
+            _adjustWidthHeight(col, row, originImage.width, originImage.height, table.scenegraph, padding);
+        }
+        if (keepAspectRatio || isDamagePic(image)) {
+            const { width: cellWidth, height: cellHeight, isMerge } = getCellRange(cellGroup, table);
+            const { width: imageWidth, height: imageHeight } = calcKeepAspectRatioSize(originImage.width, originImage.height, cellWidth - padding[1] - padding[3], cellHeight - padding[0] - padding[2]);
+            const pos = calcStartPosition(0, 0, cellWidth, cellHeight, imageWidth, imageHeight, textAlign, textBaseline, padding);
+            image.setAttributes({
+                x: pos.x,
+                y: pos.y,
+                width: imageWidth,
+                height: imageHeight
+            });
+            if (isMerge) {
+                updateImageDxDy(cellGroup.mergeStartCol, cellGroup.mergeEndCol, cellGroup.mergeStartRow, cellGroup.mergeEndRow, table);
+            }
+        }
+    }
+    function isDamagePic(image) {
+        const regedIcons = get$1();
+        return image.attribute.image === regedIcons.damage_pic.svg;
+    }
 
     function createProgressBarCell(progressBarDefine, style, width, value, dataValue, col, row, padding, table) {
         if (progressBarDefine.dependField) {
@@ -34295,8 +34431,8 @@
         iconAttribute.funcType = icon.funcType;
         iconAttribute.interactive = icon.interactive;
         let hierarchyOffset = 0;
-        if (isNumber$3(col) &&
-            isNumber$3(row) &&
+        if (isNumber$2(col) &&
+            isNumber$2(row) &&
             table &&
             (icon.funcType === IconFuncTypeEnum.collapse || icon.funcType === IconFuncTypeEnum.expand)) {
             hierarchyOffset = range
@@ -35739,10 +35875,10 @@
 
     function isMergeCellGroup(cellGroup) {
         if (cellGroup.role === 'cell' &&
-            isNumber$3(cellGroup.mergeStartCol) &&
-            isNumber$3(cellGroup.mergeStartRow) &&
-            isNumber$3(cellGroup.mergeEndCol) &&
-            isNumber$3(cellGroup.mergeEndRow)) {
+            isNumber$2(cellGroup.mergeStartCol) &&
+            isNumber$2(cellGroup.mergeStartRow) &&
+            isNumber$2(cellGroup.mergeEndCol) &&
+            isNumber$2(cellGroup.mergeEndRow)) {
             return true;
         }
         return false;
@@ -35764,10 +35900,10 @@
                 max = domainMax + (domainMax - domainMin) * axisOption.expand.max;
             }
         }
-        if (isNumber$3(axisOption?.min)) {
+        if (isNumber$2(axisOption?.min)) {
             min = axisOption.min;
         }
-        if (isNumber$3(axisOption?.max)) {
+        if (isNumber$2(axisOption?.max)) {
             max = axisOption.max;
         }
         let scale;
@@ -35809,7 +35945,7 @@
         delete scale._niceType;
         let scaleTicks;
         if (!skipTick) {
-            scaleTicks = scale.ticks(isNumber$3(axisOption?.tickCount) ? axisOption?.tickCount : DEFAULT_CONTINUOUS_TICK_COUNT, {
+            scaleTicks = scale.ticks(isNumber$2(axisOption?.tickCount) ? axisOption?.tickCount : DEFAULT_CONTINUOUS_TICK_COUNT, {
                 noDecimals: axisOption?.tick?.noDecimals
             });
         }
@@ -36044,13 +36180,13 @@
                         }
                     }
                 }
-                if (isNumber$3(axisOption?.min)) {
+                if (isNumber$2(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
                     }
                 }
-                if (isNumber$3(axisOption?.max)) {
+                if (isNumber$2(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -36095,13 +36231,13 @@
                         }
                     }
                 }
-                if (isNumber$3(axisOption?.min)) {
+                if (isNumber$2(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
                     }
                 }
-                if (isNumber$3(axisOption?.max)) {
+                if (isNumber$2(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -36177,13 +36313,13 @@
                         }
                     }
                 }
-                if (isNumber$3(axisOption?.min)) {
+                if (isNumber$2(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
                     }
                 }
-                if (isNumber$3(axisOption?.max)) {
+                if (isNumber$2(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -36225,13 +36361,13 @@
                         }
                     }
                 }
-                if (isNumber$3(axisOption?.min)) {
+                if (isNumber$2(axisOption?.min)) {
                     range.min = axisOption.min;
                     if (range.min > 0) {
                         axisOption.zero = false;
                     }
                 }
-                if (isNumber$3(axisOption?.max)) {
+                if (isNumber$2(axisOption?.max)) {
                     range.max = axisOption.max;
                     if (range.max < 0) {
                         axisOption.zero = false;
@@ -36411,13 +36547,13 @@
         const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, layout._table.getColWidth(col));
         range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
         range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
-        if (isNumber$3(axisOption?.min)) {
+        if (isNumber$2(axisOption?.min)) {
             range.min = axisOption.min;
             if (range.min > 0) {
                 axisOption.zero = false;
             }
         }
-        if (isNumber$3(axisOption?.max)) {
+        if (isNumber$2(axisOption?.max)) {
             range.max = axisOption.max;
             if (range.max < 0) {
                 axisOption.zero = false;
@@ -36707,12 +36843,8 @@
                 }
                 if (isAllRowsAuto || table.getDefaultRowHeight(row) === 'auto') {
                     const height = computeRowHeight(row, startCol, endCol, table);
-                    if (update) {
-                        newHeights[row] = Math.round(height);
-                    }
-                    else {
-                        table._setRowHeight(row, height);
-                    }
+                    newHeights[row] = Math.round(height);
+                    table._setRowHeight(row, height);
                 }
             }
             for (let row = table.rowCount - table.bottomFrozenRowCount; row <= rowEnd; row++) {
@@ -36775,7 +36907,7 @@
             }
         }
         else {
-            table.rowHeightsMap.clear();
+            table.clearRowHeightCache();
             for (let row = 0; row < table.rowCount; row++) {
                 newHeights[row] = table.getRowHeight(row);
             }
@@ -36872,7 +37004,22 @@
                     table._setRowHeight(row, newRowHeight);
                 }
             }
-            for (let row = 0; row < table.rowCount; row++) {
+            if (table.heightMode === 'adaptive' ||
+                (table.autoFillHeight && table.getAllRowsHeight() <= table.tableNoFrameHeight)) {
+                for (let row = 0; row <= table.columnHeaderLevelCount - 1; row++) {
+                    const newRowHeight = table.getRowHeight(row);
+                    if (newRowHeight !== oldRowHeights[row]) {
+                        table.scenegraph.updateRowHeight(row, newRowHeight - oldRowHeights[row], true);
+                    }
+                }
+                for (let row = table.rowCount - table.bottomFrozenRowCount; row <= table.rowCount - 1; row++) {
+                    const newRowHeight = table.getRowHeight(row);
+                    if (newRowHeight !== oldRowHeights[row]) {
+                        table.scenegraph.updateRowHeight(row, newRowHeight - oldRowHeights[row], true);
+                    }
+                }
+            }
+            for (let row = table.scenegraph.proxy.rowStart; row <= table.scenegraph.proxy.rowEnd; row++) {
                 const newRowHeight = table.getRowHeight(row);
                 if (newRowHeight !== oldRowHeights[row]) {
                     table.scenegraph.updateRowHeight(row, newRowHeight - oldRowHeights[row], true);
@@ -36893,7 +37040,7 @@
             }
             else {
                 const defaultHeight = table.getDefaultRowHeight(row);
-                if (isNumber$3(defaultHeight)) {
+                if (isNumber$2(defaultHeight)) {
                     return defaultHeight;
                 }
             }
@@ -36927,7 +37074,7 @@
                 : table.getBodyColumnType(col, row);
             if (cellType !== 'text' && cellType !== 'link' && cellType !== 'progressbar' && cellType !== 'checkbox') {
                 const defaultHeight = table.getDefaultRowHeight(row);
-                maxHeight = Math.max(maxHeight, isNumber$3(defaultHeight) ? defaultHeight : table.defaultRowHeight);
+                maxHeight = Math.max(maxHeight, isNumber$2(defaultHeight) ? defaultHeight : table.defaultRowHeight);
                 continue;
             }
             const textHeight = computeTextHeight(col, row, cellType, table);
@@ -37201,7 +37348,7 @@
                 wordBreak: 'break-word',
                 whiteSpace: lines.length === 1 && !autoWrapText ? 'no-wrap' : 'normal'
             });
-            maxHeight = utilTextMark.AABBBounds.height();
+            maxHeight = utilTextMark.AABBBounds.height() || (typeof lineHeight === 'number' ? lineHeight : fontSize);
         }
         else {
             maxHeight = lines.length * lineHeight;
@@ -37242,9 +37389,13 @@
             rowStart = row + 1;
             rowEnd = scene.table.columnHeaderLevelCount - 1;
         }
+        else if (row >= scene.table.rowCount - scene.table.bottomFrozenRowCount) {
+            rowStart = row + 1;
+            rowEnd = scene.table.rowCount - 1;
+        }
         else {
             rowStart = row + 1;
-            rowEnd = scene.bodyRowEnd;
+            rowEnd = Math.min(scene.proxy.rowEnd, scene.table.rowCount - scene.table.bottomFrozenRowCount - 1);
         }
         for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
             for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {
@@ -38153,13 +38304,13 @@
         }
         update(backX, lineX, backY, lineY) {
             if (typeof backX === 'number' && typeof lineX === 'number') {
-                this.columnMoverLabel.setAttribute('x', lineX - this.table.stateManager.scroll.horizontalBarPos);
-                this.columnMoverLine.setAttribute('x', lineX - this.table.stateManager.scroll.horizontalBarPos);
+                this.columnMoverLabel.setAttribute('x', lineX);
+                this.columnMoverLine.setAttribute('x', lineX);
                 this.columnMoverBack.setAttribute('x', backX);
             }
             else if (typeof backY === 'number' && typeof lineY === 'number') {
-                this.columnMoverLabel.setAttribute('y', lineY - this.table.stateManager.scroll.verticalBarPos);
-                this.columnMoverLine.setAttribute('y', lineY - this.table.stateManager.scroll.verticalBarPos);
+                this.columnMoverLabel.setAttribute('y', lineY);
+                this.columnMoverLine.setAttribute('y', lineY);
                 this.columnMoverBack.setAttribute('y', backY);
             }
         }
@@ -39765,6 +39916,90 @@
         injectable()
     ], SplitRectAfterRenderContribution);
 
+    let loadingImage;
+    let VTableDrawItemInterceptorContribution = class VTableDrawItemInterceptorContribution {
+        order = 1;
+        interceptors;
+        constructor() {
+            this.interceptors = [new ImageDrawItemInterceptorContribution()];
+        }
+        afterDrawItem(graphic, renderService, drawContext, drawContribution, params) {
+            for (let i = 0; i < this.interceptors.length; i++) {
+                if (this.interceptors[i].afterDrawItem &&
+                    this.interceptors[i].afterDrawItem(graphic, renderService, drawContext, drawContribution, params)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        beforeDrawItem(graphic, renderService, drawContext, drawContribution, params) {
+            if ((!graphic.in3dMode || drawContext.in3dInterceptor) &&
+                !graphic.shadowRoot &&
+                !(graphic.baseGraphic || graphic.attribute.globalZIndex || graphic.interactiveGraphic)) {
+                return false;
+            }
+            for (let i = 0; i < this.interceptors.length; i++) {
+                if (this.interceptors[i].beforeDrawItem &&
+                    this.interceptors[i].beforeDrawItem(graphic, renderService, drawContext, drawContribution, params)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    };
+    VTableDrawItemInterceptorContribution = __decorate([
+        injectable()
+    ], VTableDrawItemInterceptorContribution);
+    class ImageDrawItemInterceptorContribution {
+        order = 1;
+        afterDrawItem(graphic, renderService, drawContext, drawContribution, params) {
+            if (graphic.type === 'image') {
+                this.drawItem(graphic, renderService, drawContext, drawContribution, params);
+            }
+            return false;
+        }
+        drawItem(graphic, renderService, drawContext, drawContribution, params) {
+            const { image: url } = graphic.attribute;
+            if (!url || !graphic.resources) {
+                return false;
+            }
+            const res = graphic.resources.get(url);
+            if (res.state !== 'loading') {
+                return false;
+            }
+            if (!loadingImage) {
+                const regedIcons = get$1();
+                const svg = regedIcons.loading_pic.svg;
+                const width = regedIcons.loading_pic.width;
+                const height = regedIcons.loading_pic.height;
+                loadingImage = createImage({
+                    width,
+                    height,
+                    image: svg
+                });
+            }
+            const { image: loadingUrl } = loadingImage.attribute;
+            if (!url || !loadingImage.resources) {
+                return false;
+            }
+            const loadingRes = loadingImage.resources.get(loadingUrl);
+            if (loadingRes.state !== 'success') {
+                return false;
+            }
+            const { context } = drawContext;
+            context.highPerformanceSave();
+            graphic.parent && context.setTransformFromMatrix(graphic.parent.globalTransMatrix, true);
+            graphic.glyphHost &&
+                graphic.glyphHost.parent &&
+                context.setTransformFromMatrix(graphic.glyphHost.parent.globalTransMatrix, true);
+            const b = graphic.AABBBounds;
+            const { width, height } = calcKeepAspectRatioSize(loadingRes.data.width, loadingRes.data.height, b.width(), b.height());
+            context.drawImage(loadingRes.data, b.x1 + (b.width() - width) / 2, b.y1 + (b.height() - height) / 2, width, height);
+            context.highPerformanceRestore();
+            return true;
+        }
+    }
+
     var splitModule = new ContainerModule((bind, unbind, isBound, rebind) => {
         if (isBound(SplitRectBeforeRenderContribution$1)) {
             rebind(SplitRectBeforeRenderContribution$1).to(SplitRectBeforeRenderContribution).inSingletonScope();
@@ -39807,6 +40042,8 @@
         bind(GroupRenderContribution).toService(ClipBodyGroupBeforeRenderContribution);
         bind(ClipBodyGroupAfterRenderContribution).toSelf().inSingletonScope();
         bind(GroupRenderContribution).toService(ClipBodyGroupAfterRenderContribution);
+        bind(VTableDrawItemInterceptorContribution).toSelf().inSingletonScope();
+        bind(DrawItemInterceptor).toService(VTableDrawItemInterceptorContribution);
     });
 
     function computeColsWidth(table, colStart, colEnd, update) {
@@ -40218,7 +40455,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$3(defaultHeaderRowHeight) ? defaultHeaderRowHeight : defaultRowHeight, table, cellLocation, rowLimit);
+            const { width: default2Width, height: default2Height } = createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, table.scenegraph.mergeMap, cellLocation === 'columnHeader' && isNumber$2(defaultHeaderRowHeight) ? defaultHeaderRowHeight : defaultRowHeight, table, cellLocation, rowLimit);
             x += default2Width;
             heightMax = Math.max(heightMax, default2Height);
         }
@@ -40436,7 +40673,7 @@
             const deltaX = screenLeftX - (colGroup.attribute.x + proxy.table.getFrozenColsWidth() + proxy.table.scenegraph.proxy.deltaX);
             proxy.table.scenegraph.proxy.deltaX += deltaX;
             proxy.currentCol = direction === 'left' ? proxy.currentCol + count : proxy.currentCol - count;
-            proxy.totalCol = direction === 'left' ? proxy.totalCol + count : proxy.totalCol - count;
+            proxy.totalCol = Math.max(0, Math.min(proxy.table.colCount - 1, direction === 'left' ? proxy.totalCol + count : proxy.totalCol - count));
             proxy.referenceCol = proxy.colStart + Math.floor((proxy.colEnd - proxy.colStart) / 2);
             proxy.colUpdatePos = distStartCol;
             proxy.colUpdateDirection = direction;
@@ -40473,7 +40710,7 @@
                 proxy.table.scenegraph.proxy.deltaX = deltaX;
             }
             proxy.currentCol = direction === 'left' ? proxy.currentCol + count : proxy.currentCol - count;
-            proxy.totalCol = direction === 'left' ? proxy.totalCol + count : proxy.totalCol - count;
+            proxy.totalCol = Math.max(0, Math.min(proxy.table.colCount - 1, direction === 'left' ? proxy.totalCol + count : proxy.totalCol - count));
             proxy.referenceCol = proxy.colStart + Math.floor((proxy.colEnd - proxy.colStart) / 2);
             proxy.colUpdatePos = proxy.colStart;
             proxy.colUpdateDirection = distEndCol > proxy.bodyRightCol - (proxy.colEnd - proxy.colStart + 1) ? 'right' : 'left';
@@ -40572,7 +40809,7 @@
         });
     }
 
-    function updateAutoRow(colStart, colEnd, rowStart, rowEnd, table, direction = 'up') {
+    function updateAutoRow(colStart, colEnd, rowStart, rowEnd, table, direction = 'up', part) {
         if (direction === 'up') {
             for (let col = colStart; col <= colEnd; col++) {
                 for (let row = rowStart; row <= rowEnd; row++) {
@@ -40584,6 +40821,13 @@
                     if (cellGroup._prev) {
                         y = cellGroup._prev?.attribute.y + table.getRowHeight(cellGroup._prev.row);
                     }
+                    else if (part) {
+                        const baseCellGroup = table.scenegraph.highPerformanceGetCell(col, rowEnd + 1, true);
+                        y = baseCellGroup.attribute.y;
+                        for (let r = rowStart; r <= rowEnd; r++) {
+                            y -= table.getRowHeight(r);
+                        }
+                    }
                     else {
                         y = table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row - 1);
                     }
@@ -40602,6 +40846,13 @@
                     if (cellGroup._next) {
                         y = cellGroup._next?.attribute.y - table.getRowHeight(cellGroup.row);
                     }
+                    else if (part) {
+                        const baseCellGroup = table.scenegraph.highPerformanceGetCell(col, rowStart - 1, true);
+                        y = baseCellGroup.attribute.y;
+                        for (let r = rowStart; r <= rowEnd; r++) {
+                            y += table.getRowHeight(r);
+                        }
+                    }
                     else {
                         y = table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row - 1);
                     }
@@ -40677,9 +40928,9 @@
             proxy.rowEnd = direction === 'up' ? proxy.rowEnd + count : proxy.rowEnd - count;
             updateRowContent(syncTopRow, syncBottomRow, proxy);
             if (proxy.table.heightMode === 'autoHeight') {
-                updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
-                updateAutoRow(0, proxy.table.frozenColCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
-                updateAutoRow(proxy.table.colCount - proxy.table.rightFrozenColCount, proxy.table.colCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
+                updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up', true);
+                updateAutoRow(0, proxy.table.frozenColCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up', true);
+                updateAutoRow(proxy.table.colCount - proxy.table.rightFrozenColCount, proxy.table.colCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up', true);
                 const cellGroup = proxy.table.scenegraph.highPerformanceGetCell(proxy.colStart, screenTopRow, true);
                 const deltaY = screenTopY - (cellGroup.attribute.y + proxy.table.getFrozenRowsHeight() + proxy.table.scenegraph.proxy.deltaY);
                 proxy.table.scenegraph.proxy.deltaY += deltaY;
@@ -41137,7 +41388,7 @@
             computeColsWidth(this.table, this.currentCol + 1, endCol);
             for (let row = 0; row < this.table.rowCount; row++) {
                 const cellGroup = this.highPerformanceGetCell(this.currentCol, row);
-                if (isNumber$3(cellGroup.mergeStartCol) && cellGroup.mergeStartCol > this.currentCol) {
+                if (isNumber$2(cellGroup.mergeStartCol) && cellGroup.mergeStartCol > this.currentCol) {
                     this.table.scenegraph.updateCellContent(cellGroup.col, cellGroup.row);
                 }
             }
@@ -41231,9 +41482,9 @@
             }
             updateRowContent(this.rowUpdatePos, distRow, this);
             if (this.table.heightMode === 'autoHeight') {
-                updateAutoRow(this.bodyLeftCol, this.bodyRightCol, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection);
-                updateAutoRow(0, this.table.frozenColCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection);
-                updateAutoRow(this.table.colCount - this.table.rightFrozenColCount, this.table.colCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection);
+                updateAutoRow(this.bodyLeftCol, this.bodyRightCol, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection, true);
+                updateAutoRow(0, this.table.frozenColCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection, true);
+                updateAutoRow(this.table.colCount - this.table.rightFrozenColCount, this.table.colCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection, true);
             }
             this.rowUpdatePos = distRow + 1;
         }
@@ -41401,6 +41652,8 @@
             const columnHeaderGroup = table.scenegraph.getColGroup(col, true);
             const columnGroup = table.scenegraph.getColGroup(col);
             const columnBottomGroup = table.scenegraph.getColGroupInBottom(col);
+            const columnLeftBottomGroup = table.scenegraph.getColGroupInLeftBottomCorner(col);
+            const columnRightBottomGroup = table.scenegraph.getColGroupInRightBottomCorner(col);
             if (columnHeaderGroup) {
                 columnHeaderGroup.setAttribute('width', columnWidth);
                 columnHeaderGroup.forEachChildren((child) => {
@@ -41419,6 +41672,18 @@
                     child.setAttribute('width', columnWidth);
                 });
             }
+            if (columnRightBottomGroup) {
+                columnRightBottomGroup.setAttribute('width', columnWidth);
+                columnRightBottomGroup.forEachChildren((child) => {
+                    child.setAttribute('width', columnWidth);
+                });
+            }
+            if (columnLeftBottomGroup) {
+                columnLeftBottomGroup.setAttribute('width', columnWidth);
+                columnLeftBottomGroup.forEachChildren((child) => {
+                    child.setAttribute('width', columnWidth);
+                });
+            }
         }
         scene.updateContainer();
         if (direction === 'column') {
@@ -41938,28 +42203,28 @@
         });
         const rowHeightsMap = table.rowHeightsMap;
         removeRows.forEach(row => {
-            rowHeightsMap.delAndReorder(row);
+            rowHeightsMap.delete(row);
         });
         if (removeRows.length) {
             resetRowNumber(scene);
             const beforeRow = removeRows[removeRows.length - 1] - 1;
             const afterRow = removeRows[0] - removeRows.length + 1;
             const rowUpdatePos = updateMergeCellGroup(beforeRow, afterRow, scene);
-            isNumber$3(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
+            isNumber$2(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
         }
         scene.table._clearRowRangeHeightsMap();
         let updateAfter;
         addRows.forEach(row => {
             const needUpdateAfter = addRow(row, scene);
             updateAfter = updateAfter ?? needUpdateAfter;
-            rowHeightsMap.addAndReorder(row);
+            rowHeightsMap.insert(row);
         });
         resetRowNumberAndY(scene);
         if (addRows.length) {
             const beforeRow = addRows[0] - 1;
             const afterRow = addRows[addRows.length - 1] + 1;
             const rowUpdatePos = updateMergeCellGroup(beforeRow, afterRow, scene);
-            isNumber$3(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
+            isNumber$2(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
         }
         for (let col = 0; col < table.colCount; col++) {
             updateRows.forEach(r => {
@@ -41980,9 +42245,9 @@
             const beforeRow = updateRows[0] - 1;
             const afterRow = updateRows[updateRows.length - 1] + 1;
             const rowUpdatePos = updateMergeCellGroup(beforeRow, afterRow, scene);
-            isNumber$3(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
+            isNumber$2(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
         }
-        if (isNumber$3(updateAfter)) {
+        if (isNumber$2(updateAfter)) {
             for (let col = 0; col < table.colCount; col++) {
                 for (let row = updateAfter; row < table.rowCount; row++) {
                     const cellGroup = scene.highPerformanceGetCell(col, row, true);
@@ -41992,7 +42257,7 @@
             scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, updateAfter);
         }
         if (addRows.length) {
-            if (!isNumber$3(updateAfter)) {
+            if (!isNumber$2(updateAfter)) {
                 const minRow = Math.min(...addRows);
                 scene.proxy.rowUpdatePos = Math.min(minRow, scene.proxy.rowUpdatePos);
             }
@@ -42060,15 +42325,6 @@
         }
         return row;
     }
-    function deduplication$1(array) {
-        const result = [];
-        for (let i = 0; i < array.length; i++) {
-            if (result.indexOf(array[i]) === -1) {
-                result.push(array[i]);
-            }
-        }
-        return result;
-    }
     function resetRowNumber(scene) {
         scene.bodyGroup.forEachChildren((colGroup) => {
             let rowIndex = scene.bodyRowStart;
@@ -42300,7 +42556,7 @@
                 });
             });
         });
-        changedCells.length = 0;
+        changedCells.clear();
         const { scrollTop, scrollLeft, frozenRowCount, frozenColCount } = table;
         const frozenRowsHeight = table.getFrozenRowsHeight();
         const frozenColsWidth = table.getFrozenColsWidth();
@@ -42364,10 +42620,10 @@
         }
     }
     function adjustCellContentVerticalLayout(cellGroup, minTop, maxTop, changedCells, table) {
-        if (isNumber$3(cellGroup.mergeStartCol) &&
-            isNumber$3(cellGroup.mergeStartRow) &&
-            isNumber$3(cellGroup.mergeEndCol) &&
-            isNumber$3(cellGroup.mergeEndRow)) {
+        if (isNumber$2(cellGroup.mergeStartCol) &&
+            isNumber$2(cellGroup.mergeStartRow) &&
+            isNumber$2(cellGroup.mergeEndCol) &&
+            isNumber$2(cellGroup.mergeEndRow)) {
             for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
                 for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
                     const singleCellGroup = table.scenegraph.getCell(col, row);
@@ -42399,34 +42655,36 @@
         const textBottom = graphic.globalAABBBounds.y2;
         if (textTop < minTop) {
             const deltaHeight = textTop - minTop;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dy', (child.attribute.dy ?? 0) - deltaHeight + 2);
             });
         }
         else if (textBottom > maxTop) {
             const deltaHeight = textBottom - maxTop;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dy', (child.attribute.dy ?? 0) - deltaHeight);
             });
         }
     }
     function adjustCellContentHorizontalLayout(cellGroup, minLeft, maxLeft, changedCells, table) {
-        if (isNumber$3(cellGroup.mergeStartCol) &&
-            isNumber$3(cellGroup.mergeStartRow) &&
-            isNumber$3(cellGroup.mergeEndCol) &&
-            isNumber$3(cellGroup.mergeEndRow)) {
+        if (isNumber$2(cellGroup.mergeStartCol) &&
+            isNumber$2(cellGroup.mergeStartRow) &&
+            isNumber$2(cellGroup.mergeEndCol) &&
+            isNumber$2(cellGroup.mergeEndRow)) {
             for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {
                 for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {
                     const singleCellGroup = table.scenegraph.getCell(col, row);
@@ -42448,24 +42706,26 @@
         const textRight = text.globalAABBBounds.x2;
         if (textLeft < minLeft) {
             const deltaWidth = textLeft - minLeft;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dx', (child.attribute.dx ?? 0) - deltaWidth + 2);
             });
         }
         else if (textRight > maxLeft) {
             const deltaWidth = textRight - maxLeft;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dx', (child.attribute.dx ?? 0) - deltaWidth);
             });
@@ -43458,7 +43718,7 @@
                 }
             }
         });
-        if (isNumber$3(updateAfter)) {
+        if (isNumber$2(updateAfter)) {
             for (let col = updateAfter; col < table.colCount; col++) {
                 for (let row = 0; row < table.rowCount; row++) {
                     const cellGroup = scene.highPerformanceGetCell(col, row, true);
@@ -43468,7 +43728,7 @@
             scene.proxy.colUpdatePos = updateAfter;
         }
         if (addCols.length) {
-            if (!isNumber$3(updateAfter)) {
+            if (!isNumber$2(updateAfter)) {
                 const minCol = Math.min(...addCols);
                 scene.proxy.colUpdatePos = minCol;
             }
@@ -44351,11 +44611,9 @@
             }
         }
         updateRowHeight(row, detaY, skipTableHeightMap) {
-            if (row >= this.proxy.rowStart && row <= this.proxy.rowEnd) {
-                detaY = Math.round(detaY);
-                updateRowHeight(this, row, detaY, skipTableHeightMap);
-                this.updateContainerHeight(row, detaY);
-            }
+            detaY = Math.round(detaY);
+            updateRowHeight(this, row, detaY, skipTableHeightMap);
+            this.updateContainerHeight(row, detaY);
         }
         updateRowsHeight(rows, detaYs, skipTableHeightMap) {
             for (let i = 0; i < rows.length; i++) {
@@ -44423,7 +44681,10 @@
             if (oldHeight === height) {
                 return;
             }
-            this.updateRowHeight(row, height - oldHeight);
+            if ((row >= this.proxy.rowStart && row <= this.proxy.rowEnd) ||
+                (row >= this.table.rowCount - this.table.bottomFrozenRowCount && row <= this.table.rowCount - 1)) {
+                this.updateRowHeight(row, height - oldHeight);
+            }
             this.table._clearRowRangeHeightsMap(row);
         }
         setX(x) {
@@ -44663,7 +44924,7 @@
             this.colHeaderGroup.setDeltaWidth(colHeaderX - this.colHeaderGroup.attribute.width);
             this.rowHeaderGroup.setDeltaWidth(rowHeaderX - this.rowHeaderGroup.attribute.width);
             this.bottomFrozenGroup.setDeltaWidth(colHeaderX - this.bottomFrozenGroup.attribute.width);
-            this.rightFrozenGroup.setDeltaWidth(rightX - this.table.getRightFrozenColsWidth());
+            this.rightFrozenGroup.setDeltaWidth(rightX - this.rightFrozenGroup.attribute.width);
             this.rightTopCornerGroup.setDeltaWidth(rightX - this.rightTopCornerGroup.attribute.width);
             this.rightBottomCornerGroup.setDeltaWidth(rightX - this.rightBottomCornerGroup.attribute.width);
             this.bodyGroup.setDeltaWidth(bodyX - this.bodyGroup.attribute.width);
@@ -44832,9 +45093,30 @@
             this.stage.enableDirtyBounds();
         }
         updateRow(removeCells, addCells, updateCells = []) {
+            const addRows = deduplication$1(addCells.map(cell => cell.row)).sort((a, b) => a - b);
+            const updateRows = deduplication$1(updateCells.map(cell => cell.row)).sort((a, b) => a - b);
+            const isNotFillHeight = this.table.getAllRowsHeight() -
+                [...addRows, ...updateRows].reduce((tolHeight, rowNumber) => {
+                    return tolHeight + this.table.getRowHeight(rowNumber);
+                }, 0) <=
+                this.table.tableNoFrameHeight;
             updateRow(removeCells, addCells, updateCells, this.table);
             this.recalculateColWidths();
-            this.recalculateRowHeights();
+            if (this.table.heightMode === 'adaptive' ||
+                (this.table.autoFillHeight && (this.table.getAllRowsHeight() <= this.table.tableNoFrameHeight || isNotFillHeight))) {
+                this.table.scenegraph.recalculateRowHeights();
+            }
+            else if (this.table.heightMode === 'autoHeight') {
+                for (let i = 0; i < updateRows.length; i++) {
+                    const row = updateRows[i];
+                    const oldHeight = this.table.getRowHeight(row);
+                    const newHeight = computeRowHeight(row, 0, this.table.colCount - 1, this.table);
+                    if ((row >= this.proxy.rowStart && row <= this.proxy.rowEnd) ||
+                        (row >= this.table.rowCount - this.table.bottomFrozenRowCount && row <= this.table.rowCount - 1)) {
+                        this.table.scenegraph.updateRowHeight(row, newHeight - oldHeight);
+                    }
+                }
+            }
             this.table.stateManager.checkFrozen();
             if (!this.isPivot && !this.transpose) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
@@ -45242,7 +45524,10 @@
                 }
                 else if (col >= 0 && row >= 0) {
                     const cellRange = table.getCellRange(col, row);
-                    state.select.ranges.push(cellRange);
+                    state.select.ranges.push({
+                        start: { col: cellRange.start.col, row: cellRange.start.row },
+                        end: { col: cellRange.end.col, row: cellRange.end.row }
+                    });
                 }
                 cellPos.col = col;
                 cellPos.row = row;
@@ -45496,20 +45781,44 @@
         let backX;
         let lineY;
         let backY;
-        const cellLocation = state.table.getCellLocation(col, row);
+        const cellLocation = state.table.getCellLocation(state.columnMove.colSource, state.columnMove.rowSource);
         if (cellLocation === 'columnHeader') {
-            (backX = state.columnMove.x),
-                (lineX =
+            backX = state.columnMove.x;
+            if (state.table.isFrozenColumn(col)) {
+                lineX =
                     state.columnMove.colTarget >= state.columnMove.colSource
                         ? state.table.getColsWidth(0, state.columnMove.colTarget)
-                        : state.table.getColsWidth(0, state.columnMove.colTarget - 1));
+                        : state.table.getColsWidth(0, state.columnMove.colTarget - 1);
+            }
+            else if (state.table.isRightFrozenColumn(col)) {
+                lineX = state.table.tableNoFrameWidth - state.table.getColsWidth(targetCell.col + 1, state.table.colCount - 1);
+            }
+            else {
+                lineX =
+                    (state.columnMove.colTarget >= state.columnMove.colSource
+                        ? state.table.getColsWidth(0, state.columnMove.colTarget)
+                        : state.table.getColsWidth(0, state.columnMove.colTarget - 1)) -
+                        state.table.stateManager.scroll.horizontalBarPos;
+            }
         }
         else if (cellLocation === 'rowHeader') {
-            (backY = state.columnMove.y),
-                (lineY =
+            backY = state.columnMove.y;
+            if (state.table.isFrozenRow(row)) {
+                lineY =
                     state.columnMove.rowTarget >= state.columnMove.rowSource
                         ? state.table.getRowsHeight(0, state.columnMove.rowTarget)
-                        : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1));
+                        : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1);
+            }
+            else if (state.table.isBottomFrozenRow(row)) {
+                lineY = state.table.tableNoFrameHeight - state.table.getRowsHeight(targetCell.row + 1, state.table.rowCount - 1);
+            }
+            else {
+                lineY =
+                    (state.columnMove.rowTarget >= state.columnMove.rowSource
+                        ? state.table.getRowsHeight(0, state.columnMove.rowTarget)
+                        : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1)) -
+                        state.table.stateManager.scroll.verticalBarPos;
+            }
         }
         state.table.scenegraph.component.updateMoveCol(backX, lineX, backY, lineY);
         state.table.scenegraph.updateNextFrame();
@@ -45528,6 +45837,28 @@
                 clearWidthsAndHeightsCache(state.columnMove.colSource, state.columnMove.rowSource, state.columnMove.colTarget, state.columnMove.rowTarget, state.table);
                 state.table.clearCellStyleCache();
                 state.table.scenegraph.updateHeaderPosition(state.columnMove.colSource, state.columnMove.rowSource, state.columnMove.colTarget, state.columnMove.rowTarget, sourceMergeInfo, targetMergeInfo);
+                if (state.table.internalProps.frozenColDragHeaderMode === 'adjustFrozenCount' && state.table.isListTable()) {
+                    if (state.table.isFrozenColumn(state.columnMove.colTarget) &&
+                        !state.table.isFrozenColumn(state.columnMove.colSource)) {
+                        state.table.frozenColCount +=
+                            sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                    else if (state.table.isFrozenColumn(state.columnMove.colSource) &&
+                        !state.table.isFrozenColumn(state.columnMove.colTarget)) {
+                        state.table.frozenColCount -=
+                            sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                    if (state.table.isRightFrozenColumn(state.columnMove.colTarget) &&
+                        !state.table.isRightFrozenColumn(state.columnMove.colSource)) {
+                        state.table.rightFrozenColCount +=
+                            sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                    else if (state.table.isRightFrozenColumn(state.columnMove.colSource) &&
+                        !state.table.isRightFrozenColumn(state.columnMove.colTarget)) {
+                        state.table.rightFrozenColCount -=
+                            sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1;
+                    }
+                }
             }
             state.updateCursor();
         }
@@ -46854,14 +47185,15 @@
             if (stateManager.interactionState === InteractionState.scrolling) {
                 return;
             }
-            if (stateManager.interactionState === InteractionState.grabing &&
-                Math.abs(lastX - e.x) + Math.abs(lastY - e.y) >= 1) {
-                if (stateManager.isResizeCol()) ;
-                else if (stateManager.isMoveCol()) {
-                    eventManager.dealColumnMover(eventArgsSet);
-                }
-                else {
-                    eventManager.dealTableSelect(eventArgsSet, true);
+            if (stateManager.interactionState === InteractionState.grabing) {
+                if (Math.abs(lastX - e.x) + Math.abs(lastY - e.y) >= 1) {
+                    if (stateManager.isResizeCol()) ;
+                    else if (stateManager.isMoveCol()) {
+                        eventManager.dealColumnMover(eventArgsSet);
+                    }
+                    else {
+                        eventManager.dealTableSelect(eventArgsSet, true);
+                    }
                 }
                 return;
             }
@@ -48164,7 +48496,9 @@
         }
         dealColumnMover(eventArgsSet) {
             const { eventArgs } = eventArgsSet;
-            this.table.stateManager.updateMoveCol(eventArgs.col, eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
+            if (isValid$1(eventArgs.col) && isValid$1(eventArgs.row)) {
+                this.table.stateManager.updateMoveCol(eventArgs.col, eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
+            }
         }
         startColumnResize(eventArgsSet) {
         }
@@ -51030,6 +51364,238 @@
         return new DiscreteTableLegend(option, table);
     }
 
+    class NumberRangeMap {
+        data;
+        cumulativeSum;
+        difference;
+        totalSum;
+        table;
+        isUpdate = false;
+        _keys = [];
+        _sorted = false;
+        constructor(table) {
+            this.data = new Map();
+            this._keys.length = 0;
+            this.cumulativeSum = new Map();
+            this.difference = new Map();
+            this.totalSum = 0;
+            this.table = table;
+        }
+        clear() {
+            this.data.clear();
+            this.cumulativeSum.clear();
+            this.difference.clear();
+            this.totalSum = 0;
+        }
+        clearRange() {
+            this.cumulativeSum.clear();
+            this.difference.clear();
+        }
+        add(position, value) {
+            const defaultValue = this.table.getRowHeight(position);
+            if (!this.data.has(position)) {
+                this._keys.push(position);
+                this._sorted = false;
+            }
+            this.data.set(position, value);
+            this.totalSum += value;
+            this.updateDifference(position, value - defaultValue);
+        }
+        remove(position) {
+            if (this.data.has(position)) {
+                const value = this.data.get(position);
+                this.data.delete(position);
+                const index = this._keys.indexOf(position);
+                if (index !== -1) {
+                    this._keys.splice(index, 1);
+                }
+                this.totalSum -= value;
+                const defaultValue = this.table.getRowHeight(position);
+                this.updateDifference(position, defaultValue - value);
+            }
+        }
+        put(position, newValue) {
+            if (this.data.has(position)) {
+                const oldValue = this.data.get(position);
+                this.data.set(position, newValue);
+                const difference = newValue - oldValue;
+                this.totalSum += difference;
+                this.updateDifference(position, difference);
+            }
+            else {
+                this.add(position, newValue);
+            }
+        }
+        get(position) {
+            return this.data.get(position);
+        }
+        has(position) {
+            return this.data.has(position);
+        }
+        _sort() {
+            const { _keys: keys } = this;
+            if (!this._sorted) {
+                keys.sort((a, b) => {
+                    if (a < b) {
+                        return -1;
+                    }
+                    if (a > b) {
+                        return 1;
+                    }
+                    return 0;
+                });
+                this._sorted = true;
+            }
+        }
+        updateDifference(position, difference) {
+            const oldDifference = this.difference.get(position) ?? 0;
+            this.difference.set(position, oldDifference + difference);
+            this.update();
+        }
+        getSumInRange(start, end) {
+            return this.calculatePrefixSum(end) - this.calculatePrefixSum(start - 1);
+        }
+        updateCumulativeSum(position, difference) {
+            for (const [pos, sum] of this.cumulativeSum) {
+                if (pos >= position) {
+                    this.cumulativeSum.set(pos, sum + difference);
+                }
+            }
+        }
+        calculatePrefixSum(position) {
+            if (position < 0) {
+                return 0;
+            }
+            if (this.cumulativeSum.has(position)) {
+                let cache = this.cumulativeSum.get(position);
+                for (const [pos, difference] of this.difference) {
+                    if (pos <= position) {
+                        cache += difference;
+                    }
+                }
+                return cache;
+            }
+            this.dealDiffenence();
+            return this.getCumulativeSum(position);
+        }
+        getCumulativeSum(position) {
+            let sum = 0;
+            for (let i = position; i >= 0; i--) {
+                if (this.cumulativeSum.has(i)) {
+                    sum += this.cumulativeSum.get(i);
+                    break;
+                }
+                else {
+                    sum += this.data.get(i) ?? this.table.getRowHeight(i);
+                }
+            }
+            this.cumulativeSum.set(position, sum);
+            return sum;
+        }
+        update() {
+            if (this.isUpdate) {
+                return;
+            }
+            this.isUpdate = true;
+            setTimeout(() => {
+                this.dealDiffenence();
+                this.isUpdate = false;
+            }, 0);
+        }
+        dealDiffenence() {
+            for (const [sumPos, sum] of this.cumulativeSum) {
+                for (const [difPos, difference] of this.difference) {
+                    if (sumPos >= difPos) {
+                        this.cumulativeSum.set(sumPos, sum + difference);
+                    }
+                }
+            }
+            this.difference.clear();
+        }
+        insert(position, value) {
+            const lastIndex = this.getLastIndex() + 1;
+            this.adjustOrder(position, position + 1, lastIndex - position);
+            if (isValid$1(value)) {
+                this.put(position, value);
+            }
+        }
+        getLastIndex() {
+            this._sort();
+            return this._keys[this._keys.length - 1];
+        }
+        delLast() {
+            const lastIndex = this.getLastIndex();
+            this.remove(lastIndex);
+        }
+        delete(position) {
+            if (!this.has(position)) {
+                return;
+            }
+            const lastIndex = this.getLastIndex();
+            this.adjustOrder(position + 1, position, lastIndex - position);
+            this.delLast();
+        }
+        adjustOrder(sourceIndex, targetIndex, moveCount) {
+            this.clearRange();
+            this._sort();
+            const { _keys: keys } = this;
+            if (sourceIndex > targetIndex) {
+                const sourceVals = [];
+                for (let i = indexFirst(keys, sourceIndex + moveCount - 1); i >= 0; i--) {
+                    const key = keys[i];
+                    if (key >= sourceIndex) {
+                        sourceVals.push(this.get(key));
+                    }
+                    else if (targetIndex <= key && key < sourceIndex) {
+                        this.put(key + moveCount, this.get(key));
+                    }
+                    else if (key < targetIndex) {
+                        break;
+                    }
+                }
+                for (let i = 0; i < moveCount; i++) {
+                    this.put(targetIndex + i, sourceVals[moveCount - 1 - i]);
+                }
+            }
+            const { length } = keys;
+            if (sourceIndex < targetIndex) {
+                const sourceVals = [];
+                for (let i = indexFirst(keys, sourceIndex); i < length; i++) {
+                    const key = keys[i];
+                    if (key >= sourceIndex && key < sourceIndex + moveCount) {
+                        sourceVals.push(this.get(key));
+                    }
+                    else if (sourceIndex + moveCount <= key && key <= targetIndex) {
+                        this.put(key - moveCount, this.get(key));
+                    }
+                    else if (key > targetIndex) {
+                        break;
+                    }
+                }
+                for (let i = 0; i < moveCount; i++) {
+                    this.put(targetIndex + i, sourceVals[i]);
+                }
+            }
+        }
+    }
+    function indexFirst(arr, elm) {
+        let low = 0;
+        let high = arr.length - 1;
+        while (low <= high) {
+            const i = Math.floor((low + high) / 2);
+            if (arr[i] === elm) {
+                return i;
+            }
+            else if (arr[i] > elm) {
+                high = i - 1;
+            }
+            else {
+                low = i + 1;
+            }
+        }
+        return high < 0 ? 0 : high;
+    }
+
     const { toBoxArray } = style;
     const { isTouchEvent } = event;
     const rangeReg = /^\$(\d+)\$(\d+)$/;
@@ -51061,7 +51627,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.18.4";
+        version = "0.19.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -51116,7 +51682,7 @@
                 internalProps.context = internalProps.canvas.getContext('2d');
             }
             internalProps.handler = new EventHandler();
-            if (isNumber$3(this.options.resizeTime)) {
+            if (isNumber$2(this.options.resizeTime)) {
                 internalProps.handler.resizeTime = this.options.resizeTime;
             }
             internalProps.pixelRatio = pixelRatio;
@@ -51132,7 +51698,7 @@
             internalProps.renderChartAsync = renderChartAsync;
             setBatchRenderChartCount(renderChartAsyncBatchCount);
             internalProps.overscrollBehavior = overscrollBehavior ?? 'auto';
-            internalProps._rowHeightsMap = new NumberMap();
+            internalProps._rowHeightsMap = new NumberRangeMap(this);
             internalProps._rowRangeHeightsMap = new Map();
             internalProps._colRangeWidthsMap = new Map();
             internalProps._widthResizedColMap = new Set();
@@ -51206,7 +51772,7 @@
             this.headerStyleCache = new Map();
             this.bodyStyleCache = new Map();
             this.bodyBottomStyleCache = new Map();
-            internalProps.stick = { changedCells: [] };
+            internalProps.stick = { changedCells: new Map() };
             internalProps.customMergeCell = options.customMergeCell;
         }
         throttleInvalidate = throttle2(this.render.bind(this), 200);
@@ -51486,7 +52052,8 @@
             return 'grid';
         }
         getColsWidth(startCol, endCol) {
-            endCol = Math.min(endCol, this.colCount - 1);
+            startCol = Math.max(startCol, 0);
+            endCol = Math.min(endCol, (this.colCount ?? Infinity) - 1);
             const cachedColWidth = this._colRangeWidthsMap.get(`$${startCol}$${endCol}`);
             if (cachedColWidth !== null && cachedColWidth !== undefined) {
                 return cachedColWidth;
@@ -51510,11 +52077,11 @@
             return Math.round(w);
         }
         getRowHeight(row) {
-            if (this.rowHeightsMap.get(row)) {
+            if (isValid$1(this.rowHeightsMap.get(row))) {
                 return this.rowHeightsMap.get(row);
             }
             const defaultHeight = this.getDefaultRowHeight(row);
-            if (isNumber$3(defaultHeight)) {
+            if (isNumber$2(defaultHeight)) {
                 return defaultHeight;
             }
             return this.defaultRowHeight;
@@ -51539,26 +52106,8 @@
             }
         }
         getRowsHeight(startRow, endRow) {
-            const cachedRowHeight = this._rowRangeHeightsMap.get(`$${startRow}$${endRow}`);
-            if (cachedRowHeight !== null && cachedRowHeight !== undefined) {
-                return cachedRowHeight;
-            }
-            const cachedLowerRowHeight = this._rowRangeHeightsMap.get(`$${startRow}$${endRow - 1}`);
-            if (cachedLowerRowHeight !== null && cachedLowerRowHeight !== undefined) {
-                const height = Math.round(cachedLowerRowHeight +
-                    (this.rowHeightsMap.get(endRow) ??
-                        (this.isColumnHeader(0, endRow) || this.isCornerHeader(0, endRow)
-                            ? Array.isArray(this.defaultHeaderRowHeight) && isNumber$3(this.defaultHeaderRowHeight[endRow])
-                                ? this.defaultHeaderRowHeight[endRow]
-                                : isNumber$3(this.defaultHeaderRowHeight)
-                                    ? this.defaultHeaderRowHeight
-                                    : this.internalProps.defaultRowHeight
-                            : this.internalProps.defaultRowHeight)));
-                if (startRow >= 0 && endRow >= 0) {
-                    this._rowRangeHeightsMap.set(`$${startRow}$${endRow}`, Math.round(height));
-                }
-                return height;
-            }
+            startRow = Math.max(startRow, 0);
+            endRow = Math.min(endRow, (this.rowCount ?? Infinity) - 1);
             let h = 0;
             if (this.heightMode === 'standard' &&
                 !this.autoFillHeight &&
@@ -51572,12 +52121,7 @@
                 h += this.defaultRowHeight * (endRow - Math.max(this.columnHeaderLevelCount, startRow) + 1);
             }
             else {
-                for (let i = startRow; i <= endRow; i++) {
-                    h += this.getRowHeight(i);
-                }
-            }
-            if (startRow >= 0 && endRow >= 0 && h > 0) {
-                this._rowRangeHeightsMap.set(`$${startRow}$${endRow}`, Math.round(h));
+                h = this.rowHeightsMap.getSumInRange(startRow, endRow);
             }
             return Math.round(h);
         }
@@ -51653,22 +52197,7 @@
             }
         }
         _clearRowRangeHeightsMap(row) {
-            if (typeof row !== 'number') {
-                this._rowRangeHeightsMap.clear();
-            }
-            else {
-                const keys = this._rowRangeHeightsMap.keys();
-                for (const key of keys) {
-                    const reg = rangeReg.exec(key);
-                    if (reg) {
-                        const start = Number(reg[1]);
-                        const end = Number(reg[2]);
-                        if (row >= start && row <= end) {
-                            this._rowRangeHeightsMap.delete(key);
-                        }
-                    }
-                }
-            }
+            this.rowHeightsMap.clearRange();
         }
         _getColContentWidth(col) {
             return Number(this.colContentWidthsMap.get(col));
@@ -52205,13 +52734,14 @@
             setBatchRenderChartCount(renderChartAsyncBatchCount);
             internalProps.overscrollBehavior = overscrollBehavior ?? 'auto';
             internalProps.cellTextOverflows = {};
-            internalProps._rowHeightsMap = new NumberMap();
+            internalProps._rowHeightsMap = new NumberRangeMap(this);
             internalProps._rowRangeHeightsMap = new Map();
             internalProps._colRangeWidthsMap = new Map();
             internalProps._widthResizedColMap = new Set();
             this.colWidthsMap = new NumberMap();
             this.colContentWidthsMap = new NumberMap();
             this.colWidthsLimit = {};
+            internalProps.stick.changedCells.clear();
             internalProps.theme = themes.of(options.theme ?? themes.DEFAULT);
             this.scenegraph.updateStageBackground();
             internalProps.autoWrapText = options.autoWrapText;
@@ -52909,6 +53439,10 @@
         }
         _canDragHeaderPosition(col, row) {
             if (this.isHeader(col, row) && this.stateManager.isSelected(col, row)) {
+                if (this.internalProps.frozenColDragHeaderMode === 'disabled' &&
+                    (this.isFrozenColumn(col) || this.isRightFrozenColumn(col))) {
+                    return false;
+                }
                 const selectRange = this.stateManager.select.ranges[0];
                 if (this.isColumnHeader(col, row)) {
                     if (selectRange.end.row !== this.rowCount - 1) {
@@ -53668,10 +54202,10 @@
                         }
                     }
                 }
-                if (isNumber$3(axisOption?.min)) {
+                if (isNumber$2(axisOption?.min)) {
                     range.min = axisOption.min;
                 }
-                if (isNumber$3(axisOption?.max)) {
+                if (isNumber$2(axisOption?.max)) {
                     range.max = axisOption.max;
                 }
                 axes.push(merge({
@@ -53724,10 +54258,10 @@
                         }
                     }
                 }
-                if (isNumber$3(axisOption?.min)) {
+                if (isNumber$2(axisOption?.min)) {
                     range.min = axisOption.min;
                 }
-                if (isNumber$3(axisOption?.max)) {
+                if (isNumber$2(axisOption?.max)) {
                     range.max = axisOption.max;
                 }
                 axes.push(merge({
@@ -53807,10 +54341,10 @@
             range.min = axisRange[0];
             range.max = axisRange[1];
         }
-        if (isNumber$3(axisOption?.min)) {
+        if (isNumber$2(axisOption?.min)) {
             range.min = axisOption.min;
         }
-        if (isNumber$3(axisOption?.max)) {
+        if (isNumber$2(axisOption?.max)) {
             range.max = axisOption.max;
         }
         return {
@@ -53831,12 +54365,425 @@
         return isHasChart;
     }
 
+    class DimensionTree {
+        sharedVar;
+        sizeIncludeParent = false;
+        rowExpandLevel;
+        hierarchyType;
+        tree = {
+            id: 0,
+            dimensionKey: '',
+            value: '',
+            children: [],
+            level: -1,
+            levelSpan: 1,
+            startIndex: 0,
+            size: 0,
+            startInTotal: 0,
+            hierarchyState: undefined
+        };
+        totalLevel = 0;
+        dimensionKeys = new NumberMap();
+        cache = new Map();
+        constructor(tree, sharedVar, hierarchyType = 'grid', rowExpandLevel = undefined) {
+            this.sizeIncludeParent = rowExpandLevel !== null && rowExpandLevel !== undefined;
+            this.rowExpandLevel = rowExpandLevel;
+            this.hierarchyType = hierarchyType;
+            this.sharedVar = sharedVar;
+            this.reset(tree);
+        }
+        reset(tree, updateTreeNode = false) {
+            this.cache.clear();
+            this.dimensionKeys = new NumberMap();
+            this.tree.children = tree;
+            this.setTreeNode(this.tree, 0, this.tree);
+            this.totalLevel = this.dimensionKeys.count();
+        }
+        setTreeNode(node, startIndex, parent) {
+            node.startIndex = startIndex;
+            node.startInTotal = (parent.startInTotal ?? 0) + node.startIndex;
+            if (node.dimensionKey ?? node.indicatorKey) {
+                !this.dimensionKeys.contain(node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey) &&
+                    this.dimensionKeys.put(node.level, node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey);
+                if (!node.id) {
+                    node.id = ++this.sharedVar.seqId;
+                }
+            }
+            let size = node.dimensionKey ? (this.sizeIncludeParent ? 1 : 0) : 0;
+            const children = node.children || node.columns;
+            if (this.hierarchyType === 'grid') {
+                if (children?.length >= 1) {
+                    children.forEach((n) => {
+                        n.level = (node.level ?? 0) + 1;
+                        size += this.setTreeNode(n, size, node);
+                    });
+                }
+                else {
+                    size = 1;
+                }
+            }
+            else if (node.hierarchyState === HierarchyState.expand && children?.length >= 1) {
+                children.forEach((n) => {
+                    n.level = (node.level ?? 0) + 1;
+                    size += this.setTreeNode(n, size, node);
+                });
+            }
+            else if (node.hierarchyState === HierarchyState.collapse && children?.length >= 1) {
+                children.forEach((n) => {
+                    n.level = (node.level ?? 0) + 1;
+                    this.setTreeNode(n, size, node);
+                });
+            }
+            else if (!node.hierarchyState && node.level + 1 < this.rowExpandLevel && children?.length >= 1) {
+                node.hierarchyState = HierarchyState.expand;
+                children.forEach((n) => {
+                    n.level = (node.level ?? 0) + 1;
+                    size += this.setTreeNode(n, size, node);
+                });
+            }
+            else if (children?.length >= 1) {
+                node.hierarchyState = HierarchyState.collapse;
+                children.forEach((n) => {
+                    n.level = (node.level ?? 0) + 1;
+                    this.setTreeNode(n, size, node);
+                });
+            }
+            else {
+                node.hierarchyState = HierarchyState.none;
+                size = 1;
+            }
+            node.size = size;
+            return size;
+        }
+        getTreePath(index, maxDeep = 30) {
+            const path = [];
+            this.searchPath(index, this.tree, path, maxDeep);
+            path.shift();
+            return path;
+        }
+        getTreePathByCellIds(ids) {
+            const path = [];
+            let nodes = this.tree.children;
+            for (let i = 0; i < ids.length; i++) {
+                const id = ids[i];
+                const pathNode = this.findNodeById(nodes, id);
+                if (pathNode) {
+                    path.push(pathNode);
+                    nodes = pathNode.children;
+                }
+                else {
+                    break;
+                }
+            }
+            return path;
+        }
+        findNodeById(nodes, id) {
+            return nodes.find(node => {
+                return node.id === id;
+            });
+        }
+        searchPath(index, node, path, maxDeep) {
+            if (!node) {
+                return;
+            }
+            if (index < node.startIndex || index >= node.startIndex + node.size) {
+                return;
+            }
+            path.push(node);
+            if (!node.children || node.children.length === 0 || node.level >= maxDeep) {
+                return;
+            }
+            const cIndex = index - node.startIndex;
+            if (this.cache.has(node.level + 1)) {
+                const cacheNode = this.cache.get(node.level + 1);
+                if (cIndex >= cacheNode.startIndex && cIndex < cacheNode.startIndex + cacheNode.size) {
+                    this.searchPath(cIndex, cacheNode, path, maxDeep);
+                    return;
+                }
+            }
+            let left = 0;
+            let right = node.children.length - 1;
+            while (left <= right) {
+                const middle = Math.floor((left + right) / 2);
+                const element = node.children[middle];
+                if (cIndex >= element.startIndex && cIndex < element.startIndex + element.size) {
+                    this.cache.set(element.level, element);
+                    const deleteLevels = [];
+                    this.cache.forEach((node, key) => {
+                        if (key > element.level) {
+                            deleteLevels.push(key);
+                        }
+                    });
+                    deleteLevels.forEach(key => {
+                        this.cache.delete(key);
+                    });
+                    this.searchPath(cIndex, element, path, maxDeep);
+                    break;
+                }
+                else if (cIndex < element.startIndex) {
+                    right = middle - 1;
+                }
+                else {
+                    left = middle + 1;
+                }
+            }
+            return;
+        }
+        movePosition(level, sourceIndex, targetIndex) {
+            let parNode;
+            let sourceSubIndex;
+            let targetSubIndex;
+            const findTargetNode = (node, subIndex) => {
+                if (sourceSubIndex !== undefined && targetSubIndex !== undefined) {
+                    return;
+                }
+                if (node.level === level) {
+                    if (node.startInTotal === sourceIndex) {
+                        sourceSubIndex = subIndex;
+                    }
+                    if (node.startInTotal <= targetIndex && targetIndex <= node.startInTotal + node.size - 1) {
+                        targetSubIndex = subIndex;
+                    }
+                }
+                const children = node.children || node.columns;
+                if (children && node.level < level) {
+                    parNode = node;
+                    for (let i = 0; i < children.length; i++) {
+                        if ((sourceIndex >= children[i].startInTotal && sourceIndex <= children[i].startInTotal + children[i].size) ||
+                            (targetIndex >= children[i].startInTotal && targetIndex <= children[i].startInTotal + children[i].size)) {
+                            findTargetNode(children[i], i);
+                        }
+                    }
+                }
+            };
+            findTargetNode(this.tree, 0);
+            const children = parNode.children || parNode.columns;
+            const sourceColumns = children.splice(sourceSubIndex, 1);
+            sourceColumns.unshift(targetSubIndex, 0);
+            Array.prototype.splice.apply(children, sourceColumns);
+        }
+        getCopiedTree() {
+            const children = cloneDeep(this.tree.children);
+            clearNode(children);
+            return children;
+        }
+    }
+    function generateLayoutTree(tree, children) {
+        children?.forEach((node) => {
+            const diemnsonNode = {
+                dimensionKey: node.dimensionKey,
+                indicatorKey: node.indicatorKey,
+                value: node.value,
+                hierarchyState: node.hierarchyState,
+                children: undefined
+            };
+            tree.push(diemnsonNode);
+            if (node.children) {
+                diemnsonNode.children = [];
+                generateLayoutTree(diemnsonNode.children, node.children);
+            }
+        });
+    }
+    function countLayoutTree(children, countParentNode) {
+        let count = 0;
+        children?.forEach((node) => {
+            if (countParentNode) {
+                count++;
+            }
+            else {
+                if (!node.children || node.children.length === 0) {
+                    count++;
+                }
+            }
+            if (node.children) {
+                count += countLayoutTree(node.children, countParentNode);
+            }
+        });
+        return count;
+    }
+    function dealHeader(hd, _headerCellIds, results, roots, row, layoutMap) {
+        const id = hd.id;
+        const dimensionInfo = layoutMap.rowsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey) ??
+            layoutMap.columnsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
+        const indicatorInfo = layoutMap.indicatorsDefine?.find(indicator => {
+            if (typeof indicator === 'string') {
+                return false;
+            }
+            if (hd.indicatorKey) {
+                return indicator.indicatorKey === hd.indicatorKey;
+            }
+            return indicator.title === hd.value;
+        });
+        const cell = {
+            id,
+            title: hd.value ?? indicatorInfo?.title,
+            field: hd.dimensionKey,
+            style: typeof (indicatorInfo ?? dimensionInfo)?.headerStyle === 'function'
+                ? (indicatorInfo ?? dimensionInfo)?.headerStyle
+                : Object.assign({}, (indicatorInfo ?? dimensionInfo)?.headerStyle),
+            headerType: indicatorInfo?.headerType ?? dimensionInfo?.headerType ?? 'text',
+            headerIcon: indicatorInfo?.headerIcon ?? dimensionInfo?.headerIcon,
+            define: Object.assign({}, hd, indicatorInfo ?? dimensionInfo),
+            fieldFormat: indicatorInfo?.headerFormat ?? dimensionInfo?.headerFormat,
+            dropDownMenu: indicatorInfo?.dropDownMenu ?? dimensionInfo?.dropDownMenu,
+            pivotInfo: {
+                value: hd.value,
+                dimensionKey: hd.dimensionKey,
+                isPivotCorner: false
+            },
+            width: dimensionInfo?.width,
+            minWidth: dimensionInfo?.minWidth,
+            maxWidth: dimensionInfo?.maxWidth,
+            showSort: indicatorInfo?.showSort ?? dimensionInfo?.showSort,
+            description: dimensionInfo?.description
+        };
+        if (indicatorInfo) {
+            if (indicatorInfo.customRender) {
+                hd.customRender = indicatorInfo.customRender;
+            }
+            if (!isValid$1(layoutMap._indicators?.find(indicator => indicator.indicatorKey === indicatorInfo.indicatorKey))) {
+                layoutMap._indicators?.push({
+                    id: ++layoutMap.sharedVar.seqId,
+                    indicatorKey: indicatorInfo.indicatorKey,
+                    field: indicatorInfo.indicatorKey,
+                    fieldFormat: indicatorInfo?.format,
+                    cellType: indicatorInfo?.cellType ?? indicatorInfo?.columnType ?? 'text',
+                    chartModule: 'chartModule' in indicatorInfo ? indicatorInfo.chartModule : null,
+                    chartSpec: 'chartSpec' in indicatorInfo ? indicatorInfo.chartSpec : null,
+                    sparklineSpec: 'sparklineSpec' in indicatorInfo ? indicatorInfo.sparklineSpec : null,
+                    style: indicatorInfo?.style,
+                    icon: indicatorInfo?.icon,
+                    define: Object.assign({}, hd, indicatorInfo, {
+                        dragHeader: dimensionInfo?.dragHeader
+                    }),
+                    width: indicatorInfo?.width,
+                    minWidth: indicatorInfo?.minWidth,
+                    maxWidth: indicatorInfo?.maxWidth,
+                    disableColumnResize: indicatorInfo?.disableColumnResize
+                });
+            }
+        }
+        else if (hd.indicatorKey) {
+            if (!isValid$1(layoutMap._indicators?.find(indicator => indicator.indicatorKey === hd.indicatorKey))) {
+                layoutMap._indicators?.push({
+                    id: ++layoutMap.sharedVar.seqId,
+                    indicatorKey: hd.indicatorKey,
+                    field: hd.indicatorKey,
+                    cellType: 'text',
+                    define: Object.assign({}, hd)
+                });
+            }
+        }
+        results[id] = cell;
+        layoutMap._headerObjects[id] = cell;
+        _headerCellIds[row][layoutMap.colIndex] = id;
+        for (let r = row - 1; r >= 0; r--) {
+            _headerCellIds[r][layoutMap.colIndex] = roots[r];
+        }
+        if (hd.levelSpan > 1) {
+            for (let i = 1; i < hd.levelSpan; i++) {
+                if (!_headerCellIds[row + i]) {
+                    _headerCellIds[row + i] = [];
+                }
+                _headerCellIds[row + i][layoutMap.colIndex] = id;
+            }
+        }
+        if (hd.children?.length >= 1) {
+            layoutMap
+                ._addHeaders(_headerCellIds, row + (hd.levelSpan ?? 1), hd.children ?? [], [
+                ...roots,
+                ...Array(hd.levelSpan ?? 1).fill(id)
+            ])
+                .forEach(c => results.push(c));
+        }
+        else {
+            for (let r = row + 1; r < _headerCellIds.length; r++) {
+                _headerCellIds[r][layoutMap.colIndex] = id;
+            }
+            layoutMap.colIndex++;
+        }
+    }
+    function dealHeaderForTreeMode(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, layoutMap) {
+        const id = hd.id;
+        const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
+        const cell = {
+            id,
+            title: hd.value,
+            field: hd.dimensionKey,
+            style: hd.level + 1 === totalLevel || typeof dimensionInfo?.headerStyle === 'function'
+                ? dimensionInfo?.headerStyle
+                : Object.assign({}, dimensionInfo?.headerStyle, { textAlign: 'left' }),
+            headerType: dimensionInfo?.headerType ?? 'text',
+            headerIcon: dimensionInfo?.headerIcon,
+            define: Object.assign(hd, {
+                linkJump: dimensionInfo?.linkJump,
+                linkDetect: dimensionInfo?.linkDetect,
+                templateLink: dimensionInfo?.templateLink,
+                keepAspectRatio: dimensionInfo?.keepAspectRatio ?? false,
+                imageAutoSizing: dimensionInfo?.imageAutoSizing,
+                headerCustomRender: dimensionInfo?.headerCustomRender,
+                headerCustomLayout: dimensionInfo?.headerCustomLayout,
+                dragHeader: dimensionInfo?.dragHeader,
+                disableHeaderHover: !!dimensionInfo?.disableHeaderHover,
+                disableHeaderSelect: !!dimensionInfo?.disableHeaderSelect
+            }),
+            fieldFormat: dimensionInfo?.headerFormat,
+            dropDownMenu: dimensionInfo?.dropDownMenu,
+            pivotInfo: {
+                value: hd.value,
+                dimensionKey: hd.dimensionKey,
+                isPivotCorner: false
+            },
+            hierarchyLevel: hd.level,
+            dimensionTotalLevel: totalLevel,
+            hierarchyState: hd.level + 1 === totalLevel ? undefined : hd.hierarchyState,
+            width: dimensionInfo?.width,
+            minWidth: dimensionInfo?.minWidth,
+            maxWidth: dimensionInfo?.maxWidth,
+            parentCellId: roots[roots.length - 1]
+        };
+        results[id] = cell;
+        layoutMap._headerObjects[id] = cell;
+        _headerCellIds[row][layoutMap.colIndex] = id;
+        for (let r = row - 1; r >= 0; r--) {
+            _headerCellIds[r][layoutMap.colIndex] = roots[r];
+        }
+        if (hd.hierarchyState === HierarchyState.expand && hd.children?.length >= 1) {
+            show && layoutMap.colIndex++;
+            layoutMap
+                ._addHeadersForTreeMode(_headerCellIds, row, hd.children ?? [], [...roots, id], totalLevel, show && hd.hierarchyState === HierarchyState.expand, dimensions)
+                .forEach(c => results.push(c));
+        }
+        else {
+            show && layoutMap.colIndex++;
+            for (let r = row + 1; r < _headerCellIds.length; r++) {
+                _headerCellIds[r][layoutMap.colIndex] = id;
+            }
+        }
+    }
+    function clearNode(children) {
+        for (let i = 0; i < children.length; i++) {
+            const node = children[i];
+            delete node.level;
+            delete node.startIndex;
+            delete node.id;
+            delete node.levelSpan;
+            delete node.size;
+            delete node.startInTotal;
+            const childrenNew = node.children || node.columns;
+            if (childrenNew) {
+                clearNode(childrenNew);
+            }
+        }
+    }
+
     class SimpleHeaderLayoutMap {
         seqId = 0;
         _headerObjects;
         _headerObjectMap;
         _headerCellIds;
         _columns;
+        columnTree;
         bodyRowSpanCount = 1;
         hierarchyIndent;
         _transpose = false;
@@ -53851,6 +54798,7 @@
             this._columns = [];
             this._headerCellIds = [];
             this.hierarchyIndent = hierarchyIndent ?? 20;
+            this.columnTree = new DimensionTree(columns, { seqId: 0 });
             this._headerObjects = this._addHeaders(0, columns, []);
             this._headerObjectMap = this._headerObjects.reduce((o, e) => {
                 o[e.id] = e;
@@ -53957,7 +54905,7 @@
             }
             else {
                 row = col;
-                if (this.frozenRowCount > 0 && row >= this.rowCount - this.bottomFrozenRowCount) {
+                if (this.bottomFrozenRowCount > 0 && row >= this.rowCount - this.bottomFrozenRowCount) {
                     return true;
                 }
             }
@@ -54494,6 +55442,11 @@
             if (source.col < 0 || source.row < 0 || target.col < 0 || target.row < 0) {
                 return false;
             }
+            if (this._table.internalProps.frozenColDragHeaderMode === 'disabled') {
+                if (this._table.isFrozenColumn(target.col) || this._table.isRightFrozenColumn(target.col)) {
+                    return false;
+                }
+            }
             const sourceCellRange = this.getCellRange(source.col, source.row);
             if (this.isColumnHeader(source.col, source.row)) {
                 const sourceTopId = this.getParentCellId(source.col, sourceCellRange.start.row);
@@ -54531,6 +55484,7 @@
                     const sourceColumns = this._columns.splice(sourceCellRange.start.col, moveSize);
                     sourceColumns.unshift(targetIndex, 0);
                     Array.prototype.splice.apply(this._columns, sourceColumns);
+                    this.columnTree.movePosition(sourceCellRange.start.row, sourceCellRange.start.col, targetIndex);
                     this._cellRangeMap = new Map();
                     return {
                         sourceIndex: sourceCellRange.start.col,
@@ -54560,6 +55514,7 @@
                     const sourceColumns = this._columns.splice(sourceCellRange.start.row, moveSize);
                     sourceColumns.unshift(targetIndex, 0);
                     Array.prototype.splice.apply(this._columns, sourceColumns);
+                    this.columnTree.movePosition(sourceCellRange.start.col, sourceCellRange.start.row, targetIndex);
                     this._cellRangeMap = new Map();
                     return {
                         sourceIndex: sourceCellRange.start.row,
@@ -54814,28 +55769,52 @@
                         return;
                     }
                 }
-                editor.bindSuccessCallback?.(() => {
-                    this.completeEdit();
-                });
                 this.editingEditor = editor;
                 this.editCell = { col, row };
                 const dataValue = this.table.getCellOriginValue(col, row);
                 const rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row));
-                editor.beginEditing(this.table.getElement(), { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } }, dataValue);
+                const referencePosition = { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } };
+                editor.beginEditing && (void 0);
+                editor.beginEditing?.(this.table.getElement(), referencePosition, dataValue);
+                if (editor.bindSuccessCallback) ;
+                editor.bindSuccessCallback?.(() => {
+                    this.completeEdit();
+                });
+                editor.onStart?.({
+                    value: dataValue,
+                    endEdit: () => {
+                        this.completeEdit();
+                    },
+                    referencePosition,
+                    container: this.table.getElement()
+                });
             }
         }
         completeEdit(e) {
+            if (!this.editingEditor) {
+                return;
+            }
             const target = e?.target;
-            if (this.editingEditor && (!target || (target && !this.editingEditor.targetIsOnEditor(target)))) {
-                const changedValue = this.editingEditor.getValue();
-                this.table.changeCellValue(this.editCell.col, this.editCell.row, changedValue);
-                this.editingEditor.exit();
-                this.editingEditor = null;
+            if (this.editingEditor.targetIsOnEditor) {
+                if (target && this.editingEditor.targetIsOnEditor(target)) {
+                    return;
+                }
+            }
+            else if (!this.editingEditor.isEditorElement || (target && this.editingEditor.isEditorElement?.(target))) {
+                return;
             }
+            if (!this.editingEditor.getValue) ;
+            const changedValue = this.editingEditor.getValue?.();
+            this.table.changeCellValue(this.editCell.col, this.editCell.row, changedValue);
+            this.editingEditor.exit && (void 0);
+            this.editingEditor.exit?.();
+            this.editingEditor.onEnd?.();
+            this.editingEditor = null;
         }
         cancelEdit() {
             if (this.editingEditor) {
-                this.editingEditor.exit();
+                this.editingEditor.exit?.();
+                this.editingEditor.onEnd?.();
                 this.editingEditor = null;
             }
         }
@@ -54860,6 +55839,7 @@
             }
             super(container, options);
             const internalProps = this.internalProps;
+            internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode;
             this.pagination = options.pagination;
             internalProps.sortState = options.sortState;
             internalProps.columns = options.columns
@@ -54927,7 +55907,7 @@
             this.eventManager.updateEventBinder();
         }
         get columns() {
-            return this.internalProps.columns;
+            return this.internalProps.layoutMap.columnTree.getCopiedTree();
         }
         get header() {
             return this.internalProps.columns;
@@ -55049,6 +56029,7 @@
         updateOption(options, accelerateFirstScreen = false) {
             const internalProps = this.internalProps;
             super.updateOption(options);
+            internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode;
             this.pagination = options.pagination;
             this.showHeader = options.showHeader ?? true;
             internalProps.columns = options.columns
@@ -55962,397 +56943,6 @@
         }
     }
 
-    class DimensionTree {
-        sharedVar;
-        sizeIncludeParent = false;
-        rowExpandLevel;
-        hierarchyType;
-        tree = {
-            id: 0,
-            dimensionKey: '',
-            value: '',
-            children: [],
-            level: -1,
-            levelSpan: 1,
-            startIndex: 0,
-            size: 0,
-            startInTotal: 0,
-            hierarchyState: undefined
-        };
-        totalLevel = 0;
-        dimensionKeys = new NumberMap();
-        cache = new Map();
-        constructor(tree, sharedVar, hierarchyType = 'grid', rowExpandLevel = undefined) {
-            this.sizeIncludeParent = rowExpandLevel !== null && rowExpandLevel !== undefined;
-            this.rowExpandLevel = rowExpandLevel;
-            this.hierarchyType = hierarchyType;
-            this.sharedVar = sharedVar;
-            this.reset(tree);
-        }
-        reset(tree, updateTreeNode = false) {
-            this.cache.clear();
-            this.dimensionKeys = new NumberMap();
-            this.tree.children = tree;
-            this.setTreeNode(this.tree, 0, this.tree);
-            this.totalLevel = this.dimensionKeys.count();
-        }
-        setTreeNode(node, startIndex, parent) {
-            node.startIndex = startIndex;
-            node.startInTotal = (parent.startInTotal ?? 0) + node.startIndex;
-            if (node.dimensionKey ?? node.indicatorKey) {
-                !this.dimensionKeys.contain(node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey) &&
-                    this.dimensionKeys.put(node.level, node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey);
-                if (!node.id) {
-                    node.id = ++this.sharedVar.seqId;
-                }
-            }
-            let size = node.dimensionKey ? (this.sizeIncludeParent ? 1 : 0) : 0;
-            if (this.hierarchyType === 'grid') {
-                if (node.children?.length >= 1) {
-                    node.children.forEach(n => {
-                        n.level = (node.level ?? 0) + 1;
-                        size += this.setTreeNode(n, size, node);
-                    });
-                }
-                else {
-                    size = 1;
-                }
-            }
-            else if (node.hierarchyState === HierarchyState.expand && node.children?.length >= 1) {
-                node.children.forEach(n => {
-                    n.level = (node.level ?? 0) + 1;
-                    size += this.setTreeNode(n, size, node);
-                });
-            }
-            else if (node.hierarchyState === HierarchyState.collapse && node.children?.length >= 1) {
-                node.children.forEach(n => {
-                    n.level = (node.level ?? 0) + 1;
-                    this.setTreeNode(n, size, node);
-                });
-            }
-            else if (!node.hierarchyState && node.level + 1 < this.rowExpandLevel && node.children?.length >= 1) {
-                node.hierarchyState = HierarchyState.expand;
-                node.children.forEach(n => {
-                    n.level = (node.level ?? 0) + 1;
-                    size += this.setTreeNode(n, size, node);
-                });
-            }
-            else if (node.children?.length >= 1) {
-                node.hierarchyState = HierarchyState.collapse;
-                node.children.forEach(n => {
-                    n.level = (node.level ?? 0) + 1;
-                    this.setTreeNode(n, size, node);
-                });
-            }
-            else {
-                node.hierarchyState = HierarchyState.none;
-                size = 1;
-            }
-            node.size = size;
-            return size;
-        }
-        getTreePath(index, maxDeep = 30) {
-            const path = [];
-            this.searchPath(index, this.tree, path, maxDeep);
-            path.shift();
-            return path;
-        }
-        getTreePathByCellIds(ids) {
-            const path = [];
-            let nodes = this.tree.children;
-            for (let i = 0; i < ids.length; i++) {
-                const id = ids[i];
-                const pathNode = this.findNodeById(nodes, id);
-                if (pathNode) {
-                    path.push(pathNode);
-                    nodes = pathNode.children;
-                }
-                else {
-                    break;
-                }
-            }
-            return path;
-        }
-        findNodeById(nodes, id) {
-            return nodes.find(node => {
-                return node.id === id;
-            });
-        }
-        searchPath(index, node, path, maxDeep) {
-            if (!node) {
-                return;
-            }
-            if (index < node.startIndex || index >= node.startIndex + node.size) {
-                return;
-            }
-            path.push(node);
-            if (!node.children || node.children.length === 0 || node.level >= maxDeep) {
-                return;
-            }
-            const cIndex = index - node.startIndex;
-            if (this.cache.has(node.level + 1)) {
-                const cacheNode = this.cache.get(node.level + 1);
-                if (cIndex >= cacheNode.startIndex && cIndex < cacheNode.startIndex + cacheNode.size) {
-                    this.searchPath(cIndex, cacheNode, path, maxDeep);
-                    return;
-                }
-            }
-            let left = 0;
-            let right = node.children.length - 1;
-            while (left <= right) {
-                const middle = Math.floor((left + right) / 2);
-                const element = node.children[middle];
-                if (cIndex >= element.startIndex && cIndex < element.startIndex + element.size) {
-                    this.cache.set(element.level, element);
-                    const deleteLevels = [];
-                    this.cache.forEach((node, key) => {
-                        if (key > element.level) {
-                            deleteLevels.push(key);
-                        }
-                    });
-                    deleteLevels.forEach(key => {
-                        this.cache.delete(key);
-                    });
-                    this.searchPath(cIndex, element, path, maxDeep);
-                    break;
-                }
-                else if (cIndex < element.startIndex) {
-                    right = middle - 1;
-                }
-                else {
-                    left = middle + 1;
-                }
-            }
-            return;
-        }
-        movePosition(level, sourceIndex, targetIndex) {
-            let parNode;
-            let sourceSubIndex;
-            let targetSubIndex;
-            const findTargetNode = (node, subIndex) => {
-                if (sourceSubIndex !== undefined && targetSubIndex !== undefined) {
-                    return;
-                }
-                if (node.level === level) {
-                    if (node.startInTotal === sourceIndex) {
-                        sourceSubIndex = subIndex;
-                    }
-                    if (node.startInTotal <= targetIndex && targetIndex <= node.startInTotal + node.size - 1) {
-                        targetSubIndex = subIndex;
-                    }
-                }
-                if (node.children && node.level < level) {
-                    parNode = node;
-                    for (let i = 0; i < node.children.length; i++) {
-                        if ((sourceIndex >= node.children[i].startInTotal &&
-                            sourceIndex <= node.children[i].startInTotal + node.children[i].size) ||
-                            (targetIndex >= node.children[i].startInTotal &&
-                                targetIndex <= node.children[i].startInTotal + node.children[i].size)) {
-                            findTargetNode(node.children[i], i);
-                        }
-                    }
-                }
-            };
-            findTargetNode(this.tree, 0);
-            const sourceColumns = parNode.children.splice(sourceSubIndex, 1);
-            sourceColumns.unshift(targetSubIndex, 0);
-            Array.prototype.splice.apply(parNode.children, sourceColumns);
-        }
-    }
-    function generateLayoutTree(tree, children) {
-        children?.forEach((node) => {
-            const diemnsonNode = {
-                dimensionKey: node.dimensionKey,
-                indicatorKey: node.indicatorKey,
-                value: node.value,
-                hierarchyState: node.hierarchyState,
-                children: undefined
-            };
-            tree.push(diemnsonNode);
-            if (node.children) {
-                diemnsonNode.children = [];
-                generateLayoutTree(diemnsonNode.children, node.children);
-            }
-        });
-    }
-    function countLayoutTree(children, countParentNode) {
-        let count = 0;
-        children?.forEach((node) => {
-            if (countParentNode) {
-                count++;
-            }
-            else {
-                if (!node.children || node.children.length === 0) {
-                    count++;
-                }
-            }
-            if (node.children) {
-                count += countLayoutTree(node.children, countParentNode);
-            }
-        });
-        return count;
-    }
-    function dealHeader(hd, _headerCellIds, results, roots, row, layoutMap) {
-        const id = hd.id;
-        const dimensionInfo = layoutMap.rowsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey) ??
-            layoutMap.columnsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
-        const indicatorInfo = layoutMap.indicatorsDefine?.find(indicator => {
-            if (typeof indicator === 'string') {
-                return false;
-            }
-            if (hd.indicatorKey) {
-                return indicator.indicatorKey === hd.indicatorKey;
-            }
-            return indicator.title === hd.value;
-        });
-        const cell = {
-            id,
-            title: hd.value ?? indicatorInfo?.title,
-            field: hd.dimensionKey,
-            style: typeof (indicatorInfo ?? dimensionInfo)?.headerStyle === 'function'
-                ? (indicatorInfo ?? dimensionInfo)?.headerStyle
-                : Object.assign({}, (indicatorInfo ?? dimensionInfo)?.headerStyle),
-            headerType: indicatorInfo?.headerType ?? dimensionInfo?.headerType ?? 'text',
-            headerIcon: indicatorInfo?.headerIcon ?? dimensionInfo?.headerIcon,
-            define: Object.assign({}, hd, indicatorInfo ?? dimensionInfo),
-            fieldFormat: indicatorInfo?.headerFormat ?? dimensionInfo?.headerFormat,
-            dropDownMenu: indicatorInfo?.dropDownMenu ?? dimensionInfo?.dropDownMenu,
-            pivotInfo: {
-                value: hd.value,
-                dimensionKey: hd.dimensionKey,
-                isPivotCorner: false
-            },
-            width: dimensionInfo?.width,
-            minWidth: dimensionInfo?.minWidth,
-            maxWidth: dimensionInfo?.maxWidth,
-            showSort: indicatorInfo?.showSort ?? dimensionInfo?.showSort,
-            description: dimensionInfo?.description
-        };
-        if (indicatorInfo) {
-            if (indicatorInfo.customRender) {
-                hd.customRender = indicatorInfo.customRender;
-            }
-            if (!isValid$1(layoutMap._indicators?.find(indicator => indicator.indicatorKey === indicatorInfo.indicatorKey))) {
-                layoutMap._indicators?.push({
-                    id: ++layoutMap.sharedVar.seqId,
-                    indicatorKey: indicatorInfo.indicatorKey,
-                    field: indicatorInfo.indicatorKey,
-                    fieldFormat: indicatorInfo?.format,
-                    cellType: indicatorInfo?.cellType ?? indicatorInfo?.columnType ?? 'text',
-                    chartModule: 'chartModule' in indicatorInfo ? indicatorInfo.chartModule : null,
-                    chartSpec: 'chartSpec' in indicatorInfo ? indicatorInfo.chartSpec : null,
-                    sparklineSpec: 'sparklineSpec' in indicatorInfo ? indicatorInfo.sparklineSpec : null,
-                    style: indicatorInfo?.style,
-                    icon: indicatorInfo?.icon,
-                    define: Object.assign({}, hd, indicatorInfo, {
-                        dragHeader: dimensionInfo?.dragHeader
-                    }),
-                    width: indicatorInfo?.width,
-                    minWidth: indicatorInfo?.minWidth,
-                    maxWidth: indicatorInfo?.maxWidth,
-                    disableColumnResize: indicatorInfo?.disableColumnResize
-                });
-            }
-        }
-        else if (hd.indicatorKey) {
-            if (!isValid$1(layoutMap._indicators?.find(indicator => indicator.indicatorKey === hd.indicatorKey))) {
-                layoutMap._indicators?.push({
-                    id: ++layoutMap.sharedVar.seqId,
-                    indicatorKey: hd.indicatorKey,
-                    field: hd.indicatorKey,
-                    cellType: 'text',
-                    define: Object.assign({}, hd)
-                });
-            }
-        }
-        results[id] = cell;
-        layoutMap._headerObjects[id] = cell;
-        _headerCellIds[row][layoutMap.colIndex] = id;
-        for (let r = row - 1; r >= 0; r--) {
-            _headerCellIds[r][layoutMap.colIndex] = roots[r];
-        }
-        if (hd.levelSpan > 1) {
-            for (let i = 1; i < hd.levelSpan; i++) {
-                if (!_headerCellIds[row + i]) {
-                    _headerCellIds[row + i] = [];
-                }
-                _headerCellIds[row + i][layoutMap.colIndex] = id;
-            }
-        }
-        if (hd.children?.length >= 1) {
-            layoutMap
-                ._addHeaders(_headerCellIds, row + (hd.levelSpan ?? 1), hd.children ?? [], [
-                ...roots,
-                ...Array(hd.levelSpan ?? 1).fill(id)
-            ])
-                .forEach(c => results.push(c));
-        }
-        else {
-            for (let r = row + 1; r < _headerCellIds.length; r++) {
-                _headerCellIds[r][layoutMap.colIndex] = id;
-            }
-            layoutMap.colIndex++;
-        }
-    }
-    function dealHeaderForTreeMode(hd, _headerCellIds, results, roots, row, totalLevel, show, dimensions, layoutMap) {
-        const id = hd.id;
-        const dimensionInfo = dimensions.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === hd.dimensionKey);
-        const cell = {
-            id,
-            title: hd.value,
-            field: hd.dimensionKey,
-            style: hd.level + 1 === totalLevel || typeof dimensionInfo?.headerStyle === 'function'
-                ? dimensionInfo?.headerStyle
-                : Object.assign({}, dimensionInfo?.headerStyle, { textAlign: 'left' }),
-            headerType: dimensionInfo?.headerType ?? 'text',
-            headerIcon: dimensionInfo?.headerIcon,
-            define: Object.assign(hd, {
-                linkJump: dimensionInfo?.linkJump,
-                linkDetect: dimensionInfo?.linkDetect,
-                templateLink: dimensionInfo?.templateLink,
-                keepAspectRatio: dimensionInfo?.keepAspectRatio ?? false,
-                imageAutoSizing: dimensionInfo?.imageAutoSizing,
-                headerCustomRender: dimensionInfo?.headerCustomRender,
-                headerCustomLayout: dimensionInfo?.headerCustomLayout,
-                dragHeader: dimensionInfo?.dragHeader,
-                disableHeaderHover: !!dimensionInfo?.disableHeaderHover,
-                disableHeaderSelect: !!dimensionInfo?.disableHeaderSelect
-            }),
-            fieldFormat: dimensionInfo?.headerFormat,
-            dropDownMenu: dimensionInfo?.dropDownMenu,
-            pivotInfo: {
-                value: hd.value,
-                dimensionKey: hd.dimensionKey,
-                isPivotCorner: false
-            },
-            hierarchyLevel: hd.level,
-            dimensionTotalLevel: totalLevel,
-            hierarchyState: hd.level + 1 === totalLevel ? undefined : hd.hierarchyState,
-            width: dimensionInfo?.width,
-            minWidth: dimensionInfo?.minWidth,
-            maxWidth: dimensionInfo?.maxWidth,
-            parentCellId: roots[roots.length - 1]
-        };
-        results[id] = cell;
-        layoutMap._headerObjects[id] = cell;
-        _headerCellIds[row][layoutMap.colIndex] = id;
-        for (let r = row - 1; r >= 0; r--) {
-            _headerCellIds[r][layoutMap.colIndex] = roots[r];
-        }
-        if (hd.hierarchyState === HierarchyState.expand && hd.children?.length >= 1) {
-            show && layoutMap.colIndex++;
-            layoutMap
-                ._addHeadersForTreeMode(_headerCellIds, row, hd.children ?? [], [...roots, id], totalLevel, show && hd.hierarchyState === HierarchyState.expand, dimensions)
-                .forEach(c => results.push(c));
-        }
-        else {
-            show && layoutMap.colIndex++;
-            for (let r = row + 1; r < _headerCellIds.length; r++) {
-                _headerCellIds[r][layoutMap.colIndex] = id;
-            }
-        }
-    }
-
     const defaultDimension = { startInTotal: 0, level: 0 };
     class PivotHeaderLayoutMap {
         sharedVar;
@@ -57342,6 +57932,44 @@
             if (this.isRightFrozenColumn(col, row) || this.isBottomFrozenRow(col, row)) {
                 return result;
             }
+            if (this._table.isPivotChart()) {
+                if (this.isLeftBottomCorner(col, row)) {
+                    return {
+                        start: {
+                            col: 0,
+                            row: this.rowCount - this.bottomFrozenRowCount
+                        },
+                        end: {
+                            col: this.frozenColCount - 1,
+                            row: this.rowCount - 1
+                        }
+                    };
+                }
+                else if (this.isRightTopCorner(col, row)) {
+                    return {
+                        start: {
+                            col: this.colCount - this.rightFrozenColCount,
+                            row: 0
+                        },
+                        end: {
+                            col: this.colCount - 1,
+                            row: this.frozenRowCount - 1
+                        }
+                    };
+                }
+                else if (this.isRightBottomCorner(col, row)) {
+                    return {
+                        start: {
+                            col: this.colCount - this.rightFrozenColCount,
+                            row: this.rowCount - this.bottomFrozenRowCount
+                        },
+                        end: {
+                            col: this.colCount - 1,
+                            row: this.rowCount - 1
+                        }
+                    };
+                }
+            }
             for (let i = 0; i < this._largeCellRangeCache.length; i++) {
                 const range = this._largeCellRangeCache[i];
                 if (col >= range.start.col && col <= range.end.col && row >= range.start.row && row <= range.end.row) {
@@ -57826,7 +58454,7 @@
                     const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col, moveSize);
                     sourceColumns.unshift(targetIndex, 0);
                     Array.prototype.splice.apply(this._columnWidths, sourceColumns);
-                    this.columnDimensionTree.movePosition(source.row, sourceCellRange.start.col - this.rowHeaderLevelCount, targetIndex - this.rowHeaderLevelCount);
+                    this.columnDimensionTree.movePosition(this.getCellHeaderPathsWidthTreeNode(source.col, source.row).colHeaderPaths.length - 1, sourceCellRange.start.col - this.rowHeaderLevelCount, targetIndex - this.rowHeaderLevelCount);
                     this.columnDimensionTree.reset(this.columnDimensionTree.tree.children, true);
                     this._CellHeaderPathMap = new Map();
                     this._largeCellRangeCache.length = 0;
@@ -62359,7 +62987,7 @@
     }
 
     registerForVrender();
-    const version = "0.18.4";
+    const version = "0.19.0";
     function getIcons() {
         return get$1();
     }