k-vtable 1.0.7 → 1.0.9

package/dist/vtable.js

@@ -34605,6 +34605,21 @@
             obj[childrenProperty].forEach((child) => traverseObject(child, childrenProperty, callback));
         }
     }
+    function computeChildrenNodeLength(indexKey, hierarchyState, nodeData) {
+        let size = 0;
+        if (!hierarchyState || hierarchyState === HierarchyState.collapse || hierarchyState === HierarchyState.none) {
+            return size;
+        }
+        const children = nodeData.filteredChildren ? nodeData.filteredChildren : nodeData.children;
+        if (children) {
+            for (let i = 0; i < children.length; i++) {
+                size += 1;
+                const childIndex = Array.isArray(indexKey) ? indexKey.concat([i]) : [indexKey, i];
+                size += computeChildrenNodeLength(childIndex, children[i].hierarchyState, children[i]);
+            }
+        }
+        return size;
+    }
 
     const isNode = typeof window === 'undefined' || typeof window.window === 'undefined';
     let arrayFind;
@@ -37286,21 +37301,7 @@
                 this.hasHierarchyStateExpand = true;
             }
             else if (state === HierarchyState.expand) {
-                let childrenLength = 0;
-                const computeChildrenNodeLength = (indexKey, hierarchyState, nodeData) => {
-                    if (!hierarchyState || hierarchyState === HierarchyState.collapse || hierarchyState === HierarchyState.none) {
-                        return;
-                    }
-                    const children = nodeData.filteredChildren ? nodeData.filteredChildren : nodeData.children;
-                    if (children) {
-                        for (let i = 0; i < children.length; i++) {
-                            childrenLength += 1;
-                            const childIndex = Array.isArray(indexKey) ? indexKey.concat([i]) : [indexKey, i];
-                            computeChildrenNodeLength(childIndex, children[i].hierarchyState, children[i]);
-                        }
-                    }
-                };
-                computeChildrenNodeLength(indexed, state, data);
+                const childrenLength = computeChildrenNodeLength(indexed, state, data);
                 this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexed) + 1, childrenLength);
                 data.hierarchyState = HierarchyState.collapse;
             }
@@ -43660,8 +43661,11 @@
             });
             const textMark = oldCellGroup.getChildByName('text');
             if (forceFastUpdate && textMark) {
+                const textAlign = cellTheme.text.textAlign;
+                const hierarchyOffset = getHierarchyOffset(col, row, table);
                 const attribute = {
-                    textBaseline: 'top'
+                    textBaseline: 'top',
+                    dx: textAlign === 'left' ? hierarchyOffset : 0
                 };
                 textMark.setAttributes(cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute);
             }
@@ -43722,8 +43726,8 @@
         const type = isVtableMerge || isCustomMerge
             ? 'text'
             : table.isHeader(col, row)
-                ? (table._getHeaderLayoutMap(col, row).headerType ?? 'text')
-                : (table.getBodyColumnType(col, row) ?? 'text');
+                ? table._getHeaderLayoutMap(col, row).headerType ?? 'text'
+                : table.getBodyColumnType(col, row) ?? 'text';
         const padding = cellTheme._vtable.padding;
         const textAlign = cellTheme.text.textAlign;
         const textBaseline = cellTheme.text.textBaseline;
@@ -46099,6 +46103,12 @@
         }
         return rowY;
     }
+    function getRowBottomY(table) {
+        return table.tableNoFrameHeight - table.getBottomFrozenRowsHeight();
+    }
+    function getRowTopY(table) {
+        return table.getFrozenRowsHeight();
+    }
 
     class TableComponent {
         table;
@@ -46114,6 +46124,8 @@
         hScrollBar;
         frozenShadowLine;
         rightFrozenShadowLine;
+        topFrozenShadowLine;
+        bottonFrozenShadowLine;
         drillIcon;
         cellMover;
         labelVisible;
@@ -46250,6 +46262,7 @@
             const shadowWidth = theme.frozenColumnLine?.shadow?.width;
             const shadowStartColor = theme.frozenColumnLine?.shadow?.startColor;
             const shadowEndColor = theme.frozenColumnLine?.shadow?.endColor;
+            theme.cellBorder?.borderColor ?? 'red';
             const visible = theme.frozenColumnLine?.shadow?.visible;
             this.frozenShadowLine = createRect({
                 visible: visible === 'always',
@@ -46289,12 +46302,52 @@
                     ]
                 }
             });
