@visactor/vtable-sheet 1.26.3-alpha.0 → 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,
@@ -50797,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,
@@ -53044,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 => {
@@ -53061,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 => {
@@ -57550,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);
@@ -61431,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__ = {
@@ -63644,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({
@@ -87769,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();
@@ -87801,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('=')) {
@@ -91299,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;
@@ -91426,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 = [];
@@ -96192,7 +96229,7 @@
         importStyle();
     }
 
-    const version = "1.26.2";
+    const version = "1.26.3";
     importStyles();
 
     exports.TYPES = index;