@hailin-zheng/editor-core 2.0.35 → 2.0.37

package/index.js

@@ -1722,8 +1722,8 @@ class TextProps extends INotifyPropertyChanged {
         super();
     }
     color;
-    fontName;
-    fontSize;
+    fontName = '宋体';
+    fontSize = 12;
     fontWeight = 'normal';
     fontStyle = 'normal';
     //textDecoration: 'none' | 'underline' | 'overline' | 'line-through' = 'none';
@@ -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)) {
@@ -14677,6 +14687,9 @@ class DocumentArrange {
                     blockLine = children[++j];
                 }
             }
+            // if (cloneRender.length === 0 && sumHeight === 0) {
+            //     return null;
+            // }
             ElementUtil.remeasure(cloneRender);
             ElementUtil.remeasure(render);
             if (cloneRender.length === 0) {
@@ -27225,13 +27238,16 @@ class DocEditor {
      * 设置光标
      */
     setCursor() {
+        if (this.documentEvent.ismousedown) {
+            return;
+        }
         this.selectionState;
         if (!this.canSetCursor() || !this.selectionState.startHitInfo) {
             this.selectionState.editable = false;
             this.docCtx.selectionState.cursorPos = null;
             const cursorRect = this.getCursorRect();
             this.hiddenInput(false, cursorRect);
-            return false;
+            return;
         }
         const cursorRect = this.getCursorRect();
         this.docCtx.cursorRect = ElementUtil.cloneRect(cursorRect);
@@ -27239,12 +27255,20 @@ class DocEditor {
         const abPos = ElementUtil.cloneRect(cursorRect);
         this.setCursorPosition(abPos);
         //this.documentEvent.invokeCursor(startControl);
-        return true;
+        return;
     }
     getCursorRect() {
         try {
             const { startControl, startOffset } = this.selectionState;
             if (!this.documentEvent.startHitInfo || !startControl || (startControl && !startControl.parent)) {
+                if (this.documentEvent.mousedownPos) {
+                    return {
+                        x: this.documentEvent.mousedownPos.x,
+                        y: this.documentEvent.mousedownPos.y,
+                        width: 0,
+                        height: 0
+                    };
+                }
                 return { x: 0, y: 0, width: 0, height: 0 };
             }
             const { startRegion, hitDocIndex } = this.documentEvent.startHitInfo;
@@ -28277,7 +28301,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.0.35";
+        return "2.0.37";
     }
 }