@meta2d/core 1.0.64 → 1.0.65

package/package.json

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

@@ -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);
@@ -2208,7 +2208,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,
@@ -6156,9 +6161,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 +6185,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';
         }
@@ -6442,7 +6449,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 +7062,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;