@visactor/vtable 0.18.1 → 0.18.2-alpha.0

package/dist/vtable.js

@@ -32707,31 +32707,29 @@
         image.name = 'image';
         image.keepAspectRatio = keepAspectRatio;
         if (keepAspectRatio || imageAutoSizing) {
-            image.successCallback = () => {
-                const originImage = image.resources.get(image.attribute.image).data;
-                if (imageAutoSizing) {
-                    _adjustWidthHeight(col, row, originImage.width, originImage.height, table.scenegraph, padding);
-                }
-                if (keepAspectRatio) {
-                    const { width: cellWidth, height: cellHeight, isMerge } = getCellRange(cellGroup, table);
-                    const { width: imageWidth, height: imageHeight } = calcKeepAspectRatioSize(originImage.width, originImage.height, cellWidth - padding[1] - padding[3], cellHeight - padding[0] - padding[2]);
-                    const pos = calcStartPosition(0, 0, cellWidth, cellHeight, imageWidth, imageHeight, textAlign, textBaseline, padding);
-                    image.setAttributes({
-                        x: pos.x,
-                        y: pos.y,
-                        width: imageWidth,
-                        height: imageHeight,
-                        dx: isMerge ? -table.getColsWidth(cellGroup.mergeStartCol, col - 1) : 0,
-                        dy: isMerge ? -table.getRowsHeight(cellGroup.mergeStartRow, row - 1) : 0
-                    });
-                }
-                table.scenegraph.updateNextFrame();
-            };
+            if (image.resources &&
+                image.resources.has(image.attribute.image) &&
+                image.resources.get(image.attribute.image).state === 'success') {
+                updateAutoSizingAndKeepAspectRatio(imageAutoSizing, keepAspectRatio, padding, textAlign, textBaseline, image, cellGroup, table);
+            }
+            else {
+                image.successCallback = () => {
+                    updateAutoSizingAndKeepAspectRatio(imageAutoSizing, keepAspectRatio, padding, textAlign, textBaseline, image, cellGroup, table);
+                    table.scenegraph.updateNextFrame();
+                };
+            }
         }
         else {
-            image.successCallback = () => {
+            if (image.resources &&
+                image.resources.has(image.attribute.image) &&
+                image.resources.get(image.attribute.image).state === 'success') {
                 updateImageCellContentWhileResize(cellGroup, col, row, table);
-            };
+            }
+            else {
+                image.successCallback = () => {
+                    updateImageCellContentWhileResize(cellGroup, col, row, table);
+                };
+            }
         }
         image.failCallback = () => {
             const regedIcons = get$1();
@@ -32844,6 +32842,43 @@
             isMerge: false
         };
     }
+    function updateImageDxDy(startCol, endCol, startRow, endRow, table) {
+        for (let col = startCol; col <= endCol; col++) {
+            for (let row = startRow; row <= endRow; row++) {
+                const cellGroup = table.scenegraph.getCell(col, row);
+                if (cellGroup) {
+                    const image = cellGroup.getChildByName('image');
+                    if (image) {
+                        image.setAttributes({
+                            dx: -table.getColsWidth(cellGroup.mergeStartCol, col - 1),
+                            dy: -table.getRowsHeight(cellGroup.mergeStartRow, row - 1)
+                        });
+                    }
+                }
+            }
+        }
+    }
+    function updateAutoSizingAndKeepAspectRatio(imageAutoSizing, keepAspectRatio, padding, textAlign, textBaseline, image, cellGroup, table) {
+        const originImage = image.resources.get(image.attribute.image).data;
+        const { col, row } = cellGroup;
+        if (imageAutoSizing) {
+            _adjustWidthHeight(col, row, originImage.width, originImage.height, table.scenegraph, padding);
+        }
+        if (keepAspectRatio) {
+            const { width: cellWidth, height: cellHeight, isMerge } = getCellRange(cellGroup, table);
+            const { width: imageWidth, height: imageHeight } = calcKeepAspectRatioSize(originImage.width, originImage.height, cellWidth - padding[1] - padding[3], cellHeight - padding[0] - padding[2]);
+            const pos = calcStartPosition(0, 0, cellWidth, cellHeight, imageWidth, imageHeight, textAlign, textBaseline, padding);
+            image.setAttributes({
+                x: pos.x,
+                y: pos.y,
+                width: imageWidth,
+                height: imageHeight
+            });
+            if (isMerge) {
+                updateImageDxDy(cellGroup.mergeStartCol, cellGroup.mergeEndCol, cellGroup.mergeStartRow, cellGroup.mergeEndRow, table);
+            }
+        }
+    }
 
     function createProgressBarCell(progressBarDefine, style, width, value, dataValue, col, row, padding, table) {
         if (progressBarDefine.dependField) {
@@ -41863,7 +41898,7 @@
                 });
             });
         });
