@hailin-zheng/editor-core 1.1.31 → 1.1.33

package/index.js

@@ -652,7 +652,9 @@ function insertEle(ele) {
     //     return;
     // }
     appendToOps(options.doc, ele, {
-        insert: ele.clone(true)
+        //如果当前插入的为单元格，由于新插入的单元格，内部的内容没有补足，导致后续计算索引会出现问题
+        //之前为ele.clone(true);
+        insert: ele
     });
 }
 function removeEle(ele) {
@@ -672,15 +674,18 @@ function appendToOps(doc, ele, ops) {
     if (!array) {
         docOpsMap.set(doc, array = []);
     }
+    const log = getOpsLog(ele, ops);
+    array.push(log);
+}
+function getOpsLog(ele, ops) {
     const prevEle = ElementUtil.getPrevSiblingElement(ele);
-    const log = {
+    return {
         index: ElementUtil.getControlIndex(ele, true),
         parentIndex: ElementUtil.getControlIndex(ele.parent, true),
         prevIndex: prevEle ? ElementUtil.getControlIndex(prevEle, true) : -1,
         ele,
         ops
     };
-    array.push(log);
 }
 function inputText(ele, startIndex, input) {
     const options = getDocCtx(ele);
@@ -789,6 +794,13 @@ function generatePatch(doc) {
             }
             formatOpsMap.set(ele, op);
         }
+        if ('insert' in op.ops) {
+            op.ops.insert = ele.clone(true);
+            const log = getOpsLog(ele, op.ops);
+            op.index = log.index;
+            op.prevIndex = log.prevIndex;
+            op.parentIndex = log.parentIndex;
+        }
         patchs.push({ index: op.index, parentIndex: op.parentIndex, prevIndex: op.prevIndex, ops: op.ops });
     }
     //清空
@@ -1202,6 +1214,7 @@ class BranchElement extends Element {
     removeChildByIndex(index) {
         const child = this.chilren[index];
         if (child) {
+            removeEle(child);
             this.chilren.splice(index, 1);
             this.disposeChild(child);
         }
@@ -5233,8 +5246,10 @@ class TableUtil {
                     currCell.props.hMerge = null;
                 }
                 if (currCell !== startCell) {
-                    cellContents.push(...ElementUtil.getChildrenElements(currCell));
-                    currCell.clearItems();
+                    if (currCell.getChildLength() !== 2) {
+                        cellContents.push(...ElementUtil.getChildrenElements(currCell.clone(true)));
+                        currCell.clearItems();
+                    }
                 }
             }
         }
@@ -12245,9 +12260,10 @@ class DocumentArrange {
         }
     }
     cutRowRenderItem(render, limitHeight) {
-        if (render.element.props.minHeight > 0 && render.rect.height > limitHeight) {
-            return null;
-        }
+        //可能当前行的高度就超过了限制高度，且存在最小高度
+        // if (render.element.props.minHeight > 0 && render.rect.height < limitHeight) {
+        //     return null;
+        // }
         const cloneRowRender = render.element.createRenderObject();
         cloneRowRender.rect.width = render.rect.width;
         //cloneRowRender.rect.maxWidth = render.rect.height;