@visactor/vtable 0.14.0 → 0.14.2-alpha.0

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 {
@@ -55957,10 +55957,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 +56496,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 +56534,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 +56986,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 +57216,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 +57224,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 +57571,24 @@
 
     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();
         addRows.forEach(row => {
             addRow(row, scene);
+            scene.table.rowHeightsMap.adjustOrder(row, row + 1, scene.table.rowHeightsMap.count() - row);
         });
+        const newTotalHeight = resetRowNumberAndY(scene);
         updateCells.forEach(cell => {
             if (!cell) {
                 return;
@@ -57592,13 +57605,17 @@
                 updateCell$1(cell.col, cell.row, scene.table, false);
             }
         });
-        const newTotalHeight = resetRowNumberAndY(scene);
         if (addRows.length) {
-            scene.proxy.rowUpdatePos = scene.proxy.rowStart;
+            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,13 +57633,18 @@
                 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++) {
@@ -57661,10 +57683,10 @@
                 }
             }
         }
-        scene.proxy.rowEnd++;
         scene.proxy.bodyBottomRow++;
-        scene.proxy.currentRow++;
         scene.proxy.totalRow++;
+        scene.proxy.rowEnd++;
+        scene.proxy.currentRow++;
     }
     function deduplication(array) {
         const result = [];
@@ -57684,11 +57706,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++;
             });
@@ -57708,6 +57744,13 @@
             rowIndex = colGroup.firstChild?.row;
             y = 0;
             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') {
@@ -59799,6 +59842,7 @@
             if (!this.isPivot && !this.transpose) {
                 this.component.setFrozenColumnShadow(this.table.frozenColCount - 1);
             }
+            this.component.updateScrollBar();
             this.updateNextFrame();
         }
         getColumnGroupX(col) {
@@ -61637,10 +61681,29 @@
     }
 
     let LastPointerXY;
+    let LastBodyPointerXY;
+    let isDown = false;
+    let isDraging = false;
     function bindTableGroupListener(eventManeger) {
         const table = eventManeger.table;
         const stateManeger = table.stateManeger;
+        document.body.addEventListener('pointerdown', e => {
+            LastBodyPointerXY = { x: e.x, y: e.y };
+            isDown = true;
+        });
+        document.addEventListener('pointerup', e => {
+            LastBodyPointerXY = null;
+            isDown = false;
+            isDraging = false;
+        });
         document.body.addEventListener('pointermove', (e) => {
+            if (isDown && LastBodyPointerXY) {
+                const lastX = LastBodyPointerXY?.x ?? e.x;
+                const lastY = LastBodyPointerXY?.y ?? e.y;
+                if (Math.abs(lastX - e.x) > 1 || Math.abs(lastY - e.y) > 1) {
+                    isDraging = true;
+                }
+            }
             const { x, y } = table._getMouseAbstractPoint(e, false);
             if (stateManeger.interactionState === InteractionState.scrolling) {
                 return;
@@ -61829,12 +61892,7 @@
                 if (table.stateManeger.select?.ranges?.length) {
                     const lastCol = table.stateManeger.select.ranges[table.stateManeger.select.ranges.length - 1].end.col;
                     const lastRow = table.stateManeger.select.ranges[table.stateManeger.select.ranges.length - 1].end.row;
-                    table.stateManeger.select.selecting = false;
-                    table.fireListeners(TABLE_EVENT_TYPE.SELECTED_CELL, {
-                        ranges: table.stateManeger.select.ranges,
-                        col: lastCol,
-                        row: lastRow
-                    });
+                    table.stateManeger.endSelectCells();
                     if (table.hasListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END)) {
                         const cellsEvent = {
                             event: e.nativeEvent,
@@ -62062,16 +62120,18 @@
         });
         table.scenegraph.stage.addEventListener('pointertap', (e) => {
             const target = e.target;
-            if (target &&
-                !target.isDescendantsOf(table.scenegraph.tableGroup) &&
-                target !== table.scenegraph.tableGroup &&
-                target !== table.scenegraph.stage) {
+            if (!isDraging &&
+                target &&
+                !target.isDescendantsOf(table.scenegraph.tableGroup)) {
                 stateManeger.updateInteractionState(InteractionState.default);
                 eventManeger.dealTableHover();
                 eventManeger.dealTableSelect();
                 stateManeger.updateCursor();
                 table.scenegraph.updateChartState(null);
             }
+            else if (isDraging) {
+                stateManeger.endSelectCells();
+            }
         });
         table.scenegraph.tableGroup.addEventListener('dblclick', (e) => {
             const eventArgsSet = getCellEventArgsSet(e);
@@ -65650,7 +65710,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.14.0";
+        version = "0.14.2-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -75053,7 +75113,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.14.0";
+    const version = "0.14.2-alpha.0";
     function getIcons() {
         return get$1();
     }