@meta2d/core 1.0.14 → 1.0.16

package/package.json

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

@@ -12,6 +12,7 @@ import { Scroll } from '../scroll';
 import { CanvasImage } from './canvasImage';
 import { MagnifierCanvas } from './magnifierCanvas';
 import { Meta2d } from '../core';
+import { Dialog } from '../dialog';
 export declare const movingSuffix: "-moving";
 export declare class Canvas {
     parent: Meta2d;
@@ -102,6 +103,7 @@ export declare class Canvas {
     canvasImage: CanvasImage;
     canvasImageBottom: CanvasImage;
     magnifierCanvas: MagnifierCanvas;
+    dialog: Dialog;
     stopPropagation: (e: MouseEvent) => void;
     constructor(parent: Meta2d, parentElement: HTMLElement, store: Meta2dStore);
     curve: typeof curve;

package/src/canvas/canvas.js

@@ -96,6 +96,7 @@ import { Scroll } from '../scroll';
 import { CanvasImage } from './canvasImage';
 import { MagnifierCanvas } from './magnifierCanvas';
 import { lockedError } from '../utils/error';
+import { Dialog } from '../dialog';
 export var movingSuffix = '-moving';
 var Canvas = /** @class */ (function () {
     function Canvas(parent, parentElement, store) {
@@ -2539,6 +2540,7 @@ var Canvas = /** @class */ (function () {
             var hover = _this.store.data.pens.find(function (item) { return item.calculative.hover === true; });
             setHover(hover, false);
         };
+        this.dialog = new Dialog(parentElement);
         if (this.store.options.scroll) {
             this.scroll = new Scroll(this);
         }
@@ -4117,15 +4119,18 @@ 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;
         this.store.data.y += y * this.store.data.scale;
         this.store.data.x = Math.round(this.store.data.x);
         this.store.data.y = Math.round(this.store.data.y);
-        this.canvasImage.init();
-        this.canvasImageBottom.init();
-        this.render();
+        setTimeout(function () {
+            _this.canvasImage.init();
+            _this.canvasImageBottom.init();
+            _this.render();
+        });
         this.store.emitter.emit('translate', {
             x: this.store.data.x,
             y: this.store.data.y,
@@ -4215,14 +4220,16 @@ var Canvas = /** @class */ (function () {
             _this.execPenResize(pen);
         });
         this.calcActiveRect();
-        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(function () {
+            _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.rotatePens = function (e) {
         var e_17, _a;
@@ -4478,7 +4485,9 @@ var Canvas = /** @class */ (function () {
             // 线宽为 0 ，看不到外边框，拖动过程中给个外边框
             pen.lineWidth === 0 && (value.lineWidth = 1);
             // TODO: 例如 pen.name = 'triangle' 的情况，但有图片，是否还需要变成矩形呢？
-            if (isDomShapes.includes(pen.name) || pen.image) {
+            if (isDomShapes.includes(pen.name) ||
+                _this.store.options.domShapes.includes(pen.name) ||
+                pen.image) {
                 // 修改名称会执行 onDestroy ，清空它
                 value.name = 'rectangle';
                 value.onDestroy = undefined;
@@ -6215,9 +6224,10 @@ var Canvas = /** @class */ (function () {
         this.render();
     };
     Canvas.prototype.destroy = function () {
-        var _a;
+        var _a, _b;
         this.scroll && this.scroll.destroy();
         (_a = this.tooltip) === null || _a === void 0 ? void 0 : _a.destroy();
+        (_b = this.dialog) === null || _b === void 0 ? void 0 : _b.destroy();
         // ios
         this.externalElements.removeEventListener('gesturestart', this.onGesturestart);
         this.externalElements.ondragover = function (e) { return e.preventDefault(); };