@visactor/vtable-sheet 1.26.2 → 1.26.3

package/dist/vtable-sheet.js

@@ -43572,13 +43572,20 @@
       return parse$3(font);
     }
 
-    function getQuadProps(paddingOrigin) {
+    function normalizeQuadArray(values) {
+      return 0 === values.length ? [0, 0, 0, 0] : 1 === values.length ? [values[0], values[0], values[0], values[0]] : 2 === values.length ? [values[0], values[1], values[0], values[1]] : 3 === values.length ? [values[0], values[1], values[2], values[1]] : [values[0], values[1], values[2], values[3]];
+    }
+    function parseStringQuad(padding) {
+      const tokens = padding.trim().split(/\s+/),
+        values = tokens.map(token => Number.parseFloat(token)).filter(value => Number.isFinite(value));
+      return values.length === tokens.length && values.length > 0 ? normalizeQuadArray(values) : [padding, padding, padding, padding];
+    }
+    function normalizePaddingObject(paddingOrigin) {
       var _a, _b, _c, _d;
-      if (isNumber$2(paddingOrigin) || isString$2(paddingOrigin) || isArray$8(paddingOrigin)) {
-        let padding = parsePadding(paddingOrigin);
-        return "number" == typeof padding || "string" == typeof padding ? padding = [padding, padding, padding, padding] : Array.isArray(padding) && (padding = padding.slice(0)), padding;
-      }
-      return paddingOrigin && (isFinite(paddingOrigin.bottom) || isFinite(paddingOrigin.left) || isFinite(paddingOrigin.right) || isFinite(paddingOrigin.top)) ? [null !== (_a = paddingOrigin.top) && void 0 !== _a ? _a : 0, null !== (_b = paddingOrigin.right) && void 0 !== _b ? _b : 0, null !== (_c = paddingOrigin.bottom) && void 0 !== _c ? _c : 0, null !== (_d = paddingOrigin.left) && void 0 !== _d ? _d : 0] : [0, 0, 0, 0];
+      return Number.isFinite(paddingOrigin.bottom) || Number.isFinite(paddingOrigin.left) || Number.isFinite(paddingOrigin.right) || Number.isFinite(paddingOrigin.top) ? [null !== (_a = paddingOrigin.top) && void 0 !== _a ? _a : 0, null !== (_b = paddingOrigin.right) && void 0 !== _b ? _b : 0, null !== (_c = paddingOrigin.bottom) && void 0 !== _c ? _c : 0, null !== (_d = paddingOrigin.left) && void 0 !== _d ? _d : 0] : [0, 0, 0, 0];
+    }
+    function getQuadProps(paddingOrigin) {
+      return Array.isArray(paddingOrigin) ? normalizeQuadArray(paddingOrigin.slice(0, 4)) : "number" == typeof paddingOrigin && Number.isFinite(paddingOrigin) ? [paddingOrigin, paddingOrigin, paddingOrigin, paddingOrigin] : "string" == typeof paddingOrigin ? parseStringQuad(paddingOrigin) : paddingOrigin && "object" == typeof paddingOrigin ? normalizePaddingObject(paddingOrigin) : [0, 0, 0, 0];
     }
 
     const TYPE_PAREN = 0,
@@ -44605,7 +44612,7 @@
           col: null !== (_b = null == range ? void 0 : range.start.col) && void 0 !== _b ? _b : col,
           row: null !== (_c = null == range ? void 0 : range.start.row) && void 0 !== _c ? _c : row,
           dataValue: table.getCellOriginValue(col, row),
-          value: table.getCellValue(col, row) || "",
+          value: table.getCellValue(col, row),
           rect: {
             left: 0,
             top: 0,
@@ -44627,7 +44634,7 @@
           col: col,
           row: row,
           dataValue: table.getCellOriginValue(col, row),
-          value: table.getCellValue(col, row) || "",
+          value: table.getCellValue(col, row),
           rect: {
             left: 0,
             top: 0,
@@ -46616,7 +46623,7 @@
           col: null !== (_b = null == cellRange ? void 0 : cellRange.start.col) && void 0 !== _b ? _b : col,
           row: null !== (_c = null == cellRange ? void 0 : cellRange.start.row) && void 0 !== _c ? _c : row,
           dataValue: table.getCellOriginValue(col, row),
-          value: table.getCellValue(col, row) || "",
+          value: table.getCellValue(col, row),
           rect: getCellRect$1(col, row, table),
           table: table,
           originCol: col,
@@ -47525,6 +47532,17 @@
       }
     }
 
+    function getBodyHorizontalScrollRange(table) {
+      var _a, _b, _c, _d;
+      const totalWidth = table.getAllColsWidth(),
+        frozenColsWidth = table.getFrozenColsWidth(),
+        rightFrozenColsWidth = table.getRightFrozenColsWidth(),
+        frozenColsContentWidth = null !== (_b = null === (_a = table.getFrozenColsContentWidth) || void 0 === _a ? void 0 : _a.call(table)) && void 0 !== _b ? _b : frozenColsWidth,
+        rightFrozenColsContentWidth = null !== (_d = null === (_c = table.getRightFrozenColsContentWidth) || void 0 === _c ? void 0 : _c.call(table)) && void 0 !== _d ? _d : rightFrozenColsWidth,
+        bodyViewportWidth = table.tableNoFrameWidth - frozenColsWidth - rightFrozenColsWidth,
+        bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth;
+      return Math.max(0, bodyContentWidth - bodyViewportWidth);
+    }
     function getColX(col, table, isRightFrozen) {
       var _a, _b, _c, _d, _e, _f;
       if (isRightFrozen) return Math.min(table.tableNoFrameWidth, table.getAllColsWidth()) - table.getColsWidth(col, table.colCount - 1) + (null !== (_b = null === (_a = table.getRightFrozenColsScrollLeft) || void 0 === _a ? void 0 : _a.call(table)) && void 0 !== _b ? _b : 0);
@@ -47817,17 +47835,18 @@
           rightFrozenColsWidth = this.table.getRightFrozenColsWidth(),
           rightFrozenColsContentWidth = null !== (_m = null === (_l = (_k = this.table).getRightFrozenColsContentWidth) || void 0 === _l ? void 0 : _l.call(_k)) && void 0 !== _m ? _m : rightFrozenColsWidth,
           hoverOn = this.table.theme.scrollStyle.hoverOn,
-          sizeTolerance = (null === (_o = this.table.options.customConfig) || void 0 === _o ? void 0 : _o._disableColumnAndRowSizeRound) ? 1 : 0;
-        if (totalWidth > tableWidth + sizeTolerance) {
-          const y = Math.min(tableHeight, totalHeight),
-            bodyViewportWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth,
-            bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth,
+          sizeTolerance = (null === (_o = this.table.options.customConfig) || void 0 === _o ? void 0 : _o._disableColumnAndRowSizeRound) ? 1 : 0,
+          bodyScrollRange = getBodyHorizontalScrollRange(this.table),
+          y = Math.min(tableHeight, totalHeight);
+        let attrY = 0;
+        attrY = this.table.theme.scrollStyle.barToSide ? this.table.tableNoFrameHeight - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y) + this.table.tableY : y - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y);
+        const ignoreFrozenCols = null !== (_q = null === (_p = this.table.theme.scrollStyle) || void 0 === _p ? void 0 : _p.ignoreFrozenCols) && void 0 !== _q && _q;
+        if (bodyScrollRange > sizeTolerance) {
+          const bodyViewportWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth,
+            bodyContentWidth = bodyViewportWidth + bodyScrollRange,
             rangeEnd = bodyContentWidth > 0 ? Math.max(.05, bodyViewportWidth / bodyContentWidth) : 1;
-          let attrY = 0;
-          attrY = this.table.theme.scrollStyle.barToSide ? this.table.tableNoFrameHeight - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y) + this.table.tableY : y - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y);
           let hScrollBarx = frozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x),
             hScrollBarWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth;
