@meta2d/core 1.0.60 → 1.0.61

package/package.json

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

@@ -126,13 +126,13 @@ export class Canvas {
         this.canvasImage = new CanvasImage(parentElement, store);
         this.canvasImage.canvas.style.zIndex = '4';
         this.magnifierCanvas = new MagnifierCanvas(this, parentElement, store);
-        this.magnifierCanvas.canvas.style.zIndex = '5';
+        this.magnifierCanvas.canvas.style.zIndex = '100'; //放大镜盖过dom图元
         this.externalElements.style.position = 'absolute';
         this.externalElements.style.left = '0';
         this.externalElements.style.top = '0';
         this.externalElements.style.outline = 'none';
         this.externalElements.style.background = 'transparent';
-        this.externalElements.style.zIndex = '5';
+        this.externalElements.style.zIndex = '101';
         parentElement.style.position = 'relative';
         parentElement.appendChild(this.externalElements);
         this.createInput();
@@ -353,7 +353,7 @@ export class Canvas {
         }
         let data = JSON.parse(e.data);
         if (typeof data === 'object') {
-            this.parent.doMessageEvent(data.name);
+            this.parent.doMessageEvent(data.name, data.value);
         }
         else {
             this.parent.doMessageEvent(data);
@@ -6133,7 +6133,7 @@ export class Canvas {
             textRect.x + this.store.data.x - (pen.textLeft || 0) + 'px'; //+ 5
         this.inputParent.style.top =
             textRect.y + this.store.data.y - (pen.textTop || 0) + 'px'; //+ 5
-        let _width = textRect.width + (pen.textLeft || 0);
+        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)
         this.inputParent.style.zIndex = '9999';
@@ -6152,6 +6152,8 @@ export class Canvas {
             if (!this.store.data.locked) {
                 this.inputRight.style.display = 'none';
             }
+            this.dropdown.style.background = pen.dropdownBackground || '#fff';
+            this.dropdown.style.color = pen.dropdownColor || '#bdc7db';
             this.setDropdownList();
         }
         else {
@@ -6357,7 +6359,7 @@ export class Canvas {
                 pen.text = this.inputDiv.dataset.value;
                 pen.calculative.text = pen.text;
                 this.inputDiv.dataset.penId = undefined;
-                if (pen.name === 'text' && pen.textAutoAdjust) {
+                if (pen.text && pen.textAutoAdjust) {
                     calcTextAutoWidth(pen);
                 }
                 calcTextRect(pen);
@@ -6597,6 +6599,15 @@ export class Canvas {
         li.onmousedown = this.stopPropagation;
         li.dataset.i = index + '';
         li.onclick = this.selectDropdown;
+        const pen = this.store.pens[this.inputDiv.dataset.penId];
+        li.onmouseenter = () => {
+            li.style.background = pen.dropdownHoverBackground || '#eee';
+            li.style.color = pen.dropdownHoverColor || '#bdc7db';
+        };
+        li.onmouseleave = () => {
+            li.style.background = pen.dropdownBackground || '#fff';
+            li.style.color = pen.dropdownColor || '#bdc7db';
+        };
         this.dropdown.appendChild(li);
     }
     selectDropdown = (e) => {
@@ -7211,6 +7222,7 @@ export class Canvas {
     }
     showMagnifier() {
         this.magnifierCanvas.magnifier = true;
+        this.magnifierCanvas.updateDomOffscreen();
         this.externalElements.style.cursor = 'default';
         this.render();
     }