@hailin-zheng/editor-core 1.1.13 → 1.1.15

package/index.js

@@ -9016,7 +9016,7 @@ class ColumnPatchUtil {
         //要分割的列坐标
         const newLinePointMap = this.getLinePointMap(splitCols);
         const resArray = new Set();
-        const allPointMap = oldLinePointMap.concat(newLinePointMap);
+        const allPointMap = oldLinePointMap.concat(newLinePointMap).sort((a, b) => a.index - b.index);
         for (let i = 0; i < allPointMap.length; i++) {
             const part = allPointMap[i];
             resArray.add(part.offset);
@@ -9240,7 +9240,7 @@ class TableSplitCell {
         const mergeCols = this.getHMergeColsCount(tb, focusRowIndex, focusCellIndex);
         //只有拆分的行数需要满足此条件
         if (mergeRows > 1 && rows > 1) {
-            if (rows % mergeRows !== 0) {
+            if (mergeRows % rows !== 0) {
                 throw new Error(`当前合并的行数为:${mergeRows},当前可拆分的行数是${mergeRows}的约数`);
             }
         }
@@ -9341,6 +9341,8 @@ class TableSplitCell {
         const splitCols = this.getSplitCols(colsWidth, cols);
         const [otherPacks, currPacks] = ColumnPatchUtil.getPatchPacks(hMergeCols, splitCols);
         this.applyHorSplitColumnPatchPacks(tb, focusRowIndex, 1, otherPacks);
+        //当前单元格执行补丁前，需要先还原单元格
+        TableUtil.restoreCell(ss);
         this.applyHorSplitColumnCurrPatchPacks(tb, focusRowIndex, focusCellIndex, rows, currPacks);
         tb.pubOnChange('to-child');
         tb.refreshView();
@@ -9404,7 +9406,6 @@ class TableSplitCell {
     static applyHorSplitColumnCurrPatchPacks(tb, focusRowIndex, focusColInex, splitRows, packs) {
         //获取当前列的合并行数
         let vMergeRows = this.getVMergeRowsCount(tb, focusRowIndex, focusColInex);
-        vMergeRows = vMergeRows === 1 ? 0 : vMergeRows;
         const startRow = tb.getChild(focusRowIndex);
         const endRow = tb.getChild(focusRowIndex + vMergeRows - 1);
         for (let i = 0; i < packs.length; i++) {