@visactor/vtable 0.14.1 → 0.14.2-alpha.1

package/dist/vtable.js

@@ -52055,8 +52055,8 @@
         let textAlign;
         let textBaseline;
         let y = 0;
-        if (columnGroup.colHeight) {
-            y = columnGroup.colHeight;
+        if (columnGroup.lastChild) {
+            y = columnGroup.lastChild.attribute.y + columnGroup.lastChild.attribute.height;
         }
         for (let j = rowStart; j <= rowEnd; j++) {
             const row = j;
@@ -53376,10 +53376,10 @@
             };
             if (customLayout) {
                 const customLayoutObj = customLayout(arg);
-                if (customLayoutObj.rootContainer) {
-                    customLayoutObj.rootContainer = decodeReactDom(customLayoutObj.rootContainer);
-                }
                 if (customLayoutObj.rootContainer instanceof Group$3) {
+                    customLayoutObj.rootContainer = decodeReactDom(customLayoutObj.rootContainer);
+                    dealPercentCalc(customLayoutObj.rootContainer, table.getColWidth(col), 0);
+                    customLayoutObj.rootContainer.setStage(table.scenegraph.stage);
                     height = customLayoutObj.rootContainer.AABBBounds.height() ?? 0;
                 }
                 else {
@@ -53918,6 +53918,13 @@
                         });
                     });
                     const changed = updateCellContentWidth(singleCellGroup, distWidth, cellHeight, detaX, autoRowHeight, padding, textAlign, textBaseline, table.scenegraph);
+                    const hierarchyOffset = getHierarchyOffset(singleCellGroup.col, singleCellGroup.row, table);
+                    if (hierarchyOffset) {
+                        const text = singleCellGroup.getChildByName('text');
+                        if (text) {
+                            text.setAttribute('dx', hierarchyOffset);
+                        }
+                    }
                     const rangeHeight = table.getRowHeight(row);
                     const rangeWidth = table.getColWidth(col);
                     singleCellGroup.contentWidth = distWidth;
