@hailin-zheng/editor-core 2.0.54 → 2.1.0

package/index.js

@@ -26232,7 +26232,14 @@ class EditorCalendarVNode {
                                 elm.style.left = (position.x - elmRect.width + 10) + 'px';
                             }
                             if (elmRect.top + elmRect.height > parentRect.top + parentRect.height) {
-                                elm.style.top = (position.y - position.height - elmRect.height) + 'px';
+                                const newTop = position.y - position.height - elmRect.height;
+                                const oldTop = position.y + 5 + position.height;
+                                //计算前后的高度的差距,然后判断新的值是否在父元素的范围内，如果不在则使用旧的值
+                                if (oldTop - newTop < elmRect.top - parentRect.top) {
+                                    elm.style.top = (position.y - position.height - elmRect.height) + 'px';
+                                }
+                                //elm.style.top = (top - (elmRect.top + elmRect.height - (parentRect.top + parentRect.height))) + 'px';
+                                //elm.style.top = (position.y - position.height - elmRect.height) + 'px';
                             }
                         }
                     }
@@ -27129,7 +27136,8 @@ class DocEditor {
                                     sel: 'div.scale-container', data: {
                                         style: {
                                             transform: 'scale(' + this.viewOptions.scale + ')',
-                                            transformOrigin: 'left top'
+                                            transformOrigin: 'right top',
+                                            width: this.viewOptions.docPageSettings.width + 'px',
                                         }
                                     },
                                     children: [docContentVNode, inputVNode, dropContainer]
@@ -27240,8 +27248,8 @@ class DocEditor {
             this.contentChanged.next();
         }
         this.updateSelection();
-        this.onShouldRender.next();
         this.setCursor();
+        this.onShouldRender.next();
         //this.refreshView();
     }
     /**
@@ -27385,12 +27393,12 @@ class DocEditor {
      */
     docClickHandle(evt) {
         this.hiddenInput();
-        this.setCursor();
-        this.updateSelection();
+        // this.setCursor();
+        // this.updateSelection();
+        this.refreshDocument();
         this.onClickEvent.next(evt);
         if (this.menusData) {
             this.menusData = null;
-            this.onChange();
         }
     }
     /**
@@ -27479,7 +27487,9 @@ class DocEditor {
         elementEvent.source = startControl;
         DocumentEvent.invokeEvent('ElementContextMenu', startControl, elementEvent, 'All');
         //const position = {x: evt.offsetX + 10, y: evt.offsetY, translateY: this.viewOptions.pageOffset.y};
-        const pos = ElementUtil.getMousePos(evt);
+        const pos = ElementUtil.getMousePos(evt, this.viewOptions.scale);
+        pos.x += 10;
+        pos.y -= 10;
         this.menusData = {
             position: pos,
             menus: elementEvent.menus
@@ -28054,6 +28064,7 @@ class DocEditor {
                         style: {
                             height: '0px',
                             position: 'relative',
+                            width: '0px',
                             'user-select': 'none',
                         },
                         on: this.documentEvent.getEventListener()
@@ -28362,7 +28373,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.0.54";
+        return "2.1.0";
     }
 }