feat(ui): 统一等宽字体回退链 通过 FontMono 资源声明设计稿字体链,并在字体管理器层把缺失的 Consolas 映射到跨平台等宽字体与中文回退;控制台、编辑区与日志统一使用该资源。 新增字体回退测试,更新界面设计说明。大石头 authored at 2026-11-12 10:08:54
diff --git "a/Doc/\347\225\214\351\235\242\350\256\276\350\256\241/\350\256\276\350\256\241\350\257\264\346\230\216.md" "b/Doc/\347\225\214\351\235\242\350\256\276\350\256\241/\350\256\276\350\256\241\350\257\264\346\230\216.md"
index 26da48b..69f1d03 100644
--- "a/Doc/\347\225\214\351\235\242\350\256\276\350\256\241/\350\256\276\350\256\241\350\257\264\346\230\216.md"
+++ "b/Doc/\347\225\214\351\235\242\350\256\276\350\256\241/\350\256\276\350\256\241\350\257\264\346\230\216.md"
@@ -79,7 +79,16 @@
> 桌面实现中按钮、输入框与下拉框的最小高度为 32px(比原型 36px 更紧凑),以适配工具页的密集表单。
-### 2.3 XAML 对应
+### 2.3 字体
+
+| 用途 | 字体链 | 实现 |
+|------|--------|------|
+| 界面 | Inter → 系统默认字体 | WithInterFont();中文由系统字体回退 |
+| 代码/日志 | Cascadia Code → JetBrains Mono → Consolas → SF Mono → Menlo → DejaVu Sans Mono → Noto Sans Mono → Noto Sans Mono CJK SC → Microsoft YaHei UI → PingFang SC | FontMono 资源;FontOptions 在字体管理器层把缺失的 Consolas 映射到整条链,避免 Linux/macOS 退化成比例字体 |
+
+> 新控件直接引用 {DynamicResource FontMono};旧视图里的 Consolas 由字体管理器映射兜底,无需逐文件改写。
+
+### 2.4 XAML 对应
| 原型(CSS / HTML) | 产品(Avalonia) |
|--------------------|------------------|
diff --git a/Tests/XCoder.App.Tests/FontOptionsTests.cs b/Tests/XCoder.App.Tests/FontOptionsTests.cs
new file mode 100644
index 0000000..d7370ff
--- /dev/null
+++ b/Tests/XCoder.App.Tests/FontOptionsTests.cs
@@ -0,0 +1,38 @@
+using System.ComponentModel;
+using System.Linq;
+using Avalonia.Media;
+using NewLife.XCoder;
+using Xunit;
+
+namespace XCoder.App.Tests;
+
+/// <summary>字体回退链测试</summary>
+public class FontOptionsTests
+{
+ [Fact]
+ [DisplayName("等宽字体回退链覆盖跨平台字体与中文回退")]
+ public void MonoFallback_ContainsCrossPlatformFamilies()
+ {
+ var family = new FontFamily(FontOptions.MonoFallback);
+ var names = family.FamilyNames.ToArray();
+
+ Assert.Contains("Cascadia Code", names);
+ Assert.Contains("JetBrains Mono", names);
+ Assert.Contains("Consolas", names);
+ Assert.Contains("DejaVu Sans Mono", names);
+ Assert.Contains("Microsoft YaHei UI", names);
+ }
+
+ [Fact]
+ [DisplayName("字体管理器把缺失的 Consolas 映射到等宽回退链")]
+ public void Create_MapsConsolasToMonoFallback()
+ {
+ var options = FontOptions.Create();
+
+ Assert.NotNull(options.FontFamilyMappings);
+ Assert.True(options.FontFamilyMappings.TryGetValue("Consolas", out var family));
+ Assert.NotNull(family);
+ Assert.Contains("Cascadia Code", family!.FamilyNames);
+ Assert.Contains("Noto Sans Mono CJK SC", family.FamilyNames);
+ }
+}
diff --git a/XCoder.App/Common/FontOptions.cs b/XCoder.App/Common/FontOptions.cs
new file mode 100644
index 0000000..ae49efd
--- /dev/null
+++ b/XCoder.App/Common/FontOptions.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using Avalonia.Media;
+
+namespace NewLife.XCoder;
+
+/// <summary>字体回退配置</summary>
+/// <remarks>
+/// 设计稿优先使用 Cascadia Code / JetBrains Mono,但不同系统不一定安装;
+/// 统一声明等宽回退链,并在字体管理器层面把缺失的 Consolas 映射到该链,
+/// 避免 Linux/macOS 退化为比例字体。
+/// </remarks>
+public static class FontOptions
+{
+ /// <summary>等宽字体回退链</summary>
+ public const String MonoFallback = "Cascadia Code, JetBrains Mono, Consolas, SF Mono, Menlo, DejaVu Sans Mono, Noto Sans Mono, Noto Sans Mono CJK SC, Microsoft YaHei UI, PingFang SC";
+
+ /// <summary>创建字体管理器选项</summary>
+ /// <returns>字体管理器选项</returns>
+ public static FontManagerOptions Create() => new()
+ {
+ FontFamilyMappings = new Dictionary<String, FontFamily>
+ {
+ ["Consolas"] = new(MonoFallback),
+ },
+ };
+}
diff --git a/XCoder.App/Program.cs b/XCoder.App/Program.cs
index 9279812..c8196aa 100644
--- a/XCoder.App/Program.cs
+++ b/XCoder.App/Program.cs
@@ -48,6 +48,7 @@ class Program
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
+ .With(FontOptions.Create())
.WithInterFont()
.LogToTrace();
diff --git a/XCoder.App/Themes/Controls.axaml b/XCoder.App/Themes/Controls.axaml
index ca9f989..a8d698c 100644
--- a/XCoder.App/Themes/Controls.axaml
+++ b/XCoder.App/Themes/Controls.axaml
@@ -505,7 +505,7 @@
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="8" />
<Setter Property="Padding" Value="10,8" />
- <Setter Property="FontFamily" Value="Consolas" />
+ <Setter Property="FontFamily" Value="{DynamicResource FontMono}" />
<Setter Property="FontSize" Value="12" />
<Setter Property="CaretBrush" Value="{DynamicResource ConsoleText}" />
<Setter Property="SelectionBrush" Value="{DynamicResource ConsoleSelection}" />
@@ -545,7 +545,7 @@
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="10" />
- <Setter Property="FontFamily" Value="Consolas" />
+ <Setter Property="FontFamily" Value="{DynamicResource FontMono}" />
<Setter Property="FontSize" Value="12" />
</Style>
<Style Selector="Border.editor TextBox /template/ Border#PART_BorderElement">
@@ -579,7 +579,7 @@
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="0" />
- <Setter Property="FontFamily" Value="Consolas" />
+ <Setter Property="FontFamily" Value="{DynamicResource FontMono}" />
<Setter Property="FontSize" Value="12" />
</Style>
</Styles>
diff --git a/XCoder.App/Themes/Tokens.axaml b/XCoder.App/Themes/Tokens.axaml
index c4f6b6a..4325013 100644
--- a/XCoder.App/Themes/Tokens.axaml
+++ b/XCoder.App/Themes/Tokens.axaml
@@ -71,6 +71,9 @@
<SolidColorBrush x:Key="ConsoleSelection" Color="#1E4C7A" />
<SolidColorBrush x:Key="ConsoleMuted" Color="#7C8FA6" />
+ <!-- 等宽字体回退链:优先设计稿字体,缺失时逐级回退到跨平台等宽字体与中文回退 -->
+ <FontFamily x:Key="FontMono">Cascadia Code, JetBrains Mono, Consolas, SF Mono, Menlo, DejaVu Sans Mono, Noto Sans Mono, Noto Sans Mono CJK SC, Microsoft YaHei UI, PingFang SC</FontFamily>
+
<!-- 尺寸令牌(与主题无关) -->
<x:Double x:Key="SidebarWidth">216</x:Double>
<x:Double x:Key="SidebarRailWidth">64</x:Double>