@@ -55957,10 +55964,10 @@
             };
             if (customLayout) {
                 const customLayoutObj = customLayout(arg);
-                if (customLayoutObj.rootContainer) {
-                    customLayoutObj.rootContainer = decodeReactDom(customLayoutObj.rootContainer);
-                }
                 if (customLayoutObj.rootContainer instanceof Group$3) {
+                    customLayoutObj.rootContainer = decodeReactDom(customLayoutObj.rootContainer);
+                    dealPercentCalc(customLayoutObj.rootContainer, 0, table.getRowHeight(row));
+                    customLayoutObj.rootContainer.setStage(table.scenegraph.stage);
                     width = customLayoutObj.rootContainer.AABBBounds.width() ?? 0;
                 }
                 else {
@@ -56496,7 +56503,9 @@
             proxy.rowEnd = direction === 'up' ? proxy.rowEnd + count : proxy.rowEnd - count;
             updateRowContent(syncTopRow, syncBottomRow, proxy);
             if (proxy.table.heightMode === 'autoHeight') {
-                updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, direction);
+                updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
+                updateAutoRow(0, proxy.table.frozenColCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
+                updateAutoRow(proxy.table.colCount - proxy.table.rightFrozenColCount, proxy.table.colCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
                 const cellGroup = proxy.table.scenegraph.highPerformanceGetCell(proxy.bodyLeftCol, screenTopRow, true);
                 const delaY = screenTopY - (cellGroup.attribute.y + proxy.table.getFrozenRowsHeight() + proxy.table.scenegraph.proxy.deltaY);
                 proxy.table.scenegraph.proxy.deltaY += delaY;
@@ -56532,6 +56541,8 @@
             updateRowContent(syncTopRow, syncBottomRow, proxy);
             if (proxy.table.heightMode === 'autoHeight') {
                 updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
+                updateAutoRow(0, proxy.table.frozenColCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
+                updateAutoRow(proxy.table.colCount - proxy.table.rightFrozenColCount, proxy.table.colCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
             }
             proxy.table.scenegraph.proxy.deltaY = 0;
             proxy.currentRow = direction === 'up' ? proxy.currentRow + count : proxy.currentRow - count;
@@ -56982,6 +56993,8 @@
             updateRowContent(this.rowUpdatePos, distRow, this);
             if (this.table.heightMode === 'autoHeight') {
                 updateAutoRow(this.bodyLeftCol, this.bodyRightCol, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection);
+                updateAutoRow(0, this.table.frozenColCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection);
+                updateAutoRow(this.table.colCount - this.table.rightFrozenColCount, this.table.colCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection);
             }
             this.rowUpdatePos = distRow + 1;
         }
@@ -57210,7 +57223,7 @@
         const cellRange = scene.table.getCellRange(startCol, startRow);
         const colsWidth = scene.table.getColsWidth(cellRange.start.col, endCol);
         const rowsHeight = scene.table.getRowsHeight(cellRange.start.row, endRow);
-        const firstCellBound = scene.highPerformanceGetCell(startCol, startRow).globalAABBBounds;
+        const firstCellBound = scene.highPerformanceGetCell(cellRange.start.col, cellRange.start.row).globalAABBBounds;
         selectComp.rect.setAttributes({
             x: firstCellBound.x1 - scene.tableGroup.attribute.x,
             y: firstCellBound.y1 - scene.tableGroup.attribute.y,
@@ -57218,9 +57231,9 @@
             height: rowsHeight,
             visible: true
         });
-        const isNearRowHeader = startCol === scene.table.frozenColCount;
+        const isNearRowHeader = cellRange.start.col === scene.table.frozenColCount;
         const isNearRightRowHeader = endCol === scene.table.colCount - scene.table.rightFrozenColCount - 1;
-        const isNearColHeader = startRow === scene.table.frozenRowCount;
+        const isNearColHeader = cellRange.start.row === scene.table.frozenRowCount;
         const isNearBottomColHeader = endRow === scene.table.rowCount - scene.table.bottomFrozenRowCount - 1;
         if ((isNearRowHeader && selectComp.rect.attribute.stroke[3]) ||
             (isNearRightRowHeader && selectComp.rect.attribute.stroke[1]) ||
@@ -57565,17 +57578,26 @@
 
     function updateRow(removeCells, addCells, updateCells, table) {
         const scene = table.scenegraph;
-        const removeRows = deduplication(removeCells.map(cell => cell.row)).sort((a, b) => a - b);
+        const removeRows = deduplication(removeCells.map(cell => cell.row)).sort((a, b) => b - a);
         const addRows = deduplication(addCells.map(cell => cell.row)).sort((a, b) => a - b);
         removeRows.forEach(row => {
             removeRow(row, scene);
         });
+        removeRows.forEach(row => {
+            scene.table.rowHeightsMap.adjustOrder(row + 1, row, scene.table.rowHeightsMap.count() - row - 1);
+            scene.table.rowHeightsMap.del(scene.table.rowHeightsMap.count() - 1);
+        });
         if (removeRows.length) {
             resetRowNumber(scene);
         }
+        scene.table._clearRowRangeHeightsMap();
+        let updateAfter;
         addRows.forEach(row => {
-            addRow(row, scene);
+            const needUpdateAfter = addRow(row, scene);
+            updateAfter = updateAfter || needUpdateAfter;
+            scene.table.rowHeightsMap.adjustOrder(row, row + 1, scene.table.rowHeightsMap.count() - row);
         });
+        const newTotalHeight = resetRowNumberAndY(scene);
         updateCells.forEach(cell => {
             if (!cell) {
                 return;
@@ -57592,13 +57614,28 @@
                 updateCell$1(cell.col, cell.row, scene.table, false);
             }
         });
-        const newTotalHeight = resetRowNumberAndY(scene);
+        if (isNumber$7(updateAfter)) {
+            for (let col = 0; col < table.colCount; col++) {
+                for (let row = updateAfter; row < table.rowCount; row++) {
+                    const cellGroup = scene.highPerformanceGetCell(col, row, true);
+                    cellGroup.needUpdate = true;
+                }
+            }
+            scene.proxy.rowUpdatePos = updateAfter;
+        }
         if (addRows.length) {
-            scene.proxy.rowUpdatePos = scene.proxy.rowStart;
+            if (!isNumber$7(updateAfter)) {
+                const minRow = Math.min(...addRows);
+                scene.proxy.rowUpdatePos = minRow;
+            }
             scene.proxy.rowUpdateDirection = 'up';
             scene.proxy.updateCellGroups(scene.proxy.screenRowCount * 2);
             scene.proxy.progress();
         }
+        else if (removeRows.length) {
+            scene.proxy.updateCellGroups(scene.proxy.screenRowCount * 2);
+            scene.proxy.progress();
+        }
         scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
     }
     function removeRow(row, scene) {
@@ -57616,55 +57653,43 @@
                 return false;
             });
             if (cellGroup) {
+                colGroup.updateColumnHeight(-cellGroup.attribute.height);
                 colGroup.removeChild(cellGroup);
             }
         }
-        scene.proxy.rowEnd--;
+        if (row <= scene.proxy.rowEnd) {
+            scene.proxy.rowEnd--;
+            scene.proxy.currentRow--;
+        }
         scene.proxy.bodyBottomRow--;
-        scene.proxy.currentRow--;
-        scene.proxy.totalRow--;
+        const totalActualBodyRowCount = Math.min(scene.proxy.rowLimit, scene.proxy.bodyBottomRow - scene.proxy.bodyTopRow + 1);
+        scene.proxy.totalActualBodyRowCount = totalActualBodyRowCount;
+        scene.proxy.totalRow = scene.proxy.bodyTopRow + totalActualBodyRowCount - 1;
     }
     function addRow(row, scene) {
-        for (let col = 0; col < scene.table.colCount; col++) {
-            const cellGroup = new Group$1({
-                x: 0,
-                y: 0,
-                width: scene.table.getColWidth(col),
-                height: scene.table.getRowHeight(row)
-            });
-            cellGroup.role = 'cell';
-            cellGroup.col = col;
-            cellGroup.row = row;
-            cellGroup.needUpdate = true;
-            if (!cellGroup) {
-                continue;
-            }
-            const colGroup = scene.getColGroup(col);
-            if (!colGroup) {
-                continue;
-            }
-            if (colGroup.firstChild && row < colGroup.firstChild.row) {
-                colGroup.insertBefore(cellGroup, colGroup.firstChild);
-                colGroup.firstChild.row = colGroup.firstChild.row + 1;
-            }
-            else if (colGroup.lastChild && row > colGroup.lastChild.row) {
-                colGroup.appendChild(cellGroup);
-            }
-            else {
-                const cellBefore = scene.highPerformanceGetCell(col, row, true);
-                if (cellBefore !== cellGroup) {
-                    colGroup.insertBefore(cellGroup, cellBefore);
-                    cellBefore && (cellBefore.row = cellBefore.row + 1);
-                    if (cellBefore !== colGroup.lastChild) {
-                        colGroup.lastChild && (colGroup.lastChild.row = colGroup.lastChild.row + 1);
-                    }
-                }
-            }
-        }
-        scene.proxy.rowEnd++;
+        const proxy = scene.proxy;
         scene.proxy.bodyBottomRow++;
-        scene.proxy.currentRow++;
         scene.proxy.totalRow++;
+        if (row < proxy.rowStart) {
+            return undefined;
+        }
+        else if (row > proxy.rowEnd) {
+            if (proxy.rowEnd - proxy.rowStart < scene.proxy.rowLimit) {
+                scene.proxy.rowEnd++;
+                scene.proxy.currentRow++;
+                addRowCellGroup(row, scene);
+            }
+            return undefined;
+        }
+        if (proxy.rowEnd - proxy.rowStart < scene.proxy.rowLimit) {
+            scene.proxy.rowEnd++;
+            scene.proxy.currentRow++;
+            addRowCellGroup(row, scene);
+        }
+        else {
+            return row;
+        }
+        return undefined;
     }
     function deduplication(array) {
         const result = [];
@@ -57684,11 +57709,25 @@
             }
             let rowIndex = headerColGroup.firstChild?.row;
             headerColGroup.forEachChildren((cellGroup) => {
+                const oldRow = cellGroup.row;
+                if (isNumber$7(cellGroup.mergeStartRow)) {
+                    cellGroup.mergeStartRow = cellGroup.mergeStartRow - oldRow + rowIndex;
+                }
+                if (isNumber$7(cellGroup.mergeEndRow)) {
+                    cellGroup.mergeEndRow = cellGroup.mergeEndRow - oldRow + rowIndex;
+                }
                 cellGroup.row = rowIndex;
                 rowIndex++;
             });
             rowIndex = colGroup.firstChild?.row;
             colGroup.forEachChildren((cellGroup) => {
+                const oldRow = cellGroup.row;
+                if (isNumber$7(cellGroup.mergeStartRow)) {
+                    cellGroup.mergeStartRow = cellGroup.mergeStartRow - oldRow + rowIndex;
+                }
+                if (isNumber$7(cellGroup.mergeEndRow)) {
+                    cellGroup.mergeEndRow = cellGroup.mergeEndRow - oldRow + rowIndex;
+                }
                 cellGroup.row = rowIndex;
                 rowIndex++;
             });
@@ -57706,8 +57745,15 @@
             let rowIndex = headerColGroup.firstChild?.row;
             let y = 0;
             rowIndex = colGroup.firstChild?.row;
-            y = 0;
+            y = scene.getCellGroupY(rowIndex);
             colGroup.forEachChildren((cellGroup) => {
+                const oldRow = cellGroup.row;
+                if (isNumber$7(cellGroup.mergeStartRow)) {
+                    cellGroup.mergeStartRow = cellGroup.mergeStartRow - oldRow + rowIndex;
+                }
+                if (isNumber$7(cellGroup.mergeEndRow)) {
+                    cellGroup.mergeEndRow = cellGroup.mergeEndRow - oldRow + rowIndex;
+                }
                 cellGroup.row = rowIndex;
                 rowIndex++;
                 if (cellGroup.role !== 'cell') {
@@ -57720,6 +57766,58 @@
         }
         return newTotalHeight;
     }
+    function addRowCellGroup(row, scene) {
+        for (let col = 0; col < scene.table.colCount; col++) {
+            const cellGroup = new Group$1({
+                x: 0,
+                y: 0,
+                width: scene.table.getColWidth(col),
+                height: scene.table.getRowHeight(row)
+            });
+            cellGroup.role = 'cell';
+            cellGroup.col = col;
+            cellGroup.row = row;
+            cellGroup.needUpdate = true;
+            if (!cellGroup) {
+                continue;
+            }
+            const colGroup = scene.getColGroup(col);
+            if (!colGroup) {
+                continue;
+            }
+            if (colGroup.firstChild && row < colGroup.firstChild.row) {
+                colGroup.insertBefore(cellGroup, colGroup.firstChild);
+                colGroup.firstChild.row = colGroup.firstChild.row + 1;
+                if (isNumber$7(colGroup.firstChild.mergeStartRow) &&
+                    isNumber$7(colGroup.firstChild.mergeEndRow)) {
+                    colGroup.firstChild.mergeStartRow = colGroup.firstChild.mergeStartRow + 1;
+                    colGroup.firstChild.mergeEndRow = colGroup.firstChild.mergeEndRow + 1;
+                }
+            }
+            else if (colGroup.lastChild && row > colGroup.lastChild.row) {
+                colGroup.appendChild(cellGroup);
+            }
+            else {
+                const cellBefore = scene.highPerformanceGetCell(col, row, true);
+                if (cellBefore !== cellGroup) {
+                    colGroup.insertBefore(cellGroup, cellBefore);
+                    cellBefore && (cellBefore.row = cellBefore.row + 1);
+                    if (isNumber$7(cellBefore.mergeStartRow) && isNumber$7(cellBefore.mergeEndRow)) {
+                        cellBefore.mergeStartRow = cellBefore.mergeStartRow + 1;
+                        cellBefore.mergeEndRow = cellBefore.mergeEndRow + 1;
+                    }
+                    if (cellBefore !== colGroup.lastChild) {
+                        colGroup.lastChild && (colGroup.lastChild.row = colGroup.lastChild.row + 1);
+                        if (isNumber$7(colGroup.lastChild.mergeStartRow) &&
+                            isNumber$7(colGroup.lastChild.mergeEndRow)) {
+                            colGroup.lastChild.mergeStartRow = colGroup.lastChild.mergeStartRow + 1;
+                            colGroup.lastChild.mergeEndRow = colGroup.lastChild.mergeEndRow + 1;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     function handleTextStick(table) {
         const { changedCells } = table.internalProps.stick;
@@ -59799,6 +59897,7 @@
             if (!this.isPivot && !this.transpose) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
             }
+            this.component.updateScrollBar();
             this.updateNextFrame();
         }
         getColumnGroupX(col) {
@@ -60166,15 +60265,17 @@
                     scenegraph.deleteAllSelectBorder();
                 }
                 if (state.select.headerSelectMode !== 'cell' && table.isColumnHeader(col, row)) {
+                    const cellRange = table.getCellRange(col, row);
                     state.select.ranges.push({
-                        start: { col, row },
-                        end: { col, row: table.rowCount - 1 }
+                        start: { col: cellRange.start.col, row },
+                        end: { col: cellRange.end.col, row: table.rowCount - 1 }
                     });
                 }
                 else if (state.select.headerSelectMode !== 'cell' && table.isRowHeader(col, row)) {
+                    const cellRange = table.getCellRange(col, row);
                     state.select.ranges.push({
-                        start: { col, row },
-                        end: { col: table.colCount - 1, row }
+                        start: { col, row: cellRange.start.row },
+                        end: { col: table.colCount - 1, row: cellRange.end.row }
                     });
                 }
                 else {
@@ -65666,7 +65767,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.14.1";
+        version = "0.14.2-alpha.1";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -75069,7 +75170,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.14.1";
+    const version = "0.14.2-alpha.1";
     function getIcons() {
         return get$1();
     }