@hailin-zheng/editor-core 1.1.14 → 1.1.16

package/index.js

@@ -1308,6 +1308,7 @@ class BranchElement extends Element {
     }
 }
 function clearChildrenRenderCache(ele) {
+    ele.cacheRender = null;
     for (let i = 0; i < ele.length; i++) {
         const curr = ele.getChild(i);
         curr.cacheRender = null;
@@ -3934,12 +3935,33 @@ class TableRowElement extends BlockContainerElement {
         //在差异更新中，由于行内单元格存在合并行的情况，需要将当前行内存在合并的单元格，将其修改标志改为修改
         const changeSub = this.onChangeSubject.subscribe(() => {
             if (this.modifyFlag === ModifyFlag$1.Track) {
-                //this.checkRowModifyState();
+                this.checkRowModifyState();
                 this.pubOnChange('to-child');
             }
         });
         this.addsubscribe(this, changeSub);
     }
+    /**
+     * 解决纵向合并行的行缓存高度bug
+     * @private
+     */
+    checkRowModifyState() {
+        const tb = ElementUtil.getParentByType(this, TableElement);
+        if (!tb) {
+            return;
+        }
+        const currRowIndex = this.getIndex();
+        for (let i = 0; i < this.length; i++) {
+            const cell = this.getChild(i);
+            if (cell.props.vMerge === 'continue') {
+                const endRowIndex = TableUtil.getVMergeEndIndex(tb, currRowIndex, i);
+                const startRowIndex = TableUtil.getVMergeStartIndex(tb, currRowIndex, i);
+                for (let j = startRowIndex; j <= endRowIndex; j++) {
+                    clearChildrenRenderCache(tb.getChild(j));
+                }
+            }
+        }
+    }
     createRenderObject() {
         return new TableRowRenderObject(this);
     }
@@ -5114,7 +5136,7 @@ class TextGroupElement extends LeafElement {
      * @param format
      */
     setFormat(format) {
-        formatEle(this, format);
+        //History.formatEle(this, format);
         Object.keys(format).forEach(key => {
             this.props[key] = format[key];
         });
@@ -9224,7 +9246,9 @@ class TableSplitCell {
         if (rows === 1 && cols === 1) {
             return;
         }
+        //获取当前单元格
         const focusCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
+        //获取当前行
         const focusRow = ElementUtil.getParentByType(focusCell, TableRowElement);
         const tb = ElementUtil.getParentByType(focusRow, TableElement);
         if (!focusCell || !focusRow || !tb) {
@@ -9240,7 +9264,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}的约数`);
             }
         }