@meta2d/core 1.0.23 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.23",
+    "version": "1.0.24",
     "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
     "main": "index.js",
     "types": "index.d.ts",
@@ -36,4 +36,4 @@
         "access": "public"
     },
     "gitHead": "78f2a53ca1839c89b56e2e498d17ba4eb987ad14"
-}
+}

package/src/canvas/canvas.js

@@ -82,7 +82,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 import { KeydownType } from '../options';
-import { addLineAnchor, calcIconRect, calcTextRect, calcWorldAnchors, calcWorldRects, LockState, nearestAnchor, PenType, pushPenAnchor, removePenAnchor, renderPen, scalePen, translateLine, deleteTempAnchor, connectLine, disconnectLine, getAnchor, calcAnchorDock, calcMoveDock, calcTextLines, setNodeAnimate, setLineAnimate, calcPenRect, setChildrenActive, getParent, setHover, randomId, getPensLock, getToAnchor, getFromAnchor, calcPadding, getPensDisableRotate, getPensDisableResize, needCalcTextRectProps, calcResizeDock, needPatchFlagsPenRectProps, needCalcIconRectProps, isDomShapes, renderPenRaw, needSetPenProps, getAllChildren, calcInView, isShowChild, getTextColor, getGlobalColor, clearLifeCycle, rotatePen, } from '../pen';
+import { addLineAnchor, calcIconRect, calcTextRect, calcWorldAnchors, calcWorldRects, LockState, nearestAnchor, PenType, pushPenAnchor, removePenAnchor, renderPen, scalePen, translateLine, deleteTempAnchor, connectLine, disconnectLine, getAnchor, calcAnchorDock, calcMoveDock, calcTextLines, setNodeAnimate, setLineAnimate, calcPenRect, setChildrenActive, getParent, setHover, randomId, getPensLock, getToAnchor, getFromAnchor, calcPadding, getPensDisableRotate, getPensDisableResize, needCalcTextRectProps, calcResizeDock, needPatchFlagsPenRectProps, needCalcIconRectProps, isDomShapes, renderPenRaw, needSetPenProps, getAllChildren, calcInView, isShowChild, getTextColor, getGlobalColor, clearLifeCycle, rotatePen, calcTextAutoWidth, } from '../pen';
 import { calcRotate, distance, getDistance, hitPoint, PointType, PrevNextType, rotatePoint, samePoint, scalePoint, translatePoint, TwoWay, } from '../point';
 import { calcCenter, calcRightBottom, calcRelativePoint, getRect, getRectOfPoints, pointInRect, pointInSimpleRect, rectInRect, rectToPoints, resizeRect, translateRect, } from '../rect';
 import { EditType, globalStore, } from '../store';
@@ -307,6 +307,9 @@ var Canvas = /** @class */ (function () {
                 e.target.tagName === 'TEXTAREA') {
                 return;
             }
+            if (_this.store.options.unavailableKeys.includes(e.key)) {
+                return;
+            }
             var x = 10;
             var y = 10;
             switch (e.key) {
@@ -989,7 +992,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:
@@ -1662,7 +1665,7 @@ var Canvas = /** @class */ (function () {
                             for (var _d = (e_1 = void 0, __values(pen.calculative.worldAnchors)), _e = _d.next(); !_e.done; _e = _d.next()) {
                                 var anchor = _e.value;
                                 if (hitPoint(pt, anchor, _this.pointSize, anchor.penId ? _this.store.pens[anchor.penId] : undefined)) {
-                                    _this.title.show(anchor);
+                                    _this.title.show(anchor, pen);
                                     if (anchor.title) {
                                         return "break-outer";
                                     }
@@ -2237,7 +2240,7 @@ var Canvas = /** @class */ (function () {
         };
         this.ondblclick = function (e) {
             if (_this.store.hover &&
-                !_this.store.data.locked &&
+                (!_this.store.data.locked || _this.store.hover.dbInput) &&
                 !_this.store.options.disableInput) {
                 if (_this.store.hover.onShowInput) {
                     _this.store.hover.onShowInput(_this.store.hover, e);
@@ -2273,9 +2276,13 @@ var Canvas = /** @class */ (function () {
                 return;
             }
             //过滤table2图元
-            if (!rect) {
+            if (!rect && !pen.dbInput) {
                 _this.setInputStyle(pen);
             }
+            else {
+                _this.inputDiv.style.width = '100%';
+                _this.inputDiv.style.height = '100%';
+            }
             var textRect = rect || pen.calculative.worldTextRect;
             //value和innerText问题
             var preInputText = pen.calculative.tempText || pen.text + '' || '';
@@ -2500,6 +2507,9 @@ var Canvas = /** @class */ (function () {
                     pen.text = _this.inputDiv.dataset.value;
                     pen.calculative.text = pen.text;
                     _this.inputDiv.dataset.penId = undefined;
+                    if (pen.name === 'text' && pen.textAutoAdjust) {
+                        calcTextAutoWidth(pen);
+                    }
                     calcTextRect(pen);
                     _this.patchFlags = true;
                     _this.pushHistory({
@@ -3148,7 +3158,6 @@ var Canvas = /** @class */ (function () {
                 },
             ],
         });
-        this.inactive();
     };
     /**
      * 拖拽结束，数据更新到 active.pens
@@ -3189,6 +3198,9 @@ var Canvas = /** @class */ (function () {
         // active 消息表示拖拽结束
         // this.store.emitter.emit('active', this.store.active);
         this.initImageCanvas(this.store.active);
+        // 避免选中图元的出错情况，this.dock为undefined
+        if (!this.dock)
+            return;
         var _a = this.dock, xDock = _a.xDock, yDock = _a.yDock;
         var dockPen;
         if (xDock) {
@@ -4625,7 +4637,8 @@ var Canvas = /** @class */ (function () {
             // 线宽为 0 ，看不到外边框，拖动过程中给个外边框
             pen.lineWidth === 0 && (value.lineWidth = 1);
             // TODO: 例如 pen.name = 'triangle' 的情况，但有图片，是否还需要变成矩形呢？
-            if (isDomShapes.includes(pen.name) ||
+            if (pen.name.endsWith('Dom') ||
+                isDomShapes.includes(pen.name) ||
                 _this.store.options.domShapes.includes(pen.name) ||
                 pen.image) {
                 // 修改名称会执行 onDestroy ，清空它