Merge pull request #1724 from VisActor/fix/multiline-rt-fontSize

fix: fix issue with multiline richtext lineHeight
VisActor · Feb 11, 2025 · 67eb9fd · 67eb9fd
2 parents bcc4950 + 0fb7ce4
commit 67eb9fd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/common/changes/@visactor/vrender-core/fix-multiline-rt-fontSize_2025-02-10-09-47.json b/common/changes/@visactor/vrender-core/fix-multiline-rt-fontSize_2025-02-10-09-47.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vrender-core",
+      "comment": "fix: fix issue with multiline richtext lineHeight",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vrender-core"
+}
diff --git a/packages/vrender-core/src/graphic/richtext.ts b/packages/vrender-core/src/graphic/richtext.ts
@@ -448,7 +448,18 @@ export class RichText extends Graphic<IRichTextGraphicAttribute> implements IRic
           // 如果有文字内有换行符，将该段文字切为多段，并在后一段加入newLine标记
           const textParts = richTextConfig.text.split('\n');
           for (let j = 0; j < textParts.length; j++) {
-            paragraphs.push(new Paragraph(textParts[j], j !== 0, richTextConfig, ascentDescentMode));
+            if (j === 0) {
+              paragraphs.push(new Paragraph(textParts[j], false, richTextConfig, ascentDescentMode));
+            } else if (textParts[j] || i === textConfig.length - 1) {
+              paragraphs.push(new Paragraph(textParts[j], true, richTextConfig, ascentDescentMode));
+            } else {
+              // 空行的话，config应该要和下一行对齐
+              const nextRichTextConfig = this.combinedStyleToCharacter(
+                textConfig[i + 1] as IRichTextParagraphCharacter
+              ) as IRichTextParagraphCharacter;
+              paragraphs.push(new Paragraph(textParts[j], true, nextRichTextConfig, ascentDescentMode));
+            }
+            // paragraphs.push(new Paragraph(textParts[j], j !== 0, richTextConfig, ascentDescentMode));
           }
         } else if (richTextConfig.text) {
           paragraphs.push(new Paragraph(richTextConfig.text, false, richTextConfig, ascentDescentMode));