@hailin-zheng/editor-core 1.1.28 → 1.1.30

package/index.js

@@ -673,13 +673,18 @@ 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
-    });
+    };
+    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);
@@ -3831,7 +3836,7 @@ class TableCellElement extends BlockContainerElement {
     }
     beginMeasure(data) {
         //不被合并的单元格
-        if (!this.length && this.isNotBeMergedCell()) {
+        if (!this.length) {
             this.addChild(data.createParaFn());
         }
         super.beginMeasure(data);
@@ -4950,7 +4955,7 @@ class TableUtil {
         let index = colIndex;
         for (let i = colIndex + 1; i < tb.getColsCount(); i++) {
             const cell = currRow.getChild(i);
-            if (cell.props.hMerge === 'continue') {
+            if (cell && cell.props.hMerge === 'continue') {
                 index = i;
             }
             else {
@@ -5088,6 +5093,9 @@ class TableUtil {
             }
         }
         tb.removeChild(row);
+        if (tb.length === 0) {
+            tb.remove();
+        }
     }
     /**
      * 移除列
@@ -5102,7 +5110,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') {
@@ -5129,15 +5137,31 @@ class TableUtil {
         if (!ss.startControl) {
             return;
         }
-        const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
-        if (!startCell?.parent) {
-            throw new Error('parent is null');
+        const tb = ElementUtil.getParentByType(ss.startControl, TableElement);
+        if (!tb) {
+            return;
         }
-        const currRow = startCell.parent;
-        const tb = currRow.parent;
-        this.removeRow(currRow);
-        if (tb.length === 0) {
-            tb.remove();
+        if (ss.collapsed) {
+            const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
+            if (!startCell?.parent) {
+                throw new Error('parent is null');
+            }
+            const currRow = startCell.parent;
+            this.removeRow(currRow);
+        }
+        else {
+            if (!ss.selectedRange || ss.selectedRange.target !== tb) {
+                return;
+            }
+            const selectedRows = [];
+            ss.selectedRange.selectedChildren.forEach(child => {
+                if (child.target instanceof TableRowElement) {
+                    selectedRows.push(child.target);
+                }
+            });
+            if (selectedRows.length) {
+                selectedRows.forEach(row => this.removeRow(row));
+            }
         }
         ss.clear();
     }
@@ -5147,32 +5171,46 @@ class TableUtil {
      */
     static removeCurrCol(ss) {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
-        if (!startCell?.parent) {
-            throw new Error('parent is null');
+        if (!startCell) {
+            return;
         }
+        let startColIndex = 0;
+        let endColIndex = 0;
         if (ss.collapsed) {
             const currRow = startCell.parent;
             const tb = currRow.parent;
-            this.removeCol(tb, startCell.getIndex());
+            startColIndex = startCell.getIndex();
+            endColIndex = this.getHMergeEndIndex(tb, currRow.getIndex(), startColIndex);
+            while (startColIndex <= endColIndex) {
+                this.removeCol(tb, endColIndex);
+                endColIndex--;
+            }
             ss.clear();
             return;
         }
-        const { ancestorCommonControl, startControl, endControl } = ss;
-        if (ancestorCommonControl instanceof TableElement || ancestorCommonControl instanceof TableRowElement) {
-            const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent;
-            const startCell = ElementUtil.getParentByType(startControl, TableCellElement);
-            const endCell = ElementUtil.getParentByType(endControl, TableCellElement);
-            if (startCell?.parent?.parent === tbElement && endCell?.parent?.parent === tbElement) {
-                const startColIndex = startCell.getIndex();
-                let endColIndex = endCell.getIndex();
-                while (startColIndex <= endColIndex) {
-                    this.removeCol(tbElement, endColIndex);
-                    endColIndex--;
+        else {
+            const { ancestorCommonControl, startControl, endControl } = ss;
+            if (ancestorCommonControl instanceof TableElement || ancestorCommonControl instanceof TableRowElement) {
+                const tb = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent;
+                const startCell = ElementUtil.getParentByType(startControl, TableCellElement);
+                const endCell = ElementUtil.getParentByType(endControl, TableCellElement);
+                if (startCell?.parent?.parent === tb && endCell?.parent?.parent === tb) {
+                    const startColIndex = startCell.getIndex();
+                    let endColIndex = this.getHMergeEndIndex(tb, endCell.parent.getIndex(), endCell.getIndex());
+                    //选中所有的列，直接删除表格
+                    if (startColIndex === 0 && endColIndex === tb.props.cols.length - 1) {
+                        tb.remove();
+                        ss.clear();
+                        return;
+                    }
+                    while (startColIndex <= endColIndex) {
+                        this.removeCol(tb, endColIndex);
+                        endColIndex--;
+                    }
                 }
             }
-            tbElement.pubOnChange('self');
+            ss.clear();
         }
-        ss.clear();
     }
     /**
      * 合并单元格
@@ -5735,7 +5773,7 @@ class TableElement extends BlockContainerElement {
         this.props.cols = cols;
     }
     getColsCount() {
-        return this.actualColsProps.length;
+        return this.props.cols.length;
     }
     clone(data) {
         const clone = new TableElement();
@@ -5995,7 +6033,6 @@ class ElementSerialize {
                     prevEle = { ele: child, props: serializeChild };
                 }
             }
-            return result;
         }
         if (element.props && element.props['__attachedProperty'] && !result.props['__attachedProperty']) {
             result.props['__attachedProperty'] = CommonUtil.cloneValue(element.props['__attachedProperty']);
@@ -14888,7 +14925,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);
@@ -15040,7 +15078,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) {
@@ -17275,28 +17313,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);
         }
     }
     /**