+            this.topFrozenShadowLine = createRect({
+                visible: visible === 'always',
+                pickable: false,
+                x: 0,
+                y: 0,
+                width: 0,
+                height: shadowWidth,
+                fill: {
+                    gradient: 'linear',
+                    x0: 0,
+                    y0: 0,
+                    x1: 0,
+                    y1: 1,
+                    stops: [
+                        { color: shadowStartColor, offset: 0 },
+                        { color: shadowEndColor, offset: 1 }
+                    ]
+                }
+            });
+            this.bottonFrozenShadowLine = createRect({
+                visible: visible === 'always',
+                pickable: false,
+                x: 0,
+                y: 0,
+                width: 0,
+                height: shadowWidth,
+                fill: {
+                    gradient: 'linear',
+                    x0: 0,
+                    y0: 0,
+                    x1: 0,
+                    y1: 1,
+                    stops: [
+                        { color: shadowEndColor, offset: 0 },
+                        { color: shadowStartColor, offset: 1 }
+                    ]
+                }
+            });
             this.menu = new MenuHandler$1(this.table);
             this.drillIcon = new DrillIcon();
         }
         addToGroup(componentGroup) {
             componentGroup.addChild(this.frozenShadowLine);
             componentGroup.addChild(this.rightFrozenShadowLine);
+            componentGroup.addChild(this.bottonFrozenShadowLine);
+            componentGroup.addChild(this.topFrozenShadowLine);
             componentGroup.addChild(this.columnResizeBgLine);
             componentGroup.addChild(this.columnResizeLine);
             componentGroup.addChild(this.columnResizeLabel);
@@ -46622,6 +46675,40 @@
                 });
             }
         }
+        setBottonFrozenColumnShadow() {
+            const rowY = getRowBottomY(this.table);
+            if (this.table.bottomFrozenRowCount === 0 || this.table.theme.frozenColumnLine?.shadow?.visible !== 'always') {
+                this.bottonFrozenShadowLine.setAttributes({
+                    visible: false,
+                    y: 0,
+                    width: 0
+                });
+            }
+            else {
+                this.bottonFrozenShadowLine.setAttributes({
+                    visible: true,
+                    y: rowY - (this.table.theme.frozenColumnLine?.shadow?.width ?? 2),
+                    width: this.table.getDrawRange().width
+                });
+            }
+        }
+        setTopFrozenColumnShadow() {
+            const rowY = getRowTopY(this.table);
+            if (this.table.columnHeaderLevelCount === this.table.frozenRowCount || this.table.theme.frozenColumnLine?.shadow?.visible !== 'always') {
+                this.bottonFrozenShadowLine.setAttributes({
+                    visible: false,
+                    y: 0,
+                    width: 0
+                });
+            }
+            else {
+                this.topFrozenShadowLine.setAttributes({
+                    visible: true,
+                    y: rowY,
+                    width: this.table.getDrawRange().width
+                });
+            }
+        }
         hideFrozenColumnShadow() {
             const visible1 = this.table.theme.frozenColumnLine?.shadow?.visible;
             const visible = this.table.theme.frozenColumnLine?.shadow?.visible ?? visible1;
@@ -47131,6 +47218,114 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     }
 
