@hailin-zheng/editor-core 2.0.38 → 2.0.40

package/index.js

@@ -3870,7 +3870,7 @@ function drawDecorator(e, r) {
 }
 function exportDecoratorHTML(event, r) {
     const canPaint = r.element.isMouseenter || r.element.isFocused;
-    if (canPaint && r.element.paintRenders.indexOf(r) === 0) {
+    if (canPaint) {
         const strokeColor = '#0050b3';
         const verOffset = 0;
         const renderPosMap = getCurrentParaGroupRenders(r).map(item => ({ pos: getRenderPosToDoc(item), render: item }));
@@ -12484,6 +12484,17 @@ class ElementUtil {
         offset = offset === -1 ? 1 : offset;
         return offset;
     }
+    /**
+     * 设置光标在数据元内容末尾
+     */
+    static setDataElemEndFocus(ss, ele) {
+        if (ele.length === 2) {
+            ss.resetRange(ele.getChild(0), 1);
+        }
+        else {
+            ss.resetRange(ele.getChild(ele.length - 2), -1);
+        }
+    }
 }
 
 class RenderContext {
@@ -14687,9 +14698,9 @@ class DocumentArrange {
                     blockLine = children[++j];
                 }
             }
-            // if (cloneRender.length === 0 && sumHeight === 0) {
-            //     return null;
-            // }
+            if (cloneRender.length === 0 && sumHeight === 0) {
+                return null;
+            }
             ElementUtil.remeasure(cloneRender);
             ElementUtil.remeasure(render);
             if (cloneRender.length === 0) {
@@ -14746,7 +14757,7 @@ class DocumentArrange {
                     if (cutRow) {
                         cloneTbRender.addChild(cutRow);
                         sumHeight += cutRow.rect.height;
-                        if (currRow.getItems().every(item => item.length !== 0)) {
+                        if (currRow.getItems().some(item => item.length !== 0)) {
                             cutRows.push(currRow);
                         }
                         else {
@@ -18763,6 +18774,7 @@ class DocumentChange {
         if (!selectedRange) {
             throw new Error('selectionRange is null');
         }
+        this.selectionState.clear();
         //用于刷新后定位光标
         let startPointElement;
         let startPointOffset = 0;
@@ -18812,8 +18824,13 @@ class DocumentChange {
         else {
             this.deleteRange(selectedRange);
         }
-        this.selectionState.resetRange(startPointElement, startPointOffset);
-        return { cursorEle: startPointElement, cursorOffset: startPointOffset };
+        if (startPointElement) {
+            //如果其他位置设置过选区对象，则以启动位置设置的选区为准
+            if (!this.selectionState.range) {
+                this.selectionState.resetRange(startPointElement, startPointOffset);
+            }
+        }
+        //return {cursorEle: startPointElement, cursorOffset: startPointOffset};
     }
     /**
      * backspace删除
@@ -18876,9 +18893,8 @@ class DocumentChange {
                         return;
                     }
                     if (control.isPrefix && this.viewOptions.docMode === DocMode.FormEdit) {
-                        if (this.jumpToPrevDataElement(dataEle)) {
-                            return;
-                        }
+                        this.selectionState.resetRange(dataEle.startDecorate, 1);
+                        return;
                     }
                 }
                 if (control.isDecorate) {
@@ -18902,7 +18918,7 @@ class DocumentChange {
             return false;
         }
         if (prevEle) {
-            this.selectionState.resetRange(prevEle.endDecorate, 0);
+            ElementUtil.setDataElemEndFocus(this.selectionState, prevEle);
             return true;
         }
         return false;
@@ -19259,6 +19275,7 @@ class DocumentChange {
         //在数据元内删除，调用普通的删除处理
         if (dataElement) {
             this.deleteRange(range);
+            this.selectionState.resetRange(dataElement.startDecorate, 1);
             return;
         }
         //在数据元外删除
@@ -19847,6 +19864,14 @@ class DocumentChange {
         }
     }
     getCursorElementByDeleteAction(control) {
+        if (this.viewOptions.docMode === DocMode.FormEdit) {
+            if (control.parent instanceof DataElementInlineGroup) {
+                return {
+                    ele: control.parent.startDecorate,
+                    offset: 1
+                };
+            }
+        }
         const prevLeafElementInPara = ElementUtil.getRecursionPrevSiblingElement(control, false, true, this.viewOptions);
         //是否为同一段落
         if (prevLeafElementInPara && ElementUtil.isInSameParagraph(prevLeafElementInPara, control)) {
@@ -27310,6 +27335,8 @@ class DocEditor {
         this.editInput.style.width = "1px";
         this.editInput.readOnly = false;
         this.setCursorVisibility(true);
+        //判断光标位置是否被可见，如果不可见，需要将其设置到可见区域
+        //TODO:暂时不做处理
         //this.setCursorInputStatus();
     }
     /**
@@ -28076,12 +28103,7 @@ class DocEditor {
      * 设置光标在数据元内容末尾
      */
     setDataElemEndFocus(ele) {
-        if (ele.length === 2) {
-            this.selectionState.resetRange(ele.getChild(0), 1);
-        }
-        else {
-            this.selectionState.resetRange(ele.getChild(ele.length - 2), -1);
-        }
+        ElementUtil.setDataElemEndFocus(this.selectionState, ele);
     }
     /**
      * 渲染下拉框数据元
@@ -28308,7 +28330,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.0.38";
+        return "2.0.40";
     }
 }