@visactor/vtable 0.17.7 → 0.17.8

package/dist/vtable.js

@@ -4158,6 +4158,7 @@
       textureSize: 10,
       texturePadding: 2,
       backgroundMode: "no-repeat",
+      backgroundFit: !0,
       blur: 0,
       cursor: null,
       html: null
@@ -12488,7 +12489,8 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (background) if (graphic.backgroundImg && graphic.resources) {
           const res = graphic.resources.get(background);
@@ -12503,13 +12505,33 @@
           }
           context.clip();
           const b = graphic.AABBBounds;
-          context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), this.doDrawImage(context, res.data, b, backgroundMode), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
+          context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = background, context.fill(), context.highPerformanceRestore();
       }
-      doDrawImage(context, data, b, backgroundMode) {
+      doDrawImage(context, data, b, backgroundMode, backgroundFit) {
         if ("no-repeat" === backgroundMode) context.drawImage(data, b.x1, b.y1, b.width(), b.height());else {
+          const targetW = b.width(),
+            targetH = b.height();
+          let w = targetW,
+            h = targetH;
+          if (backgroundFit && "repeat" !== backgroundMode && (data.width || data.height)) {
+            const resW = data.width,
+              resH = data.height;
+            if ("repeat-x" === backgroundMode) {
+              w = resW * (targetH / resH);
+            } else if ("repeat-y" === backgroundMode) {
+              h = resH * (targetW / resW);
+            }
+            const canvas = canvasAllocate.allocate({
+                width: w,
+                height: h,
+                dpr: context.dpr
+              }),
+              ctx = canvas.getContext("2d");
+            ctx && (ctx.inuse = !0, ctx.clearMatrix(), ctx.setTransformForCurrent(!0), ctx.clearRect(0, 0, w, h), ctx.drawImage(data, 0, 0, w, h), data = canvas.nativeCanvas), document.body.appendChild(data), canvasAllocate.free(canvas);
+          }
           const pattern = context.createPattern(data, backgroundMode);
-          context.fillStyle = pattern, context.translate(b.x1, b.y1), context.fillRect(0, 0, b.width(), b.height()), context.translate(-b.x1, -b.y1);
+          context.fillStyle = pattern, context.translate(b.x1, b.y1), context.fillRect(0, 0, targetW, targetH), context.translate(-b.x1, -b.y1);
         }
       }
     }
@@ -12769,14 +12791,15 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (background) if (graphic.backgroundImg && graphic.resources) {
           const res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
           context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0);
           const b = graphic.AABBBounds;
-          this.doDrawImage(context, res.data, b, backgroundMode), context.highPerformanceRestore(), context.setTransformForCurrent();
+          this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.highPerformanceRestore(), context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.fillStyle = background, context.fill(), context.highPerformanceRestore();
       }
     }
@@ -12845,7 +12868,8 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (background) if (graphic.backgroundImg) {
           const res = graphic.resources.get(background);
@@ -12859,7 +12883,7 @@
             context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), context.translate(scrollX, scrollY);
           }
           const b = graphic.AABBBounds;
-          this.doDrawImage(context, res.data, b, backgroundMode), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
+          this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
         } else if (isObject$4(background)) {
           const {
             stroke: stroke,
@@ -14160,14 +14184,15 @@
       drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         const {
           background: background,
-          backgroundMode = graphicAttribute.backgroundMode
+          backgroundMode = graphicAttribute.backgroundMode,
+          backgroundFit = graphicAttribute.backgroundFit
         } = graphic.attribute;
         if (!background) return;
         const b = graphic.AABBBounds;
         if (graphic.backgroundImg && graphic.resources) {
           const res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
-          context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), this.doDrawImage(context, res.data, b, backgroundMode), context.highPerformanceRestore(), context.setTransformForCurrent();
+          context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.highPerformanceRestore(), context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.fillStyle = background, context.fillRect(b.x1, b.y1, b.width(), b.height()), context.highPerformanceRestore();
       }
     }
@@ -16066,10 +16091,10 @@
         let left = 0,
           top = 0;
         if ("position" === anchorType) {
-          const matrix = graphic.transMatrix;
+          const matrix = graphic.globalTransMatrix;
           left = matrix.e, top = matrix.f;
         } else {
-          const b = graphic.AABBBounds;
+          const b = graphic.globalAABBBounds;
           left = b.x1, top = b.y1;
         }
         const containerTL = application.global.getElementTopLeft(nativeContainer, !1),