+    function getCellHoverColor(cellGroup, table) {
+        let colorKey;
+        if (cellGroup.role === 'cell' &&
+            isValid$3(cellGroup.mergeStartCol) &&
+            isValid$3(cellGroup.mergeStartRow) &&
+            isValid$3(cellGroup.mergeEndCol) &&
+            isValid$3(cellGroup.mergeEndRow)) {
+            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
+            for (let col = colStart; col <= colEnd; col++) {
+                for (let row = rowStart; row <= rowEnd; row++) {
+                    const key = isCellHover(table.stateManager, col, row, cellGroup);
+                    if (key && (!colorKey || key === 'cellBgColor')) {
+                        colorKey = key;
+                    }
+                }
+            }
+        }
+        else if (cellGroup.role === 'cell') {
+            colorKey = isCellHover(table.stateManager, cellGroup.col, cellGroup.row, cellGroup);
+        }
+        if (!colorKey) {
+            return undefined;
+        }
+        let hoverStyle;
+        const layout = table.internalProps.layoutMap;
+        if (layout.isCornerHeader(cellGroup.col, cellGroup.row)) {
+            hoverStyle = table.theme.cornerHeaderStyle?.hover || table.theme.headerStyle?.hover;
+        }
+        else if (layout.isColumnHeader(cellGroup.col, cellGroup.row)) {
+            hoverStyle = table.theme.headerStyle?.hover;
+        }
+        else if (layout.isRowHeader(cellGroup.col, cellGroup.row)) {
+            hoverStyle = table.theme.rowHeaderStyle?.hover;
+        }
+        else if (layout.isBottomFrozenRow(cellGroup.col, cellGroup.row)) {
+            hoverStyle =
+                table.theme.bottomFrozenStyle?.hover ||
+                    (table.isListTable() ? table.theme.bodyStyle?.hover : table.theme.headerStyle?.hover);
+        }
+        else if (layout.isRightFrozenColumn(cellGroup.col, cellGroup.row)) {
+            hoverStyle =
+                table.theme.rightFrozenStyle?.hover ||
+                    (table.isListTable() ? table.theme.bodyStyle?.hover : table.theme.rowHeaderStyle?.hover);
+        }
+        else if (!table.isHeader(cellGroup.col, cellGroup.row)) {
+            hoverStyle = table.theme.bodyStyle?.hover;
+        }
+        const fillColor = getProp(colorKey, hoverStyle, cellGroup.col, cellGroup.row, table);
+        return fillColor;
+    }
+    function isCellHover(state, col, row, cellGroup) {
+        const { highlightScope, disableHeader, cellPos } = state.hover;
+        const table = state.table;
+        const isHeader = table.isHeader(col, row);
+        if (isHeader && disableHeader) {
+            return undefined;
+        }
+        let hoverMode;
+        if (highlightScope === HighlightScope.single && cellPos.col === col && cellPos.row === row) {
+            hoverMode = 'cellBgColor';
+        }
+        else if (highlightScope === HighlightScope.column && cellPos.col === col) {
+            if (cellPos.col === col && cellPos.row === row) {
+                hoverMode = 'cellBgColor';
+            }
+            else {
+                hoverMode = 'inlineColumnBgColor';
+            }
+        }
+        else if (highlightScope === HighlightScope.row && cellPos.row === row) {
+            if (cellPos.col === col && cellPos.row === row) {
+                hoverMode = 'cellBgColor';
+            }
+            else {
+                hoverMode = 'inlineRowBgColor';
+            }
+        }
+        else if (highlightScope === HighlightScope.cross) {
+            if (cellPos.col === col && cellPos.row === row) {
+                hoverMode = 'cellBgColor';
+            }
+            else if (cellPos.col === col) {
+                hoverMode = 'inlineColumnBgColor';
+            }
+            else if (cellPos.row === row) {
+                hoverMode = 'inlineRowBgColor';
+            }
+        }
+        if (hoverMode) {
+            let cellDisable;
+            if (isHeader) {
+                const define = table.getHeaderDefine(col, row);
+                cellDisable = define?.disableHeaderHover;
+                if (cellGroup.firstChild && cellGroup.firstChild.name === 'axis' && table.options.hover?.disableAxisHover) {
+                    cellDisable = true;
+                }
+            }
+            else {
+                const define = table.getBodyColumnDefine(col, row);
+                cellDisable = define?.disableHover;
+            }
+            if (cellDisable) {
+                hoverMode = undefined;
+            }
+        }
+        return hoverMode;
+    }
+
     const CHART_NUMBER_TYPE = genNumberType();
     class Chart extends Rect$2 {
         type = 'chart';
@@ -47166,6 +47361,7 @@
         activate(table) {
             this.active = true;
             const { col, row } = this.parent;
+            const hoverColor = getCellHoverColor(this.parent, table);
             const { x1, y1, x2, y2 } = this.getViewBox();
             const tableBound = getTableBounds(col, row, table);
             const clipBound = tableBound.intersect({
@@ -47214,6 +47410,15 @@
                     ctx.inuse = false;
                     stage.needRender = false;
                     chartStage.resumeRender();
+                },
+                afterClearScreen(drawParams) {
+                    const { context, layer, viewBox } = drawParams;
+                    if (layer.main) {
+                        context.beginPath();
+                        context.fillStyle = hoverColor;
+                        context.rect(viewBox.x1, viewBox.y1, viewBox.x2 - viewBox.x1, viewBox.y2 - viewBox.y1);
+                        context.fill();
+                    }
                 }
             }));
             const chartStage = this.activeChartInstance.getStage();
@@ -47684,114 +47889,6 @@
         injectable()
     ], AfterGifImageRenderContribution);
 
