@hailin-zheng/editor-core 2.1.16 → 2.1.18

package/index.js

@@ -4674,10 +4674,16 @@ class TableRowElement extends BlockContainerElement {
     }
 }
 class TableRowRenderObject extends MuiltBlockLineRenderObject {
+    //被截断的行是否需要重新计算高度
+    remeasureState = true;
+    //当前行是否存在合并单元格
+    hasMergeCells = false;
     render(e) {
     }
     clone() {
         const cloneRender = new TableRowRenderObject(this.element);
+        cloneRender.remeasureState = this.remeasureState;
+        cloneRender.hasMergeCells = this.hasMergeCells;
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         for (let i = 0; i < this.length; i++) {
             cloneRender.addChild(this.getChild(i).clone());
@@ -8269,8 +8275,9 @@ class DataElementBarcode extends DataElementLeaf {
     }
     createRenderObject() {
         const render = new DataElementBarcodeRenderObject(this);
-        render.rect.width = this.props.width + 2;
-        render.rect.height = this.props.height + 2;
+        const { width, height } = render.measureSize();
+        render.rect.width = width + 2;
+        render.rect.height = height + 2;
         return render;
     }
     serialize(options) {
@@ -8341,11 +8348,27 @@ class DataElementBarcodeRenderObject extends ResizeLeafRenderObject {
         else {
             const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
             JsBarcode(svg, this.element.props.text);
+            const width = Number.parseInt(svg.getAttribute('width').replace('px', ''));
+            const height = Number.parseInt(svg.getAttribute('height').replace('px', ''));
+            svg.setAttribute('width', this.element.props.width + 'px');
+            svg.setAttribute('height', height * (this.element.props.width / width) + 'px');
             const vNode = toVNode(svg);
             t.children = [vNode];
         }
         return t;
     }
+    measureSize() {
+        if (this.element.props.type === 'qrcode') {
+            return { width: this.element.props.width, height: this.element.props.height };
+        }
+        else {
+            const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+            JsBarcode(svg, this.element.props.text);
+            const width = Number.parseInt(svg.getAttribute('width').replace('px', ''));
+            const height = Number.parseInt(svg.getAttribute('height').replace('px', ''));
+            return { width: this.element.props.width, height: height * (this.element.props.width / width) };
+        }
+    }
     toSvgString(qr, border, lightColor, darkColor) {
         let parts = [];
         for (let y = 0; y < qr.size; y++) {
@@ -11172,7 +11195,12 @@ class ElementUtil {
         if (render instanceof TableRenderObject) {
             //this.setTableAlign(render);
             this.remeasureTableMerge(render);
-            render.getItems().forEach(item => this.remeasure(item, false), null);
+            render.getItems().forEach(item => {
+                if (item.remeasureState) {
+                    this.remeasure(item, false);
+                    item.remeasureState = false;
+                }
+            }, null);
         }
         const innerRect = render.getInnerRect();
         innerRect.height = 0;
@@ -11188,7 +11216,7 @@ class ElementUtil {
         render.updateRenderHeight(innerRect);
         return innerRect.height;
     }
-    static remeasureTableRow(rowRender, foreceColIndex = -1) {
+    static remeasureTableRow(rowRender, forceColIndex = -1) {
         const rowEle = rowRender.element;
         let maxCellHeight = rowEle.props.minHeight > 20 ? rowEle.props.minHeight : 20;
         //限制行最小高度
@@ -11197,7 +11225,7 @@ class ElementUtil {
         for (let i = 0; i < rowRender.length; i++) {
             const cellRender = rowRender.getChild(i);
             const { vMerge } = cellRender.element.props;
-            if (cellRender.rect.height > maxCellHeight && (vMerge !== 'restart' || i === foreceColIndex)) {
+            if (cellRender.rect.height > maxCellHeight && (vMerge !== 'restart' || i === forceColIndex)) {
                 maxCellHeight = cellRender.rect.height;
             }
         }
@@ -11206,7 +11234,7 @@ class ElementUtil {
             const cellRender = rowRender.getChild(i);
             const cellElement = cellRender.element;
             const { vMerge } = cellElement.props;
-            if ((vMerge !== 'restart' || i === foreceColIndex) || cellRender.rect.height < maxCellHeight) {
+            if ((vMerge !== 'restart' || i === forceColIndex) || cellRender.rect.height < maxCellHeight) {
                 cellRender.rect.height = maxCellHeight;
             }
             //处理单元格内容纵向居中
@@ -11301,11 +11329,16 @@ class ElementUtil {
         let needReCalc = false;
         for (let i = 0; i < tbRender.length; i++) {
             const row = tbRender.getChild(i);
+            if (row.hasMergeCells === false) {
+                continue;
+            }
+            row.hasMergeCells = false;
             for (let j = 0; j < row.length; j++) {
                 const cellRender = row.getChild(j);
                 const ele = cellRender.element;
                 const { vMerge } = ele.props;
                 if (vMerge === 'restart') {
+                    row.hasMergeCells = true;
                     const eleIndex = ele.getIndex();
                     const continueRows = this.getContinueVMergeRenderRows(tbRender, i, eleIndex);
                     if (!continueRows.length) {
@@ -14920,29 +14953,23 @@ class DocumentArrange {
         while (currRow) {
             const rowContentHeight = this.getBlockLineHeight(currRow);
             if (rowContentHeight + sumHeight > limitHeight) {
-                if (currRow instanceof MuiltBlockLineRenderObject) {
-                    //限制的外框尺寸
-                    const availHeight = limitHeight - sumHeight;
-                    //限制的内框尺寸
-                    const limitRenderInnterHeight = ElementUtil.innerRectMaxHeight(tbRender, availHeight);
-                    const cutRow = this.cutRowRenderItem(currRow, limitRenderInnterHeight);
-                    if (cutRow) {
-                        cloneTbRender.addChild(cutRow);
-                        sumHeight += cutRow.rect.height;
-                        if (currRow.getItems().some(item => item.length !== 0)) {
-                            cutRows.push(currRow);
-                        }
-                        else {
-                            tbRender.removeChild(currRow);
-                        }
-                        if (currRow === joinRow) {
-                            break;
-                        }
-                        currRow = rows[++j];
+                //限制的外框尺寸
+                const availHeight = limitHeight - sumHeight;
+                const limitRenderInnerHeight = ElementUtil.innerRectMaxHeight(tbRender, availHeight);
+                const cutRow = this.cutRowRenderItem(currRow, limitRenderInnerHeight);
+                if (cutRow) {
+                    cloneTbRender.addChild(cutRow);
+                    sumHeight += cutRow.rect.height;
+                    if (currRow.getItems().some(item => item.length !== 0)) {
+                        cutRows.push(currRow);
                     }
                     else {
+                        tbRender.removeChild(currRow);
+                    }
+                    if (currRow === joinRow) {
                         break;
                     }
+                    currRow = rows[++j];
                 }
                 else {
                     break;
@@ -14974,6 +15001,7 @@ class DocumentArrange {
         // if (render.element.props.minHeight > 0 && render.rect.height < limitHeight) {
         //     return null;
         // }
+        render.remeasureState = true;
         const cloneRowRender = render.element.createRenderObject();
         cloneRowRender.rect.width = render.rect.width;
         //cloneRowRender.rect.maxWidth = render.rect.height;
@@ -15870,7 +15898,10 @@ class ElementRenderCut {
             documentRender.addChild(cloneFooterRender);
             //审阅模式，添加审阅窗口
             if (this.options.showReviewWindow && commentsRender) {
-                const commentsContainer = commentsRender.element.createRenderObject({ options: this.options, renderCtx: this.renderContext });
+                const commentsContainer = commentsRender.element.createRenderObject({
+                    options: this.options,
+                    renderCtx: this.renderContext
+                });
                 commentsContainer.padding.top = bodyMarginTop;
                 commentsContainer.rect.height = documentRender.rect.height;
                 documentRender.addChild(commentsContainer);
@@ -15881,13 +15912,19 @@ class ElementRenderCut {
         return docPages;
     }
     getDocInnerRect(documentRender) {
-        const render = documentRender.element.createRenderObject({ options: this.options, renderCtx: this.renderContext });
+        const render = documentRender.element.createRenderObject({
+            options: this.options,
+            renderCtx: this.renderContext
+        });
         render.padding = documentRender.padding;
         return render.getInnerRect();
     }
     getFullViewDocRender(documentRender, documentElement) {
         const commentsRender = documentRender.getChild(3);
-        const commentsContainer = commentsRender.element.createRenderObject({ options: this.options, renderCtx: this.renderContext });
+        const commentsContainer = commentsRender.element.createRenderObject({
+            options: this.options,
+            renderCtx: this.renderContext
+        });
         documentRender.rect.height -= commentsContainer.rect.height;
         const bodyRender = documentRender.getChild(1);
         if (this.options.showReviewWindow) {
@@ -15901,7 +15938,10 @@ class ElementRenderCut {
         return [documentRender];
     }
     createEmptyBodyRender(bodyRender, limitRect) {
-        const pageBodyRender = bodyRender.element.createRenderObject({ options: this.options, renderCtx: this.renderContext });
+        const pageBodyRender = bodyRender.element.createRenderObject({
+            options: this.options,
+            renderCtx: this.renderContext
+        });
         pageBodyRender.rect.width = limitRect.width;
         const bodyInnerLimitRect = pageBodyRender.getInnerRect();
         if (this.options.fullPageView) {
@@ -15925,7 +15965,10 @@ class ElementRenderCut {
         if (render instanceof TableRenderObject) {
             return this.cutTable(render, limitHeight);
         }
-        const cloneRender = render.element.createRenderObject({ options: this.options, renderCtx: this.renderContext });
+        const cloneRender = render.element.createRenderObject({
+            options: this.options,
+            renderCtx: this.renderContext
+        });
         cloneRender.setRenderWidth(render.rect.width);
         if (render instanceof MuiltBlockLineRenderObject) {
             let sumHeight = 0;
@@ -16060,16 +16103,16 @@ class ElementRenderCut {
         }
         const cloneRowRender = render.element.createRenderObject();
         cloneRowRender.rect.width = render.rect.width;
+        render.remeasureState = true;
         //cloneRowRender.rect.maxWidth = render.rect.height;
         const cellRenders = [...render.getItems()];
         const cutCellRenders = [];
         for (let i = 0; i < cellRenders.length; i++) {
             const cellRender = cellRenders[i];
+            this.markMergeRowRenderDirty(cellRender);
             if (cellRender.rect.height > limitHeight) {
-                //限制的外框尺寸
-                const availHeight = limitHeight;
                 //限制的内框尺寸
-                const limitCellHeight = ElementUtil.innerRectMaxHeight(cellRender, availHeight);
+                const limitCellHeight = ElementUtil.innerRectMaxHeight(cellRender, limitHeight);
                 const cutCellRender = this.cutRenderItem(cellRender, limitCellHeight);
                 if (cutCellRender) {
                     cutCellRenders.push(cutCellRender);
@@ -16093,7 +16136,10 @@ class ElementRenderCut {
             for (let i = 0; i < cutCellRenders.length; i++) {
                 let cellRender = cutCellRenders[i];
                 if (!cellRender) {
-                    cellRender = cellRenders[i].element.createRenderObject({ options: this.options, renderCtx: this.renderContext });
+                    cellRender = cellRenders[i].element.createRenderObject({
+                        options: this.options,
+                        renderCtx: this.renderContext
+                    });
                     cellRender.rect = ElementUtil.cloneRect(cellRenders[i].rect);
                     ElementUtil.remeasure(cellRender);
                 }
@@ -16103,6 +16149,33 @@ class ElementRenderCut {
             return cloneRowRender;
         }
     }
+    /**
+     * 标记合并单元格所在行需要重新计算
+     * @param cellRender
+     * @private
+     */
+    markMergeRowRenderDirty(cellRender) {
+        const cellEle = cellRender.element;
+        if (cellEle.props.vMerge !== 'restart') {
+            return;
+        }
+        const rowRender = cellRender.parent;
+        rowRender.element;
+        const tb = rowRender.parent;
+        const cellYPos = cellRender.rect.y;
+        for (let i = rowRender.getIndex() + 1; i < tb.length; i++) {
+            const nextRowRender = tb.getChild(i);
+            if (nextRowRender.rect.y <= cellYPos) {
+                nextRowRender.remeasureState = true;
+                nextRowRender.getItems().forEach(item => {
+                    this.markMergeRowRenderDirty(item);
+                });
+            }
+            else {
+                break;
+            }
+        }
+    }
     /**
      * 修复->已经截断的合并单元格要向下移动到合适的位置
      * @param tbRender
@@ -27924,6 +27997,7 @@ class DocEditor {
     insertTable(rows, cols) {
         const tb = TableUtil.createTable(rows, cols, this.selectionState);
         this.documentChange.insertTable(tb);
+        return tb;
     }
     /**
      * 插入软换行符
@@ -28788,7 +28862,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.16";
+        return "2.1.18";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);