@hailin-zheng/editor-core 2.1.21 → 2.1.22

package/index.js

@@ -631,7 +631,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，则直接返回
@@ -4854,6 +4853,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') {
@@ -4872,10 +4873,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,
@@ -4883,8 +4885,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,
@@ -4892,6 +4892,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;
         }
@@ -12839,7 +12842,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;
@@ -27806,7 +27820,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.21";
+        return "2.1.22";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);