@hailin-zheng/editor-core 2.0.36 → 2.0.38

package/index.js

@@ -11884,7 +11884,7 @@ class ElementUtil {
             }
             const lastLeafElement = ElementUtil.getLastLeafElement(prevElement);
             //用于光标定位
-            if (forCursor && lastLeafElement && lastLeafElement.disableClick) {
+            if (forCursor && lastLeafElement && !ElementUtil.canSetCursor(lastLeafElement, 0, true, viewOptions)) {
                 return this.getRecursionPrevSiblingElement(lastLeafElement, inPara, forCursor, viewOptions);
             }
             if (lastLeafElement) {
@@ -11960,13 +11960,20 @@ class ElementUtil {
      */
     static getRecursionNextSiblingElement(currElement, inPara = false, forCursor = false, viewOptions) {
         const parent = currElement?.parent;
-        if (!currElement || !parent || !currElement.paintRenders.length) {
+        if (!currElement || !parent) {
             return null;
         }
+        // if (!currElement.paintRenders.length) {
+        //     return this.getRecursionNextSiblingElement(currElement, inPara, forCursor, viewOptions);
+        // }
         //如果当前数据元不可编辑，则直接跳过
         if (parent instanceof DataElementInlineGroup && !parent.props.editable && viewOptions.docMode === DocMode.FormEdit) {
             return this.getRecursionNextSiblingElement(parent, inPara, forCursor, viewOptions);
         }
+        //如果当前为数据组，且数据组被隐藏，则直接跳过
+        if (parent instanceof DataElementGroupElement && parent.props.hidden) {
+            return this.getRecursionNextSiblingElement(parent, inPara, forCursor, viewOptions);
+        }
         if (forCursor && parent.disableClick) {
             return this.getRecursionNextSiblingElement(parent, inPara, forCursor, viewOptions);
         }
@@ -11990,7 +11997,7 @@ class ElementUtil {
             }
             const lastLeafElement = ElementUtil.getFirstLeafElement(nextElement);
             //用于光标定位
-            if (forCursor && lastLeafElement && lastLeafElement.disableClick) {
+            if (forCursor && lastLeafElement && !ElementUtil.canSetCursor(lastLeafElement, ElementUtil.getElementEndOffset(lastLeafElement), true, viewOptions)) {
                 return this.getRecursionNextSiblingElement(lastLeafElement, inPara, forCursor, viewOptions);
             }
             if (lastLeafElement) {
@@ -12442,13 +12449,16 @@ class ElementUtil {
         if (!startControl || !editable) {
             return false;
         }
-        if (viewOptions.docMode === DocMode.Design) {
-            return true;
-        }
         //浏览模式
         if (viewOptions.docMode === DocMode.View) {
             return false;
         }
+        if (startControl.paintRenders.length === 0) {
+            return false;
+        }
+        if (viewOptions.docMode === DocMode.Design) {
+            return true;
+        }
         //表单模式下，如果不在数据元素中，则不显示光标
         if (viewOptions.docMode === DocMode.FormEdit) {
             if (!IsInSideDataElement(startControl, startOffset)) {
@@ -28183,7 +28193,14 @@ class DocEditor {
                                             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';
                                         }
                                     }
                                 }
@@ -28291,7 +28308,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.0.36";
+        return "2.0.38";
     }
 }