@visactor/vtable 0.17.3-alpha.0 → 0.17.3-alpha.2

package/dist/vtable.js

@@ -49120,6 +49120,8 @@
         colHeight;
         border;
         needUpdate;
+        needUpdateWidth;
+        needUpdateHeight;
         clear() {
             this.removeAllChild();
         }
@@ -50366,6 +50368,7 @@
         _autoWidth = false;
         _autoHeight = false;
         _cellWidth;
+        _originCellWidth;
         _cellHeight;
         _align;
         _baseline;
@@ -50397,6 +50400,7 @@
             this._autoWidth = option.autoWidth;
             this._autoHeight = option.autoHeight;
             this._cellWidth = option.cellWidth;
+            this._originCellWidth = option.cellWidth;
             this._cellHeight = option.cellHeight;
             this._align = option.align;
             this._baseline = option.baseline;
@@ -50518,10 +50522,12 @@
         }
         updateWidth(width) {
             this._cellWidth = width;
+            this._originCellWidth = width;
             this.layout();
         }
         updateHeight(height) {
             this._cellHeight = height;
+            this._cellWidth = this._originCellWidth;
             this.layout();
         }
     }
@@ -51774,6 +51780,8 @@
         if (row === range.end.row) {
             newLineWidth[2] = isLineWidthArray ? lineWidth[2] : lineWidth;
         }
