@meta2d/core 1.0.73 → 1.0.75

package/package.json

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

@@ -362,7 +362,9 @@ export class Canvas {
     onMessage = (e) => {
         if (typeof e.data !== 'string' ||
             !e.data ||
-            e.data.startsWith('setImmediate')) {
+            e.data.startsWith('setImmediate') ||
+            e.data.startsWith('webpackHotUpdate') // 处理vue2 webpack4 热更新消息冲突问题
+        ) {
             return;
         }
         let data = JSON.parse(e.data);
@@ -729,6 +731,19 @@ export class Canvas {
                 break;
             case 'g':
             case 'G':
+                //组合/解组
+                if (e.ctrlKey || e.metaKey) {
+                    if (e.shiftKey) {
+                        this.parent.uncombine();
+                    }
+                    else {
+                        if (this.store.active.length > 1) {
+                            this.parent.combine(this.store.active);
+                        }
+                    }
+                    e.preventDefault();
+                    break;
+                }
                 // 进入移动瞄点状态
                 if (this.hoverType === HoverType.NodeAnchor) {
                     this.movingAnchor = this.store.hoverAnchor;
@@ -4090,7 +4105,9 @@ export class Canvas {
         this.renderBorder();
         this.renderHoverPoint();
         offscreenCtx.restore();
-        this.magnifierCanvas.render();
+        if (this.magnifierCanvas.magnifier) {
+            this.magnifierCanvas.render();
+        }
         const ctx = this.canvas.getContext('2d');
         ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
         ctx.drawImage(this.offscreen, 0, 0, this.width, this.height);
@@ -6176,6 +6193,24 @@ export class Canvas {
                             this.store.pens[id].calculative.active = false;
                             this.store.pens[id].calculative.hover = false;
                         });
+                        if (this.store.hover.parentId) {
+                            //组合图元 找命中率高的子图元
+                            let id = this.store.hover.id;
+                            const pt = this.calibrateMouse({ x: e.offsetX, y: e.offsetY });
+                            let distance = Infinity;
+                            this.store.pens[this.store.hover.parentId]?.children?.forEach((_id) => {
+                                const pen = this.store.pens[_id];
+                                if (pointInRect(pt, pen.calculative.worldRect)) {
+                                    const dis = Math.sqrt((pt.x - pen.calculative.worldRect.center.x) ** 2 + (pt.y - pen.calculative.worldRect.center.y) ** 2);
+                                    if (dis < distance) {
+                                        distance = dis;
+                                        id = _id;
+                                    }
+                                }
+                            });
+                            this.store.hover = this.store.pens[id];
+                            this.store.pens[id].calculative.hover = true;
+                        }
                         this.active([this.store.hover]);
                     }
                 }
@@ -7432,7 +7467,7 @@ export class Canvas {
         //将所有当前框选的图元设置到该容器中
         const pens = this.store.data.pens.filter((pen) => {
             if (
-            // pen.locked >= LockState.DisableMove || 
+            // pen.locked >= LockState.DisableMove ||
             pen.parentId || pen.isRuleLine) {
                 return false;
             }
@@ -7581,7 +7616,7 @@ export class Canvas {
             calcRightBottom(rect);
             const pens = this.store.data.pens.filter((pen) => {
                 if (
-                // pen.locked >= LockState.DisableMove || 
+                // pen.locked >= LockState.DisableMove ||
                 pen.parentId || pen.isRuleLine) {
                     return false;
                 }