@meta2d/core 1.0.53 → 1.0.54

package/package.json

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

@@ -843,6 +843,15 @@ var Canvas = /** @class */ (function () {
                             this.calibrateMouse(pt);
                             this.dropPens(obj, pt);
                             this.addCaches = [];
+                            // 拖拽新增图元判断是否是在容器上
+                            this.getContainerHover(pt);
+                            this.mousePos.x = pt.x;
+                            this.mousePos.y = pt.y;
+                            this.store.emitter.emit('mouseup', {
+                                x: pt.x,
+                                y: pt.y,
+                                pen: this.store.hoverContainer,
+                            });
                         }
                         this.store.emitter.emit('drop', obj || json);
                         return [2 /*return*/];
@@ -1733,11 +1742,13 @@ var Canvas = /** @class */ (function () {
                 if (_this.store.hover) {
                     _this.store.hover.calculative.mouseDown = false;
                 }
-                _this.store.emitter.emit('mouseup', {
-                    x: e.x,
-                    y: e.y,
-                    pen: _this.store.hover,
-                });
+                if (_this.store.hover != _this.store.hoverContainer) {
+                    _this.store.emitter.emit('mouseup', {
+                        x: e.x,
+                        y: e.y,
+                        pen: _this.store.hover,
+                    });
+                }
                 _this.store.emitter.emit('mouseup', {
                     x: e.x,
                     y: e.y,
@@ -1828,8 +1839,7 @@ var Canvas = /** @class */ (function () {
                     var pen = containerPens[i];
                     if (pen.visible == false ||
                         pen.calculative.inView == false ||
-                        pen.locked === LockState.Disable ||
-                        pen.calculative.active) {
+                        pen.locked === LockState.Disable) {
                         continue;
                     }
                     if (pointInRect(pt, pen.calculative.worldRect)) {
@@ -1852,7 +1862,8 @@ var Canvas = /** @class */ (function () {
                         _this.store.hoverContainer = undefined;
                         if (_this.store.lastHoverContainer !== _this.store.hoverContainer) {
                             _this.patchFlags = true;
-                            if (_this.store.lastHoverContainer) {
+                            var movingPen = _this.store.lastHoverContainer.calculative.canvas.store.pens[_this.store.lastHoverContainer.id + movingSuffix];
+                            if (_this.store.lastHoverContainer && !movingPen) {
                                 _this.store.lastHoverContainer.calculative.containerHover = false;
                                 _this.store.emitter.emit('leave', _this.store.lastHoverContainer);
                             }
@@ -2904,6 +2915,7 @@ var Canvas = /** @class */ (function () {
                         pens: [deepClone(pen, true)],
                         initPens: initPens,
                     });
+                    _this.store.emitter.emit('change', pen);
                     _this.store.emitter.emit('valueUpdate', pen);
                 }
                 else if (pen.text === _this.inputDiv.dataset.value && pen.calculative.textLines.length == 0) {
@@ -3010,6 +3022,7 @@ var Canvas = /** @class */ (function () {
                 initPens: initPens,
             });
             _this.render();
+            _this.store.emitter.emit('change', pen);
             _this.store.emitter.emit('valueUpdate', pen);
         };
         this.inFitBorder = function (pt) {
@@ -4389,8 +4402,8 @@ var Canvas = /** @class */ (function () {
                         if (_this.store.data.pens[i].type &&
                             _this.store.data.pens[i].lastConnected) {
                             for (var key in _this.store.data.pens[i].lastConnected) {
-                                _this.store.pens[key].connectedLines =
-                                    _this.store.data.pens[i].lastConnected[key];
+                                _this.store.pens[key] && (_this.store.pens[key].connectedLines =
+                                    _this.store.data.pens[i].lastConnected[key]);
                             }
                         }
                         _this.store.data.pens[i] = pen;
@@ -4430,7 +4443,7 @@ var Canvas = /** @class */ (function () {
                     _this.store.pens[pen.id] = pen;
                     if (pen.type && pen.lastConnected) {
                         for (var key in pen.lastConnected) {
-                            _this.store.pens[key].connectedLines = pen.lastConnected[key];
+                            _this.store.pens[key] && (_this.store.pens[key].connectedLines = pen.lastConnected[key]);
                         }
                     }
                     pen.calculative.canvas = _this;
@@ -4482,7 +4495,7 @@ var Canvas = /** @class */ (function () {
                     _this.store.pens[pen.id] = pen;
                     if (pen.type && pen.lastConnected) {
                         for (var key in pen.lastConnected) {
-                            _this.store.pens[key].connectedLines = pen.lastConnected[key];
+                            _this.store.pens[key] && (_this.store.pens[key].connectedLines = pen.lastConnected[key]);
                         }
                     }
                     pen.calculative.canvas = _this;
@@ -6116,7 +6129,7 @@ var Canvas = /** @class */ (function () {
         if (!pen.connectedLines) {
             return;
         }
-        pen.connectedLines.forEach(function (item) {
+        pen.connectedLines.forEach(function (item, index) {
             var line = _this.store.pens[item.lineId];
             // 活动层的线不需要更新，会在活动层处理
             if (!line || line.calculative.active) {
@@ -6126,6 +6139,11 @@ var Canvas = /** @class */ (function () {
             if (!lineAnchor) {
                 return;
             }
+            if (!lineAnchor.connectTo) {
+                // 如果pen有连接关系但连线中没有连接关系，删除pen的连接关系
+                pen.connectedLines.splice(index, 1);
+                return;
+            }
             if (line.autoFrom) {
                 var from = getFromAnchor(line);
                 if (from.id === lineAnchor.id) {
@@ -7084,6 +7102,7 @@ var Canvas = /** @class */ (function () {
                     _this.inputDiv.style.paddingTop = '';
                 }
             }
+            _this.store.emitter.emit('input', pen);
         };
         this.inputDiv.onclick = function (e) {
             e.stopPropagation();