+        const widthChange = rangeWidth !== cellGroup.attribute.width;
+        const heightChange = rangeHeight !== cellGroup.attribute.height;
         cellGroup.setAttributes({
             width: rangeWidth,
             height: rangeHeight,
@@ -51783,6 +51791,10 @@
         cellGroup.mergeStartRow = range.start.row;
         cellGroup.mergeEndCol = range.end.col;
         cellGroup.mergeEndRow = range.end.row;
+        return {
+            widthChange,
+            heightChange
+        };
     }
     function dealMerge(range, mergeMap, table) {
         let cellWidth = 0;
@@ -52781,7 +52793,7 @@
                 if (isAllRowsAuto || table.getDefaultRowHeight(row) === 'auto') {
                     const height = computeRowHeight(row, startCol, endCol, table);
                     if (update) {
-                        newHeights[row] = height;
+                        newHeights[row] = Math.round(height);
                     }
                     else {
                         table._setRowHeight(row, height);
@@ -52792,7 +52804,7 @@
                 if (isAllRowsAuto || table.getDefaultRowHeight(row) === 'auto') {
                     const height = computeRowHeight(row, 0, table.colCount - 1, table);
                     if (update) {
-                        newHeights[row] = height;
+                        newHeights[row] = Math.round(height);
                     }
                     else {
                         table._setRowHeight(row, height);
@@ -52809,7 +52821,7 @@
                     for (let row = table.rowCount - table.bottomFrozenRowCount; row <= rowEnd; row++) {
                         const height = computeRowHeight(row, 0, table.colCount - 1, table);
                         if (update) {
-                            newHeights[row] = height;
+                            newHeights[row] = Math.round(height);
                         }
                         else {
                             table._setRowHeight(row, height);
@@ -52827,7 +52839,7 @@
                             height = computeRowHeight(row, 0, table.colCount - 1, table);
                         }
                         if (update) {
-                            newHeights[row] = height;
+                            newHeights[row] = Math.round(height);
                         }
                         else {
                             table._setRowHeight(row, height);
@@ -52838,7 +52850,7 @@
                     for (let row = Math.max(rowStart, table.columnHeaderLevelCount); row <= rowEnd; row++) {
                         const height = computeRowHeight(row, 0, table.colCount - 1, table);
                         if (update) {
-                            newHeights[row] = height;
+                            newHeights[row] = Math.round(height);
                         }
                         else {
                             table._setRowHeight(row, height);
@@ -52939,10 +52951,15 @@
             for (let row = 0; row < table.rowCount; row++) {
                 const newRowHeight = newHeights[row] ?? table.getRowHeight(row);
                 if (newRowHeight !== oldRowHeights[row]) {
-                    table.scenegraph.updateRowHeight(row, newRowHeight - oldRowHeights[row]);
                     table._setRowHeight(row, newRowHeight);
                 }
             }
+            for (let row = 0; row < table.rowCount; row++) {
+                const newRowHeight = table.getRowHeight(row);
+                if (newRowHeight !== oldRowHeights[row]) {
+                    table.scenegraph.updateRowHeight(row, newRowHeight - oldRowHeights[row], true);
+                }
+            }
         }
     }
     function computeRowHeight(row, startCol, endCol, table) {
@@ -53279,8 +53296,10 @@
         };
     }
 
-    function updateRowHeight(scene, row, detaY) {
-        scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, true);
+    function updateRowHeight(scene, row, detaY, skipTableHeightMap) {
+        if (!skipTableHeightMap) {
+            scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, true);
+        }
         for (let col = 0; col < scene.table.colCount; col++) {
             const cell = scene.getCell(col, row);
             const mergeInfo = getCellMergeInfo(scene.table, col, row);
@@ -53311,7 +53330,6 @@
         }
     }
     function updateCellHeightForRow(scene, cell, col, row, height, detaY, isHeader) {
-        cell.setAttribute('height', height);
         const cellGroup = cell;
         const distHeight = height;
         if (!cellGroup) {
@@ -53320,6 +53338,11 @@
         updateCellHeight(scene, cellGroup, col, row, distHeight, detaY);
     }
     function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHeader) {
+        if (cell.attribute.height === distHeight && !cell.needUpdateHeight) {
+            return;
+        }
+        cell.needUpdateHeight = false;
+        cell.setAttribute('height', distHeight);
         const type = scene.table.isHeader(col, row)
             ? scene.table._getHeaderLayoutMap(col, row).headerType
             : scene.table.getBodyColumnType(col, row);
@@ -53407,7 +53430,7 @@
                     const rangeHeight = table.getRowHeight(row);
                     const rangeWidth = table.getColWidth(col);
                     singleCellGroup.contentHeight = distHeight;
-                    resizeCellGroup(singleCellGroup, rangeWidth, rangeHeight, {
+                    const { widthChange } = resizeCellGroup(singleCellGroup, rangeWidth, rangeHeight, {
                         start: {
                             col: cellGroup.mergeStartCol,
                             row: cellGroup.mergeStartRow
@@ -53417,6 +53440,9 @@
                             row: cellGroup.mergeEndRow
                         }
                     }, table);
+                    if (widthChange) {
+                        singleCellGroup.needUpdateWidth = true;
+                    }
                 }
             }
         }
@@ -53425,8 +53451,10 @@
         }
     }
 
-    function updateColWidth(scene, col, detaX) {
-        scene.table._setColWidth(col, scene.table.getColWidth(col) + detaX, true);
+    function updateColWidth(scene, col, detaX, skipTableWidthMap) {
+        if (!skipTableWidthMap) {
+            scene.table._setColWidth(col, scene.table.getColWidth(col) + detaX, true);
+        }
         const autoRowHeight = scene.table.heightMode === 'autoHeight';
         const colOrCornerHeaderColumn = scene.getColGroup(col, true);
         if (colOrCornerHeaderColumn) {
@@ -53567,9 +53595,10 @@
         }
     }
     function updateCellWidth(scene, cell, col, row, oldWidth, distWidth, detaX, isHeader, autoRowHeight) {
-        if (cell.attribute.width === distWidth) {
+        if (cell.attribute.width === distWidth && !cell.needUpdateWidth) {
             return false;
         }
+        cell.needUpdateWidth = false;
         cell.setAttribute('width', distWidth);
         const cellGroup = cell;
         if (!cellGroup) {
@@ -53689,7 +53718,7 @@
                     const rangeHeight = table.getRowHeight(row);
                     const rangeWidth = table.getColWidth(col);
                     singleCellGroup.contentWidth = distWidth;
-                    resizeCellGroup(singleCellGroup, rangeWidth, rangeHeight, {
+                    const { heightChange } = resizeCellGroup(singleCellGroup, rangeWidth, rangeHeight, {
                         start: {
                             col: cellGroup.mergeStartCol,
                             row: cellGroup.mergeStartRow
@@ -53699,6 +53728,9 @@
                             row: cellGroup.mergeEndRow
                         }
                     }, table);
+                    if (heightChange) {
+                        singleCellGroup.needUpdateHeight = true;
+                    }
                     isHeightChange = isHeightChange || changed;
                 }
             }
@@ -54765,12 +54797,12 @@
             viewBox.y2 = viewBox.y1 + 1;
         }
         axes.forEach((axis, index) => {
-            if (axis.type === 'linear') {
-                chartInstance.updateModelSpecSync({ type: 'axes', index }, { min: axis.range?.min ?? 0, max: axis.range?.max ?? 0 }, true);
-            }
-            else if (axis.type === 'band') {
+            if (axis.type === 'band') {
                 chartInstance.updateModelSpec({ type: 'axes', index }, { domain: axis.domain.slice(0) }, true);
             }
+            else {
+                chartInstance.updateModelSpecSync({ type: 'axes', index }, { min: axis.range?.min ?? 0, max: axis.range?.max ?? 0 }, true);
+            }
         });
         chartInstance.updateViewBox({
             x1: viewBox.x1 - chart.getRootNode().table.scrollLeft,
@@ -55592,7 +55624,7 @@
                 table._clearColRangeWidthsMap(col);
             }
             if (update) {
-                newWidths[col] = table._adjustColWidth(col, maxWidth);
+                newWidths[col] = Math.round(table._adjustColWidth(col, maxWidth));
             }
             else {
                 table._setColWidth(col, table._adjustColWidth(col, maxWidth), false, true);
@@ -55637,7 +55669,13 @@
             for (let col = 0; col < table.colCount; col++) {
                 const newColWidth = newWidths[col] ?? table.getColWidth(col);
                 if (newColWidth !== oldColWidths[col]) {
-                    table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col], true);
+                    table._setColWidth(col, newColWidth);
+                }
+            }
+            for (let col = 0; col < table.colCount; col++) {
+                const newColWidth = table.getColWidth(col);
+                if (newColWidth !== oldColWidths[col]) {
+                    table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col], true, true);
                 }
             }
             table.scenegraph.updateContainer();
@@ -59782,8 +59820,8 @@
             });
             moveSelectingRangeComponentsToSelectedRangeComponents(this);
         }
-        updateColWidth(col, detaX, skipUpdateContainer) {
-            updateColWidth(this, col, Math.round(detaX));
+        updateColWidth(col, detaX, skipUpdateContainer, skipTableWidthMap) {
+            updateColWidth(this, col, Math.round(detaX), skipTableWidthMap);
             if (!skipUpdateContainer) {
                 this.updateContainer();
             }
@@ -59961,9 +59999,9 @@
                 });
             }
         }
-        updateRowHeight(row, detaY) {
+        updateRowHeight(row, detaY, skipTableHeightMap) {
             detaY = Math.round(detaY);
-            updateRowHeight(this, row, detaY);
+            updateRowHeight(this, row, detaY, skipTableHeightMap);
             this.updateContainerHeight(row, detaY);
         }
         updateContainerWidth(col, detaX) {
@@ -61763,11 +61801,13 @@
             const totalHeight = this.table.getAllRowsHeight();
             top = Math.max(0, Math.min(top, totalHeight - this.table.scenegraph.height));
             top = Math.ceil(top);
+            if (top !== this.scroll.verticalBarPos) {
+                this.table.stateManager.updateHoverPos(-1, -1);
+            }
             this.scroll.verticalBarPos = top;
             this.table.scenegraph.setY(-top);
             const yRatio = top / (totalHeight - this.table.scenegraph.height);
             this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio);
-            this.table.stateManager.updateHoverPos(-1, -1);
             this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
                 scrollTop: this.scroll.verticalBarPos,
                 scrollLeft: this.scroll.horizontalBarPos,
@@ -61784,11 +61824,13 @@
             this.table.getFrozenColsWidth();
             left = Math.max(0, Math.min(left, totalWidth - this.table.scenegraph.width));
             left = Math.ceil(left);
+            if (left !== this.scroll.horizontalBarPos) {
+                this.table.stateManager.updateHoverPos(-1, -1);
+            }
             this.scroll.horizontalBarPos = left;
             this.table.scenegraph.setX(-left);
             const xRatio = left / (totalWidth - this.table.scenegraph.width);
             this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
-            this.table.stateManager.updateHoverPos(-1, -1);
             this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
                 scrollTop: this.scroll.verticalBarPos,
                 scrollLeft: this.scroll.horizontalBarPos,
@@ -66581,7 +66623,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.17.3-alpha.0";
+        version = "0.17.3-alpha.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -77208,7 +77250,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.17.3-alpha.0";
+    const version = "0.17.3-alpha.2";
     function getIcons() {
         return get$2();
     }