@hailin-zheng/editor-core 1.1.27 → 1.1.29

package/index.js

@@ -4950,7 +4950,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 +5088,9 @@ class TableUtil {
             }
         }
         tb.removeChild(row);
+        if (tb.length === 0) {
+            tb.remove();
+        }
     }
     /**
      * 移除列
@@ -5129,15 +5132,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 +5166,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 +5768,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();
@@ -5963,11 +5996,14 @@ class ElementSerialize {
      * @param viewOptions
      */
     static serialize(element, viewOptions) {
+        const result = element.serialize(viewOptions);
+        if (!result) {
+            return null;
+        }
+        if (result.complete) {
+            return result;
+        }
         if (element instanceof BranchElement) {
-            const result = element.serialize(viewOptions);
-            if (!result || result.complete) {
-                return result;
-            }
             result.children = [];
             let prevEle = null;
             for (let i = 0; i < element.length; i++) {
@@ -5982,9 +6018,6 @@ class ElementSerialize {
                 if (serializeChild) {
                     delete serializeChild.complete;
                     serializeChild.props = serializeChild.props || {};
-                    if (child.props && child.props['__attachedProperty']) {
-                        serializeChild.props['__attachedProperty'] = CommonUtil.cloneValue(child.props['__attachedProperty']);
-                    }
                     if (Object.keys(serializeChild.props).length === 0) {
                         delete serializeChild.props;
                     }
@@ -5995,11 +6028,11 @@ class ElementSerialize {
                     prevEle = { ele: child, props: serializeChild };
                 }
             }
-            return result;
         }
-        else {
-            return element.serialize(viewOptions);
+        if (element.props && element.props['__attachedProperty'] && !result.props['__attachedProperty']) {
+            result.props['__attachedProperty'] = CommonUtil.cloneValue(element.props['__attachedProperty']);
         }
+        return result;
     }
     static serializeString(element, options = { all: false }) {
         if (!options.all && element instanceof TrackRunElement && element.type === TrackRunTypeEnum.Deleted) {