@meta2d/core 1.0.1 → 1.0.3

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
-    "main": "index.ts",
+    "main": "index.js",
     "types": "index.d.ts",
     "scripts": {
         "copy": "shx cp package.build.json ../../dist/core/package.json",

package/src/canvas/canvas.js

@@ -1968,7 +1968,9 @@ var Canvas = /** @class */ (function () {
                         var size = anchor.radius ||
                             _this.store.hover.anchorRadius ||
                             _this.store.options.anchorRadius;
-                        if (_this.store.hover.type) {
+                        if (_this.store.hover.type &&
+                            !anchor.radius &&
+                            !_this.store.hover.anchorRadius) {
                             size = 3;
                             if (_this.store.hover.calculative.lineWidth > 3) {
                                 size = _this.store.hover.calculative.lineWidth;
@@ -2187,7 +2189,8 @@ var Canvas = /** @class */ (function () {
                 textRect.x + _this.store.data.x - (pen.textLeft || 0) + 'px'; //+ 5
             _this.inputParent.style.top =
                 textRect.y + _this.store.data.y - (pen.textTop || 0) + 'px'; //+ 5
-            _this.inputParent.style.width = textRect.width + (pen.textLeft || 0) + 'px'; //(textRect.width < pen.width ? 0 : 10)
+            var _width = textRect.width + (pen.textLeft || 0);
+            _this.inputParent.style.width = (_width < 0 ? 12 : _width) + 'px'; //(textRect.width < pen.width ? 0 : 10)
             _this.inputParent.style.height = textRect.height + (pen.textTop || 0) + 'px'; //   (textRect.height < pen.height ? 0 : 10)
             _this.inputParent.style.zIndex = '9999';
             _this.inputParent.style.background = background;
@@ -2327,7 +2330,7 @@ var Canvas = /** @class */ (function () {
             }
             else {
                 if (pen.whiteSpace === undefined || pen.whiteSpace === 'break-all') {
-                    var tem = pen.width / scale - (pen.textLeft || 0);
+                    var tem = (pen.calculative.worldTextRect.width || 12) / scale; //pen.width / scale - ( pen.textLeft || 0);
                     if (tem < 0) {
                         tem = 0;
                     }
@@ -2993,7 +2996,7 @@ var Canvas = /** @class */ (function () {
         var _this = this;
         // 鼠标松手才更新，此处是更新前的值
         var initPens = deepClone(this.store.active, true);
-        var pens = deepClone(this.store.active, true);
+        // const pens = deepClone(this.store.active, true);
         this.store.active.forEach(function (pen, i) {
             var _a;
             var _b = _this.movingPens[i], x = _b.x, y = _b.y;
@@ -3033,6 +3036,7 @@ var Canvas = /** @class */ (function () {
         if (!dockPen && yDock) {
             dockPen = this.store.pens[yDock.penId];
         }
+        var pens = deepClone(this.store.active, true);
         // 移动到连线端点，自动连线
         if (readyConnect &&
             this.store.active.length === 1 &&
@@ -3203,7 +3207,7 @@ var Canvas = /** @class */ (function () {
             pen.name === 'line' &&
             anchor.connectTo) {
             var connectPen = this.findOne(anchor.connectTo);
-            if (!(connectPen === null || connectPen === void 0 ? void 0 : connectPen.calculative.active)) {
+            if ((connectPen === null || connectPen === void 0 ? void 0 : connectPen.calculative) && !(connectPen === null || connectPen === void 0 ? void 0 : connectPen.calculative.active)) {
                 pen = connectPen;
                 var connectAnchor = connectPen.calculative.worldAnchors.find(function (item) { return item.id === anchor.anchorId; });
                 connectAnchor && (anchor = connectAnchor);
@@ -3479,7 +3483,7 @@ var Canvas = /** @class */ (function () {
     Canvas.prototype.activeHistory = function () {
         var _this = this;
         var before = this.store.histories[this.store.historyIndex];
-        if (before) {
+        if (before && before.type === EditType.Add) {
             before.pens.forEach(function (pen) {
                 if (!pen.calculative) {
                     return;
@@ -4373,7 +4377,7 @@ var Canvas = /** @class */ (function () {
     };
     Canvas.prototype.moveLineAnchor = function (pt, keyOptions) {
         var _this = this;
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.activeRect || this.store.data.locked) {
             return;
         }
@@ -4384,6 +4388,14 @@ var Canvas = /** @class */ (function () {
             var pen = this.store.pens[this.store.activeAnchor.connectTo];
             disconnectLine(pen, getAnchor(pen, this.store.activeAnchor.anchorId), this.store.pens[this.store.activeAnchor.penId], this.store.activeAnchor);
         }
+        var anchorId = this.store.activeAnchor.id;
+        var connectedLine = (_b = this.store.pens[this.store.activeAnchor.penId].connectedLines) === null || _b === void 0 ? void 0 : _b.filter(function (item) { return item.anchor === anchorId; });
+        if (connectedLine && connectedLine.length > 0) {
+            connectedLine.forEach(function (connected) {
+                var pen = _this.store.pens[connected.lineId];
+                disconnectLine(_this.store.pens[_this.store.activeAnchor.penId], _this.store.activeAnchor, pen, getAnchor(pen, connected.lineAnchor));
+            });
+        }
         var line = this.store.active[0];
         var from = getFromAnchor(line);
         var to = getToAnchor(line);
@@ -4403,7 +4415,7 @@ var Canvas = /** @class */ (function () {
                 to.prev = undefined;
                 // 重新自动计算连线
                 if (line.lineName !== 'polyline') {
-                    (_b = this[line.lineName]) === null || _b === void 0 ? void 0 : _b.call(this, this.store, line);
+                    (_c = this[line.lineName]) === null || _c === void 0 ? void 0 : _c.call(this, this.store, line);
                 }
             }
         }
@@ -4745,7 +4757,6 @@ var Canvas = /** @class */ (function () {
                 else {
                     pen.calculative.rotate = pen.rotate;
                 }
-                pen.calculative.worldRect = pen.calculative.initRect;
                 //其他回到最初始状态
                 var originStatus = deepClone(this.store.animateMap.get(pen));
                 if (originStatus) {
@@ -4756,6 +4767,7 @@ var Canvas = /** @class */ (function () {
                         history: false,
                     });
                 }
+                pen.calculative.worldRect = pen.calculative.initRect;
             }
             this.updatePenRect(pen, { worldRectIsReady: true });
             if (pen.calculative.text !== pen.text) {