@@ -17958,9 +17983,9 @@
       }
       children.length && flatten(1 === children.length ? children[0] : children, childrenList);
       const g = "Group" === c.name ? new c(attribute) : c(config);
-      return parseToGraphic(g, childrenList, props), stateProxy && (g.stateProxy = stateProxy), g;
+      return parseToGraphic$1(g, childrenList, props), stateProxy && (g.stateProxy = stateProxy), g;
     }
-    function parseToGraphic(g, childrenList, props) {
+    function parseToGraphic$1(g, childrenList, props) {
       let out,
         isGraphic = !1;
       switch (g.type) {
@@ -32076,8 +32101,12 @@
             return dom;
         }
         const type = dom.type;
-        const { attribute, children } = dom.props;
+        const { attribute, children, stateProxy } = dom.props;
         const g = type({ attribute });
+        parseToGraphic(g, dom.props);
+        if (stateProxy) {
+            g.stateProxy = stateProxy;
+        }
         g.id = attribute.id;
         g.name = attribute.name;
         if (isArray$1(children)) {
@@ -32091,6 +32120,25 @@
         }
         return g;
     }
+    function parseToGraphic(g, props) {
+        let isGraphic = false;
+        switch (g.type) {
+            case 'richtext':
+                break;
+            case 'rich/image':
+                break;
+            default:
+                isGraphic = true;
+        }
+        if (isGraphic) {
+            Object.keys(props).forEach(k => {
+                const en = REACT_TO_CANOPUS_EVENTS[k];
+                if (en) {
+                    g.on(en, props[k]);
+                }
+            });
+        }
+    }
 
     const icons = {};
     class IconCache {
@@ -39441,11 +39489,11 @@
             computeColsWidth(table, 0, distCol);
         }
         computeRowsHeight(table, 0, distRow);
-        if (distCol < table.colCount - 1 - table.rightFrozenColCount) {
-            computeColsWidth(table, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1);
+        if (distCol < table.colCount - table.rightFrozenColCount) {
+            computeColsWidth(table, table.colCount - table.rightFrozenColCount, table.colCount - 1);
         }
-        if (distRow < table.rowCount - 1 - table.bottomFrozenRowCount) {
-            computeRowsHeight(table, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1);
+        if (distRow < table.rowCount - table.bottomFrozenRowCount) {
+            computeRowsHeight(table, table.rowCount - table.bottomFrozenRowCount, table.rowCount - 1);
         }
         table.scenegraph.colHeaderGroup.setAttribute('x', table.getFrozenColsWidth());
         table.scenegraph.rowHeaderGroup.setAttribute('y', table.getFrozenRowsHeight());
@@ -40750,35 +40798,39 @@
             if (selectComp.rect.attribute.x < scene.table.getFrozenColsWidth() &&
                 scene.table.scrollLeft > 0 &&
                 (selectComp.role === 'body' || selectComp.role === 'columnHeader' || selectComp.role === 'bottomFrozen')) {
+                const width = selectComp.rect.attribute.width - (scene.table.getFrozenColsWidth() - selectComp.rect.attribute.x);
                 selectComp.rect.setAttributes({
                     x: selectComp.rect.attribute.x + (scene.table.getFrozenColsWidth() - selectComp.rect.attribute.x),
-                    width: selectComp.rect.attribute.width - (scene.table.getFrozenColsWidth() - selectComp.rect.attribute.x)
+                    width: width > 0 ? width : 0
                 });
             }
             if (scene.table.getRightFrozenColsWidth() > 0 &&
                 scene.rightFrozenGroup.attribute.height > 0 &&
                 selectComp.rect.attribute.x + selectComp.rect.attribute.width > scene.rightFrozenGroup.attribute.x &&
                 (selectComp.role === 'body' || selectComp.role === 'columnHeader' || selectComp.role === 'bottomFrozen')) {
+                const width = scene.rightFrozenGroup.attribute.x - selectComp.rect.attribute.x;
                 selectComp.rect.setAttributes({
                     x: selectComp.rect.attribute.x,
-                    width: scene.rightFrozenGroup.attribute.x - selectComp.rect.attribute.x
+                    width: width > 0 ? width : 0
                 });
             }
             if (selectComp.rect.attribute.y < scene.colHeaderGroup.attribute.height &&
                 scene.table.scrollTop > 0 &&
                 (selectComp.role === 'body' || selectComp.role === 'rowHeader' || selectComp.role === 'rightFrozen')) {
+                const height = selectComp.rect.attribute.height - (scene.colHeaderGroup.attribute.height - selectComp.rect.attribute.y);
                 selectComp.rect.setAttributes({
                     y: selectComp.rect.attribute.y + (scene.colHeaderGroup.attribute.height - selectComp.rect.attribute.y),
-                    height: selectComp.rect.attribute.height - (scene.colHeaderGroup.attribute.height - selectComp.rect.attribute.y)
+                    height: height > 0 ? height : 0
                 });
             }
             if (scene.bottomFrozenGroup.attribute.width > 0 &&
                 scene.bottomFrozenGroup.attribute.height > 0 &&
                 selectComp.rect.attribute.y + selectComp.rect.attribute.height > scene.bottomFrozenGroup.attribute.y &&
                 (selectComp.role === 'body' || selectComp.role === 'rowHeader' || selectComp.role === 'rightFrozen')) {
+                const height = scene.bottomFrozenGroup.attribute.y - selectComp.rect.attribute.y;
                 selectComp.rect.setAttributes({
                     y: selectComp.rect.attribute.y,
-                    height: scene.bottomFrozenGroup.attribute.y - selectComp.rect.attribute.y
+                    height: height > 0 ? height : 0
                 });
             }
         }
@@ -41267,9 +41319,15 @@
             const merge = getCellMergeInfo(scene.table, cellGroup.col, cellGroup.row);
             if (merge) {
                 cellGroup.mergeStartCol = merge.start.col;
-                cellGroup.mergeStartCol = merge.start.col;
-                cellGroup.mergeEndCol = merge.end.col;
                 cellGroup.mergeEndCol = merge.end.col;
+                cellGroup.mergeStartRow = merge.start.row;
+                cellGroup.mergeEndRow = merge.end.row;
+            }
+            else {
+                cellGroup.mergeStartCol = undefined;
+                cellGroup.mergeEndCol = undefined;
+                cellGroup.mergeStartRow = undefined;
+                cellGroup.mergeEndRow = undefined;
             }
         }
     }