-    function getCellHoverColor(cellGroup, table) {
-        let colorKey;
-        if (cellGroup.role === 'cell' &&
-            isValid$3(cellGroup.mergeStartCol) &&
-            isValid$3(cellGroup.mergeStartRow) &&
-            isValid$3(cellGroup.mergeEndCol) &&
-            isValid$3(cellGroup.mergeEndRow)) {
-            const { colStart, colEnd, rowStart, rowEnd } = getCellMergeRange(cellGroup, table.scenegraph);
-            for (let col = colStart; col <= colEnd; col++) {
-                for (let row = rowStart; row <= rowEnd; row++) {
-                    const key = isCellHover(table.stateManager, col, row, cellGroup);
-                    if (key && (!colorKey || key === 'cellBgColor')) {
-                        colorKey = key;
-                    }
-                }
-            }
-        }
-        else if (cellGroup.role === 'cell') {
-            colorKey = isCellHover(table.stateManager, cellGroup.col, cellGroup.row, cellGroup);
-        }
-        if (!colorKey) {
-            return undefined;
-        }
-        let hoverStyle;
-        const layout = table.internalProps.layoutMap;
-        if (layout.isCornerHeader(cellGroup.col, cellGroup.row)) {
-            hoverStyle = table.theme.cornerHeaderStyle?.hover || table.theme.headerStyle?.hover;
-        }
-        else if (layout.isColumnHeader(cellGroup.col, cellGroup.row)) {
-            hoverStyle = table.theme.headerStyle?.hover;
-        }
-        else if (layout.isRowHeader(cellGroup.col, cellGroup.row)) {
-            hoverStyle = table.theme.rowHeaderStyle?.hover;
-        }
-        else if (layout.isBottomFrozenRow(cellGroup.col, cellGroup.row)) {
-            hoverStyle =
-                table.theme.bottomFrozenStyle?.hover ||
-                    (table.isListTable() ? table.theme.bodyStyle?.hover : table.theme.headerStyle?.hover);
-        }
-        else if (layout.isRightFrozenColumn(cellGroup.col, cellGroup.row)) {
-            hoverStyle =
-                table.theme.rightFrozenStyle?.hover ||
-                    (table.isListTable() ? table.theme.bodyStyle?.hover : table.theme.rowHeaderStyle?.hover);
-        }
-        else if (!table.isHeader(cellGroup.col, cellGroup.row)) {
-            hoverStyle = table.theme.bodyStyle?.hover;
-        }
-        const fillColor = getProp(colorKey, hoverStyle, cellGroup.col, cellGroup.row, table);
-        return fillColor;
-    }
-    function isCellHover(state, col, row, cellGroup) {
-        const { highlightScope, disableHeader, cellPos } = state.hover;
-        const table = state.table;
-        const isHeader = table.isHeader(col, row);
-        if (isHeader && disableHeader) {
-            return undefined;
-        }
-        let hoverMode;
-        if (highlightScope === HighlightScope.single && cellPos.col === col && cellPos.row === row) {
-            hoverMode = 'cellBgColor';
-        }
-        else if (highlightScope === HighlightScope.column && cellPos.col === col) {
-            if (cellPos.col === col && cellPos.row === row) {
-                hoverMode = 'cellBgColor';
-            }
-            else {
-                hoverMode = 'inlineColumnBgColor';
-            }
-        }
-        else if (highlightScope === HighlightScope.row && cellPos.row === row) {
-            if (cellPos.col === col && cellPos.row === row) {
-                hoverMode = 'cellBgColor';
-            }
-            else {
-                hoverMode = 'inlineRowBgColor';
-            }
-        }
-        else if (highlightScope === HighlightScope.cross) {
-            if (cellPos.col === col && cellPos.row === row) {
-                hoverMode = 'cellBgColor';
-            }
-            else if (cellPos.col === col) {
-                hoverMode = 'inlineColumnBgColor';
-            }
-            else if (cellPos.row === row) {
-                hoverMode = 'inlineRowBgColor';
-            }
-        }
-        if (hoverMode) {
-            let cellDisable;
-            if (isHeader) {
-                const define = table.getHeaderDefine(col, row);
-                cellDisable = define?.disableHeaderHover;
-                if (cellGroup.firstChild && cellGroup.firstChild.name === 'axis' && table.options.hover?.disableAxisHover) {
-                    cellDisable = true;
-                }
-            }
-            else {
-                const define = table.getBodyColumnDefine(col, row);
-                cellDisable = define?.disableHover;
-            }
-            if (cellDisable) {
-                hoverMode = undefined;
-            }
-        }
-        return hoverMode;
-    }
-
     function getCellSelectColor(cellGroup, table) {
         let colorKey;
         if (cellGroup.role === 'cell' &&
@@ -48486,26 +48583,59 @@
     AdjustColorGroupAfterRenderContribution = __decorate([
         injectable()
     ], AdjustColorGroupAfterRenderContribution);
+    let AdjustInfoGroupBeforeRenderContribution = class AdjustInfoGroupBeforeRenderContribution {
+        time = BaseRenderContributionTime.beforeFillStroke;
+        useStyle = true;
+        order = 0;
+        drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
+            if (group.__customInfoBefore) {
+                const table = group.stage.table;
+                if (table && table.stateManager.interactionState !== InteractionState.scrolling) {
+                    group.__customInfoBefore({
+                        group,
+                        context,
+                        x,
+                        y,
+                        doFill,
+                        doStroke,
+                        fVisible,
+                        sVisible,
+                        groupAttribute,
+                        drawContext,
+                        fillCb,
+                        strokeCb,
+                        doFillOrStroke
+                    });
+                }
+            }
+        }
+    };
+    AdjustInfoGroupBeforeRenderContribution = __decorate([
+        injectable()
+    ], AdjustInfoGroupBeforeRenderContribution);
     let AdjustInfoGroupAfterRenderContribution = class AdjustInfoGroupAfterRenderContribution {
         time = BaseRenderContributionTime.afterFillStroke;
         useStyle = true;
         order = 0;
         drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
             if (group.__customInfo) {
-                group.__customInfo({
-                    group,
-                    context,
-                    x,
-                    y,
-                    doFill,
-                    doStroke,
-                    fVisible,
-                    sVisible,
-                    groupAttribute,
-                    drawContext,
-                    fillCb,
-                    strokeCb,
-                });
+                const table = group.stage.table;
+                if (table && table.stateManager.interactionState !== InteractionState.scrolling) {
+                    group.__customInfo({
+                        group,
+                        context,
+                        x,
+                        y,
+                        doFill,
+                        doStroke,
+                        fVisible,
+                        sVisible,
+                        groupAttribute,
+                        drawContext,
+                        fillCb,
+                        strokeCb
+                    });
+                }
             }
         }
     };
