@hailin-zheng/editor-core 1.1.30 → 1.1.32

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,19 +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
     };
-    if (log.prevIndex === -1) {
-        const nextEle = ElementUtil.getNextSiblingElement(ele);
-        log.nextIndex = nextEle ? ElementUtil.getControlIndex(nextEle, true) : -1;
-    }
-    array.push(log);
 }
 function inputText(ele, startIndex, input) {
     const options = getDocCtx(ele);
@@ -774,14 +775,15 @@ function generatePatch(doc) {
     if (!ops || !ops.length) {
         return [];
     }
-    const delOpsMap = getDeleteEleOps(ops);
+    getDeleteEleOps(ops);
     for (let i = 0; i < ops.length; i++) {
         const op = ops[i];
         const ele = op.ele;
         //修改样式
         if ('format' in op.ops) {
             //修改插入或者删除的不做处理
-            if (insertOpsMap.has(ele) || delOpsMap.has(ele)) {
+            //|| delOpsMap.has(ele)
+            if (insertOpsMap.has(ele)) {
                 continue;
             }
             //合并操作属性
@@ -792,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 });
     }
     //清空
@@ -5118,8 +5127,8 @@ class TableUtil {
                 const hMergeEndIndex = this.getHMergeEndIndex(tb, i, colIndex);
                 //当前单元格处于合并行的最后一行，并且合并的行数为2行
                 if (hMergeEndIndex === colIndex && hMergeEndIndex - hMergeStartIndex === 1) {
-                    const masterVMergeCell = tb.getChild(hMergeStartIndex).getChild(i);
-                    masterVMergeCell.props.hMerge = null;
+                    const masterHMergeCell = tb.getChild(i).getChild(hMergeStartIndex);
+                    masterHMergeCell.props.hMerge = null;
                 }
             }
             row.removeChild(cell);