@hailin-zheng/editor-core 1.1.29 → 1.1.31

package/index.js

@@ -673,13 +673,14 @@ function appendToOps(doc, ele, ops) {
         docOpsMap.set(doc, array = []);
     }
     const prevEle = ElementUtil.getPrevSiblingElement(ele);
-    array.push({
+    const log = {
         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);
@@ -769,14 +770,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;
             }
             //合并操作属性
@@ -3831,7 +3833,7 @@ class TableCellElement extends BlockContainerElement {
     }
     beginMeasure(data) {
         //不被合并的单元格
-        if (!this.length && this.isNotBeMergedCell()) {
+        if (!this.length) {
             this.addChild(data.createParaFn());
         }
         super.beginMeasure(data);
@@ -5105,7 +5107,7 @@ class TableUtil {
                 const hMergeEndIndex = this.getHMergeEndIndex(tb, i, colIndex);
                 if (hMergeEndIndex > colIndex) {
                     const nextCell = row.getChild(colIndex + 1);
-                    nextCell.props.hMerge = hMergeEndIndex - colIndex > 2 ? 'restart' : null;
+                    nextCell.props.hMerge = hMergeEndIndex - colIndex >= 2 ? 'restart' : null;
                 }
             }
             else if (cell.props.hMerge === 'continue') {
@@ -5113,8 +5115,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);
@@ -14920,7 +14922,8 @@ class DocumentEvent {
         if (!this.selectionState.cursorPos) {
             return;
         }
-        let { x, y } = this.selectionState.cursorPos;
+        let { x, y, height } = this.selectionState.cursorPos;
+        y = y + (height / 2 * (up ? -1 : 1));
         //y -= this.viewOptions.pageOffset.y;
         for (let i = 0; i < 50; i++) {
             const docEvent = new MouseElementEvent(this.docCtx);
@@ -15072,7 +15075,7 @@ class DocumentInput {
             const evt = nodeEvt.sourceEvt;
             const keyEvent = new KeyboradElementEvent(this.docCtx);
             keyEvent.sourceEvent = evt;
-            if (DocumentEvent.invokeEvent('ElementKeyDown', this.docCtx.selectionState.startControl, keyEvent, 'Capture')) {
+            if (DocumentEvent.invokeEvent('ElementKeyDown', this.docCtx.selectionState.startControl, keyEvent, 'All')) {
                 return;
             }
             if (evt.keyCode === 8) {
@@ -17307,28 +17310,25 @@ class ElementTrackManage {
         }
     }
     restoreToInsert(index, parentIndex, prevIndex, data) {
-        const prevSiblingEle = prevIndex !== -1 ? this.getControl(prevIndex) : null;
+        const prevSiblingEle = prevIndex !== -1 ? this.getControl(prevIndex, true) : null;
+        //const nextSiblingEle = prevSiblingEle ? prevSiblingEle.nextSibling : null;
         //获取插入位置之前的元素，然后向后插入目标元素
-        const ele = this.getControl(index - 1);
+        //const ele = this.getControl(index - 1,true);
+        const parent = this.getControl(parentIndex, true);
         const target = data.clone(true);
         if (prevSiblingEle) {
             prevSiblingEle.parent.addChild(target, prevSiblingEle.getIndex() + 1);
         }
         else {
-            //ele获取的为父容器
-            if (index === parentIndex + 1) {
-                if (ele instanceof BranchElement) {
-                    if (ele.type === 'tbc' && ele.getChildLength() === 2) {
-                        ele.clearItems();
-                    }
-                    ele.addChild(target, 0);
-                    return;
-                }
-                else {
-                    throw new Error('父级类型不正确');
+            if (parent instanceof BranchElement) {
+                if (parent.type === 'tbc' && parent.getChildLength() === 2) {
+                    parent.clearItems();
                 }
+                parent.addChild(target, 0);
+            }
+            else {
+                throw new Error('父级类型不正确');
             }
-            ele.parent.addChild(target, ele.getIndex() + 1);
         }
     }
     /**