@@ -49076,6 +49206,8 @@
         bind(GroupRenderContribution).toService(AdjustColorGroupBeforeRenderContribution);
         bind(AdjustColorGroupAfterRenderContribution).toSelf().inSingletonScope();
         bind(GroupRenderContribution).toService(AdjustColorGroupAfterRenderContribution);
+        bind(AdjustInfoGroupBeforeRenderContribution).toSelf().inSingletonScope();
+        bind(GroupRenderContribution).toService(AdjustInfoGroupBeforeRenderContribution);
         bind(AdjustInfoGroupAfterRenderContribution).toSelf().inSingletonScope();
         bind(GroupRenderContribution).toService(AdjustInfoGroupAfterRenderContribution);
         bind(SplitGroupAfterRenderContribution).toSelf().inSingletonScope();
@@ -49765,9 +49897,9 @@
             }
             const type = isVtableMerge || isCustomMerge
                 ? 'text'
-                : ((table.isHeader(col, row)
-                    ? (table._getHeaderLayoutMap(col, row).headerType ?? 'text')
-                    : table.getBodyColumnType(col, row)) ?? 'text');
+                : (table.isHeader(col, row)
+                    ? table._getHeaderLayoutMap(col, row).headerType ?? 'text'
+                    : table.getBodyColumnType(col, row)) ?? 'text';
             if (isPromise(value)) {
                 createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);
                 dealPromiseData(value, table, callCreateCellForPromiseValue.bind(null, {
@@ -51755,8 +51887,8 @@
         selectComp.rect.setAttributes({
             x: firstCellBound.x1 - scene.tableGroup.attribute.x,
             y: firstCellBound.y1 - scene.tableGroup.attribute.y,
-            width: colsWidth,
-            height: rowsHeight,
+            width: colsWidth - 1,
+            height: rowsHeight - 1,
             visible: true
         });
         if (selectComp.fillhandle) {
@@ -52423,6 +52555,7 @@
             const pos = _getUpdateRowIndex(beforeRow, afterRow, scene);
             rowUpdatePos = isValid$3(rowUpdatePos) ? (isValid$3(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos) : pos;
         }
+        const batchMergePos = new Set();
         for (let col = 0; col < table.colCount; col++) {
             updateRows.forEach(row => {
                 if (row < table.frozenRowCount) {
@@ -52430,7 +52563,11 @@
                     if (mergeInfo) {
                         for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) {
                             for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) {
-                                updateCell$1(col, row, scene.table, false);
+                                const key = `${col}-${row}`;
+                                if (!batchMergePos.has(key)) {
+                                    updateCell$1(col, row, scene.table, false);
+                                    batchMergePos.add(key);
+                                }
                             }
                         }
                     }
@@ -52448,7 +52585,11 @@
                     if (mergeInfo) {
                         for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) {
                             for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) {
-                                updateCell$1(col, row, scene.table, false);
+                                const key = `${col}-${row}`;
+                                if (!batchMergePos.has(key)) {
+                                    updateCell$1(col, row, scene.table, false);
+                                    batchMergePos.add(key);
+                                }
                             }
                         }
                     }
@@ -53045,6 +53186,8 @@
         else if (scene.table.options.frozenColCount) {
             scene.component.setRightFrozenColumnShadow(scene.table.colCount - scene.table.rightFrozenColCount);
         }
+        scene.component.setBottonFrozenColumnShadow();
+        scene.component.setTopFrozenColumnShadow();
         scene.hasFrozen = true;
         scene.frozenColCount = scene.table.frozenColCount;
         scene.frozenRowCount =
@@ -53095,6 +53238,8 @@
         else if (scene.table.options.rightFrozenColCount) {
             scene.component.setRightFrozenColumnShadow(scene.table.colCount - scene.table.rightFrozenColCount);
         }
+        scene.component.setBottonFrozenColumnShadow();
+        scene.component.setTopFrozenColumnShadow();
         scene.hasFrozen = true;
     }
     function moveColumnFromBodyToRowHeader(scene) {
@@ -54198,13 +54343,18 @@
             colWidthsMap.addAndReorder(col);
         });
         resetColNumberAndX(scene);
+        const batchMergePos = new Set();
         updateCols.forEach(col => {
             for (let row = 0; row < table.rowCount; row++) {
                 const mergeInfo = getCellMergeInfo(scene.table, col, row);
                 if (mergeInfo) {
                     for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) {
                         for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) {
-                            updateCell$1(col, row, scene.table, false);
+                            const key = `${col}-${row}`;
+                            if (!batchMergePos.has(key)) {
+                                updateCell$1(col, row, scene.table, false);
+                                batchMergePos.add(key);
+                            }
                         }
                     }
                 }
@@ -55504,6 +55654,8 @@
             if (!this.isPivot && !this.table.transpose) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
                 this.component.setRightFrozenColumnShadow(this.table.colCount - this.table.rightFrozenColCount);
+                this.component.setBottonFrozenColumnShadow();
+                this.component.setTopFrozenColumnShadow();
             }
             else if (this.table.options.frozenColCount) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
@@ -56018,6 +56170,8 @@
             if (!this.isPivot && !this.table.transpose) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
                 this.component.setRightFrozenColumnShadow(this.table.colCount - this.table.rightFrozenColCount);
+                this.component.setBottonFrozenColumnShadow();
+                this.component.setTopFrozenColumnShadow();
             }
             else if (this.table.options.frozenColCount) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
@@ -56036,6 +56190,8 @@
             if (!this.isPivot && !this.table.transpose) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
                 this.component.setRightFrozenColumnShadow(this.table.colCount - this.table.rightFrozenColCount);
+                this.component.setBottonFrozenColumnShadow();
+                this.component.setTopFrozenColumnShadow();
             }
             else if (this.table.options.frozenColCount) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
