@hailin-zheng/editor-core 1.1.7 → 1.1.9

package/index.js

@@ -4288,6 +4288,13 @@ class TableUtil {
                     currCell.props.vMerge = i === tbRegion.startRow ? 'restart' : 'continue';
                     currCell.props.hMerge = 'restart';
                 }
+                //选择的行数一行，此时纵向合并不需要设置
+                if (tbRegion.endRow === tbRegion.startRow) {
+                    currCell.props.vMerge = null;
+                }
+                if (tbRegion.startCol === tbRegion.endCol) {
+                    currCell.props.hMerge = null;
+                }
                 if (currCell !== startCell) {
                     cellContents.push(...ElementUtil.getChildrenElements(currCell));
                     currCell.clearItems();
@@ -4427,6 +4434,13 @@ class TableUtil {
         tb.pubOnChange('self');
         tb.refreshView();
     }
+    /**
+     * 在指定位置插入行
+     * 动作：在指定行上方或者下方插入行
+     * 原则：插入的行单元格尽量不纵向合并
+     * @param ss
+     * @param insertRowIndex
+     */
     static insertRow(ss, insertRowIndex) {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
@@ -4434,7 +4448,7 @@ class TableUtil {
         }
         const startRow = startCell.parent;
         const tb = startRow.parent;
-        const currRowIndex = startRow.getIndex();
+        startRow.getIndex();
         insertRowIndex = insertRowIndex < 0 ? 0 : insertRowIndex;
         insertRowIndex = insertRowIndex > tb.length ? tb.length : insertRowIndex;
         const newRow = TableRowElement.createRow(tb.getColsCount());
@@ -4452,16 +4466,12 @@ class TableUtil {
             if (destCell.props.vMerge === 'continue') {
                 //获取合并列的最后的行索引
                 const vMergeEndRowIndex = this.getVMergeEndIndex(tb, insertRowIndex, i);
-                if (vMergeEndRowIndex > insertRowIndex || (vMergeEndRowIndex === insertRowIndex && currRowIndex < insertRowIndex)) {
+                //当前单元格处于纵向合并的单元格之中
+                if (vMergeEndRowIndex >= insertRowIndex) {
                     newCell.props.vMerge = 'continue';
-                    //newCell.cellProps.hMerge = destCell.cellProps.hMerge;
                 }
             }
-            else if (destCell.props.vMerge === 'restart' && currRowIndex > insertRowIndex) {
-                //在上方新增行，目标行单元格属于合并的起点
-                newCell.props.vMerge = 'continue';
-                //newCell.cellProps.hMerge = destCell.cellProps.hMerge;
-            }
+            newCell.props.hMerge = destCell.props.hMerge;
         }
         tb.addChild(newRow, insertRowIndex);
         tb.refreshView();
@@ -11319,6 +11329,10 @@ class ParagraphMeasure {
         }
         else if (paraElement.props.textAlign === 'justify') {
             const renderUnitCount = this.getRenderUnitLength(paraLineRender.line);
+            if (paraLineIndex === counter - 1 || renderUnitCount === 1) {
+                return;
+                //return indent;
+            }
             const spaceWidth = (limitWidth - paraLineRender.line.rect.width) / (renderUnitCount - 1);
             this.setAlignJustify(paraLineRender.line, 0, spaceWidth);
             //return indent;
@@ -15836,12 +15850,14 @@ class DocumentChange {
     }
     /**
      * 根据开始位置和结束位置，将字符切割成指定的区间
-     * @param splitTextUnit
+     * @param text
      * @param start
      * @param end
      * @returns
      */
     static splitTextGroupByRange(text, start, end) {
+        start = Math.floor(start);
+        end = Math.floor(end);
         end = end === -1 ? text.textMeasures.length : end;
         if (start === end) {
             return null;