@visactor/vtable 1.19.7 → 1.19.8

package/dist/vtable.js

@@ -49797,6 +49797,9 @@
         else if (columnGroup.colHeight) {
             y = columnGroup.colHeight;
         }
+        else if (rowStart >= table.columnHeaderLevelCount && rowStart < table.rowCount - table.bottomFrozenRowCount) {
+            y = table.getRowsHeight(table.columnHeaderLevelCount, rowStart - 1);
+        }
         for (let j = rowStart; j <= rowEnd; j++) {
             const row = j;
             let cellLocation = table.getCellLocation(col, row);
@@ -60330,40 +60333,63 @@
             if (eventArgsSet.eventArgs) {
                 stateManager.triggerContextMenu(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
                 const { col, row } = eventArgsSet.eventArgs;
-                if (table.hasListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL)) {
-                    const cellInfo = table.getCellInfo(col, row);
-                    let icon;
-                    let position;
-                    if (eventArgsSet.eventArgs?.target) {
-                        const iconInfo = getIconAndPositionFromTarget(eventArgsSet.eventArgs?.target);
-                        if (iconInfo) {
-                            icon = iconInfo.icon;
-                            position = iconInfo.position;
+                if (col >= 0 && row >= 0) {
+                    const ranges = table.getSelectedCellRanges();
+                    let cellInRange = false;
+                    if (ranges.length > 0) {
+                        for (let i = 0; i < ranges.length; i++) {
+                            const range = ranges[i];
+                            const startCol = range.start.col;
+                            const endCol = range.end.col;
+                            const startRow = range.start.row;
+                            const endRow = range.end.row;
+                            if ((col >= startCol && col <= endCol && row >= startRow && row <= endRow) ||
+                                (col >= endCol && col <= startCol && row >= endRow && row <= startRow) ||
+                                (col >= startCol && col <= endCol && row >= endRow && row <= startRow) ||
+                                (col >= endCol && col <= startCol && row >= startRow && row <= endRow)) {
+                                cellInRange = true;
+                                break;
+                            }
                         }
                     }
-                    const cellsEvent = {
-                        ...cellInfo,
-                        event: e.nativeEvent,
-                        cells: [],
-                        targetIcon: icon
-                            ? {
-                                name: icon.name,
-                                position: position,
-                                funcType: icon.attribute.funcType
+                    if (!cellInRange) {
+                        table.selectCell(col, row);
+                    }
+                    if (table.hasListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL)) {
+                        const cellInfo = table.getCellInfo(col, row);
+                        let icon;
+                        let position;
+                        if (eventArgsSet.eventArgs?.target) {
+                            const iconInfo = getIconAndPositionFromTarget(eventArgsSet.eventArgs?.target);
+                            if (iconInfo) {
+                                icon = iconInfo.icon;
+                                position = iconInfo.position;
                             }
-                            : undefined,
-                        target: eventArgsSet?.eventArgs?.target,
-                        mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
-                    };
-                    if (table.options.eventOptions?.contextmenuReturnAllSelectedCells ?? true) {
-                        if (cellInRanges(table.stateManager.select.ranges, col, row)) {
-                            cellsEvent.cells = table.getSelectedCellInfos();
                         }
-                        else {
-                            cellsEvent.cells = [[cellInfo]];
+                        const cellsEvent = {
+                            ...cellInfo,
+                            event: e.nativeEvent,
+                            cells: [],
+                            targetIcon: icon
+                                ? {
+                                    name: icon.name,
+                                    position: position,
+                                    funcType: icon.attribute.funcType
+                                }
+                                : undefined,
+                            target: eventArgsSet?.eventArgs?.target,
+                            mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
+                        };
+                        if (table.options.eventOptions?.contextmenuReturnAllSelectedCells ?? true) {
+                            if (cellInRanges(table.stateManager.select.ranges, col, row)) {
+                                cellsEvent.cells = table.getSelectedCellInfos();
+                            }
+                            else {
+                                cellsEvent.cells = [[cellInfo]];
+                            }
                         }
+                        table.fireListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL, cellsEvent);
                     }
-                    table.fireListeners(TABLE_EVENT_TYPE.CONTEXTMENU_CELL, cellsEvent);
                 }
             }
         });
@@ -62188,33 +62214,6 @@
         });
     }
 
-    function rightButtonClickEvent(table) {
-        table.on(TABLE_EVENT_TYPE.CONTEXTMENU_CELL, e => {
-            const { col, row } = e;
-            const ranges = table.getSelectedCellRanges();
-            let cellInRange = false;
-            if (ranges.length > 0) {
-                for (let i = 0; i < ranges.length; i++) {
-                    const range = ranges[i];
-                    const startCol = range.start.col;
-                    const endCol = range.end.col;
-                    const startRow = range.start.row;
-                    const endRow = range.end.row;
-                    if ((col >= startCol && col <= endCol && row >= startRow && row <= endRow) ||
-                        (col >= endCol && col <= startCol && row >= endRow && row <= startRow) ||
-                        (col >= startCol && col <= endCol && row >= endRow && row <= startRow) ||
-                        (col >= endCol && col <= startCol && row >= startRow && row <= endRow)) {
-                        cellInRange = true;
-                        break;
-                    }
-                }
-            }
-            if (!cellInRange) {
-                table.selectCell(col, row);
-            }
-        });
-    }
-
     class EventManager {
         table;
         isTouchdown;
@@ -62299,7 +62298,6 @@
             bindGroupCheckboxTreeChange(this.table);
             bindHeaderCheckboxChange(this.table);
             bindButtonClickEvent(this.table);
-            rightButtonClickEvent(this.table);
         }
         dealTableHover(eventArgsSet) {
             if (!eventArgsSet) {
@@ -64966,22 +64964,24 @@
         }
     }
     function generateLayoutTree(tree, children) {
-        children?.forEach((node) => {
-            const diemnsonNode = {
-                dimensionKey: node.dimensionKey,
-                indicatorKey: node.indicatorKey,
-                value: node.value,
-                hierarchyState: node.hierarchyState,
-                children: undefined,
-                virtual: node.virtual ?? false,
-                levelSpan: node.levelSpan ?? 1
-            };
-            tree.push(diemnsonNode);
-            if (node.children) {
-                diemnsonNode.children = [];
-                generateLayoutTree(diemnsonNode.children, node.children);
-            }
-        });
+        if (Array.isArray(children)) {
+            children?.forEach((node) => {
+                const diemnsonNode = {
+                    dimensionKey: node.dimensionKey,
+                    indicatorKey: node.indicatorKey,
+                    value: node.value,
+                    hierarchyState: node.hierarchyState,
+                    children: undefined,
+                    virtual: node.virtual ?? false,
+                    levelSpan: node.levelSpan ?? 1
+                };
+                tree.push(diemnsonNode);
+                if (node.children) {
+                    diemnsonNode.children = [];
+                    generateLayoutTree(diemnsonNode.children, node.children);
+                }
+            });
+        }
     }
     function countLayoutTree(children, countParentNode) {
         let count = 0;
@@ -67264,7 +67264,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.19.7";
+        version = "1.19.8";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -84873,10 +84873,10 @@
                 needLowestLevel_colPaths = true;
                 needLowestLevel_rowPaths = true;
             }
-            if (colHeaderPaths.length >= this._getColumnHeaderTreeExpandedMaxLevelCount()) {
+            if ((colHeaderPaths?.length ?? 0) && colHeaderPaths.length >= this._getColumnHeaderTreeExpandedMaxLevelCount()) {
                 needLowestLevel_colPaths = true;
             }
-            if (rowHeaderPaths.length >= this._getRowHeaderTreeExpandedMaxLevelCount()) {
+            if ((rowHeaderPaths?.length ?? 0) && rowHeaderPaths.length >= this._getRowHeaderTreeExpandedMaxLevelCount()) {
                 needLowestLevel_rowPaths = true;
             }
             let col;
@@ -88176,7 +88176,7 @@
             if (sourceNode.value === targetNode.value && sourceNode.dimensionKey === targetNode.dimensionKey) {
                 targetNode.hierarchyState =
                     targetNode.hierarchyState ?? (targetNode?.children ? sourceNode.hierarchyState : undefined);
-                targetNode?.children?.forEach((targetChildNode, index) => {
+                targetNode?.children?.forEach?.((targetChildNode, index) => {
                     if (sourceNode?.children?.[index] && targetChildNode) {
                         const beforeRowDimension = sourceNode.children.find((item) => item.dimensionKey === targetChildNode.dimensionKey && item.value === targetChildNode.value);
                         if (beforeRowDimension) {
@@ -91186,7 +91186,7 @@
     }
 
     registerForVrender();
-    const version = "1.19.7";
+    const version = "1.19.8";
     function getIcons() {
         return get$2();
     }