@@ -56234,6 +56390,8 @@
         if (prevHoverCellCol === col && prevHoverCellRow === row) {
             return;
         }
+        cellPos.col = col;
+        cellPos.row = row;
         if (!state.table.options.customConfig?.disableBuildInChartActive) {
             scenegraph.deactivateChart(prevHoverCellCol, prevHoverCellRow);
             scenegraph.activateChart(col, row);
@@ -56274,8 +56432,6 @@
         if (highlightScope !== HighlightScope.none && !disableHeader) {
             scenegraph.showHoverIcon(col, row);
         }
-        cellPos.col = col;
-        cellPos.row = row;
         if (updateScenegraph) {
             state.table.scenegraph.updateNextFrame();
         }
@@ -57023,6 +57179,12 @@
         state.columnMove.moving = true;
         state.columnMove.colSource = col;
         state.columnMove.rowSource = row;
+        if (state.table.isListTable()) {
+            const nodeIndex = state.table.getRecordIndexByCell(col, row);
+            const nodeData = state.table.getRecordByCell(col, row);
+            const hierarchyState = state.table.getRecordHierarchyState(col, row);
+            state.columnMove.rowSourceSize = computeChildrenNodeLength(nodeIndex, hierarchyState, nodeData) + 1;
+        }
         state.columnMove.x = x - state.table.tableX;
         state.columnMove.y = y - state.table.tableY;
         const cellLocation = state.table.getCellLocation(col, row);
@@ -57065,6 +57227,12 @@
             state.columnMove.y = y - state.table.tableY;
             state.columnMove.colTarget = targetCell.col;
             state.columnMove.rowTarget = targetCell.row;
+            if (state.table.isListTable()) {
+                const nodeIndex = state.table.getRecordIndexByCell(targetCell.col, targetCell.row);
+                const nodeData = state.table.getRecordByCell(targetCell.col, targetCell.row);
+                const hierarchyState = state.table.getRecordHierarchyState(targetCell.col, targetCell.row);
+                state.columnMove.rowTargetSize = computeChildrenNodeLength(nodeIndex, hierarchyState, nodeData) + 1;
+            }
             state.updateCursor('grabbing');
             let lineX;
             let backX;
@@ -57238,6 +57406,8 @@
         else if (state.table.options.rightFrozenColCount) {
             state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);
         }
