@hailin-zheng/editor-core 2.2.34 → 2.2.36

package/index.js

@@ -5213,7 +5213,7 @@ class TextGroupRenderObject extends LeafRenderObject {
         //行高处理
         y += (height - props.fontSize) / 2;
         const t = ElementUtil.createSvgText(text, {
-            'font-family': this.element.props.fontName,
+            'font-family': props.fontName,
             'font-size': fontSize,
             x,
             y,
@@ -5221,37 +5221,41 @@ class TextGroupRenderObject extends LeafRenderObject {
         if (actualFontBoundingBoxAscent === undefined) {
             t.data.attrs['dominant-baseline'] = 'hanging';
         }
-        if (this.element.props.fontWeight !== 'normal') ;
-        if (this.element.props.fontStyle !== 'normal') {
-            t.data.attrs['font-style'] = this.element.props.fontStyle;
+        if (props.fontWeight !== 'normal' && event.mode === 'view') {
+            t.data.attrs['font-weight'] = this.element.props.fontWeight;
+            //t.data.attrs['filter'] = 'url(#t_bold)'
         }
-        if (this.element.props.color) {
-            t.data.attrs['fill'] = this.element.props.color;
+        if (props.fontStyle !== 'normal') {
+            t.data.attrs['font-style'] = props.fontStyle;
         }
-        if (this.element.props.background) {
+        if (props.color) {
+            t.data.attrs['fill'] = props.color;
+        }
+        if (props.background) {
             const bgX = event.relativePagePos.x;
             const bgY = event.relativePagePos.y;
-            event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, this.rect.width, this.rect.height, this.element.props.background));
+            event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, this.rect.width, this.rect.height, props.background));
         }
-        if (this.element.props.underline) {
-            const underHeight = this.element.props.fontSize * 1.2;
+        if (props.underline) {
+            const underHeight = props.fontSize * 1.2;
             const path = `M${event.relativePagePos.x} ${event.relativePagePos.y + underHeight} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y + underHeight}`;
             event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
         }
-        if (this.element.props.linethrough) {
+        if (props.linethrough) {
             const path = `M${event.relativePagePos.x} ${event.relativePagePos.y + this.rect.height / 2} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y + this.rect.height / 2}`;
             event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
         }
-        if (this.element.props.border) {
+        if (props.border) {
             event.highlights.push(ElementUtil.getStrokeSvgPath(ElementUtil.getRectPath(event.relativePagePos.x, event.relativePagePos.y, this.rect.width, this.rect.height), '#000', 1));
         }
-        if (this.element.props.overline) {
+        if (props.overline) {
             const path = `M${event.relativePagePos.x} ${event.relativePagePos.y} L${event.relativePagePos.x + this.rect.width} ${event.relativePagePos.y}`;
             event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
         }
         //处理null-text
         if (this.element.isDecorate && this.element.disableClick && !this.element.parent) ;
-        if (this.element.props.fontWeight === "bold") {
+        if (props.fontWeight === "bold" && event.mode === 'print') {
+            const blurRate = props.fontSize * 0.5 / 15;
             const g = {
                 sel: "g",
                 data: {
@@ -5276,7 +5280,19 @@ class TextGroupRenderObject extends LeafRenderObject {
                         data: {
                             ns: "http://www.w3.org/2000/svg",
                             attrs: {
-                                translate: { x: 0.5, y: 0 }
+                                translate: { x: blurRate, y: 0 }
+                            }
+                        },
+                        children: [
+                            { ...t }
+                        ]
+                    },
+                    {
+                        sel: "g",
+                        data: {
+                            ns: "http://www.w3.org/2000/svg",
+                            attrs: {
+                                translate: { x: 0, y: blurRate }
                             }
                         },
                         children: [
@@ -23448,7 +23464,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.34";
+        return "2.2.36";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);