@@ -41334,9 +41392,15 @@
             const merge = getCellMergeInfo(scene.table, cellGroup.col, cellGroup.row);
             if (merge) {
                 cellGroup.mergeStartCol = merge.start.col;
-                cellGroup.mergeStartCol = merge.start.col;
-                cellGroup.mergeEndCol = merge.end.col;
                 cellGroup.mergeEndCol = merge.end.col;
+                cellGroup.mergeStartRow = merge.start.row;
+                cellGroup.mergeEndRow = merge.end.row;
+            }
+            else {
+                cellGroup.mergeStartCol = undefined;
+                cellGroup.mergeEndCol = undefined;
+                cellGroup.mergeStartRow = undefined;
+                cellGroup.mergeEndRow = undefined;
             }
         }
     }
@@ -44600,6 +44664,11 @@
             delete state.columnMove.rowTarget;
         }, 0);
         state.table.scenegraph.component.hideMoveCol();
+        if (state.columnResize.col < state.table.frozenColCount &&
+            !state.table.isPivotTable() &&
+            !state.table.transpose) {
+            state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen);
+        }
         state.table.scenegraph.updateNextFrame();
     }
     function clearWidthsAndHeightsCache(colSource, rowSource, colTarget, rowTarget, table) {
@@ -47072,6 +47141,15 @@
                     const resizeCol = this.table.scenegraph.getResizeColAt(eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, eventArgsSet.eventArgs?.targetCell);
                     if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {
                         this.table.scenegraph.updateAutoColWidth(resizeCol.col);
+                        if (this.table.isPivotChart()) {
+                            this.table.scenegraph.updateChartSize(resizeCol.col);
+                        }
+                        const state = this.table.stateManager;
+                        if (state.columnResize.col < state.table.frozenColCount &&
+                            !state.table.isPivotTable() &&
+                            !state.table.transpose) {
+                            state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen);
+                        }
                     }
                 }
             });
@@ -50081,7 +50159,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.17.7";
+        version = "0.17.8";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -60824,7 +60902,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.17.7";
+    const version = "0.17.8";
     function getIcons() {
         return get$2();
     }