+        state.table.scenegraph.component.setBottonFrozenColumnShadow();
+        state.table.scenegraph.component.setTopFrozenColumnShadow();
         state.table.scenegraph.updateNextFrame();
         if (state.table.options.customConfig?.notUpdateInColumnRowMove === true) {
             return true;
@@ -57377,6 +57547,8 @@
         else if (state.table.options.rightFrozenColCount) {
             state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);
         }
+        state.table.scenegraph.component.setBottonFrozenColumnShadow();
+        state.table.scenegraph.component.setTopFrozenColumnShadow();
         state.table.scenegraph.updateNextFrame();
     }
     function updateResizeColForColumn(detaX, state) {
@@ -58188,6 +58360,8 @@
                 colTarget: -1,
                 rowSource: -1,
                 rowTarget: -1,
+                rowSourceSize: 0,
+                rowTargetSize: 0,
                 x: 0,
                 y: 0,
                 moving: false
@@ -58268,6 +58442,8 @@
                 colTarget: -1,
                 rowSource: -1,
                 rowTarget: -1,
+                rowSourceSize: 0,
+                rowTargetSize: 0,
                 x: 0,
                 y: 0,
                 moving: false
@@ -59697,11 +59873,14 @@
             table.stateManager.columnMove?.colTarget !== -1 &&
             table.stateManager.columnMove?.rowTarget !== -1) {
             if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION)) {
+                const { colSource, rowSource, colTarget, rowTarget } = table.stateManager.columnMove;
+                const rowSourceSize = table.stateManager.columnMove.rowSourceSize ?? 0;
+                const rowTargetSize = table.stateManager.columnMove.rowTargetSize ?? 0;
                 table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION, {
-                    target: { col: table.stateManager.columnMove.colTarget, row: table.stateManager.columnMove.rowTarget },
+                    target: { col: colTarget, row: rowTarget + rowTargetSize - rowSourceSize },
                     source: {
-                        col: table.stateManager.columnMove.colSource,
-                        row: table.stateManager.columnMove.rowSource
+                        col: colSource,
+                        row: rowSource
                     },
                     event: e
                 });
