@meta2d/core 1.0.49 → 1.0.51

package/package.json

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

@@ -279,7 +279,7 @@ var Canvas = /** @class */ (function () {
             }
             if (Math.abs(e.wheelDelta) > 100) {
                 //鼠标滚轮滚动 scroll模式下是上下滚动而不是缩放
-                if (_this.store.options.scroll && _this.scroll) {
+                if (_this.store.options.scroll && _this.scroll && !_this.store.options.scrollButScale) {
                     _this.scroll.wheel(e.deltaY < 0);
                     return;
                 }
@@ -3189,7 +3189,7 @@ var Canvas = /** @class */ (function () {
     Canvas.prototype.dropPens = function (pens, e) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var pens_2, pens_2_1, pen, pens_3, pens_3_1, pen, pens_4, pens_4_1, pen, pens_5, pens_5_1, pen, width, height, rect_1, flag, pens_6, pens_6_1, pen, points;
+            var pens_2, pens_2_1, pen, pens_3, pens_3_1, pen, pens_4, pens_4_1, pen, num, lastH, lastW, pens_5, pens_5_1, pen, width, height, rect_1, flag, pens_6, pens_6_1, pen, points;
             var e_7, _b, e_8, _c, e_9, _d, e_10, _e, e_11, _f;
             var _this = this;
             return __generator(this, function (_g) {
@@ -3253,23 +3253,33 @@ var Canvas = /** @class */ (function () {
                             }
                             finally { if (e_9) throw e_9.error; }
                         }
+                        num = 0;
+                        lastH = 0;
+                        lastW = 0;
                         try {
-                            // // 计算区域
-                            // for (const pen of pens) {
-                            //   // 组合节点才需要提前计算
-                            //   Array.isArray(pen.children) && pen.children.length > 0 && this.updatePenRect(pen);
-                            // }
                             for (pens_5 = __values(pens), pens_5_1 = pens_5.next(); !pens_5_1.done; pens_5_1 = pens_5.next()) {
                                 pen = pens_5_1.value;
                                 if (!pen.parentId) {
                                     pen.width *= this.store.data.scale;
                                     pen.height *= this.store.data.scale;
-                                    pen.x = e.x - pen.width / 2;
-                                    pen.y = e.y - pen.height / 2;
+                                    pen.x = e.x - pen.width / 2 + lastW;
+                                    pen.y = e.y - pen.height / 2 + lastH;
                                     if (pen.tags && pen.tags.includes('meta3d')) {
                                         pen.x = this.store.data.origin.x;
                                         pen.y = this.store.data.origin.y;
                                     }
+                                    if (pen.dataset) {
+                                        if (num % 2 === 0) {
+                                            lastW = pen.width + 10;
+                                        }
+                                        else {
+                                            lastW = 0;
+                                        }
+                                        num++;
+                                        if (num % 2 === 0) {
+                                            lastH += pen.height + 10;
+                                        }
+                                    }
                                 }
                             }
                         }