-        changedCells.length = 0;
+        changedCells.clear();
         const { scrollTop, scrollLeft, frozenRowCount, frozenColCount } = table;
         const frozenRowsHeight = table.getFrozenRowsHeight();
         const frozenColsWidth = table.getFrozenColsWidth();
@@ -41962,24 +41997,26 @@
         const textBottom = graphic.globalAABBBounds.y2;
         if (textTop < minTop) {
             const deltaHeight = textTop - minTop;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dy', (child.attribute.dy ?? 0) - deltaHeight + 2);
             });
         }
         else if (textBottom > maxTop) {
             const deltaHeight = textBottom - maxTop;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dy', (child.attribute.dy ?? 0) - deltaHeight);
             });
@@ -42011,24 +42048,26 @@
         const textRight = text.globalAABBBounds.x2;
         if (textLeft < minLeft) {
             const deltaWidth = textLeft - minLeft;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dx', (child.attribute.dx ?? 0) - deltaWidth + 2);
             });
         }
         else if (textRight > maxLeft) {
             const deltaWidth = textRight - maxLeft;
-            changedCells.push({
-                col: cellGroup.col,
-                row: cellGroup.row,
-                dx: cellGroup.firstChild?.attribute.dx ?? 0,
-                dy: cellGroup.firstChild?.attribute.dy ?? 0
-            });
+            !changedCells.has(`${cellGroup.col}-${cellGroup.row}`) &&
+                changedCells.set(`${cellGroup.col}-${cellGroup.row}`, {
+                    col: cellGroup.col,
+                    row: cellGroup.row,
+                    dx: cellGroup.firstChild?.attribute.dx ?? 0,
+                    dy: cellGroup.firstChild?.attribute.dy ?? 0
+                });
             cellGroup.forEachChildren((child) => {
                 child.setAttribute('dx', (child.attribute.dx ?? 0) - deltaWidth);
             });
@@ -50623,7 +50662,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.18.1";
+        version = "0.18.2-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -50768,7 +50807,7 @@
             this.headerStyleCache = new Map();
             this.bodyStyleCache = new Map();
             this.bodyBottomStyleCache = new Map();
-            internalProps.stick = { changedCells: [] };
+            internalProps.stick = { changedCells: new Map() };
             internalProps.customMergeCell = options.customMergeCell;
         }
         throttleInvalidate = throttle2(this.render.bind(this), 200);
@@ -51734,6 +51773,7 @@
             this.colWidthsMap = new NumberMap();
             this.colContentWidthsMap = new NumberMap();
             this.colWidthsLimit = {};
+            internalProps.stick.changedCells.clear();
             internalProps.theme = themes.of(options.theme ?? themes.DEFAULT);
             this.scenegraph.updateStageBackground();
             internalProps.autoWrapText = options.autoWrapText;
@@ -61869,7 +61909,7 @@
     }
 
     registerForVrender();
-    const version = "0.18.1";
+    const version = "0.18.2-alpha.0";
     function getIcons() {
         return get$1();
     }