@@ -59709,8 +59888,13 @@
         }
         else if (!endMoveColSuccess) {
             if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL)) {
+                const rowSourceSize = table.stateManager.columnMove.rowSourceSize ?? 0;
+                const rowTargetSize = table.stateManager.columnMove.rowTargetSize ?? 0;
                 table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL, {
-                    target: { col: table.stateManager.columnMove.colTarget, row: table.stateManager.columnMove.rowTarget },
+                    target: {
+                        col: table.stateManager.columnMove.colTarget,
+                        row: table.stateManager.columnMove.rowTarget + rowTargetSize - rowSourceSize
+                    },
                     source: {
                         col: table.stateManager.columnMove.colSource,
                         row: table.stateManager.columnMove.rowSource
@@ -67047,7 +67231,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.0.7";
+        version = "1.0.9";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -74825,6 +75009,16 @@
             const index = this.getRecordShowIndexByCell(col, row);
             return this.dataSource.getHierarchyState(index);
         }
+        getRecordHierarchyState(col, row) {
+            let recordIndex;
+            if (this.transpose) {
+                this.getRecordShowIndexByCell(col, 0);
+            }
+            else {
+                recordIndex = this.getRecordShowIndexByCell(0, row);
+            }
+            return this.dataSource.getHierarchyState(recordIndex);
+        }
         toggleHierarchyState(col, row, recalculateColWidths = true) {
             this.stateManager.updateHoverIcon(col, row, undefined, undefined);
             const hierarchyState = this.getHierarchyState(col, row);
@@ -87029,7 +87223,7 @@
                     const newCellAggregator = new SumAggregator({
                         key: indicator,
                         field: indicator,
-                        isRecord: true,
+                        isRecord: true
                     });
                     newCellAggregator.changedValue = newValue;
                     this.recalculateTotals(rowKey, colKey, indicator, newCellAggregator);
@@ -87102,6 +87296,25 @@
             if (this.totals?.row?.showGrandTotals) {
                 if (this.tree[this.rowGrandTotalLabel]?.[flatColKey]?.[indicatorIndex]) {
                     addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][flatColKey][indicatorIndex], this.rowGrandTotalLabel, flatColKey);
+                    if (this.totals?.column?.subTotalsDimensions && this.totals.column.showSubTotals !== false) {
+                        for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
+                            const colDimension = this.totals.column.subTotalsDimensions[j];
+                            const colDimensionIndex = this.columns.indexOf(colDimension);
+                            if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
+                                const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
+                                colSubTotalKeyParts.push(this.colSubTotalLabel);
+                                const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
+                                if (this.tree[this.rowGrandTotalLabel]?.[flatColSubTotalKey]?.[indicatorIndex]) {
+                                    addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][flatColSubTotalKey][indicatorIndex], this.rowGrandTotalLabel, flatColSubTotalKey);
+                                }
+                            }
+                        }
+                    }
+                    if (this.totals?.column?.showGrandTotals) {
+                        if (this.tree[this.rowGrandTotalLabel]?.[this.colGrandTotalLabel]?.[indicatorIndex]) {
+                            addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][this.colGrandTotalLabel][indicatorIndex], this.rowGrandTotalLabel, this.colGrandTotalLabel);
+                        }
+                    }
                 }
                 if (this.totals?.column?.subTotalsDimensions && this.totals.column.showSubTotals !== false) {
                     for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
@@ -87111,43 +87324,24 @@
                             const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
                             colSubTotalKeyParts.push(this.colSubTotalLabel);
                             const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
-                            if (this.tree[this.rowGrandTotalLabel]?.[flatColSubTotalKey]?.[indicatorIndex]) {
-                                addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][flatColSubTotalKey][indicatorIndex], this.rowGrandTotalLabel, flatColSubTotalKey);
+                            if (this.tree[flatRowKey]?.[flatColSubTotalKey]?.[indicatorIndex]) {
+                                addAggregatorToResetSet(this.tree[flatRowKey][flatColSubTotalKey][indicatorIndex], flatRowKey, flatColSubTotalKey);
                             }
                         }
                     }
                 }
                 if (this.totals?.column?.showGrandTotals) {
-                    if (this.tree[this.rowGrandTotalLabel]?.[this.colGrandTotalLabel]?.[indicatorIndex]) {
-                        addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][this.colGrandTotalLabel][indicatorIndex], this.rowGrandTotalLabel, this.colGrandTotalLabel);
+                    if (this.tree[flatRowKey]?.[this.colGrandTotalLabel]?.[indicatorIndex]) {
+                        addAggregatorToResetSet(this.tree[flatRowKey][this.colGrandTotalLabel][indicatorIndex], flatRowKey, this.colGrandTotalLabel);
                     }
                 }
-            }
-            if (this.totals?.column?.subTotalsDimensions && this.totals.column.showSubTotals !== false) {
-                for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
-                    const colDimension = this.totals.column.subTotalsDimensions[j];
-                    const colDimensionIndex = this.columns.indexOf(colDimension);
-                    if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
-                        const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
-                        colSubTotalKeyParts.push(this.colSubTotalLabel);
-                        const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
-                        if (this.tree[flatRowKey]?.[flatColSubTotalKey]?.[indicatorIndex]) {
-                            addAggregatorToResetSet(this.tree[flatRowKey][flatColSubTotalKey][indicatorIndex], flatRowKey, flatColSubTotalKey);
-                        }
+                aggregatorsToReset.forEach(agg => {
+                    if (newCellAggregator && subTotalAggregators.has(agg)) {
+                        agg.push(newCellAggregator);
                     }
-                }
-            }
-            if (this.totals?.column?.showGrandTotals) {
-                if (this.tree[flatRowKey]?.[this.colGrandTotalLabel]?.[indicatorIndex]) {
-                    addAggregatorToResetSet(this.tree[flatRowKey][this.colGrandTotalLabel][indicatorIndex], flatRowKey, this.colGrandTotalLabel);
-                }
+                    agg.recalculate();
+                });
             }
-            aggregatorsToReset.forEach(agg => {
-                if (newCellAggregator && subTotalAggregators.has(agg)) {
-                    agg.push(newCellAggregator);
-                }
-                agg.recalculate();
-            });
         }
         changeRecordFieldValue(fieldName, oldValue, value) {
             let isIndicatorName = false;
@@ -90720,7 +90914,7 @@
     }
 
     registerForVrender();
-    const version = "1.0.7";
+    const version = "1.0.9";
     function getIcons() {
         return get$2();
     }