@meta2d/core 1.0.64 → 1.0.66

package/package.json

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

@@ -88,6 +88,7 @@ export declare class Canvas {
         altKey?: boolean;
         ctrlKey?: boolean;
         metaKey?: boolean;
+        F?: boolean;
     };
     /**
      * @deprecated 改用 beforeAddPens
@@ -274,6 +275,7 @@ export declare class Canvas {
     private renderPenContainChild;
     renderBorder: () => void;
     renderHoverPoint: () => void;
+    transTimeout: any;
     translate(x?: number, y?: number): void;
     onMovePens(): void;
     /**

package/src/canvas/canvas.js

@@ -146,7 +146,7 @@ export class Canvas {
             setHover(hover, false);
         };
         this.popconfirm = new Popconfirm(parentElement, store);
-        this.dialog = new Dialog(parentElement);
+        this.dialog = new Dialog(parentElement, store);
         this.title = new Title(parentElement);
         if (this.store.options.scroll) {
             this.scroll = new Scroll(this);
@@ -366,7 +366,7 @@ export class Canvas {
         }
         let data = JSON.parse(e.data);
         if (typeof data === 'object') {
-            this.parent.doMessageEvent(data.name, data.value);
+            this.parent.doMessageEvent(data.name, JSON.stringify(data.data));
         }
         else {
             this.parent.doMessageEvent(data);
@@ -514,6 +514,10 @@ export class Canvas {
         this.keyOptions.shiftKey = e.shiftKey;
         this.keyOptions.ctrlKey = e.ctrlKey;
         this.keyOptions.metaKey = e.metaKey;
+        this.keyOptions.F = false;
+        if (e.key === 'F' || e.key === 'f') {
+            this.keyOptions.F = true;
+        }
         let x = 10;
         let y = 10;
         let vRect = null;
@@ -908,6 +912,10 @@ export class Canvas {
                 break;
             case 'F':
             case 'f':
+                if (!this.store.data.locked && (e.ctrlKey || e.metaKey) && !this.store.options.disableClipboard) {
+                    //粘贴到被复制图元上一层
+                    this.paste();
+                }
                 this.setFollowers();
                 break;
         }
@@ -2208,7 +2216,12 @@ export class Canvas {
         if (e.button !== 2) {
             if (distance(this.mouseDown, e) < 2) {
                 if (this.store.hover && this.store.hover.input) {
-                    this.showInput(this.store.hover);
+                    if (this.store.hover.onShowInput) {
+                        this.store.hover.onShowInput(this.store.hover, e);
+                    }
+                    else {
+                        this.showInput(this.store.hover);
+                    }
                 }
                 this.store.emitter.emit('click', {
                     x: e.x,
@@ -3523,7 +3536,13 @@ export class Canvas {
             this.updatePenRect(pen);
             return;
         }
-        this.store.data.pens.push(pen);
+        if (pen.copyIndex) {
+            this.store.data.pens.splice(pen.copyIndex + 1, 0, pen);
+            delete pen.copyIndex;
+        }
+        else {
+            this.store.data.pens.push(pen);
+        }
         this.store.pens[pen.id] = pen;
         // 集中存储path，避免数据冗余过大
         if (pen.path) {
@@ -4101,7 +4120,11 @@ export class Canvas {
         }
     };
     renderPenContainChild = (ctx, pen) => {
-        pen.calculative.inView && renderPen(ctx, pen); // 可见才绘制，组合为状态只显示其中一个
+        if (pen.calculative.inView) {
+            if (!(pen.name === 'combine' && !pen.draw)) {
+                renderPen(ctx, pen); // 可见才绘制，组合为状态只显示其中一个
+            }
+        }
         pen.children?.forEach((id) => {
             const child = this.store.pens[id];
             child && this.renderPenContainChild(ctx, child);
@@ -4322,6 +4345,7 @@ export class Canvas {
         }
         ctx.restore();
     };
+    transTimeout;
     translate(x = 0, y = 0) {
         this.store.data.x += x * this.store.data.scale;
         this.store.data.y += y * this.store.data.scale;
@@ -4366,10 +4390,21 @@ export class Canvas {
         }
         //TODO 当初为什么加异步
         // setTimeout(() => {
-        this.canvasTemplate.init();
-        this.canvasImage.init();
-        this.canvasImageBottom.init();
-        this.render();
+        if (this.store.data.asyncTranslate) {
+            clearTimeout(this.transTimeout);
+            this.transTimeout = setTimeout(() => {
+                this.canvasTemplate.init();
+                this.canvasImage.init();
+                this.canvasImageBottom.init();
+                this.render();
+            }, 300);
+        }
+        else {
+            this.canvasTemplate.init();
+            this.canvasImage.init();
+            this.canvasImageBottom.init();
+            this.render();
+        }
         // });
         this.store.emitter.emit('translate', {
             x: this.store.data.x,
@@ -5666,9 +5701,9 @@ export class Canvas {
         copyPens.sort((a, b) => {
             return a.copyIndex - b.copyIndex;
         });
-        copyPens.forEach((activePen) => {
-            delete activePen.copyIndex;
-        });
+        // copyPens.forEach((activePen: any) => {
+        //   delete activePen.copyIndex;
+        // });
         const clipboard = {
             meta2d: true,
             pens: copyPens,
@@ -5677,6 +5712,7 @@ export class Canvas {
             page,
             initRect: deepClone(this.activeRect),
             offset: 10,
+            mousePos: deepClone(this.mousePos),
         };
         if (navigator.clipboard &&
             !this.store.options.disableClipboard &&
@@ -5741,7 +5777,14 @@ export class Canvas {
         }
         this.store.clipboard = deepClone(clipboard);
         const curPage = sessionStorage.getItem('page');
-        if (curPage !== clipboard.page) {
+        const scale = this.store.data.scale;
+        if (this.store.clipboard.mousePos && (Math.abs(this.store.clipboard.mousePos.x - this.mousePos.x) > 100 * scale || Math.abs(this.store.clipboard.mousePos.y - this.mousePos.y) > 100 * scale)) {
+            const offsetX = (scale - this.store.clipboard.scale) * this.store.clipboard.initRect.width / 2;
+            const offsetY = (scale - this.store.clipboard.scale) * this.store.clipboard.initRect.height / 2;
+            this.store.clipboard.pos = { x: this.mousePos.x - offsetX, y: this.mousePos.y - offsetY };
+            this.store.clipboard.offset = 0;
+        }
+        else if (curPage !== clipboard.page) {
             this.store.clipboard.pos = { x: this.mousePos.x, y: this.mousePos.y };
             this.store.clipboard.offset = 0;
         }
@@ -5753,6 +5796,11 @@ export class Canvas {
             offset && (this.store.clipboard.offset = offset);
             pos && (this.store.clipboard.pos = pos);
         }
+        if (!this.keyOptions.F) {
+            this.store.clipboard.pens.forEach((pen) => {
+                delete pen.copyIndex;
+            });
+        }
         const rootPens = this.store.clipboard.pens.filter((pen) => !pen.parentId);
         for (const pen of rootPens) {
             this.pastePen(pen, undefined);
@@ -5850,7 +5898,7 @@ export class Canvas {
                 pen.x = -this.store.data.x + this.width / 2 - pen.width / 2;
                 pen.y = -this.store.data.y + this.height / 2 - pen.height / 2;
             }
-            else if (this.keyOptions && this.keyOptions.shiftKey && (this.keyOptions.ctrlKey || this.keyOptions.metaKey)) {
+            else if (this.keyOptions && this.keyOptions.shiftKey && (this.keyOptions.ctrlKey || this.keyOptions.metaKey || this.keyOptions.F)) {
             }
             else {
                 pen.x += this.store.clipboard.offset * this.store.data.scale;
@@ -6156,9 +6204,9 @@ export class Canvas {
         // this.inputDiv.style.fontSize = pen.calculative.fontSize + 'px';
         // this.inputDiv.style.color = getTextColor(pen, this.store);
         this.inputParent.style.left =
-            textRect.x + this.store.data.x - (pen.textLeft || 0) + 'px'; //+ 5
+            textRect.x + this.store.data.x - (pen.calculative.textLeft || 0) + 'px'; //+ 5
         this.inputParent.style.top =
-            textRect.y + this.store.data.y - (pen.textTop || 0) + 'px'; //+ 5
+            textRect.y + this.store.data.y - (pen.calculative.textTop || 0) + 'px'; //+ 5
         let _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)
@@ -6180,6 +6228,8 @@ export class Canvas {
             // }
             this.dropdown.style.background = pen.dropdownBackground || '#fff';
             this.dropdown.style.color = pen.dropdownColor || '#bdc7db';
+            this.dropdown.style.width = this.inputParent.style.width;
+            this.dropdown.style.fontSize = (pen.fontSize || 12) + 'px';
             this.setDropdownList();
             this.externalElements.style.zIndex = '9999';
         }
@@ -6387,7 +6437,7 @@ export class Canvas {
                 pen.text = this.inputDiv.dataset.value;
                 pen.calculative.text = pen.text;
                 this.inputDiv.dataset.penId = undefined;
-                if (pen.text && pen.textAutoAdjust) {
+                if (pen.text && pen.textAutoAdjust && !pen.parentId) {
                     calcTextAutoWidth(pen);
                 }
                 calcTextRect(pen);
@@ -6442,7 +6492,7 @@ export class Canvas {
             sheet.insertRule('.meta2d-input{display:none;position:absolute;outline:none;align-items: center;}');
             sheet.insertRule('.meta2d-input textarea{resize:none;border:none;outline:none;background:transparent;flex-grow:1;height:100%;left:0;top:0}');
             sheet.insertRule('.meta2d-input .right{width:10px;height:10px;flex-shrink:0;border-top: 1px solid;border-right: 1px solid;margin-right: 5px;transition: all .3s cubic-bezier(.645,.045,.355,1);position:absolute;right:1px;}');
-            sheet.insertRule('.meta2d-input ul{position:absolute;top:100%;left:-5px;width:calc(100% + 10px);min-height:30px;border-radius: 2px;box-shadow: 0 2px 8px #00000026;list-style-type: none;background-color: #fff;padding: 4px 0;max-height: 105px;overflow-y: auto;}');
+            sheet.insertRule('.meta2d-input ul{position:absolute;top:100%;margin-top:4px; width:calc(100% + 10px);min-height:30px;border-radius: 2px;box-shadow: 0 2px 8px #00000026;list-style-type: none;background-color: #fff;padding: 4px 0;max-height: 105px;overflow-y: auto;}');
             sheet.insertRule('.meta2d-input ul li{padding: 5px 12px;line-height: 22px;white-space: nowrap;cursor: pointer;}');
             sheet.insertRule('.meta2d-input ul li:hover{background: #eeeeee;}');
             sheet.insertRule(`.input-div::-webkit-scrollbar {display:none}`);
@@ -7055,6 +7105,9 @@ export class Canvas {
             if (!isShowChild(pen, this.store) || pen.visible == false) {
                 continue;
             }
+            if (pen.name === 'combine' && !pen.draw) {
+                continue;
+            }
             // TODO: hover 待考虑，若出现再补上
             const { active } = pen.calculative;
             pen.calculative.active = false;