@meta2d/core 1.0.50 → 1.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.50",
+    "version": "1.0.52",
     "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
     "main": "index.js",
     "types": "index.d.ts",

package/src/canvas/canvas.d.ts

@@ -432,8 +432,8 @@ export declare class Canvas {
         height: number;
     };
     toPng(padding?: Padding, callback?: BlobCallback, containBkImg?: boolean, maxWidth?: number): string;
-    activeToPng(padding?: Padding): string;
-    pensToPng(pens?: Pen[], padding?: Padding): string;
+    activeToPng(padding?: Padding, maxWidth?: number): string;
+    pensToPng(pens?: Pen[], padding?: Padding, maxWidth?: number): string;
     toggleAnchorMode(): void;
     addAnchorHand(): void;
     removeAnchorHand(): void;

package/src/canvas/canvas.js

@@ -279,7 +279,7 @@ var Canvas = /** @class */ (function () {
             }
             if (Math.abs(e.wheelDelta) > 100) {
                 //鼠标滚轮滚动 scroll模式下是上下滚动而不是缩放
-                if (_this.store.options.scroll && _this.scroll) {
+                if (_this.store.options.scroll && _this.scroll && !_this.store.options.scrollButScale) {
                     _this.scroll.wheel(e.deltaY < 0);
                     return;
                 }
@@ -656,7 +656,7 @@ var Canvas = /** @class */ (function () {
                             }
                             else {
                                 //图元进入编辑模式
-                                pen.calculative.focus = !pen.calculative.focus;
+                                pen.calculative.focus = true;
                             }
                         });
                         _this.render();
@@ -668,6 +668,16 @@ var Canvas = /** @class */ (function () {
                     }
                     _this.drawingLineName = undefined;
                     _this.stopPencil();
+                    if (_this.store.active) {
+                        _this.store.active.forEach(function (pen) {
+                            if (pen.type) {
+                            }
+                            else {
+                                //图元退出编辑模式
+                                pen.calculative.focus = false;
+                            }
+                        });
+                    }
                     if (_this.movingPens) {
                         _this.getAllByPens(_this.movingPens).forEach(function (pen) {
                             _this.store.pens[pen.id] = undefined;
@@ -1207,6 +1217,9 @@ var Canvas = /** @class */ (function () {
                         });
                         break;
                 }
+                if (_this.store.hover) {
+                    _this.store.hover.calculative.mouseDown = true;
+                }
                 _this.store.emitter.emit('mousedown', {
                     x: e.x,
                     y: e.y,
@@ -1657,6 +1670,9 @@ var Canvas = /** @class */ (function () {
                         pen: _this.store.hover,
                     });
                 }
+                if (_this.store.hover) {
+                    _this.store.hover.calculative.mouseDown = false;
+                }
                 _this.store.emitter.emit('mouseup', {
                     x: e.x,
                     y: e.y,
@@ -2839,7 +2855,7 @@ var Canvas = /** @class */ (function () {
             var e_6, _a;
             _this.clearDropdownList();
             var pen = _this.store.pens[_this.inputDiv.dataset.penId];
-            if (!_this.store.data.locked && !['table'].includes(pen.name)) {
+            if (!_this.store.data.locked && !['tablePlus'].includes(pen.name)) {
                 return;
             }
             _this.dropdown.style.display = 'block';
@@ -3270,7 +3286,7 @@ var Canvas = /** @class */ (function () {
                                     }
                                     if (pen.dataset) {
                                         if (num % 2 === 0) {
-                                            lastW = pen.width + 10;
+                                            lastW = pen.width - 40;
                                         }
                                         else {
                                             lastW = 0;
@@ -4468,6 +4484,11 @@ var Canvas = /** @class */ (function () {
             }
             globalStore.anchors[pen.name](pen);
         }
+        if (!pen.anchors) {
+            var anchors = deepClone(this.store.options.defaultAnchors);
+            anchors.forEach(function (item, index) { item.id = "" + index; item.penId = pen.id; });
+            pen.anchors = anchors;
+        }
         this.updatePenRect(pen);
         if (!pen.anchors && pen.calculative.worldAnchors) {
             pen.anchors = pen.calculative.worldAnchors.map(function (pt) {
@@ -5465,7 +5486,7 @@ var Canvas = /** @class */ (function () {
     };
     Canvas.prototype.moveLineAnchor = function (pt, keyOptions) {
         var _this = this;
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (!this.activeRect || this.store.data.locked) {
             return;
         }
@@ -5476,8 +5497,8 @@ var Canvas = /** @class */ (function () {
             var pen = this.store.pens[this.store.activeAnchor.connectTo];
             disconnectLine(pen, getAnchor(pen, this.store.activeAnchor.anchorId), this.store.pens[this.store.activeAnchor.penId], this.store.activeAnchor);
         }
-        var anchorId = this.store.activeAnchor.id;
-        var connectedLine = (_c = (_b = this.store.pens[this.store.activeAnchor.penId]) === null || _b === void 0 ? void 0 : _b.connectedLines) === null || _c === void 0 ? void 0 : _c.filter(function (item) { return item.anchor === anchorId; });
+        var anchorId = (_b = this.store.activeAnchor) === null || _b === void 0 ? void 0 : _b.id;
+        var connectedLine = (_d = (_c = this.store.pens[this.store.activeAnchor.penId]) === null || _c === void 0 ? void 0 : _c.connectedLines) === null || _d === void 0 ? void 0 : _d.filter(function (item) { return item.anchor === anchorId; });
         if (connectedLine && connectedLine.length > 0) {
             connectedLine.forEach(function (connected) {
                 var pen = _this.store.pens[connected.lineId];
@@ -5557,7 +5578,7 @@ var Canvas = /** @class */ (function () {
                 to.prev = undefined;
                 // 重新自动计算连线
                 if (line.lineName !== 'polyline') {
-                    (_d = this[line.lineName]) === null || _d === void 0 ? void 0 : _d.call(this, this.store, line);
+                    (_e = this[line.lineName]) === null || _e === void 0 ? void 0 : _e.call(this, this.store, line);
                 }
             }
         }
@@ -6934,7 +6955,7 @@ var Canvas = /** @class */ (function () {
         };
         this.inputDiv.oninput = function (e) {
             var pen = _this.store.pens[_this.inputDiv.dataset.penId];
-            if (pen.inputType === 'number') {
+            if (pen && pen.inputType === 'number') {
                 var value = e.target.innerText;
                 var numericValue = value.replace(/[^0-9]/g, ''); // 移除非数字字符
                 // 如果输入的值不是纯数字，则替换为纯数字
@@ -7127,6 +7148,9 @@ var Canvas = /** @class */ (function () {
                 if (needCalcIconRectProps.includes(k)) {
                     willCalcIconRect = true;
                 }
+                if (pen.image && pen.name !== 'gif' && ['globalAlpha', 'flipY', 'flipX', 'x', 'y', 'width', 'height'].includes(k)) {
+                    willRenderImage = true;
+                }
             }
             else {
                 // 复合属性，如abc.def.ghi
@@ -7435,11 +7459,11 @@ var Canvas = /** @class */ (function () {
         }
         return canvas.toDataURL();
     };
-    Canvas.prototype.activeToPng = function (padding) {
+    Canvas.prototype.activeToPng = function (padding, maxWidth) {
         if (padding === void 0) { padding = 2; }
-        return this.pensToPng(this.store.active, padding);
+        return this.pensToPng(this.store.active, padding, maxWidth);
     };
-    Canvas.prototype.pensToPng = function (pens, padding) {
+    Canvas.prototype.pensToPng = function (pens, padding, maxWidth) {
         var e_26, _a;
         if (pens === void 0) { pens = this.store.active; }
         if (padding === void 0) { padding = 2; }
@@ -7459,6 +7483,9 @@ var Canvas = /** @class */ (function () {
         rect.width += p[3] + p[1];
         rect.height += p[0] + p[2];
         calcRightBottom(rect);
+        var scale = (maxWidth || rect.width) / rect.width;
+        rect.width *= scale;
+        rect.height *= scale;
         var canvas = document.createElement('canvas');
         canvas.width = rect.width;
         canvas.height = rect.height;
@@ -7472,8 +7499,17 @@ var Canvas = /** @class */ (function () {
         }
         var ctx = canvas.getContext('2d');
         ctx.textBaseline = 'middle'; // 默认垂直居中
+        ctx.scale(scale, scale);
+        var background = this.store.data.background || this.store.options.background;
+        if (background) {
+            // 绘制背景颜色
+            ctx.save();
+            ctx.fillStyle = background;
+            ctx.fillRect(0, 0, oldRect.width + (p[3] + p[1]), oldRect.height + (p[0] + p[2]));
+            ctx.restore();
+        }
         // // 平移画布，画笔的 worldRect 不变化
-        ctx.translate(-oldRect.x, -oldRect.y);
+        ctx.translate(-oldRect.x + p[3], -oldRect.y + p[0]);
         try {
             for (var _b = __values(this.store.data.pens), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var pen = _c.value;