@hailin-zheng/editor-core 2.1.21 → 2.1.23

package/index-cjs.js

@@ -660,7 +660,6 @@ class CommonUtil {
     static cloneValue(val) {
         return CommonUtil.cloneDeep(val);
     }
-    // @ts-ignore
     static cloneDeep(source, visited = new WeakMap()) {
         if (source === null || typeof source !== 'object') {
             // 如果是基本类型或 null，则直接返回
@@ -4679,7 +4678,9 @@ class TableRowElement extends BlockContainerElement {
         }
     }
     createRenderObject() {
-        return new TableRowRenderObject(this);
+        const rowRender = new TableRowRenderObject(this);
+        rowRender.minHeight = this.props.minHeight;
+        return rowRender;
     }
     serialize(viewOptions) {
         return {
@@ -4712,10 +4713,13 @@ class TableRowRenderObject extends MuiltBlockLineRenderObject {
     remeasureState = true;
     //当前行是否存在合并单元格
     hasMergeCells = undefined;
+    //行最小高度,用于标记当前行临时的最小高度状态
+    minHeight = -1;
     clone() {
         const cloneRender = new TableRowRenderObject(this.element);
         cloneRender.remeasureState = this.remeasureState;
         cloneRender.hasMergeCells = this.hasMergeCells;
+        cloneRender.minHeight = this.minHeight;
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         for (let i = 0; i < this.length; i++) {
             cloneRender.addChild(this.getChild(i).clone());
@@ -4883,6 +4887,8 @@ class TextGroupRenderObject extends LeafRenderObject {
             return;
         }
         const props = this.element.props;
+        //基线位置到top的距离
+        const actualFontBoundingBoxAscent = event.renderCtx.mainContext.getActualFontBoundingBoxAscent(props.getFont());
         let { width, height } = this.rect;
         let vertHeight = 0; //baseLine;
         if (props.vertAlign === 'subscript') {
@@ -4901,10 +4907,11 @@ class TextGroupRenderObject extends LeafRenderObject {
             return curr.actualSize + prev;
         }, this.rect.x);
         const x = arr.join(' ');
-        const y = this.rect.y + vertHeight; //this.textMeasures.map(item => this.rect.y + vertHeight).join(' ');
-        // const text = this.textMeasures.map(item => {
-        //     return item.char
-        // }).join('');
+        let y = this.rect.y + vertHeight;
+        //基线处理
+        y += actualFontBoundingBoxAscent ?? 0;
+        //行高处理
+        y += (height - props.fontSize) / 2;
         const t = {
             sel: 'text',
             text: text,
@@ -4912,8 +4919,6 @@ class TextGroupRenderObject extends LeafRenderObject {
                 ns: "http://www.w3.org/2000/svg",
                 attrs: {
                     //"transform": `translate(0,${(height - props.fontSize) / 2})`,
-                    "translate": { x: 0, y: (height - props.fontSize) / 2 },
-                    'dominant-baseline': 'hanging',
                     'font-family': this.element.props.fontName,
                     'font-size': fontSize,
                     x,
@@ -4921,6 +4926,9 @@ class TextGroupRenderObject extends LeafRenderObject {
                 }
             },
         };
+        if (actualFontBoundingBoxAscent === undefined) {
+            t.data.attrs['dominant-baseline'] = 'hanging';
+        }
         if (this.element.props.fontWeight !== 'normal') {
             t.data.attrs['font-weight'] = this.element.props.fontWeight;
         }
@@ -11097,7 +11105,7 @@ class ElementUtil {
         canvas.style.height = scaleHeight + 'px';
         canvas.width = scaleWidth * dpr;
         canvas.height = scaleHeight * dpr;
-        ctx.textBaseline = 'top';
+        //ctx.textBaseline = 'top';
         ctx.scale(dpr, dpr);
     }
     // static setOffscreenCanvas(canvas: OffscreenCanvas, ctx: OffscreenCanvasRenderingContext2D, viewOptions: { width: number, height: number }, scale: number = 1): void {
@@ -11247,8 +11255,7 @@ class ElementUtil {
         return innerRect.height;
     }
     static remeasureTableRow(rowRender, forceColIndex = -1) {
-        const rowEle = rowRender.element;
-        let maxCellHeight = rowEle.props.minHeight > 20 ? rowEle.props.minHeight : 20;
+        let maxCellHeight = rowRender.minHeight > 20 ? rowRender.minHeight : 20;
         //限制行最小高度
         maxCellHeight = maxCellHeight < 20 ? 20 : maxCellHeight;
         //获取行内非纵向合并单元格的最高单元格高度
@@ -12796,6 +12803,13 @@ class ElementUtil {
     }
 }
 
+exports.TextUnitsHolder = void 0;
+(function (TextUnitsHolder) {
+    TextUnitsHolder[TextUnitsHolder["char"] = 0] = "char";
+    TextUnitsHolder[TextUnitsHolder["sourceSize"] = 1] = "sourceSize";
+    TextUnitsHolder[TextUnitsHolder["actualSize"] = 2] = "actualSize";
+    TextUnitsHolder[TextUnitsHolder["actualBoundingBoxAscent"] = 3] = "actualBoundingBoxAscent";
+})(exports.TextUnitsHolder || (exports.TextUnitsHolder = {}));
 class RenderContext {
     mainContext;
     contentContext;
@@ -12868,7 +12882,18 @@ class PaintContent {
         this.init();
     }
     init() {
-        this.ctx.textBaseline = 'top';
+        //this.ctx.textBaseline = 'top';
+    }
+    cacheFontBoundingBoxAscentMap = new Map();
+    getActualFontBoundingBoxAscent(font) {
+        if (this.cacheFontBoundingBoxAscentMap.has(font)) {
+            return this.cacheFontBoundingBoxAscentMap.get(font);
+        }
+        this.ctx.font = font;
+        const textMetrics = this.ctx.measureText('正');
+        const value = textMetrics.actualBoundingBoxAscent;
+        this.cacheFontBoundingBoxAscentMap.set(font, value);
+        return value;
     }
     setGlobalAlpha(alpha) {
         this.ctx.globalAlpha = alpha;
@@ -15000,13 +15025,15 @@ class DocumentArrange {
         let currRow = rows[j];
         const cutRows = [];
         while (currRow) {
-            const minHeight = currRow.element.props.minHeight;
+            const minHeight = currRow.minHeight;
             const rowContentHeight = this.getBlockLineHeight(currRow);
             if (rowContentHeight + sumHeight > limitHeight) {
                 //行存在最小高度，且当前行内容的高度小于最小高度，且当前行跨页的情况下，不截断该行
                 if (minHeight > 0 && minHeight > rowContentHeight) {
                     break;
                 }
+                //设定最小高度不生效
+                currRow.minHeight = -1;
                 //限制的外框尺寸
                 const availHeight = limitHeight - sumHeight;
                 const limitRenderInnerHeight = ElementUtil.innerRectMaxHeight(tbRender, availHeight);
@@ -15057,6 +15084,9 @@ class DocumentArrange {
         // }
         render.remeasureState = true;
         const cloneRowRender = render.element.createRenderObject();
+        if (cloneRowRender.minHeight > 0 && render.minHeight <= 0) {
+            cloneRowRender.minHeight = render.minHeight;
+        }
         cloneRowRender.rect.width = render.rect.width;
         //cloneRowRender.rect.maxWidth = render.rect.height;
         const cellRenders = [...render.getItems()];
@@ -27835,7 +27865,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.21";
+        return "2.1.23";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);