-          const ignoreFrozenCols = null !== (_q = null === (_p = this.table.theme.scrollStyle) || void 0 === _p ? void 0 : _p.ignoreFrozenCols) && void 0 !== _q && _q;
           ignoreFrozenCols ? (hScrollBarx = hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x, hScrollBarWidth = tableWidth) : (hScrollBarx = frozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x), hScrollBarWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth), this.hScrollBar.setAttributes({
             x: hScrollBarx,
             y: attrY,
@@ -47840,61 +47859,51 @@
             x: bounds.x1,
             y: bounds.y1
           }, "always" === horizontalVisible && this.hScrollBar.showAll();
-          const frozenScrollable = this.table.options.scrollFrozenCols && this.table.getFrozenColsOffset() > 0;
-          if (!ignoreFrozenCols && frozenScrollable) {
-            const frozenRangeEnd = Math.max(.05, frozenColsWidth / frozenColsContentWidth),
-              x = hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x;
-            this.frozenHScrollBar.setAttributes({
-              x: x,
-              y: attrY,
-              width: frozenColsWidth,
-              range: [0, frozenRangeEnd],
-              visible: "always" === horizontalVisible
-            });
-            const bounds = this.frozenHScrollBar.AABBBounds && this.frozenHScrollBar.globalAABBBounds;
-            this.frozenHScrollBar._viewPosition = {
-              x: bounds.x1,
-              y: bounds.y1
-            }, "always" === horizontalVisible && this.frozenHScrollBar.showAll();
-          } else this.frozenHScrollBar.setAttributes({
-            x: 2 * -this.table.tableNoFrameWidth,
-            y: 2 * -this.table.tableNoFrameHeight,
-            width: 0,
-            visible: !1
-          });
-          const rightFrozenScrollable = this.table.options.scrollRightFrozenCols && this.table.getRightFrozenColsOffset() > 0;
-          if (!ignoreFrozenCols && rightFrozenScrollable) {
-            const rightFrozenRangeEnd = Math.max(.05, rightFrozenColsWidth / rightFrozenColsContentWidth),
-              x = tableWidth - rightFrozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x);
-            this.rightFrozenHScrollBar.setAttributes({
-              x: x,
-              y: attrY,
-              width: rightFrozenColsWidth,
-              range: [0, rightFrozenRangeEnd],
-              visible: "always" === horizontalVisible
-            });
-            const bounds = this.rightFrozenHScrollBar.AABBBounds && this.rightFrozenHScrollBar.globalAABBBounds;
-            this.rightFrozenHScrollBar._viewPosition = {
-              x: bounds.x1,
-              y: bounds.y1
-            }, "always" === horizontalVisible && this.rightFrozenHScrollBar.showAll();
-          } else this.rightFrozenHScrollBar.setAttributes({
-            x: 2 * -this.table.tableNoFrameWidth,
-            y: 2 * -this.table.tableNoFrameHeight,
-            width: 0,
-            visible: !1
-          });
         } else this.hScrollBar.setAttributes({
           x: 2 * -this.table.tableNoFrameWidth,
           y: 2 * -this.table.tableNoFrameHeight,
           width: 0,
           visible: !1
-        }), this.frozenHScrollBar.setAttributes({
+        });
+        const frozenScrollable = this.table.options.scrollFrozenCols && this.table.getFrozenColsOffset() > 0;
+        if (!ignoreFrozenCols && frozenScrollable) {
+          const frozenRangeEnd = Math.max(.05, frozenColsWidth / frozenColsContentWidth),
+            x = hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x;
+          this.frozenHScrollBar.setAttributes({
+            x: x,
+            y: attrY,
+            width: frozenColsWidth,
+            range: [0, frozenRangeEnd],
+            visible: "always" === horizontalVisible
+          });
+          const bounds = this.frozenHScrollBar.AABBBounds && this.frozenHScrollBar.globalAABBBounds;
+          this.frozenHScrollBar._viewPosition = {
+            x: bounds.x1,
+            y: bounds.y1
+          }, "always" === horizontalVisible && this.frozenHScrollBar.showAll();
+        } else this.frozenHScrollBar.setAttributes({
           x: 2 * -this.table.tableNoFrameWidth,
           y: 2 * -this.table.tableNoFrameHeight,
           width: 0,
           visible: !1
-        }), this.rightFrozenHScrollBar.setAttributes({
+        });
+        const rightFrozenScrollable = this.table.options.scrollRightFrozenCols && this.table.getRightFrozenColsOffset() > 0;
+        if (!ignoreFrozenCols && rightFrozenScrollable) {
+          const rightFrozenRangeEnd = Math.max(.05, rightFrozenColsWidth / rightFrozenColsContentWidth),
+            x = tableWidth - rightFrozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x);
+          this.rightFrozenHScrollBar.setAttributes({
+            x: x,
+            y: attrY,
+            width: rightFrozenColsWidth,
+            range: [0, rightFrozenRangeEnd],
+            visible: "always" === horizontalVisible
+          });
+          const bounds = this.rightFrozenHScrollBar.AABBBounds && this.rightFrozenHScrollBar.globalAABBBounds;
+          this.rightFrozenHScrollBar._viewPosition = {
+            x: bounds.x1,
+            y: bounds.y1
+          }, "always" === horizontalVisible && this.rightFrozenHScrollBar.showAll();
+        } else this.rightFrozenHScrollBar.setAttributes({
           x: 2 * -this.table.tableNoFrameWidth,
           y: 2 * -this.table.tableNoFrameHeight,
           width: 0,
@@ -50795,7 +50804,7 @@
           col: null !== (_b = null == cellRange ? void 0 : cellRange.start.col) && void 0 !== _b ? _b : col,
           row: null !== (_c = null == cellRange ? void 0 : cellRange.start.row) && void 0 !== _c ? _c : row,
           dataValue: table.getCellOriginValue(col, row),
-          value: table.getCellValue(col, row) || "",
+          value: table.getCellValue(col, row),
           rect: getCellRect(col, row, table),
           table: table,
           originCol: col,
@@ -53042,7 +53051,8 @@
         for (let col = table.colCount - currentRightFrozenCol - 1; col >= table.colCount - distRightFrozenCol; col--) {
           insertBefore(rightFrozenGroup, scene.getColGroup(col), rightFrozenGroup.firstChild);
           insertBefore(rightTopCornerGroup, scene.getColGroup(col, !0), rightTopCornerGroup.firstChild);
-          insertBefore(rightBottomCornerGroup, scene.getColGroupInBottom(col), rightBottomCornerGroup.firstChild);
+          const bottomColGroup = scene.getColGroupInBottom(col);
+          bottomColGroup && insertBefore(rightBottomCornerGroup, bottomColGroup, rightBottomCornerGroup.firstChild);
         }
         let x = 0;
         rightFrozenGroup.forEachChildren(columnGroup => {
@@ -53059,7 +53069,10 @@
           const headerColGroup = scene.getColGroupInRightTopCorner(col);
           headerColGroup.setAttribute("x", colHeaderGroup.lastChild.attribute.x + table.getColWidth(colHeaderGroup.lastChild.col)), colHeaderGroup.appendChild(headerColGroup);
           const bottomColGroup = scene.getColGroupInRightBottomCorner(col);
-          bottomColGroup.setAttribute("x", bottomFrozenGroup.lastChild.attribute.x + table.getColWidth(bottomFrozenGroup.lastChild.col)), bottomFrozenGroup.appendChild(bottomColGroup);
+          if (bottomColGroup) {
+            const lastBottomColGroup = bottomFrozenGroup.lastChild;
+            bottomColGroup.setAttribute("x", lastBottomColGroup ? lastBottomColGroup.attribute.x + table.getColWidth(lastBottomColGroup.col) : 0), bottomFrozenGroup.appendChild(bottomColGroup);
+          }
         }
         let x = 0;
         rightFrozenGroup.forEachChildren(columnGroup => {
@@ -54447,7 +54460,7 @@
       setBodyAndColHeaderX(x) {
         const firstBodyCol = this.bodyGroup.firstChild;
         let lastBodyCol = this.bodyGroup.lastChild;
-        lastBodyCol && "group" !== lastBodyCol.type && (lastBodyCol = lastBodyCol._prev), 0 === x && firstBodyCol && firstBodyCol.col === this.table.frozenColCount && firstBodyCol.attribute.x + x < 0 ? x = -firstBodyCol.attribute.x : lastBodyCol && this.table.tableNoFrameWidth < this.table.getAllColsWidth() && lastBodyCol.col === this.table.colCount - this.table.rightFrozenColCount - 1 && lastBodyCol.attribute.x + lastBodyCol.attribute.width + x < this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() && (x = this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() - lastBodyCol.attribute.x - lastBodyCol.attribute.width), this.table.getFrozenColsWidth() + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.colHeaderGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bodySelectGroup.setAttribute("x", this.bodyGroup.attribute.x), this.colHeaderSelectGroup.setAttribute("x", this.colHeaderGroup.attribute.x), this.rowHeaderSelectGroup.setAttribute("x", this.rowHeaderGroup.attribute.x), this.cornerHeaderSelectGroup.setAttribute("x", this.cornerHeaderGroup.attribute.x), this.table.bottomFrozenRowCount > 0 && (this.bottomFrozenGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bottomFrozenSelectGroup.setAttribute("x", this.bottomFrozenGroup.attribute.x), this.leftBottomCornerSelectGroup.setAttribute("x", this.leftBottomCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && (this.rightFrozenSelectGroup.setAttribute("x", this.rightFrozenGroup.attribute.x), this.rightTopCornerSelectGroup.setAttribute("x", this.rightTopCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && this.table.bottomFrozenRowCount > 0 && this.rightBottomCornerSelectGroup.setAttribute("x", this.rightBottomCornerGroup.attribute.x), this.updateNextFrame());
+        lastBodyCol && "group" !== lastBodyCol.type && (lastBodyCol = lastBodyCol._prev), 0 === x && firstBodyCol && firstBodyCol.col === this.table.frozenColCount && firstBodyCol.attribute.x + x < 0 ? x = -firstBodyCol.attribute.x : lastBodyCol && this.table.tableNoFrameWidth < this.table.getAllColsWidth() && lastBodyCol.col === this.table.colCount - this.table.rightFrozenColCount - 1 && lastBodyCol.attribute.x + lastBodyCol.attribute.width + x < this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() && (x = this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() - lastBodyCol.attribute.x - lastBodyCol.attribute.width), this.table.options.scrollFrozenCols && x > 0 && (x = 0), this.table.getFrozenColsWidth() + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.colHeaderGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bodySelectGroup.setAttribute("x", this.bodyGroup.attribute.x), this.colHeaderSelectGroup.setAttribute("x", this.colHeaderGroup.attribute.x), this.rowHeaderSelectGroup.setAttribute("x", this.rowHeaderGroup.attribute.x), this.cornerHeaderSelectGroup.setAttribute("x", this.cornerHeaderGroup.attribute.x), this.table.bottomFrozenRowCount > 0 && (this.bottomFrozenGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bottomFrozenSelectGroup.setAttribute("x", this.bottomFrozenGroup.attribute.x), this.leftBottomCornerSelectGroup.setAttribute("x", this.leftBottomCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && (this.rightFrozenSelectGroup.setAttribute("x", this.rightFrozenGroup.attribute.x), this.rightTopCornerSelectGroup.setAttribute("x", this.rightTopCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && this.table.bottomFrozenRowCount > 0 && this.rightBottomCornerSelectGroup.setAttribute("x", this.rightBottomCornerGroup.attribute.x), this.updateNextFrame());
       }
       afterScenegraphCreated() {
         var _a, _b;
@@ -54494,11 +54507,11 @@
         let rowHeaderWidth = 0;
         this.rowHeaderGroup.forEachChildrenSkipChild(column => {
           rowHeaderWidth += column.attribute.width;
-        }), this.rowHeaderGroup.setAttribute("width", rowHeaderWidth);
+        }), table.options.scrollFrozenCols && (rowHeaderWidth = table.getFrozenColsWidth()), this.rowHeaderGroup.setAttribute("width", rowHeaderWidth);
         let cornerHeaderWidth = 0;
         this.cornerHeaderGroup.forEachChildrenSkipChild(column => {
           cornerHeaderWidth += column.attribute.width;
-        }), this.cornerHeaderGroup.setAttribute("width", cornerHeaderWidth), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width), this.rowHeaderGroup.setAttribute("y", this.cornerHeaderGroup.attribute.height), this.bodyGroup.setAttributes({
+        }), table.options.scrollFrozenCols && (cornerHeaderWidth = table.getFrozenColsWidth()), this.cornerHeaderGroup.setAttribute("width", cornerHeaderWidth), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width), this.rowHeaderGroup.setAttribute("y", this.cornerHeaderGroup.attribute.height), this.bodyGroup.setAttributes({
           x: this.rowHeaderGroup.attribute.width,
           y: this.colHeaderGroup.attribute.height
         });
@@ -56677,12 +56690,9 @@
         }), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
       }
       updateHorizontalScrollBar(xRatio) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const totalWidth = this.table.getAllColsWidth(),
-          oldHorizontalBarPos = this.scroll.horizontalBarPos,
-          frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0,
-          rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0,
-          scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset);
+        var _a, _b, _c, _d;
+        const oldHorizontalBarPos = this.scroll.horizontalBarPos,
+          scrollRange = getBodyHorizontalScrollRange(this.table);
         let horizontalBarPos = Math.ceil(xRatio * scrollRange);
         isValid$2(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
         const dx = horizontalBarPos - this.table.scenegraph.proxy.deltaX - oldHorizontalBarPos;
@@ -56690,8 +56700,8 @@
           event: void 0,
           scrollTop: this.scroll.verticalBarPos,
           scrollLeft: horizontalBarPos - this.table.scenegraph.proxy.deltaX,
-          scrollHeight: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
-          scrollWidth: null === (_h = this.table.theme.scrollStyle) || void 0 === _h ? void 0 : _h.width,
+          scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
+          scrollWidth: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "horizontal",
@@ -56704,8 +56714,8 @@
           event: void 0,
           scrollTop: this.scroll.verticalBarPos,
           scrollLeft: this.scroll.horizontalBarPos,
-          scrollHeight: null === (_j = this.table.theme.scrollStyle) || void 0 === _j ? void 0 : _j.width,
-          scrollWidth: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
+          scrollHeight: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
+          scrollWidth: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "horizontal",
@@ -56757,18 +56767,15 @@
         }), oldVerticalBarPos !== top && triggerEvent && this.checkVerticalScrollBarEnd();
       }
       setScrollLeft(left, event, triggerEvent = !0) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!this.table || !this.table.scenegraph) return;
         this.table.scrollLeft;
-        const totalWidth = this.table.getAllColsWidth(),
-          frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0,
-          rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0,
-          scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset),
-          sizeTolerance = (null === (_g = this.table.options.customConfig) || void 0 === _g ? void 0 : _g._disableColumnAndRowSizeRound) ? 1 : 0;
+        const scrollRange = getBodyHorizontalScrollRange(this.table),
+          sizeTolerance = (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0;
         left = Math.max(0, Math.min(left, scrollRange - sizeTolerance)), left = Math.ceil(left);
         const oldHorizontalBarPos = this.scroll.horizontalBarPos,
           xRatio = scrollRange ? left / scrollRange : 0;
-        if ((oldHorizontalBarPos !== left || !0 === (null === (_j = null === (_h = this.table.options) || void 0 === _h ? void 0 : _h.customConfig) || void 0 === _j ? void 0 : _j.scrollEventAlwaysTrigger)) && triggerEvent) {
+        if ((oldHorizontalBarPos !== left || !0 === (null === (_c = null === (_b = this.table.options) || void 0 === _b ? void 0 : _b.customConfig) || void 0 === _c ? void 0 : _c.scrollEventAlwaysTrigger)) && triggerEvent) {
           let horizontalBarPos = left;
           isValid$2(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
           const dx = horizontalBarPos - oldHorizontalBarPos;
@@ -56776,8 +56783,8 @@
             event: null == event ? void 0 : event.nativeEvent,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: horizontalBarPos,
-            scrollHeight: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
-            scrollWidth: null === (_l = this.table.theme.scrollStyle) || void 0 === _l ? void 0 : _l.width,
+            scrollHeight: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
+            scrollWidth: null === (_e = this.table.theme.scrollStyle) || void 0 === _e ? void 0 : _e.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -56794,8 +56801,8 @@
           event: null == event ? void 0 : event.nativeEvent,
           scrollTop: this.scroll.verticalBarPos,
           scrollLeft: this.scroll.horizontalBarPos,
-          scrollHeight: null === (_m = this.table.theme.scrollStyle) || void 0 === _m ? void 0 : _m.width,
-          scrollWidth: null === (_o = this.table.theme.scrollStyle) || void 0 === _o ? void 0 : _o.width,
+          scrollHeight: null === (_f = this.table.theme.scrollStyle) || void 0 === _f ? void 0 : _f.width,
+          scrollWidth: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "horizontal",
@@ -57554,70 +57561,73 @@
         });
       }), table.scenegraph.tableGroup.addEventListener("pointerup", e => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (0 === e.button) {
-          if ("grabing" === stateManager.interactionState) {
-            if (stateManager.updateInteractionState(InteractionState.default), stateManager.isResizeCol()) endResizeCol(table);else if (stateManager.isResizeRow()) endResizeRow(table);else if (stateManager.isMoveCol()) {
-              const endMoveColSuccess = table.stateManager.endMoveCol();
-              fireMoveColEventListeners(table, endMoveColSuccess, e.nativeEvent);
-            } else if (stateManager.isSelecting()) {
-              table.stateManager.endSelectCells(), table.stateManager.isFillHandle() && table.stateManager.endFillSelect();
-              const eventArgsSet = getEventArgsSet(e);
-              if (table.eventManager.isDraging && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END)) {
-                const cellsEvent = {
-                  event: e.nativeEvent,
-                  cells: [],
-                  col: eventArgsSet.eventArgs.target.col,
-                  row: eventArgsSet.eventArgs.target.row,
-                  scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth,
-                  target: null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target,
-                  mergeCellInfo: null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.mergeInfo
-                };
-                cellsEvent.cells = table.getSelectedCellInfos(), table.fireListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END, cellsEvent);
-              }
-            }
-          } else stateManager.interactionState === InteractionState.scrolling && stateManager.updateInteractionState(InteractionState.default);
-          if (!table.eventManager.isDraging) {
+        if (0 !== e.button) return;
+        const endedResizeCol = stateManager.isResizeCol(),
+          endedResizeRow = stateManager.isResizeRow(),
+          endedMoveCol = stateManager.isMoveCol(),
+          shouldSkipClickCell = endedResizeCol || endedResizeRow;
+        if ("grabing" === stateManager.interactionState) {
+          if (stateManager.updateInteractionState(InteractionState.default), endedResizeCol) endResizeCol(table);else if (endedResizeRow) endResizeRow(table);else if (endedMoveCol) {
+            const endMoveColSuccess = table.stateManager.endMoveCol();
+            fireMoveColEventListeners(table, endMoveColSuccess, e.nativeEvent);
+          } else if (stateManager.isSelecting()) {
+            table.stateManager.endSelectCells(), table.stateManager.isFillHandle() && table.stateManager.endFillSelect();
             const eventArgsSet = getEventArgsSet(e);
-            if (!eventManager.isTouchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
-              const {
-                  col: col,
-                  row: row
-                } = eventArgsSet.eventArgs,
-                cellInfo = table.getCellInfo(col, row);
-              let icon, position;
-              if (null === (_c = eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target) {
-                const iconInfo = getIconAndPositionFromTarget(null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.target);
-                iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
-              }
-              const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
+            if (table.eventManager.isDraging && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END)) {
+              const cellsEvent = {
                 event: e.nativeEvent,
-                federatedEvent: e,
                 cells: [],
-                targetIcon: icon ? {
-                  name: icon.name,
-                  position: position,
-                  funcType: icon.attribute.funcType
-                } : void 0,
-                target: null === (_e = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.target,
-                mergeCellInfo: null === (_f = eventArgsSet.eventArgs) || void 0 === _f ? void 0 : _f.mergeInfo
-              });
-              table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
+                col: eventArgsSet.eventArgs.target.col,
+                row: eventArgsSet.eventArgs.target.row,
+                scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth,
+                target: null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target,
+                mergeCellInfo: null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.mergeInfo
+              };
+              cellsEvent.cells = table.getSelectedCellInfos(), table.fireListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END, cellsEvent);
             }
           }
-          if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL)) {
-            const eventArgsSet = getEventArgsSet(e);
-            eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL, {
-              col: eventArgsSet.eventArgs.col,
-              row: eventArgsSet.eventArgs.row,
+        } else stateManager.interactionState === InteractionState.scrolling && stateManager.updateInteractionState(InteractionState.default);
+        if (!table.eventManager.isDraging && !shouldSkipClickCell) {
+          const eventArgsSet = getEventArgsSet(e);
+          if (!eventManager.isTouchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
+            const {
+                col: col,
+                row: row
+              } = eventArgsSet.eventArgs,
+              cellInfo = table.getCellInfo(col, row);
+            let icon, position;
+            if (null === (_c = eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target) {
+              const iconInfo = getIconAndPositionFromTarget(null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.target);
+              iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
+            }
+            const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
               event: e.nativeEvent,
-              target: null === (_g = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _g ? void 0 : _g.target,
-              mergeCellInfo: null === (_h = eventArgsSet.eventArgs) || void 0 === _h ? void 0 : _h.mergeInfo
+              federatedEvent: e,
+              cells: [],
+              targetIcon: icon ? {
+                name: icon.name,
+                position: position,
+                funcType: icon.attribute.funcType
+              } : void 0,
+              target: null === (_e = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.target,
+              mergeCellInfo: null === (_f = eventArgsSet.eventArgs) || void 0 === _f ? void 0 : _f.mergeInfo
             });
+            table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
           }
-          setTimeout(() => {
-            eventManager.isDown = !1, eventManager.isTouchdown = !1, eventManager.isTouchMove = !1, eventManager.isDraging = !1, eventManager.touchMovePoints = [];
-          }, 0);
         }
+        if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL)) {
+          const eventArgsSet = getEventArgsSet(e);
+          eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL, {
+            col: eventArgsSet.eventArgs.col,
+            row: eventArgsSet.eventArgs.row,
+            event: e.nativeEvent,
+            target: null === (_g = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _g ? void 0 : _g.target,
+            mergeCellInfo: null === (_h = eventArgsSet.eventArgs) || void 0 === _h ? void 0 : _h.mergeInfo
+          });
+        }
+        setTimeout(() => {
+          eventManager.isDown = !1, eventManager.isTouchdown = !1, eventManager.isTouchMove = !1, eventManager.isDraging = !1, eventManager.touchMovePoints = [];
+        }, 0);
       }), table.scenegraph.tableGroup.addEventListener("rightdown", e => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const eventArgsSet = getEventArgsSet(e);
@@ -61435,7 +61445,7 @@
       }
       constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
