@visactor/vtable 0.25.6 → 0.25.8-alpha.0

package/dist/vtable.js

@@ -36677,7 +36677,10 @@
     function createImageCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme, isAsync) {
         const headerStyle = table._getCellStyle(col, row);
         const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);
-        if (isValid$3(functionalPadding)) {
+        if (table.options.customConfig?.imageMargin) {
+            padding = getQuadProps(table.options.customConfig?.imageMargin);
+        }
+        else if (isValid$3(functionalPadding)) {
             padding = functionalPadding;
         }
         if (cellTheme?.text?.textAlign) {
@@ -36830,7 +36833,13 @@
         const headerStyle = table._getCellStyle(col, row);
         const textAlign = getProp('textAlign', headerStyle, col, row, table) ?? 'left';
         const textBaseline = getProp('textBaseline', headerStyle, col, row, table) ?? 'middle';
-        const padding = getQuadProps(getProp('padding', headerStyle, col, row, table)) ?? [0, 0, 0, 0];
+        let padding;
+        if (table.options.customConfig?.imageMargin) {
+            padding = getQuadProps(table.options.customConfig?.imageMargin);
+        }
+        else {
+            padding = getQuadProps(getProp('padding', headerStyle, col, row, table)) ?? [0, 0, 0, 0];
+        }
         const { width: cellWidth, height: cellHeight, isMerge } = getCellRange(cellGroup, table);
         const colStart = cellGroup.mergeStartCol ?? cellGroup.col;
         const rowStart = cellGroup.mergeStartRow ?? cellGroup.row;
@@ -38731,7 +38740,10 @@
     function createVideoCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme, isAsync) {
         const headerStyle = table._getCellStyle(col, row);
         const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);
-        if (isValid$3(functionalPadding)) {
+        if (table.options.customConfig?.imageMargin) {
+            padding = getQuadProps(table.options.customConfig?.imageMargin);
+        }
+        else if (isValid$3(functionalPadding)) {
             padding = functionalPadding;
         }
         if (cellTheme?.text?.textAlign) {
@@ -44045,7 +44057,7 @@
             if (stroke &&
                 Array.isArray(lineDash) &&
                 lineDash.length &&
-                lineDash[0].length &&
+                lineDash[0]?.length &&
                 !Array.isArray(strokeArrayColor) &&
                 !Array.isArray(strokeArrayWidth)) {
                 doFillOrStroke.doStroke = false;
@@ -44062,7 +44074,7 @@
         drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
             const { lineDash = groupAttribute.lineDash, stroke = groupAttribute.stroke, strokeArrayColor = groupAttribute.strokeArrayColor, strokeArrayWidth = groupAttribute.strokeArrayWidth, lineWidth = groupAttribute.lineWidth } = group.attribute;
             if (!stroke ||
-                !(Array.isArray(lineDash) && lineDash.length && lineDash[0].length) ||
+                !(Array.isArray(lineDash) && lineDash.length && lineDash[0]?.length) ||
                 Array.isArray(strokeArrayColor) ||
                 Array.isArray(strokeArrayWidth)) {
                 return;
@@ -58370,7 +58382,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.25.6";
+        version = "0.25.8-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -60895,7 +60907,7 @@
             const c = this.scenegraph.stage.toCanvas();
             return c.toDataURL();
         }
-        exportCellImg(col, row) {
+        exportCellImg(col, row, options) {
             const isInView = this.cellIsInVisualView(col, row);
             const { scrollTop, scrollLeft } = this;
             if (!isInView) {
@@ -60909,16 +60921,43 @@
             this.stateManager.updateHoverPos(-1, -1);
             this.scenegraph.component.hideVerticalScrollBar();
             this.scenegraph.component.hideHorizontalScrollBar();
+            this.scenegraph.tableGroup.border.setAttribute('visible', false);
+            let oldFill;
+            if (options?.disableBackground) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                oldFill = cellGroup.attribute.fill;
+                cellGroup.setAttribute('fill', 'transparent');
+            }
+            let oldStroke;
+            if (options?.disableBorder) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                oldStroke = cellGroup.attribute.stroke;
+                cellGroup.setAttribute('stroke', false);
+            }
             this.scenegraph.renderSceneGraph();
-            const c = this.scenegraph.stage.toCanvas(false, new AABBBounds().set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY));
+            let sizeOffset = 0;
+            if (this.theme.cellBorderClipDirection === 'bottom-right') {
+                sizeOffset = 1;
+            }
+            const c = this.scenegraph.stage.toCanvas(false, new AABBBounds().set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX - sizeOffset, cellRect.bottom + this.tableY - sizeOffset));
             if (!isInView) {
                 this.setScrollTop(scrollTop);
                 this.setScrollLeft(scrollLeft);
             }
+            this.scenegraph.tableGroup.border.setAttribute('visible', true);
+            if (oldFill) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                cellGroup.setAttribute('fill', oldFill);
+            }
+            if (oldStroke) {
+                const cellGroup = this.scenegraph.getCell(col, row);
+                cellGroup.setAttribute('stroke', oldStroke);
+            }
             if (this.stateManager.select?.ranges?.length > 0) {
                 restoreCellSelectBorder(this.scenegraph);
             }
             this.stateManager.updateHoverPos(hoverCol, hoverRow);
+            this.scenegraph.updateNextFrame();
             return c.toDataURL();
         }
         exportCellRangeImg(cellRange) {
@@ -71090,7 +71129,7 @@
     }
 
     registerForVrender();
-    const version = "0.25.6";
+    const version = "0.25.8-alpha.0";
     function getIcons() {
         return get$2();
     }