@meta2d/core 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.21",
+    "version": "1.0.23",
     "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

@@ -75,7 +75,7 @@ export declare class Canvas {
     renderTimer: number;
     initPens?: Pen[];
     pointSize: 8;
-    pasteOffset: number;
+    pasteOffset: boolean;
     opening: boolean;
     maxZindex: number;
     canMoveLine: boolean;
@@ -108,6 +108,7 @@ export declare class Canvas {
     canvasImageBottom: CanvasImage;
     magnifierCanvas: MagnifierCanvas;
     dialog: Dialog;
+    autoPolylineFlag: boolean;
     stopPropagation: (e: MouseEvent) => void;
     constructor(parent: Meta2d, parentElement: HTMLElement, store: Meta2dStore);
     curve: typeof curve;

package/src/canvas/canvas.js

@@ -124,7 +124,7 @@ var Canvas = /** @class */ (function () {
         this.lastAnimateRender = 0;
         this.animateRendering = false;
         this.pointSize = 8;
-        this.pasteOffset = 10;
+        this.pasteOffset = true;
         this.opening = false;
         this.maxZindex = 4;
         this.canMoveLine = false; //moveConnectedLine=false
@@ -134,6 +134,7 @@ var Canvas = /** @class */ (function () {
         this.inputRight = document.createElement('div');
         this.dropdown = document.createElement('ul');
         this.mousePos = { x: 0, y: 0 };
+        this.autoPolylineFlag = false; //标记open不自动计算
         this.stopPropagation = function (e) {
             e.stopPropagation();
         };
@@ -988,7 +989,7 @@ var Canvas = /** @class */ (function () {
                         _this.store.data.rule &&
                             !_this.store.options.disableRuleLine &&
                             _this.addRuleLine(e);
-                        _this.inactive();
+                        // this.inactive();
                         break;
                     case HoverType.Node:
                     case HoverType.Line:
@@ -1440,7 +1441,7 @@ var Canvas = /** @class */ (function () {
             if (_this.dragRect) {
                 var pens = _this.store.data.pens.filter(function (pen) {
                     if (pen.visible === false ||
-                        pen.locked === LockState.Disable ||
+                        pen.locked >= LockState.DisableMove ||
                         pen.parentId) {
                         return false;
                     }
@@ -1452,6 +1453,7 @@ var Canvas = /** @class */ (function () {
                         return true;
                     }
                 });
+                //框选
                 _this.active(pens);
             }
             if (e.button !== 2) {
@@ -1723,7 +1725,7 @@ var Canvas = /** @class */ (function () {
                     if (pen.children) {
                         var pens_1 = []; // TODO: 只考虑了一级子
                         pen.children.forEach(function (id) {
-                            pens_1.push(_this.store.pens[id]);
+                            _this.store.pens[id] && pens_1.push(_this.store.pens[id]);
                         });
                         hoverType = _this.inPens(pt, pens_1);
                         if (hoverType) {
@@ -3146,6 +3148,7 @@ var Canvas = /** @class */ (function () {
                 },
             ],
         });
+        this.inactive();
     };
     /**
      * 拖拽结束，数据更新到 active.pens
@@ -3256,7 +3259,7 @@ var Canvas = /** @class */ (function () {
             return __assign(__assign({}, pen), { x: x, y: y });
         }));
         // 偏移量 0
-        this.pasteOffset = 0;
+        this.pasteOffset = false;
         this.paste();
     };
     /**
@@ -3706,6 +3709,7 @@ var Canvas = /** @class */ (function () {
                     var pen = deepClone(aPen, true);
                     var i = _this.store.data.pens.findIndex(function (item) { return item.id === pen.id; });
                     if (i > -1) {
+                        (_a = pen.onDestroy) === null || _a === void 0 ? void 0 : _a.call(pen, _this.store.pens[pen.id]);
                         _this.store.data.pens.splice(i, 1);
                         _this.store.pens[pen.id] = undefined;
                         if (!pen.calculative) {
@@ -3714,7 +3718,6 @@ var Canvas = /** @class */ (function () {
                         pen.calculative.canvas = _this;
                         _this.store.animates.delete(pen);
                         _this.store.animateMap.delete(pen);
-                        (_a = pen.onDestroy) === null || _a === void 0 ? void 0 : _a.call(pen, pen);
                     }
                 });
                 action.type = EditType.Delete;
@@ -5141,8 +5144,8 @@ var Canvas = /** @class */ (function () {
             }
             translatePoint(lineAnchor, penAnchor.x - lineAnchor.x + offsetX, penAnchor.y - lineAnchor.y + offsetY);
             if (_this.store.options.autoPolyline &&
+                !_this.autoPolylineFlag &&
                 line.autoPolyline !== false &&
-                line.calculative.autoPolylineFlag === true &&
                 line.lineName === 'polyline') {
                 var from = getFromAnchor(line);
                 var to = getToAnchor(line);
@@ -5529,6 +5532,10 @@ var Canvas = /** @class */ (function () {
                             this.store.clipboard.pos = { x: this.mousePos.x, y: this.mousePos.y };
                             this.store.clipboard.offset = 0;
                         }
+                        else if (!this.pasteOffset) {
+                            this.store.clipboard.offset = 0;
+                            this.pasteOffset = true;
+                        }
                         else {
                             offset && (this.store.clipboard.offset = offset);
                             pos && (this.store.clipboard.pos = pos);