@meta2d/core 1.0.7 → 1.0.9

package/package.json

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

package/src/canvas/canvas.js

@@ -337,7 +337,7 @@ var Canvas = /** @class */ (function () {
                     }
                     break;
                 case 'Alt':
-                    if (_this.drawingLine) {
+                    if (!e.ctrlKey && !e.shiftKey && _this.drawingLine) {
                         var to = getToAnchor(_this.drawingLine);
                         if (to !== _this.drawingLine.calculative.activeAnchor) {
                             deleteTempAnchor(_this.drawingLine);
@@ -812,10 +812,13 @@ var Canvas = /** @class */ (function () {
             }
             //shift 快捷添加锚点并连线
             if (!_this.store.options.autoAnchor && !_this.drawingLine) {
-                if (e.shiftKey && !e.ctrlKey) {
+                if (e.shiftKey && e.ctrlKey && e.altKey) {
                     _this.setAnchor(_this.store.pointAt);
                     _this.drawingLineName = _this.store.options.drawingLineName;
                     var anchor = _this.store.activeAnchor;
+                    if (!anchor) {
+                        return;
+                    }
                     var pt = {
                         id: s8(),
                         x: anchor.x,
@@ -849,10 +852,13 @@ var Canvas = /** @class */ (function () {
                 }
                 //shift快捷添加锚点并完成连线
                 if (!_this.store.options.autoAnchor) {
-                    if (e.shiftKey) {
+                    if (e.shiftKey && e.altKey && e.ctrlKey) {
                         _this.setAnchor(_this.store.pointAt);
                         var to_2 = getToAnchor(_this.drawingLine);
                         var anchor = _this.store.activeAnchor;
+                        if (!anchor) {
+                            return;
+                        }
                         to_2.x = anchor.x;
                         to_2.y = anchor.y;
                         connectLine(_this.store.hover, anchor, _this.drawingLine, to_2);
@@ -3615,6 +3621,7 @@ var Canvas = /** @class */ (function () {
     };
     Canvas.prototype.makePen = function (pen) {
         var _this = this;
+        var _a;
         if (!pen.id) {
             pen.id = s8();
         }
@@ -3631,14 +3638,14 @@ var Canvas = /** @class */ (function () {
         if (pen.lineWidth == undefined) {
             pen.lineWidth = 1;
         }
-        var _a = this.store.options, fontSize = _a.fontSize, lineHeight = _a.lineHeight;
+        var _b = this.store.options, fontSize = _b.fontSize, lineHeight = _b.lineHeight;
         if (!pen.fontSize) {
             pen.fontSize = fontSize;
         }
         if (!pen.lineHeight) {
             pen.lineHeight = lineHeight;
         }
-        pen.calculative = { canvas: this };
+        pen.calculative = { canvas: this, singleton: (_a = pen.calculative) === null || _a === void 0 ? void 0 : _a.singleton };
         if (pen.video || pen.audio) {
             pen.calculative.onended = function (pen) {
                 _this.nextAnimate(pen);
@@ -4328,6 +4335,9 @@ var Canvas = /** @class */ (function () {
             });
             this.store.hover = undefined;
         }
+        if (!this.mouseDown) {
+            return;
+        }
         var x = e.x - this.mouseDown.x;
         var y = e.y - this.mouseDown.y;
         e.shiftKey && !e.ctrlKey && (y = 0);
@@ -4638,11 +4648,13 @@ var Canvas = /** @class */ (function () {
                     case 6:
                         this.hotkeyType = HotkeyType.None;
                         this.render();
-                        this.pushHistory({
-                            type: EditType.Update,
-                            pens: [deepClone(hoverPen, true)],
-                            initPens: initPens,
-                        });
+                        if (hoverPen) {
+                            this.pushHistory({
+                                type: EditType.Update,
+                                pens: [deepClone(hoverPen, true)],
+                                initPens: initPens,
+                            });
+                        }
                         return [2 /*return*/];
                 }
             });
@@ -5075,7 +5087,14 @@ var Canvas = /** @class */ (function () {
                                     continue;
                                 }
                                 if (typeof pen[k] !== 'object' || k === 'lineDash') {
-                                    pen[k] = pen.calculative[k];
+                                    if (k === 'lineWidth') {
+                                        pen[k] =
+                                            pen.calculative[k] /
+                                                pen.calculative.canvas.store.data.scale;
+                                    }
+                                    else {
+                                        pen[k] = pen.calculative[k];
+                                    }
                                 }
                             }
                             calcPenRect(pen);
@@ -5083,7 +5102,13 @@ var Canvas = /** @class */ (function () {
                         else {
                             for (var k in pen) {
                                 if (typeof pen[k] !== 'object' || k === 'lineDash') {
-                                    pen.calculative[k] = pen[k];
+                                    if (k === 'lineWidth') {
+                                        pen.calculative[k] =
+                                            pen[k] * pen.calculative.canvas.store.data.scale;
+                                    }
+                                    else {
+                                        pen.calculative[k] = pen[k];
+                                    }
                                 }
                             }
                         }
@@ -5418,6 +5443,7 @@ var Canvas = /** @class */ (function () {
         pens.forEach(function (pen) {
             if (!pen.parentId) {
                 if (pen.locked) {
+                    // TODO: canDelLocked 是 true ， locked 仍然删不掉
                     return;
                 }
                 else {
@@ -5434,7 +5460,7 @@ var Canvas = /** @class */ (function () {
                     return;
                 }
                 else {
-                    var parentPen = _this.store.data.pens[pen.parentId];
+                    var parentPen = getParent(pen);
                     var _index = parentPen.children.indexOf(pen.id);
                     parentPen.children.splice(_index, 1);
                     if (delPens) {
@@ -5779,6 +5805,20 @@ var Canvas = /** @class */ (function () {
             pen.calculative.strokeImage = undefined;
             this.loadImage(pen);
         }
+        if (data.lineGradientColors) {
+            pen.calculative.lineGradient = undefined;
+            pen.calculative.gradientColorStop = undefined;
+        }
+        if (data.gradientColors) {
+            pen.calculative.gradient = undefined;
+            pen.calculative.radialGradient = undefined;
+        }
+        if (data.animateLineWidth) {
+            pen.calculative.gradientAnimatePath = undefined;
+        }
+        if (data.gradientSmooth) {
+            pen.calculative.gradientAnimatePath = undefined;
+        }
         if (containIsBottom) {
             this.canvasImage.init();
             this.canvasImageBottom.init();