@meta2d/core 1.0.47 → 1.0.48

package/package.json

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

@@ -229,6 +229,7 @@ export declare class Canvas {
     onScroll: () => void;
     calibrateMouse: (pt: Point) => Point;
     clearHover(): void;
+    private getContainerHover;
     private getHover;
     private inPens;
     private dockInAnchor;

package/src/canvas/canvas.js

@@ -1360,6 +1360,8 @@ var Canvas = /** @class */ (function () {
                             }
                         }
                         _this.movePens(e);
+                        //图元是否进入容器图元
+                        _this.getContainerHover(e);
                         return;
                     }
                 }
@@ -1714,6 +1716,27 @@ var Canvas = /** @class */ (function () {
             pt.y -= _this.store.data.y;
             return pt;
         };
+        this.getContainerHover = function (pt) {
+            var _a;
+            if (_this.dragRect) {
+                return;
+            }
+            var containerPens = _this.store.data.pens.filter(function (pen) { var _a; return pen.container || ((_a = _this.store.options.containerShapes) === null || _a === void 0 ? void 0 : _a.includes(pen.name)); });
+            if (containerPens.length) {
+                for (var i = containerPens.length - 1; i >= 0; --i) {
+                    var pen = containerPens[i];
+                    if (pen.visible == false ||
+                        pen.calculative.inView == false ||
+                        pen.locked === LockState.Disable ||
+                        pen.calculative.active) {
+                        continue;
+                    }
+                    if (pointInRect(pt, pen.calculative.worldRect)) {
+                        (_a = pen === null || pen === void 0 ? void 0 : pen.onMouseMove) === null || _a === void 0 ? void 0 : _a.call(pen, pen, pt);
+                    }
+                }
+            }
+        };
         this.getHover = function (pt) {
             var _a, _b;
             if (_this.dragRect) {
@@ -1896,6 +1919,9 @@ var Canvas = /** @class */ (function () {
                         else {
                             _this.externalElements.style.cursor = _this.store.options.hoverCursor;
                         }
+                        if (pen.calculative.disabled) {
+                            _this.externalElements.style.cursor = 'not-allowed';
+                        }
                         _this.store.hover = pen;
                         _this.store.pointAt = pos.point;
                         _this.store.pointAtIndex = pos.i;
@@ -1940,6 +1966,9 @@ var Canvas = /** @class */ (function () {
                         else {
                             _this.externalElements.style.cursor = _this.store.options.hoverCursor;
                         }
+                        if (pen.calculative.disabled) {
+                            _this.externalElements.style.cursor = 'not-allowed';
+                        }
                         _this.store.hover = pen;
                         _this.initTemplateCanvas([_this.store.hover]);
                         hoverType = HoverType.Node;
@@ -2483,7 +2512,8 @@ var Canvas = /** @class */ (function () {
                 !_this.store.hover ||
                 _this.store.hover.locked ||
                 _this.store.hover.externElement ||
-                _this.store.hover.disableInput) {
+                _this.store.hover.disableInput ||
+                _this.store.hover.disabled) {
                 return;
             }
             if (_this.inputDiv.dataset.penId === pen.id) {
@@ -2761,7 +2791,8 @@ var Canvas = /** @class */ (function () {
         this.setDropdownList = function (search) {
             var e_6, _a;
             _this.clearDropdownList();
-            if (!_this.store.data.locked) {
+            var pen = _this.store.pens[_this.inputDiv.dataset.penId];
+            if (!_this.store.data.locked && !['table'].includes(pen.name)) {
                 return;
             }
             _this.dropdown.style.display = 'block';
@@ -2770,7 +2801,6 @@ var Canvas = /** @class */ (function () {
                 _this.inputRight.style.transform = 'rotate(315deg)';
                 _this.inputRight.style.zoom = _this.store.data.scale;
             });
-            var pen = _this.store.pens[_this.inputDiv.dataset.penId];
             if (!pen || !pen.dropdownList) {
                 _this.dropdown.style.display = 'none';
                 _this.inputRight.style.display = 'none';
@@ -6266,6 +6296,10 @@ var Canvas = /** @class */ (function () {
                         //根据pens顺序复制
                         copyPens.forEach(function (activePen) {
                             activePen.copyIndex = _this.store.data.pens.findIndex(function (pen) { return pen.id === activePen.id; });
+                            if (activePen.pathId) {
+                                //复制svgpath
+                                activePen.path = _this.store.data.paths[activePen.pathId];
+                            }
                         });
                         copyPens.sort(function (a, b) {
                             return a.copyIndex - b.copyIndex;
@@ -6770,6 +6804,16 @@ var Canvas = /** @class */ (function () {
             }, 300);
         };
         this.inputDiv.oninput = function (e) {
+            var pen = _this.store.pens[_this.inputDiv.dataset.penId];
+            if (pen.inputType === 'number') {
+                var value = e.target.innerText;
+                var numericValue = value.replace(/[^0-9]/g, ''); // 移除非数字字符
+                // 如果输入的值不是纯数字，则替换为纯数字
+                if (value !== numericValue) {
+                    e.preventDefault();
+                    e.target.innerText = numericValue;
+                }
+            }
             // //无文本时，光标确保居中
             if (navigator.userAgent.includes('Firefox')) {
                 if (!e.target.innerText.trim()) {