@hailin-zheng/editor-core 2.0.32 → 2.0.34

package/index.js

@@ -11131,14 +11131,19 @@ class ElementUtil {
     static getContinueVMergeRenderRows(render, rowIndex, colIndex) {
         const rows = [];
         for (let i = rowIndex + 1; i < render.length; i++) {
-            const rowRender = render.getChild(i);
-            const rowEle = rowRender.element;
-            const ele = rowEle.getChild(colIndex);
-            const { vMerge } = ele.props;
-            if (vMerge !== 'continue') {
-                break;
+            try {
+                const rowRender = render.getChild(i);
+                const rowEle = rowRender.element;
+                const ele = rowEle.getChild(colIndex);
+                const { vMerge } = ele.props;
+                if (vMerge !== 'continue') {
+                    break;
+                }
+                rows.push(rowRender);
+            }
+            catch (e) {
+                throw e;
             }
-            rows.push(rowRender);
         }
         return rows;
     }
@@ -27238,10 +27243,10 @@ class DocEditor {
     }
     getCursorRect() {
         try {
-            if (!this.selectionState.editable) {
+            const { startControl, startOffset } = this.selectionState;
+            if (!this.documentEvent.startHitInfo || (startControl && !startControl.parent)) {
                 return { x: 0, y: 0, width: 0, height: 0 };
             }
-            const { startControl, startOffset } = this.selectionState;
             const { startRegion, hitDocIndex } = this.documentEvent.startHitInfo;
             const cursorPos = DocumentCursor.getElementCursorPos(startControl, startOffset, startRegion, hitDocIndex);
             return cursorPos.rect;
@@ -27266,6 +27271,7 @@ class DocEditor {
         this.editInput.style.left = pos ? pos.x + 'px' : '-2px';
         this.editInput.style.top = pos ? pos.y + 'px' : '-2px';
         this.editInput.readOnly = true;
+        this.editInput.style.width = "0";
         //this.editInput.style.display = 'none';
         !reset && this.editInput.focus();
     }
@@ -27277,6 +27283,7 @@ class DocEditor {
         this.editInput.style.left = position.x + 'px';
         this.editInput.style.top = position.y + 'px';
         this.editInput.style.height = position.height + 'px';
+        this.editInput.style.width = "1px";
         this.editInput.readOnly = false;
         this.setCursorVisibility(true);
         //this.setCursorInputStatus();
@@ -28269,6 +28276,9 @@ class DocEditor {
         }
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
+    version() {
+        return "2.0.34";
+    }
 }
 
 /**