-        if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.26.2", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
+        if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.26.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
           const g = window;
           g[this.id] = this;
           const registry = g.__vtable__ || (g.__vtable__ = {
@@ -63648,16 +63658,17 @@
       }
       scrollToRow(row, animationOption) {
         var _a;
-        const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+        const targetRow = Math.min(Math.max(row, 0), this.rowCount - 1),
+          targetRowInt = Math.floor(targetRow);
         if (this.clearCorrectTimer(), !animationOption) return this.scrollToCell({
-          row: targetRow
-        }), void this._scheduleScrollToRowCorrect(targetRow);
+          row: targetRowInt
+        }), void this._scheduleScrollToRowCorrect(targetRowInt);
         const duration = isBoolean$2(animationOption) ? 3e3 : null !== (_a = null == animationOption ? void 0 : animationOption.duration) && void 0 !== _a ? _a : 3e3;
         this.animationManager.scrollTo({
           row: targetRow
-        }, animationOption), this._scrollToRowCorrectTimer = setTimeout(() => {
-          this.scrollToRow(targetRow, !1);
-        }, duration);
+        }, animationOption), targetRowInt === targetRow && (this._scrollToRowCorrectTimer = setTimeout(() => {
+          this.scrollToRow(targetRowInt, !1);
+        }, duration));
       }
       scrollToCol(col, animationOption) {
         animationOption ? this.animationManager.scrollTo({
@@ -87773,7 +87784,7 @@
             return this.element;
         }
         targetIsOnEditor(target) {
-            return target === this.element || target === this.sheet.formulaUIManager.formulaInput;
+            return target === this.element || target === this.sheet?.formulaUIManager.formulaInput;
         }
         createElement() {
             super.createElement();
@@ -87805,7 +87816,10 @@
                 return;
             }
             const value = this.element.value;
-            this.sheet.formulaUIManager.formulaInput.value = value;
+            const formulaInput = this.sheet.formulaUIManager.formulaInput;
+            if (formulaInput) {
+                formulaInput.value = value;
+            }
             const highlightManager = this.sheet.formulaManager.cellHighlightManager;
             if (highlightManager) {
                 if (value.startsWith('=')) {
@@ -91303,6 +91317,28 @@
         }
     }
 
+    const normalizeColumnsField = (columns, startFieldIndex = 0) => {
+        if (!columns?.length) {
+            return startFieldIndex;
+        }
+        let fieldIndex = startFieldIndex;
+        columns.forEach(column => {
+            const childColumns = column
+                .columns;
+            if (childColumns?.length) {
+                fieldIndex = normalizeColumnsField(childColumns, fieldIndex);
+                return;
+            }
+            if (!isValid$2(column.field)) {
+                column.field = fieldIndex;
+            }
+            if (!isValid$2(column.key)) {
+                column.key = column.field;
+            }
+            fieldIndex++;
+        });
+        return fieldIndex;
+    };
     class WorkSheet {
         options;
         container;
@@ -91430,10 +91466,7 @@
                 this.options.columns = [];
             }
             else {
-                for (let i = 0; i < this.options.columns.length; i++) {
-                    this.options.columns[i].field = i;
-                    this.options.columns[i].key = i;
-                }
+                normalizeColumnsField(this.options.columns);
             }
             if (!this.options.data) {
                 this.options.data = [];
@@ -96196,7 +96229,7 @@
         importStyle();
     }
 
-    const version = "1.26.2";
+    const version = "1.26.3";
     importStyles();
 
     exports.TYPES = index;