@meta2d/core 1.0.62 → 1.0.64

package/package.json

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

@@ -14,6 +14,7 @@ import { Meta2d } from '../core';
 import { Dialog } from '../dialog';
 import { Title } from '../title';
 import { CanvasTemplate } from './canvasTemplate';
+import { Popconfirm } from '../popconfirm';
 export declare const movingSuffix: "-moving";
 export declare class Canvas {
     parent: Meta2d;
@@ -108,6 +109,7 @@ export declare class Canvas {
     inputDiv: HTMLDivElement;
     dropdown: HTMLUListElement;
     tooltip: Tooltip;
+    popconfirm: Popconfirm;
     title: Title;
     mousePos: Point;
     scroll: Scroll;
@@ -127,7 +129,7 @@ export declare class Canvas {
     listen(): void;
     onCopy: (event: ClipboardEvent) => void;
     onCut: (event: ClipboardEvent) => void;
-    onPaste: (event: ClipboardEvent) => void;
+    onPaste: (event: ClipboardEvent) => Promise<void>;
     onMessage: (e: MessageEvent) => void;
     onwheel: (e: WheelEvent) => void;
     onkeydown: (e: KeyboardEvent) => void;
@@ -143,7 +145,7 @@ export declare class Canvas {
     ondrop: (event: DragEvent) => Promise<void>;
     dropPens(pens: Pen[], e: Point): Promise<void>;
     randomCombineId(pen: Pen, pens: Pen[], parentId?: string): Pen;
-    addPens(pens: Pen[], history?: boolean): Promise<Pen[]>;
+    addPens(pens: Pen[], history?: boolean, abs?: boolean): Promise<Pen[]>;
     ontouchstart: (e: TouchEvent) => void;
     ontouchmove: (event: TouchEvent) => void;
     ontouchend: (event: TouchEvent) => void;
@@ -237,7 +239,7 @@ export declare class Canvas {
     inAnchor(pt: Point, pen: Pen, anchor: Point): HoverType;
     resize(w?: number, h?: number): void;
     clearCanvas(): void;
-    addPen(pen: Pen, history?: boolean, emit?: boolean): Promise<Pen>;
+    addPen(pen: Pen, history?: boolean, emit?: boolean, abs?: boolean): Promise<Pen>;
     pushHistory(action: EditAction): void;
     undo(): void;
     redo(): void;

package/src/canvas/canvas.js

@@ -18,6 +18,7 @@ import { setter } from '../utils/object';
 import { Title } from '../title';
 import { CanvasTemplate } from './canvasTemplate';
 import { getLinePoints } from '../diagrams/line';
+import { Popconfirm } from '../popconfirm';
 export const movingSuffix = '-moving';
 export class Canvas {
     parent;
@@ -97,6 +98,7 @@ export class Canvas {
     // inputRight = document.createElement('div');
     dropdown = document.createElement('ul');
     tooltip;
+    popconfirm;
     title;
     mousePos = { x: 0, y: 0 };
     scroll;
@@ -143,6 +145,7 @@ export class Canvas {
             let hover = this.store.data.pens.find((item) => item.calculative.hover === true);
             setHover(hover, false);
         };
+        this.popconfirm = new Popconfirm(parentElement, store);
         this.dialog = new Dialog(parentElement);
         this.title = new Title(parentElement);
         if (this.store.options.scroll) {
@@ -282,7 +285,7 @@ export class Canvas {
         }
         this.cut();
     };
-    onPaste = (event) => {
+    onPaste = async (event) => {
         if (this.store.data.locked || this.store.options.disableClipboard) {
             return;
         }
@@ -313,29 +316,39 @@ export class Canvas {
                         const blob = items[i].getAsFile();
                         let name = items[i].type.slice(6) === 'gif' ? 'gif' : 'image';
                         if (blob !== null) {
-                            let base64_str;
-                            const reader = new FileReader();
-                            reader.onload = (e) => {
-                                base64_str = e.target.result;
-                                const image = new Image();
-                                image.src = base64_str;
-                                image.onload = () => {
-                                    const { width, height } = image;
-                                    const pen = {
-                                        name,
-                                        x: x - 50 / 2,
-                                        y: y - (height / width) * 50,
-                                        externElement: name === 'gif',
-                                        width: 100,
-                                        height: (height / width) * 100,
-                                        image: base64_str,
-                                    };
-                                    this.addPens([pen]);
-                                    this.active([pen]);
-                                    this.copy([pen]);
-                                };
-                            };
-                            reader.readAsDataURL(blob);
+                            const isGif = name === 'gif';
+                            const pen = await this.fileToPen(blob, isGif);
+                            pen.height = (pen.height / pen.width) * 100,
+                                pen.width = 100;
+                            pen.x = x - 50 / 2,
+                                pen.y = y - (pen.height / pen.width) * 50,
+                                pen.externElement = isGif,
+                                this.addPens([pen]);
+                            this.active([pen]);
+                            this.copy([pen]);
+                            // let base64_str: any;
+                            // const reader = new FileReader();
+                            // reader.onload = (e) => {
+                            //   base64_str = e.target.result;
+                            //   const image = new Image();
+                            //   image.src = base64_str;
+                            //   image.onload = () => {
+                            //     const { width, height } = image;
+                            //     const pen = {
+                            //       name,
+                            //       x: x - 50 / 2,
+                            //       y: y - (height / width) * 50,
+                            //       externElement: name === 'gif',
+                            //       width: 100,
+                            //       height: (height / width) * 100,
+                            //       image: base64_str as any,
+                            //     };
+                            //     this.addPens([pen]);
+                            //     this.active([pen]);
+                            //     this.copy([pen]);
+                            //   };
+                            // };
+                            // reader.readAsDataURL(blob);
                         }
                     }
                 }
@@ -1229,7 +1242,7 @@ export class Canvas {
         pen.children = newChildren;
         return pen;
     }
-    async addPens(pens, history) {
+    async addPens(pens, history, abs) {
         if (this.beforeAddPens && (await this.beforeAddPens(pens)) != true) {
             return [];
         }
@@ -1238,6 +1251,12 @@ export class Canvas {
             if (this.beforeAddPen && this.beforeAddPen(pen) != true) {
                 continue;
             }
+            if (abs) {
+                pen.x = pen.x * this.store.data.scale + this.store.data.origin.x;
+                pen.y = pen.y * this.store.data.scale + this.store.data.origin.y;
+                pen.width = pen.width * this.store.data.scale;
+                pen.height = pen.height * this.store.data.scale;
+            }
             this.makePen(pen);
             list.push(pen);
         }
@@ -1462,6 +1481,7 @@ export class Canvas {
             this.mouseRight = MouseRight.Down;
         }
         this.hideInput();
+        this.popconfirm.hide();
         if (this.store.data.locked === LockState.Disable ||
             (e.buttons !== 1 && e.buttons !== 2)) {
             this.hoverType = HoverType.None;
@@ -3210,13 +3230,19 @@ export class Canvas {
         this.canvasImage.clear();
         this.canvasImageBottom.clear();
     }
-    async addPen(pen, history, emit) {
+    async addPen(pen, history, emit, abs) {
         if (this.beforeAddPens && (await this.beforeAddPens([pen])) != true) {
             return;
         }
         if (this.beforeAddPen && this.beforeAddPen(pen) != true) {
             return;
         }
+        if (abs) {
+            pen.x = pen.x * this.store.data.scale + this.store.data.origin.x;
+            pen.y = pen.y * this.store.data.scale + this.store.data.origin.y;
+            pen.width = pen.width * this.store.data.scale;
+            pen.height = pen.height * this.store.data.scale;
+        }
         this.makePen(pen);
         this.active([pen]);
         this.render();
@@ -6155,6 +6181,7 @@ export class Canvas {
             this.dropdown.style.background = pen.dropdownBackground || '#fff';
             this.dropdown.style.color = pen.dropdownColor || '#bdc7db';
             this.setDropdownList();
+            this.externalElements.style.zIndex = '9999';
         }
         else {
             // this.inputRight.style.display = 'none';
@@ -6337,6 +6364,7 @@ export class Canvas {
         });
     }
     hideInput = () => {
+        this.externalElements.style.zIndex = '5';
         if (this.inputParent.style.display === 'flex') {
             this.inputParent.style.display = 'none';
             const pen = this.store.pens[this.inputDiv.dataset.penId];
@@ -6715,7 +6743,12 @@ export class Canvas {
             // 单属性
             if (k.indexOf('.') === -1) {
                 if (k === 'rotate') {
-                    oldRotate = pen.calculative.rotate || 0;
+                    if (pen.disableRotate) { //当图元禁止旋转时不重新设置旋转角度
+                        pen.rotate = pen.calculative.rotate || 0;
+                    }
+                    else {
+                        oldRotate = pen.calculative.rotate || 0;
+                    }
                 }
                 else if (k === 'canvasLayer' || k === 'isBottom' || k === 'showChild') {
                     containIsBottom = true;
@@ -6724,7 +6757,9 @@ export class Canvas {
                     willRenderImage = true;
                 }
                 if (typeof pen[k] !== 'object' || k === 'lineDash') {
-                    pen.calculative[k] = data[k];
+                    if (!pen.disableRotate || k !== 'rotate') { //当图元禁止旋转时不重新设置旋转角度
+                        pen.calculative[k] = data[k];
+                    }
                 }
                 if (needCalcTextRectProps.includes(k)) {
                     willCalcTextRect = true;
@@ -7607,6 +7642,7 @@ export class Canvas {
         this.tooltip?.destroy();
         this.dialog?.destroy();
         this.title?.destroy();
+        this.popconfirm?.destroy();
         // ios
         this.externalElements.removeEventListener('gesturestart', this.onGesturestart);
         this.externalElements.ondragover = (e) => e.preventDefault();