@hailin-zheng/editor-core 1.0.7 → 1.0.10

package/{lib/framework/impl/table/table-util.js → src/med_editor/framework/impl/table/table-util.ts}

@@ -1,40 +1,45 @@
-import { ElementUtil } from "@/med_editor/framework/element-util";
+import { SelectionState } from "../../document-selection";
+import { ElementUtil } from "../../element-util";
+import { Element } from "../../element-define";
 import { ParagraphElement } from "../paragraph/p-impl";
 import { TableCellElement } from "./table-cell-impl";
 import { TableElement } from "./table-impl";
 import { TableRowElement } from "./table-row-impl";
+
+
 export class TableUtil {
-    static canDeleteTable(ss) {
+
+    static canDeleteTable(ss: SelectionState): boolean {
         const { startControl } = ss;
         if (!startControl) {
             return false;
         }
         const tb = ElementUtil.getParentByType(startControl, TableElement);
-        return tb ? true : false;
+        return !!tb;
     }
     /**
      * 校验当前选区是否可以执行合并单元格操作
-     * @param ss
-     * @returns
+     * @param ss 
+     * @returns 
      */
-    static canMergeCells(ss) {
+    static canMergeCells(ss: SelectionState): boolean {
         const { ancestorCommonControl, startControl, endControl, collapsed, selectedRange } = ss;
         if (collapsed) {
             return false;
         }
         if (ancestorCommonControl instanceof TableElement || ancestorCommonControl instanceof TableRowElement) {
-            const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent;
+            const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent as TableElement;
             const startCell = ElementUtil.getParentByType(startControl, TableCellElement);
             const endCell = ElementUtil.getParentByType(endControl, TableCellElement);
             if (startCell?.parent?.parent === tbElement && endCell?.parent?.parent === tbElement) {
                 const tbRegion = this.getTableRectSelectedRegion(tbElement, startCell, endCell);
                 if (selectedRange && selectedRange.target === tbElement) {
-                    const selectedCells = [];
-                    selectedRange.selectedChildren.every(item => item.selectedChildren.every(cell => selectedCells.push(cell.target)));
+                    const selectedCells: Array<TableCellElement> = [];
+                    selectedRange.selectedChildren.every(item => item.selectedChildren.every(cell => selectedCells.push(cell.target as TableCellElement)));
                     for (let i = tbRegion.startRow; i <= tbRegion.endRow; i++) {
-                        const currRow = tbElement.getChild(i);
+                        const currRow = tbElement.getChild<TableRowElement>(i);
                         for (let j = tbRegion.startCol; j <= tbRegion.endCol; j++) {
-                            const currCell = currRow.getChild(j);
+                            const currCell = currRow.getChild<TableCellElement>(j);
                             if (currCell.isNotBeMergedCell() && selectedCells.indexOf(currCell) < 0) {
                                 return false;
                             }
@@ -46,90 +51,93 @@ export class TableUtil {
         }
         return false;
     }
+
     /**
      * 获取横向合并当前单元格合并结束索引位置
-     * @param tb
-     * @param rowIndex
-     * @param colIndex
+     * @param tb 
+     * @param rowIndex 
+     * @param colIndex 
      */
-    static getHMergeEndIndex(tb, rowIndex, colIndex) {
-        const currRow = tb.getChild(rowIndex);
+    static getHMergeEndIndex(tb: TableElement, rowIndex: number, colIndex: number): number {
+        const currRow = tb.getChild(rowIndex) as TableRowElement;
         let index = colIndex;
         for (let i = colIndex + 1; i < tb.getColsCount(); i++) {
-            const cell = currRow.getChild(i);
+            const cell = currRow.getChild(i) as TableCellElement;
             if (cell.props.hMerge === 'continue') {
                 index = i;
-            }
-            else {
+            } else {
                 break;
             }
         }
         return index;
     }
+
     /**
      * 获取横向合并当前单元格合并开始索引位置
-     * @param tb
-     * @param rowIndex
-     * @param colIndex
+     * @param tb 
+     * @param rowIndex 
+     * @param colIndex 
      */
-    static getHMergeStartIndex(tb, rowIndex, colIndex) {
-        const row = tb.getChild(rowIndex);
+    static getHMergeStartIndex(tb: TableElement, rowIndex: number, colIndex: number): number {
+        const row = tb.getChild(rowIndex) as TableRowElement;
         for (let i = colIndex - 1; i >= 0; i--) {
-            const cell = row.getChild(i);
+            const cell = row.getChild(i) as TableCellElement;
             if (cell.props.hMerge === 'restart') {
                 return i;
             }
         }
         throw new Error('未找到主合并单元格');
     }
+
     /**
      * 获取纵向合并当前单元格合并结束索引位置
-     * @param tb
-     * @param rowIndex
+     * @param tb 
+     * @param rowIndex 
      * @param colIndex i
      */
-    static getVMergeEndIndex(tb, rowIndex, colIndex) {
+    static getVMergeEndIndex(tb: TableElement, rowIndex: number, colIndex: number): number {
         let index = rowIndex;
         for (let i = rowIndex + 1; i < tb.length; i++) {
-            const currRow = tb.getChild(i);
-            const cell = currRow.getChild(colIndex);
+            const currRow = tb.getChild(i) as TableRowElement;
+            const cell = currRow.getChild(colIndex) as TableCellElement;
             if (cell.props.vMerge === 'continue') {
                 index = i;
-            }
-            else {
+            } else {
                 break;
             }
         }
         return index;
     }
+
     /**
      * 获取纵向合并当前单元格合并开始索引位置
-     * @param tb
-     * @param rowIndex
+     * @param tb 
+     * @param rowIndex 
      * @param colIndex i
      */
-    static getVMergeStartIndex(tb, rowIndex, colIndex) {
+    static getVMergeStartIndex(tb: TableElement, rowIndex: number, colIndex: number): number {
         for (let i = rowIndex - 1; i >= 0; i--) {
-            const currRow = tb.getChild(i);
-            const cell = currRow.getChild(colIndex);
+            const currRow = tb.getChild(i) as TableRowElement;
+            const cell = currRow.getChild(colIndex) as TableCellElement;
             if (cell.props.vMerge === 'restart') {
                 return i;
             }
         }
         throw new Error('未找到主合并单元格');
     }
+
     /**
      * 合并单元格
-     * @param ss
-     * @returns
+     * @param ss 
+     * @returns 
      */
-    static mergeCells(ss) {
+    static mergeCells(ss: SelectionState): void {
         const { ancestorCommonControl, startControl, endControl, collapsed } = ss;
         if (collapsed) {
             return;
         }
         if (ancestorCommonControl instanceof TableElement || ancestorCommonControl instanceof TableRowElement) {
-            const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent;
+            const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent as TableElement;
             const startCell = ElementUtil.getParentByType(startControl, TableCellElement);
             const endCell = ElementUtil.getParentByType(endControl, TableCellElement);
             if (startCell?.parent?.parent === tbElement && endCell?.parent?.parent === tbElement) {
@@ -140,51 +148,50 @@ export class TableUtil {
             ss.clear();
         }
     }
+
     /**
      * 在合并单元格后需要校验
      * 1.如果某个行的所有单元格都不是normal，则需要删除当前行
      * 2.如果某个列的所有的单元格都不是normal，则需要删除当前列
      */
-    static checkRowBeMerged(ss) {
+    private static checkRowBeMerged(ss: SelectionState): void {
         const tb = ElementUtil.getParentByType(ss.startControl, TableElement);
-        if (!tb) {
-            return;
-        }
+        if (!tb) { return }
         const colsCount = tb.getColsCount();
-        const fullMergeRows = [];
+        const fullMergeRows: Array<TableRowElement> = [];
         for (let i = 0; i < tb.length; i++) {
-            const row = tb.getChild(i);
+            const row = tb.getChild(i) as TableRowElement;
             let count = 0;
             for (let j = 0; j < colsCount; j++) {
-                const cell = row.getChild(j);
+                const cell = row.getChild(j) as TableCellElement;
                 if (!cell.isNotBeMergedCell()) {
                     count++;
                 }
             }
             //当前行所有的单元格都被合并，需要删除
             if (count === colsCount) {
-                fullMergeRows.push(row);
+                fullMergeRows.push(row)
             }
         }
         fullMergeRows.forEach(row => this.removeRow(row));
     }
+
     /**
      * 移除行
-     * @param row
+     * @param row 
      */
-    static removeRow(row) {
+    private static removeRow(row: TableRowElement): void {
         const rowIndex = row.getIndex();
-        const tb = row.parent;
+        const tb = row.parent as TableElement;
         for (let i = 0; i < row.length; i++) {
-            const cell = row.getChild(i);
+            const cell = row.getChild<TableCellElement>(i);
             if (cell.props.vMerge === 'restart') {
                 const vMergeEndIndex = this.getVMergeEndIndex(tb, rowIndex, i);
                 if (vMergeEndIndex > rowIndex) {
-                    const nextRow = tb.getChild(rowIndex + 1);
-                    nextRow.getChild(i).props.vMerge = vMergeEndIndex - rowIndex > 2 ? 'restart' : null;
+                    const nextRow = tb.getChild<TableRowElement>(rowIndex + 1);
+                    nextRow.getChild<TableCellElement>(i).props.vMerge = vMergeEndIndex - rowIndex > 2 ? 'restart' : null;
                 }
-            }
-            else if (cell.props.vMerge === 'continue') {
+            } else if (cell.props.vMerge === 'continue') {
                 // const vMergeEndIndex = this.getVMergeEndIndex(tb, rowIndex, i);
                 // if (vMergeEndIndex > rowIndex) {
                 //     const nextRow = tb.getChild<TableRowElement>(rowIndex + 1);
@@ -194,76 +201,79 @@ export class TableUtil {
                 const vMergeEndIndex = this.getVMergeEndIndex(tb, rowIndex, i);
                 //当前单元格处于合并行的最后一行，并且合并的行数为2行
                 if (vMergeEndIndex === rowIndex && vMergeEndIndex - vMergeStartIndex === 1) {
-                    const aboveCell = tb.getChild(vMergeStartIndex).getChild(i);
+                    const aboveCell = tb.getChild<TableRowElement>(vMergeStartIndex).getChild<TableCellElement>(i)
                     aboveCell.props.vMerge = null;
                 }
             }
         }
         tb.removeChild(row);
     }
+
     /**
      * 移除列
-     * @param tb
-     * @param colIndex
+     * @param tb 
+     * @param colIndex 
      */
-    static removeCol(tb, colIndex) {
+    private static removeCol(tb: TableElement, colIndex: number): void {
         for (let i = 0; i < tb.length; i++) {
-            const row = tb.getChild(i);
-            const cell = row.getChild(colIndex);
+            const row = tb.getChild<TableRowElement>(i);
+            const cell = row.getChild<TableCellElement>(colIndex);
             if (cell.props.hMerge === 'restart') {
                 const hMergeEndIndex = this.getHMergeEndIndex(tb, i, colIndex);
                 if (hMergeEndIndex > colIndex) {
-                    const nextCell = row.getChild(colIndex + 1);
+                    const nextCell = row.getChild<TableCellElement>(colIndex + 1);
                     nextCell.props.hMerge = hMergeEndIndex - colIndex > 2 ? 'restart' : null;
                 }
-            }
-            else if (cell.props.hMerge === 'continue') {
+            } else if (cell.props.hMerge === 'continue') {
                 const hMergeStartIndex = this.getHMergeStartIndex(tb, i, colIndex);
                 const hMergeEndIndex = this.getHMergeEndIndex(tb, i, colIndex);
                 //当前单元格处于合并行的最后一行，并且合并的行数为2行
                 if (hMergeEndIndex === colIndex && hMergeEndIndex - hMergeStartIndex === 1) {
-                    const masterVMergeCell = tb.getChild(hMergeStartIndex).getChild(i);
+                    const masterVMergeCell = tb.getChild<TableRowElement>(hMergeStartIndex).getChild<TableCellElement>(i)
                     masterVMergeCell.props.hMerge = null;
                 }
+
             }
             row.removeChild(cell);
         }
         tb.removeCol(colIndex);
     }
+
     /**
      * 移除光标所在的当前行
-     * @param ss
+     * @param ss 
      */
-    static removeCurrRow(ss) {
+    static removeCurrRow(ss: SelectionState): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
-        const currRow = startCell.parent;
-        const tb = currRow.parent;
+        const currRow = startCell.parent as TableRowElement;
+        const tb = currRow.parent as TableElement;
         this.removeRow(currRow);
         tb.pubOnChange('self');
         tb.refreshView();
     }
+
     /**
      * 移除光标所在的当前列
-     * @param ss
+     * @param ss 
      */
-    static removeCurrCol(ss) {
+    static removeCurrCol(ss: SelectionState): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
         if (ss.collapsed) {
-            const currRow = startCell.parent;
-            const tb = currRow.parent;
+            const currRow = startCell.parent as TableRowElement;
+            const tb = currRow.parent as TableElement;
             this.removeCol(tb, startCell.getIndex());
             ss.clear();
             return;
         }
         const { ancestorCommonControl, startControl, endControl } = ss;
         if (ancestorCommonControl instanceof TableElement || ancestorCommonControl instanceof TableRowElement) {
-            const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent;
+            const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent as TableElement;
             const startCell = ElementUtil.getParentByType(startControl, TableCellElement);
             const endCell = ElementUtil.getParentByType(endControl, TableCellElement);
             if (startCell?.parent?.parent === tbElement && endCell?.parent?.parent === tbElement) {
@@ -278,16 +288,17 @@ export class TableUtil {
         }
         ss.clear();
     }
+
     /**
      * 合并单元格
      */
-    static combineCells(tbElement, startCell, endCell) {
+    static combineCells(tbElement: TableElement, startCell: TableCellElement, endCell: TableCellElement): void {
         const tbRegion = this.getTableRectSelectedRegion(tbElement, startCell, endCell);
-        const cellContents = [];
+        const cellContents: Array<Element> = [];
         for (let i = tbRegion.startRow; i <= tbRegion.endRow; i++) {
-            const currRow = tbElement.getChild(i);
+            const currRow = tbElement.getChild<TableRowElement>(i);
             for (let j = tbRegion.startCol; j <= tbRegion.endCol; j++) {
-                const currCell = currRow.getChild(j);
+                const currCell = currRow.getChild<TableCellElement>(j);
                 currCell.props.vMerge = null;
                 currCell.props.hMerge = 'continue';
                 if (j === tbRegion.startCol) {
@@ -307,7 +318,9 @@ export class TableUtil {
             }
         }
     }
-    static canSplitCell(ss) {
+
+
+    static canSplitCell(ss: SelectionState): boolean {
         const { ancestorCommonControl, startControl, endControl, collapsed } = ss;
         if (ancestorCommonControl instanceof TableElement || ancestorCommonControl instanceof TableRowElement) {
             const tbElement = ancestorCommonControl instanceof TableElement ? ancestorCommonControl : ancestorCommonControl.parent;
@@ -318,8 +331,7 @@ export class TableUtil {
                     return startCell.props.hMerge === 'restart' || startCell.props.vMerge === 'restart';
                 }
             }
-        }
-        else {
+        } else {
             const startCell = ElementUtil.getParentByType(startControl, TableCellElement);
             if (!startCell) {
                 throw new Error('startCell is null');
@@ -327,13 +339,15 @@ export class TableUtil {
             const { hMerge, vMerge } = startCell?.props;
             return hMerge === 'restart' || vMerge === 'restart' || !hMerge || !vMerge;
         }
+
         return false;
     }
+
     /**
      * 将合并的单元格合并还原
-     * @param ss
+     * @param ss 
      */
-    static restoreCell(ss) {
+    static restoreCell(ss: SelectionState): void {
         const { ancestorCommonControl, startControl, endControl, collapsed } = ss;
         const startCell = ElementUtil.getParentByType(startControl, TableCellElement);
         if (startCell) {
@@ -342,16 +356,17 @@ export class TableUtil {
             startCell.refreshView();
         }
     }
-    static restoreCellMerge(cell) {
+
+    private static restoreCellMerge(cell: TableCellElement): void {
         const { vMerge, hMerge } = cell.props;
-        const row = cell.parent;
-        const tb = row.parent;
+        const row = cell.parent as TableRowElement;
+        const tb = row.parent as TableElement;
         const rowIndex = row.getIndex();
         const colIndex = cell.getIndex();
         if (vMerge === 'restart') {
             for (let i = rowIndex + 1; i < tb.length; i++) {
-                const row = tb.getChild(i);
-                const cell = row.getChild(colIndex);
+                const row = tb.getChild(i) as TableRowElement;
+                const cell = row.getChild(colIndex) as TableCellElement;
                 if (cell.props.vMerge === "continue") {
                     cell.props.vMerge = null;
                     if (cell.props.hMerge === "restart") {
@@ -362,7 +377,7 @@ export class TableUtil {
         }
         if (hMerge === 'restart') {
             for (let i = colIndex + 1; i < row.length; i++) {
-                const cell = row.getChild(i);
+                const cell = row.getChild(i) as TableCellElement;
                 if (cell.props.hMerge === "continue") {
                     cell.props.hMerge = null;
                     if (cell.props.vMerge === "restart") {
@@ -374,27 +389,30 @@ export class TableUtil {
         cell.props.hMerge = null;
         cell.props.vMerge = null;
     }
-    static getVMergeRows(tb, masterRowIndex, masterColIndex) {
-        const items = [];
+
+
+    private static getVMergeRows(tb: TableElement, masterRowIndex: number, masterColIndex: number): Array<TableRowElement> {
+        const items: Array<TableRowElement> = [];
         for (let i = masterRowIndex + 1; i < tb.length; i++) {
-            const row = tb.getChild(i);
-            const cell = row.getChild(masterColIndex);
+            const row = <TableRowElement>tb.getChild(i);
+            const cell = row.getChild(masterColIndex) as TableCellElement;
             if (cell.props.vMerge === 'continue') {
                 items.push(row);
-            }
-            else {
+            } else {
                 return items;
             }
         }
         return items;
     }
-    static insertCol(ss, insertColIndex) {
+
+
+    static insertCol(ss: SelectionState, insertColIndex: number): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
-        const startRow = startCell.parent;
-        const tb = startRow.parent;
+        const startRow = startCell.parent as TableRowElement;
+        const tb = startRow.parent as TableElement;
         const currColIndex = startCell.getIndex();
         const colsCount = tb.getColsCount();
         insertColIndex = insertColIndex < 0 ? 0 : insertColIndex;
@@ -403,17 +421,17 @@ export class TableUtil {
         const insertColWidth = insertColIndex === colsCount ? tb.getCellWidth(colsCount - 1) : tb.getCellWidth(insertColIndex);
         const newColWidth = Math.floor(insertColWidth / 2);
         if (newColWidth < 20) {
-            console.warn('插入列的最小宽度不能小于20,当前为:' + newColWidth);
+            console.warn('插入列的最小宽度不能小于20,当前为:' + newColWidth)
             return;
         }
         for (let i = 0; i < tb.length; i++) {
-            const row = tb.getChild(i);
+            const row = tb.getChild<TableRowElement>(i)
             const newCell = new TableCellElement();
             if (insertColIndex === 0 || insertColIndex === colsCount) {
                 row.addChild(newCell, insertColIndex);
                 continue;
             }
-            const focusCell = row.getChild(insertColIndex);
+            const focusCell = row.getChild<TableCellElement>(insertColIndex);
             if (focusCell) {
                 if (focusCell.props.hMerge === 'continue') {
                     //获取合并行的最后的行索引
@@ -421,25 +439,26 @@ export class TableUtil {
                     if (hMergeEndColIndex > insertColIndex || (hMergeEndColIndex === insertColIndex && currColIndex < insertColIndex)) {
                         newCell.props.hMerge = 'continue';
                     }
-                }
-                else if (focusCell.props.hMerge === 'restart' && currColIndex > insertColIndex) {
+                } else if (focusCell.props.hMerge === 'restart' && currColIndex > insertColIndex) {
                     newCell.props.hMerge = 'continue';
                 }
             }
             row.addChild(newCell, insertColIndex);
         }
+
         tb.setCellWidth(insertColIndex === colsCount ? insertColIndex - 1 : insertColIndex, insertColWidth - newColWidth);
         tb.insertCol(insertColIndex, newColWidth);
         tb.pubOnChange('self');
         tb.refreshView();
     }
-    static insertRow(ss, insertRowIndex) {
+
+    static insertRow(ss: SelectionState, insertRowIndex: number): TableRowElement {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
-        const startRow = startCell.parent;
-        const tb = startRow.parent;
+        const startRow = startCell.parent as TableRowElement;
+        const tb = startRow.parent as TableElement;
         const currRowIndex = startRow.getIndex();
         insertRowIndex = insertRowIndex < 0 ? 0 : insertRowIndex;
         insertRowIndex = insertRowIndex > tb.length ? tb.length : insertRowIndex;
@@ -450,10 +469,10 @@ export class TableUtil {
             tb.refreshView();
             return newRow;
         }
-        const destRow = tb.getChild(insertRowIndex);
+        const destRow = tb.getChild(insertRowIndex) as TableRowElement;
         for (let i = 0; i < destRow.length; i++) {
-            const destCell = destRow.getChild(i);
-            const newCell = newRow.getChild(i);
+            const destCell = destRow.getChild(i) as TableCellElement;
+            const newCell = newRow.getChild(i) as TableCellElement;
             //如果当前单元格是普通单元格或者合并列的最后一个单元格，则不做处理
             if (destCell.props.vMerge === 'continue') {
                 //获取合并列的最后的行索引
@@ -462,71 +481,76 @@ export class TableUtil {
                     newCell.props.vMerge = 'continue';
                     //newCell.cellProps.hMerge = destCell.cellProps.hMerge;
                 }
-            }
-            else if (destCell.props.vMerge === 'restart' && currRowIndex > insertRowIndex) {
+            } else if (destCell.props.vMerge === 'restart' && currRowIndex > insertRowIndex) {
                 //在上方新增行，目标行单元格属于合并的起点
                 newCell.props.vMerge = 'continue';
                 //newCell.cellProps.hMerge = destCell.cellProps.hMerge;
             }
+
         }
         tb.addChild(newRow, insertRowIndex);
         tb.refreshView();
         return newRow;
     }
+
     /**
      * 在下方插入行
      */
-    static insertRowBelow(ss) {
+    static insertRowBelow(ss: SelectionState): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
-        const startRow = startCell.parent;
+        const startRow = startCell.parent as TableRowElement;
         const currRowIndex = startRow.getIndex();
         this.insertRow(ss, currRowIndex + 1);
     }
+
     /**
      * 在上方插入行
      */
-    static insertRowAbove(ss) {
+    static insertRowAbove(ss: SelectionState): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
-        const startRow = startCell.parent;
+        const startRow = startCell.parent as TableRowElement;
         const currRowIndex = startRow.getIndex();
         this.insertRow(ss, currRowIndex);
     }
+
     /**
      * 在右侧插入列
      */
-    static insertColToRight(ss) {
+    static insertColToRight(ss: SelectionState): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
         const currColIndex = startCell.getIndex();
         this.insertCol(ss, currColIndex + 1);
     }
+
     /**
      * 在左侧插入列
      */
-    static insertColToLeft(ss) {
+    static insertColToLeft(ss: SelectionState): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
         const currColIndex = startCell.getIndex();
         this.insertCol(ss, currColIndex);
     }
+
     /**
      * 跳转到下一个单元格中
-     * @param ss
+     * @param ss 
      */
-    static moveNextCell(ss) {
+    static moveNextCell(ss: SelectionState): void {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
         const rowIndex = startCell.parent.getIndex();
         const nextCell = this.getNextCell(ss);
@@ -540,24 +564,26 @@ export class TableUtil {
         ss.resetRange(newRow, 0);
         newRow.refreshView();
     }
+
+
     /**
      * 获取下一个可定位的单元格
-     * @param ss
-     * @returns
+     * @param ss 
+     * @returns 
      */
-    static getNextCell(ss) {
+    static getNextCell(ss: SelectionState): TableCellElement | undefined {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
-            throw new Error('parent is null');
+            throw new Error('parent is null')
         }
         const rowIndex = startCell.parent.getIndex();
         const colIndex = startCell.getIndex();
-        const tb = startCell.parent.parent;
+        const tb = startCell.parent.parent as TableElement;
         for (let i = rowIndex; i < tb.length; i++) {
             let j = i === rowIndex ? colIndex + 1 : 0;
-            const currRow = tb.getChild(i);
+            const currRow = tb.getChild(i) as TableRowElement;
             for (; j < tb.getColsCount(); j++) {
-                const currCell = currRow.getChild(j);
+                const currCell = currRow.getChild(j) as TableCellElement;
                 if (currCell.isNotBeMergedCell()) {
                     return currCell;
                 }
@@ -565,16 +591,19 @@ export class TableUtil {
         }
         //throw new Error('getNextCell is null')
     }
+
     /**
      * 当前光标是否在最后一个单元格中
      */
-    static isLastVisiableCell(ss) {
+    static isLastVisiableCell(ss: SelectionState): boolean {
         return !this.getNextCell(ss);
     }
+
+
     /**
      * 移除当前table
      */
-    static removeTable(ss) {
+    static removeTable(ss: SelectionState): void {
         const tb = ElementUtil.getParentByType(ss.startControl, TableElement);
         if (!tb) {
             console.warn('当前位置不存在表格');
@@ -583,36 +612,37 @@ export class TableUtil {
         tb.parent.refreshView();
         tb.remove();
     }
+
     /**
      * 设置表格单元格对角线
-     * @param ss
-     * @param diagonal
-     * @returns
+     * @param ss 
+     * @param diagonal 
+     * @returns 
      */
-    static setTableCellDiagonal(ss, diagonal) {
+    static setTableCellDiagonal(ss: SelectionState, diagonal: 'main' | 'sub'): void {
         const tc = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!tc) {
             console.warn('当前位置不存在表格');
-            return;
+            return
         }
         if (!tc.props.diagonal || tc.props.diagonal !== diagonal) {
             tc.props.diagonal = diagonal;
-        }
-        else if (tc.props.diagonal === diagonal) {
+        } else if (tc.props.diagonal === diagonal) {
             tc.props.diagonal = null;
         }
         tc.refreshView();
     }
+
     /**
      * 将当前表格截断成两个相邻的表格
-     * @param tb
-     * @param rowIndex
+     * @param tb 
+     * @param rowIndex 
      */
-    static cutTable(tb, rowIndex) {
+    static cutTable(tb: TableElement, rowIndex: number): void {
         if (rowIndex === 0 || rowIndex === tb.length - 1) {
             return;
         }
-        const newTb = tb.clone(false);
+        const newTb = tb.clone(false) as TableElement;
         const len = tb.length - 1;
         while (len > rowIndex) {
             const child = tb.getChild(len);
@@ -623,14 +653,15 @@ export class TableUtil {
             tb.parent.addChild(newTb, tb.getIndex() + 1);
         }
     }
+
     /**
      * 获取表格选区区域最大的矩形区域
-     * @param tb
-     * @param startCell
-     * @param endCell
-     * @returns
+     * @param tb 
+     * @param startCell 
+     * @param endCell 
+     * @returns 
      */
-    static getTableRectSelectedRegion(tb, startCell, endCell) {
+    static getTableRectSelectedRegion(tb: TableElement, startCell: TableCellElement, endCell: TableCellElement): ITableSelectedRegion {
         let startRow = startCell.parent.getIndex();
         let startCol = startCell.getIndex();
         let endRow = endCell.parent.getIndex();
@@ -642,9 +673,9 @@ export class TableUtil {
             [endCol, startCol] = [startCol, endCol];
         }
         for (let i = startRow; i <= endRow; i++) {
-            const row = tb.getChild(i);
+            const row = tb.getChild(i) as TableRowElement;
             for (let j = startCol; j <= endCol; j++) {
-                const cell = row.getChild(j);
+                const cell = row.getChild(j) as TableCellElement;
                 const { hMerge, vMerge } = cell.props;
                 if (hMerge === 'continue') {
                     const startColIndex = TableUtil.getHMergeStartIndex(tb, i, j);
@@ -672,7 +703,14 @@ export class TableUtil {
                 }
             }
         }
-        return { startRow, endRow, startCol, endCol };
+        return { startRow, endRow, startCol, endCol }
     }
 }
-//# sourceMappingURL=table-util.js.map
+
+
+export interface ITableSelectedRegion {
+    startRow: number;
+    endRow: number;
+    startCol: number;
+    endCol: number;
+}