@meta2d/core 1.0.39 → 1.0.40

package/package.json

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

@@ -2157,7 +2157,7 @@ var Canvas = /** @class */ (function () {
                         ctx.translate(-_this.activeRect.center.x, -_this.activeRect.center.y);
                     }
                     ctx.strokeStyle = _this.store.options.activeColor;
-                    ctx.globalAlpha = _this.store.options.activeGlobalAlpha || 0.3;
+                    ctx.globalAlpha = _this.store.options.activeGlobalAlpha === undefined ? 0.3 : _this.store.options.activeGlobalAlpha;
                     ctx.beginPath();
                     ctx.lineWidth = _this.store.options.activeLineWidth || 1;
                     ctx.setLineDash(_this.store.options.activeLineDash || []);
@@ -2712,6 +2712,9 @@ var Canvas = /** @class */ (function () {
                     });
                     _this.store.emitter.emit('valueUpdate', pen);
                 }
+                else if (pen.text === _this.inputDiv.dataset.value && pen.calculative.textLines.length == 0) {
+                    calcTextRect(pen);
+                }
                 _this.initTemplateCanvas([pen]);
             }
             _this.inputDiv.dataset.penId = undefined;
@@ -4382,6 +4385,7 @@ var Canvas = /** @class */ (function () {
     Canvas.prototype.finishDrawline = function (end) {
         return __awaiter(this, void 0, void 0, function () {
             var from, to, line, rect, allowAdd, _a;
+            var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -4406,6 +4410,7 @@ var Canvas = /** @class */ (function () {
                         if (!from.connectTo || !to.connectTo) {
                             if (this.store.options.disableEmptyLine) {
                                 // 有一端未连线，且 禁止创建空线条
+                                this.store.pens[from.connectTo].connectedLines = this.store.pens[from.connectTo].connectedLines.filter(function (item) { return item.lineId !== _this.drawingLine.id; });
                                 this.drawingLine = undefined;
                                 this.render();
                                 return [2 /*return*/];
@@ -4768,7 +4773,6 @@ var Canvas = /** @class */ (function () {
         }, 50);
     };
     Canvas.prototype.translate = function (x, y) {
-        var _this = this;
         if (x === void 0) { x = 0; }
         if (y === void 0) { y = 0; }
         this.store.data.x += x * this.store.data.scale;
@@ -4812,12 +4816,13 @@ var Canvas = /** @class */ (function () {
                 }
             }
         }
-        setTimeout(function () {
-            _this.canvasTemplate.init();
-            _this.canvasImage.init();
-            _this.canvasImageBottom.init();
-            _this.render();
-        });
+        //TODO 当初为什么加异步
+        // setTimeout(() => {
+        this.canvasTemplate.init();
+        this.canvasImage.init();
+        this.canvasImageBottom.init();
+        this.render();
+        // });
         this.store.emitter.emit('translate', {
             x: this.store.data.x,
             y: this.store.data.y,
@@ -4908,17 +4913,17 @@ var Canvas = /** @class */ (function () {
             _this.execPenResize(pen);
         });
         this.calcActiveRect();
-        setTimeout(function () {
-            _this.canvasTemplate.init();
-            _this.canvasImage.init();
-            _this.canvasImageBottom.init();
-            var map = _this.parent.map;
-            if (map && map.isShow) {
-                map.setView();
-            }
-            _this.render();
-            _this.store.emitter.emit('scale', _this.store.data.scale);
-        });
+        // setTimeout(() => {
+        this.canvasTemplate.init();
+        this.canvasImage.init();
+        this.canvasImageBottom.init();
+        var map = this.parent.map;
+        if (map && map.isShow) {
+            map.setView();
+        }
+        this.render();
+        this.store.emitter.emit('scale', this.store.data.scale);
+        // });
     };
     Canvas.prototype.templateScale = function (scale, center) {
         var _this = this;