@hailin-zheng/editor-core 2.0.22 → 2.0.23

package/index-cjs.js

@@ -17936,7 +17936,7 @@ class DocumentEvent {
         if (this.viewOptions.docMode !== exports.DocMode.FormEdit) {
             return;
         }
-        const currDataEle = this.getCurrentDataElement();
+        const currDataEle = this.getCurrentDataElement('free');
         if (currDataEle) {
             if (currDataEle instanceof DataElementLeaf) {
                 this.moveCursorToRightHandle(currDataEle, 1);
@@ -18205,15 +18205,15 @@ class DocumentEvent {
      * 获取当前光标所在的数据元
      * @returns
      */
-    getCurrentDataElement() {
+    getCurrentDataElement(mode = 'strict') {
         const selectionState = this.selectionState;
         const { startControl, startOffset, collapsed, ancestorCommonControl } = selectionState;
         if (startControl && collapsed) {
-            if (!ElementUtil.verifyHitable(startControl)) {
-                return null;
-            }
+            // if (!ElementUtil.verifyHitable(startControl)) {
+            //     return null;
+            // }
             const dataEle = ElementUtil.getParent(startControl, validateDataEle);
-            if (dataEle instanceof DataElementLeaf || IsInSideDataElement(startControl, startOffset)) {
+            if (dataEle instanceof DataElementLeaf || (mode === 'free' || IsInSideDataElement(startControl, startOffset))) {
                 return dataEle;
             }
             else {
@@ -27228,6 +27228,7 @@ class DocEditor {
         this.editInput.style.left = '-2px';
         this.editInput.style.top = '-2px';
         this.editInput.readOnly = true;
+        this.editInput.focus();
     }
     /**
      * 设置光标位置
@@ -27314,6 +27315,10 @@ class DocEditor {
      */
     moveFocusToNextDataElement() {
         this.documentEvent.moveFocusToNextDataElement();
+        const startControl = this.selectionState.range?.startControl;
+        if (startControl) {
+            this.bringToView(startControl);
+        }
     }
     /**
      * 设置当前光标所在的数据元的值
@@ -27707,14 +27712,15 @@ class DocEditor {
             const docRender = ElementUtil.getParentRender(renderObj, DocumentRenderObject);
             const index = docRender.getIndex();
             const cursorPos = DocumentCursor.getElementCursorPos(ele, 0, region, index);
-            this.selectionState.resetRange(element, 0);
-            if (cursorPos.rect.y - this.viewOptions.pageOffset.y > 0 && cursorPos.rect.y - this.viewOptions.pageOffset.y < this.viewOptions.viewSettings.height) {
-                return;
-            }
-            //this.docScroll.scrollTo(cursorPos.rect.x, cursorPos.rect.y - this.viewOptions.translateY);
-            //this.doc.scrollTo(cursorPos.rect.x, cursorPos.rect.y + 100);
-            this.scrollContainer.scrollTop = cursorPos.rect.y + 100;
+            //this.selectionState.resetRange(element, 0);
+            this.scrollToPosition(cursorPos.rect);
+        }
+    }
+    scrollToPosition(pos) {
+        if (pos.y - this.viewOptions.pageOffset.y > 0 && pos.y - this.viewOptions.pageOffset.y < this.viewOptions.viewSettings.height) {
+            return;
         }
+        this.scrollContainer.scrollTop = pos.y + 30;
     }
     /**
      * 设置当前文档页边距
@@ -28134,7 +28140,8 @@ class DocEditor {
             const dataEle = editor.getCurrentDataElement();
             if (dataEle && dataEle instanceof DataElementDate) {
                 dataEle.setValue(value);
-                editor.selectionState.clear();
+                editor.selectionState.resetRange(dataEle.endDecorate, 1);
+                //editor.selectionState.clear();
             }
         });
         return {