@meta2d/core 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.8",
+    "version": "1.0.10",
     "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);
@@ -3915,6 +3922,12 @@ var Canvas = /** @class */ (function () {
                         var img_1 = new Image();
                         img_1.crossOrigin = 'anonymous';
                         img_1.src = pen.image;
+                        if (this.store.options.cdn &&
+                            !(pen.image.startsWith('http') ||
+                                pen.image.startsWith('//') ||
+                                pen.image.startsWith('data:image'))) {
+                            img_1.src = this.store.options.cdn + pen.image;
+                        }
                         img_1.onload = function () {
                             pen.calculative.img = img_1;
                             pen.calculative.imgNaturalWidth =
@@ -3940,6 +3953,12 @@ var Canvas = /** @class */ (function () {
                     var img_2 = new Image();
                     img_2.crossOrigin = 'anonymous';
                     img_2.src = pen.backgroundImage;
+                    if (this.store.options.cdn &&
+                        !(pen.backgroundImage.startsWith('http') ||
+                            pen.backgroundImage.startsWith('//') ||
+                            pen.backgroundImage.startsWith('data:image'))) {
+                        img_2.src = this.store.options.cdn + pen.backgroundImage;
+                    }
                     img_2.onload = function () {
                         pen.calculative.backgroundImg = img_2;
                         globalStore.htmlElements[pen.backgroundImage] = img_2;
@@ -3960,6 +3979,12 @@ var Canvas = /** @class */ (function () {
                     var img_3 = new Image();
                     img_3.crossOrigin = 'anonymous';
                     img_3.src = pen.strokeImage;
+                    if (this.store.options.cdn &&
+                        !(pen.strokeImage.startsWith('http') ||
+                            pen.strokeImage.startsWith('//') ||
+                            pen.strokeImage.startsWith('data:image'))) {
+                        img_3.src = this.store.options.cdn + pen.strokeImage;
+                    }
                     img_3.onload = function () {
                         pen.calculative.strokeImg = img_3;
                         globalStore.htmlElements[pen.strokeImage] = img_3;
@@ -4236,10 +4261,6 @@ var Canvas = /** @class */ (function () {
         var x = p2.x - p1.x;
         var y = p2.y - p1.y;
         var rect = deepClone(this.initActiveRect);
-        if (e.shiftKey ||
-            (this.initPens.length == 1 && this.initPens[0].ratio)) {
-            x = (rect.width / rect.height) * y;
-        }
         // 得到最准确的 rect 即 resize 后的
         resizeRect(rect, x, y, this.resizeIndex);
         calcCenter(rect);
@@ -4265,7 +4286,8 @@ var Canvas = /** @class */ (function () {
         var offsetY = y - this.lastOffsetY;
         this.lastOffsetX = x;
         this.lastOffsetY = y;
-        if (e.ctrlKey) {
+        if (e.ctrlKey ||
+            (this.initPens.length === 1 && this.initPens[0].ratio)) {
             // 1，3 是右上角和左上角的点，此时的 offsetY 符号与 offsetX 是相反的
             var sign = [1, 3].includes(this.resizeIndex) ? -1 : 1;
             offsetY = (sign * (offsetX * h)) / w;
@@ -4641,11 +4663,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*/];
                 }
             });
@@ -5434,6 +5458,7 @@ var Canvas = /** @class */ (function () {
         pens.forEach(function (pen) {
             if (!pen.parentId) {
                 if (pen.locked) {
+                    // TODO: canDelLocked 是 true ， locked 仍然删不掉
                     return;
                 }
                 else {
@@ -5450,7 +5475,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) {