feat.试验性地改了一下融合桌面的组件库，反正还是不能用。

.github/workflows/release.yml

@@ -66,8 +66,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [x64, x86]
-    name: Build_Windows_${{ matrix.arch }}
+        include:
+          # 完整版（自包含 .NET 运行时）
+          - arch: x64
+            self_contained: true
+            suffix: ''
+          - arch: x86
+            self_contained: true
+            suffix: ''
+          # 轻盈版（框架依赖，仅 x64）
+          - arch: x64
+            self_contained: false
+            suffix: '-lite'
+    name: Build_Windows_${{ matrix.arch }}${{ matrix.suffix }}
     
     steps:
       - name: Checkout
@@ -95,13 +106,16 @@ jobs:
 
       - name: Publish
         run: |
+          $selfContained = "${{ matrix.self_contained }}" -eq "true"
+          $publishDir = if ($selfContained) { "publish/windows-${{ matrix.arch }}" } else { "publish/windows-${{ matrix.arch }}-lite" }
+
           dotnet publish LanMountainDesktop/LanMountainDesktop.csproj `
             -c Release `
-            -o ./publish/windows-${{ matrix.arch }} `
-            --self-contained `
+            -o ./$publishDir `
+            --self-contained:$selfContained `
             -r win-${{ matrix.arch }} `
             -p:PublishSingleFile=false `
-            -p:SelfContained=true `
+            -p:SelfContained=$selfContained `
             -p:DebugType=none `
             -p:DebugSymbols=false `
             -p:PublishTrimmed=false `
@@ -110,6 +124,9 @@ jobs:
             -p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }} `
             -p:FileVersion=${{ needs.prepare.outputs.assembly_version }} `
             -p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
+
+          Write-Host "Published to: $publishDir"
+          Write-Host "Self-contained: $selfContained"
         shell: pwsh
 
       - name: Install Inno Setup
@@ -120,7 +137,9 @@ jobs:
         run: |
           $version = "${{ needs.prepare.outputs.version }}"
           $arch = "${{ matrix.arch }}"
-          $publishDir = "publish\windows-$arch"
+          $selfContained = "${{ matrix.self_contained }}" -eq "true"
+          $suffix = "${{ matrix.suffix }}"
+          $publishDir = if ($selfContained) { "publish\windows-$arch" } else { "publish\windows-$arch-lite" }
           $installerScript = "LanMountainDesktop\installer\LanMountainDesktop.iss"
           $outputDir = "build-installer"
           
@@ -187,6 +206,8 @@ jobs:
             "/DPublishDir=$publishDir",
             "/DMyOutputDir=$outputDir",
             "/DMyAppArch=$arch",
+            "/DMyAppSuffix=$suffix",
+            "/DIsSelfContained=$selfContained",
             $installerScript
           )
           
@@ -213,7 +234,7 @@ jobs:
       - name: Upload Installer
         uses: actions/upload-artifact@v4
         with:
-          name: release-windows-${{ matrix.arch }}
+          name: release-windows-${{ matrix.arch }}${{ matrix.suffix }}
           path: build-installer/*.exe
           if-no-files-found: error
           retention-days: 30
@@ -548,19 +569,22 @@ jobs:
           artifacts: "release-files/**"
           body: |
             ## Release ${{ needs.prepare.outputs.version }}
-            
+
             ### Windows
-            - **LanMountainDesktop-Setup-{version}-x64.exe** - 64-bit installer
-            - **LanMountainDesktop-Setup-{version}-x86.exe** - 32-bit installer
-            
+            - **LanMountainDesktop-Setup-{version}-x64.exe** - 64-bit installer (完整版，包含 .NET 运行时)
+            - **LanMountainDesktop-Setup-{version}-x64-lite.exe** - 64-bit installer (轻量版，需安装 .NET 10 Runtime)
+            - **LanMountainDesktop-Setup-{version}-x86.exe** - 32-bit installer (完整版，包含 .NET 运行时)
+
+            > **轻量版说明**：轻量版不包含 .NET 运行时，体积更小。首次运行前需安装 [.NET 10 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet/10.0)。
+
             Installation: Double-click the .exe file and follow the wizard.
-            
+
             ### Linux
             - **LanMountainDesktop-{version}-linux-x64.deb** - Debian package (x64)
-            
+
             ### macOS
             - **LanMountainDesktop-{version}-macos-x64.dmg** - Intel processor
             - **LanMountainDesktop-{version}-macos-arm64.dmg** - Apple Silicon (M1/M2/M3)
-            
+
             See commits for changes.
           token: ${{ secrets.GITHUB_TOKEN }}

.trae/specs/fused-desktop-library-redesign/spec.md

@@ -0,0 +1,100 @@
+# 融合桌面组件库窗口重设计规格
+
+## Why
+当前融合桌面组件库窗口（FusedDesktopComponentLibraryWindow）的UI设计较为基础，与Windows 11小组件编辑面板相比，缺乏现代化的交互体验和视觉层次。用户需要一个更直观、更美观的界面来浏览和添加组件到系统桌面（负一屏）。
+
+参考Windows 11小组件编辑面板的设计特点：
+- 左侧分类列表，右侧选中组件的详细预览
+- 大型组件预览区域，让用户清楚看到组件效果
+- 底部明显的"添加"操作按钮
+- 简洁的关闭按钮（X）在右上角
+- 深色主题配合毛玻璃效果
+
+## What Changes
+- **重新设计窗口布局**：从左右分栏（分类列表+组件网格）改为左侧面板+右侧预览区的布局
+- **添加组件详情预览区**：选中组件后右侧显示大尺寸预览和组件信息
+- **优化关闭按钮**：使用标准的X图标按钮，不使用圆形样式
+- **添加底部操作栏**：包含"添加到桌面"主操作按钮和"查找更多组件"链接
+- **复用阑山桌面组件库分类**：使用相同的分类ID、图标和本地化文本
+- **移除搜索功能**：参考Windows 11设计，暂不提供搜索
+
+## Impact
+- 受影响文件：
+  - `LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml`
+  - `LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs`
+  - `LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml`
+  - `LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml.cs`
+  - `LanMountainDesktop/ViewModels/ComponentLibraryWindowViewModel.cs`（可能需要添加新属性）
+
+## ADDED Requirements
+
+### Requirement: 窗口布局重设计
+系统应提供一个类似于Windows 11小组件编辑面板的组件库窗口。
+
+#### Scenario: 窗口整体结构
+- **GIVEN** 用户从托盘菜单打开融合桌面组件库
+- **WHEN** 窗口显示时
+- **THEN** 窗口应呈现：
+  - 顶部标题栏：左侧显示"添加小组件"标题，右侧有关闭按钮（X）
+  - 左侧面板：分类列表（复用阑山桌面组件库的分类和图标）
+  - 右侧主区域：选中组件的大尺寸预览 + 组件信息 + 添加按钮
+  - 底部："查找更多组件"链接
+
+#### Scenario: 分类列表交互
+- **GIVEN** 左侧显示组件分类列表
+- **WHEN** 用户点击某个分类
+- **THEN** 右侧应显示该分类下的第一个组件的预览
+- **AND** 分类项应有选中状态视觉反馈
+- **AND** 分类图标和名称应与阑山桌面组件库保持一致
+
+#### Scenario: 组件预览区
+- **GIVEN** 用户选中一个组件
+- **WHEN** 预览区显示时
+- **THEN** 应显示：
+  - 组件标题（大字号）
+  - 大尺寸组件预览图（接近实际尺寸）
+  - 组件描述/功能说明
+  - 底部"添加到桌面"按钮
+
+#### Scenario: 添加组件操作
+- **GIVEN** 用户查看组件预览
+- **WHEN** 用户点击"添加到桌面"按钮
+- **THEN** 组件应被添加到系统桌面（负一屏）中央
+- **AND** 窗口应关闭
+
+#### Scenario: 关闭按钮样式
+- **GIVEN** 窗口标题栏有关闭按钮
+- **THEN** 关闭按钮应使用标准的X图标
+- **AND** 不使用圆形背景或特殊样式
+- **AND** 使用 `DesignCornerRadiusSm` 动态资源
+
+#### Scenario: 查找更多组件链接
+- **GIVEN** 窗口底部显示"查找更多组件"链接
+- **WHEN** 用户点击该链接
+- **THEN** 应打开设置窗口的插件目录页面（后续将改为插件市场）
+
+## MODIFIED Requirements
+
+### Requirement: 组件列表展示
+原实现使用网格展示所有组件，新实现改为：
+- 左侧列表仅显示分类（复用阑山桌面组件库的分类ID和图标映射）
+- 右侧预览区一次只显示一个组件的详细信息
+- ~~移除搜索功能~~（根据Windows 11设计，暂不提供搜索）
+
+### Requirement: 关闭按钮圆角规范
+原实现关闭按钮使用硬编码 `CornerRadius="18"`，应改为使用动态资源 `DesignCornerRadiusSm`。
+
+### Requirement: 分类图标复用
+分类图标映射应与阑山桌面组件库保持一致：
+- Clock -> Symbol.Clock
+- Date -> Symbol.CalendarDate
+- Weather -> Symbol.WeatherSunny
+- Board -> Symbol.Edit
+- Media -> Symbol.Play
+- Info -> Symbol.Info
+- Calculator -> Symbol.Calculator
+- Study -> Symbol.Hourglass
+- 其他 -> Symbol.Apps
+
+## REMOVED Requirements
+- ~~搜索功能~~：根据Windows 11小组件面板设计，暂不提供搜索功能

.trae/specs/fused-desktop-library-redesign/tasks.md

@@ -0,0 +1,35 @@
+# Tasks
+
+- [x] Task 1: 修改 FusedDesktopComponentLibraryWindow.axaml 窗口布局
+  - [x] SubTask 1.1: 重新设计标题栏，使用标准X关闭按钮，移除圆形样式，使用 DesignCornerRadiusSm
+  - [x] SubTask 1.2: 调整窗口整体布局为左侧面板+右侧预览区
+  - [x] SubTask 1.3: 添加底部"查找更多组件"链接区域
+
+- [x] Task 2: 修改 FusedDesktopComponentLibraryControl.axaml 控件布局
+  - [x] SubTask 2.1: 重新设计左侧面板：仅保留分类列表（移除搜索框）
+  - [x] SubTask 2.2: 重新设计右侧预览区：组件标题 + 大尺寸预览 + 描述 + 添加按钮
+  - [x] SubTask 2.3: 优化分类列表项样式，添加选中状态视觉反馈
+  - [x] SubTask 2.4: 复用阑山桌面组件库的分类图标映射
+
+- [x] Task 3: 更新 ViewModel 支持新交互模式
+  - [x] SubTask 3.1: 在 ComponentLibraryWindowViewModel 中添加 SelectedComponent 属性
+  - [x] SubTask 3.2: 添加组件描述属性支持
+
+- [x] Task 4: 更新 FusedDesktopComponentLibraryControl.axaml.cs 代码逻辑
+  - [x] SubTask 4.1: 修改分类选择逻辑，选中分类时显示该分类第一个组件
+  - [x] SubTask 4.2: 添加组件选中逻辑
+  - [x] SubTask 4.3: 移除搜索相关代码
+  - [x] SubTask 4.4: 复用阑山桌面组件库的分类图标和本地化方法
+  - [x] SubTask 4.5: 添加"查找更多组件"链接点击处理（打开设置窗口插件目录）
+
+- [x] Task 5: 验证和测试
+  - [x] SubTask 5.1: 验证关闭按钮使用动态圆角资源 DesignCornerRadiusSm
+  - [x] SubTask 5.2: 验证窗口布局符合Windows 11小组件面板风格
+  - [x] SubTask 5.3: 验证分类图标与阑山桌面组件库一致
+  - [x] SubTask 5.4: 验证组件添加功能正常工作
+  - [x] SubTask 5.5: 验证"查找更多组件"链接能打开设置窗口
+
+# Task Dependencies
+- Task 3 依赖于 Task 1 和 Task 2 的UI设计确定
+- Task 4 依赖于 Task 3 的ViewModel更新
+- Task 5 依赖于所有前置任务完成

LanMountainDesktop/Localization/en-US.json

@@ -698,6 +698,7 @@
     "component.editor.placement_label": "Placement ID",
     "component.editor.scope_label": "Scope",
     "component.editor.scope_instance": "Instance-scoped editor",
+    "component_category.all":  "All",
     "component_category.clock":  "Clock",
     "component_category.date":  "Calendar",
     "component_category.weather":  "Weather",

LanMountainDesktop/Localization/zh-CN.json

@@ -692,6 +692,7 @@
     "component.editor.placement_label": "实例 ID",
     "component.editor.scope_label": "作用域",
     "component.editor.scope_instance": "实例级编辑器",
+    "component_category.all":  "全部",
     "component_category.clock":  "时钟",
     "component_category.date":  "日历",
     "component_category.weather":  "天气",

LanMountainDesktop/ViewModels/ComponentLibraryWindowViewModel.cs

@@ -10,6 +10,7 @@ namespace LanMountainDesktop.ViewModels;
 public sealed class ComponentLibraryWindowViewModel : ViewModelBase
 {
     private string _title = "Widgets";
+    private ComponentLibraryItemViewModel? _selectedComponent;
 
     public string Title
     {
@@ -20,6 +21,12 @@ public sealed class ComponentLibraryWindowViewModel : ViewModelBase
     public ObservableCollection<ComponentLibraryCategoryViewModel> Categories { get; } = [];
 
     public ObservableCollection<ComponentLibraryItemViewModel> Components { get; } = [];
+
+    public ComponentLibraryItemViewModel? SelectedComponent
+    {
+        get => _selectedComponent;
+        set => SetProperty(ref _selectedComponent, value);
+    }
 }
 
 public sealed class ComponentLibraryCategoryViewModel
@@ -51,6 +58,7 @@ public sealed class ComponentLibraryItemViewModel
     private readonly string _loadingPreviewText;
     private readonly string _previewUnavailableText;
     private string _displayName;
+    private string? _description;
     private ComponentPreviewKey _previewKey;
     private ComponentPreviewImageEntry? _previewImageEntry;
     private ComponentPreviewImageState _previewState;
@@ -61,12 +69,14 @@ public sealed class ComponentLibraryItemViewModel
         string componentId,
         string displayName,
         ComponentPreviewKey previewKey,
+        string? description = null,
         string loadingPreviewText = "Loading preview...",
         string previewUnavailableText = "Preview unavailable",
         ComponentPreviewImageEntry? previewImageEntry = null)
     {
         ComponentId = componentId;
         _displayName = displayName;
+        _description = description;
         _previewKey = previewKey;
         _loadingPreviewText = loadingPreviewText;
         _previewUnavailableText = previewUnavailableText;
@@ -82,6 +92,12 @@ public sealed class ComponentLibraryItemViewModel
         set => SetProperty(ref _displayName, value);
     }
 
+    public string? Description
+    {
+        get => _description;
+        set => SetProperty(ref _description, value);
+    }
+
     public ComponentPreviewKey PreviewKey
     {
         get => _previewKey;

LanMountainDesktop/Views/ComponentLibraryWindow.axaml.cs

@@ -94,6 +94,7 @@ public partial class ComponentLibraryWindow : Window
             entry.ComponentId,
             displayName,
             previewKey,
+            description: null,
             _localize?.Invoke("component_library.preview.loading", "Loading preview...") ?? "Loading preview...",
             _localize?.Invoke("component_library.preview.unavailable", "Preview unavailable") ?? "Preview unavailable",
             previewEntry);

LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml

@@ -1,160 +1,222 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:LanMountainDesktop.ViewModels"
-             xmlns:fi="using:FluentIcons.Avalonia"
+             xmlns:ui="using:FluentAvalonia.UI.Controls"
+             xmlns:fi="using:FluentIcons.Avalonia.Fluent"
+             xmlns:converters="using:Avalonia.Data.Converters"
              x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryControl"
              x:DataType="vm:ComponentLibraryWindowViewModel">
-    
-    <Grid ColumnDefinitions="240,*"
-          ColumnSpacing="12"
+
+    <UserControl.Styles>
+        <!-- 分类列表项样式 - 遵循 Fluent NavigationView 风格 -->
+        <Style Selector="ListBoxItem.category-item">
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="Margin" Value="0,2"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusSm}"/>
+            <Setter Property="Transitions">
+                <Transitions>
+                    <BrushTransition Property="Background" Duration="0:0:0.083" Easing="0.05,0.75,0.10,1.00"/>
+                </Transitions>
+            </Setter>
+        </Style>
+        <Style Selector="ListBoxItem.category-item:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
+        </Style>
+        <Style Selector="ListBoxItem.category-item:selected /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="{DynamicResource AdaptiveNavItemSelectedBackgroundBrush}"/>
+        </Style>
+        <Style Selector="ListBoxItem.category-item:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+        </Style>
+
+        <!-- 分类项图标和文字 -->
+        <Style Selector="ListBoxItem.category-item fi|FluentIcon.category-icon">
+            <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
+        </Style>
+        <Style Selector="ListBoxItem.category-item:selected fi|FluentIcon.category-icon">
+            <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
+        </Style>
+
+        <Style Selector="ListBoxItem.category-item TextBlock.category-text">
+            <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
+        </Style>
+        <Style Selector="ListBoxItem.category-item:selected TextBlock.category-text">
+            <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+        </Style>
+    </UserControl.Styles>
+
+    <Grid ColumnDefinitions="Auto,*"
+          ColumnSpacing="0"
           Margin="0">
-        <!-- 分类列表 (左侧) -->
-        <Border Classes="surface-translucent-panel"
-                CornerRadius="{DynamicResource DesignCornerRadiusLg}"
-                Padding="10">
-            <Grid RowDefinitions="Auto,*">
-                <TextBox x:Name="SearchBox"
-                         Watermark="搜索组件..."
-                         Margin="0,0,0,12"
-                         Classes="clear"
-                         Background="{DynamicResource AdaptiveSurfaceLowBrush}"
-                         CornerRadius="12"
-                         Padding="12,8">
-                    <TextBox.InnerLeftContent>
-                        <fi:SymbolIcon Symbol="Search" FontSize="16" Margin="10,0,0,0" Opacity="0.5" />
-                    </TextBox.InnerLeftContent>
-                </TextBox>
-                
+        <!-- 左侧导航列 - 分类列表 + 底部"查找更多组件" -->
+        <Border Width="280"
+                Background="Transparent">
+            <Grid RowDefinitions="*,Auto">
+                <!-- 分类列表 -->
                 <ListBox x:Name="CategoryListBox"
-                         Grid.Row="1"
+                         Grid.Row="0"
                          Background="Transparent"
                          BorderThickness="0"
+                         Margin="8,8,4,0"
                          SelectionChanged="OnCategorySelectionChanged"
                          ItemsSource="{Binding Categories}">
                     <ListBox.ItemTemplate>
                         <DataTemplate x:DataType="vm:ComponentLibraryCategoryViewModel">
-                            <Border Padding="10"
-                                    Margin="0,0,0,6"
-                                    CornerRadius="{DynamicResource DesignCornerRadiusSm}"
-                                    Background="{DynamicResource AdaptiveNavItemBackgroundBrush}">
-                                <Grid ColumnDefinitions="Auto,*"
-                                      ColumnSpacing="8">
-                                    <fi:SymbolIcon Symbol="{Binding Icon}"
-                                                   IconVariant="Regular"
-                                                   FontSize="16" />
-                                    <TextBlock Grid.Column="1"
-                                               VerticalAlignment="Center"
-                                               FontWeight="SemiBold"
-                                               Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
-                                               Text="{Binding Title}" />
-                                </Grid>
-                            </Border>
+                            <Grid ColumnDefinitions="Auto,*"
+                                  ColumnSpacing="12"
+                                  Margin="12,10">
+                                <fi:FluentIcon Icon="{Binding Icon}"
+                                               IconVariant="Regular"
+                                               FontSize="18"
+                                               Classes="category-icon"/>
+                                <TextBlock Grid.Column="1"
+                                           VerticalAlignment="Center"
+                                           FontSize="14"
+                                           Classes="category-text"
+                                           Text="{Binding Title}"/>
+                            </Grid>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
                 </ListBox>
+
+                <!-- 底部"查找更多组件" - 在左侧导航列底部 -->
+                <StackPanel Grid.Row="1"
+                            Margin="12,8,8,12">
+                    <Border Height="1"
+                            Background="{DynamicResource AdaptiveGlassPanelBorderBrush}"
+                            Opacity="0.4"
+                            Margin="0,0,0,8"/>
+                    <Button Classes="hyperlink"
+                            HorizontalAlignment="Left"
+                            Click="OnFindMoreComponentsClick">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <fi:FluentIcon Icon="Globe" IconVariant="Regular" FontSize="14"/>
+                            <TextBlock Text="查找更多组件"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
             </Grid>
         </Border>
 
-        <!-- 组件网格 (右侧) -->
+        <!-- 右侧内容区与左侧的分隔线 -->
         <Border Grid.Column="1"
-                Classes="surface-translucent-strong"
-                CornerRadius="{DynamicResource DesignCornerRadiusLg}"
-                Padding="10">
-            <ScrollViewer VerticalScrollBarVisibility="Auto"
-                          HorizontalScrollBarVisibility="Disabled">
-                <ItemsControl x:Name="ComponentItemsControl"
-                              ItemsSource="{Binding Components}">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <WrapPanel Orientation="Horizontal" />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
+                Width="1"
+                HorizontalAlignment="Left"
+                Background="{DynamicResource AdaptiveGlassPanelBorderBrush}"
+                Opacity="0.5"/>
 
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate x:DataType="vm:ComponentLibraryItemViewModel">
-                            <Border Width="240"
-                                    Height="220"
-                                    Margin="6"
-                                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
-                                    Padding="10"
-                                    Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
-                                    BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
-                                    BorderThickness="1">
-                                <Grid RowDefinitions="*,Auto,Auto"
-                                      RowSpacing="8">
-                                    <!-- 预览区域 -->
-                                    <Border CornerRadius="{DynamicResource DesignCornerRadiusSm}"
-                                            Background="{DynamicResource AdaptiveGlassPanelBackgroundBrush}"
-                                            BorderThickness="1"
-                                            BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}"
-                                            Padding="8">
-                                        <Grid>
-                                            <Image Source="{Binding PreviewBitmap}"
-                                                   Stretch="Uniform"
-                                                   HorizontalAlignment="Stretch"
-                                                   VerticalAlignment="Stretch"
-                                                   RenderOptions.BitmapInterpolationMode="HighQuality"
-                                                   IsVisible="{Binding IsPreviewReady}" />
+        <!-- 组件预览区 (右侧) -->
+        <ScrollViewer Grid.Column="1"
+                      VerticalScrollBarVisibility="Auto"
+                      HorizontalScrollBarVisibility="Disabled">
+            <StackPanel Margin="24,16,20,16"
+                        Spacing="0">
 
-                                            <!-- 加载中状态 -->
-                                            <Border IsVisible="{Binding IsPreviewPending}"
-                                                    Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
-                                                <StackPanel HorizontalAlignment="Center"
-                                                            VerticalAlignment="Center"
-                                                            Spacing="8">
-                                                    <ProgressBar Width="96"
-                                                                 IsIndeterminate="True" />
-                                                    <TextBlock HorizontalAlignment="Center"
-                                                               TextAlignment="Center"
-                                                               FontSize="12"
-                                                               Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
-                                                               Text="{Binding PreviewStatusText}" />
-                                                </StackPanel>
-                                            </Border>
+                <!-- 有选中组件时的显示 -->
+                <Panel IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNotNull}}">
 
-                                            <!-- 失败状态 -->
-                                            <Border IsVisible="{Binding IsPreviewFailed}"
-                                                    Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
-                                                <StackPanel HorizontalAlignment="Center"
-                                                            VerticalAlignment="Center"
-                                                            Spacing="8">
-                                                    <TextBlock HorizontalAlignment="Center"
-                                                               TextAlignment="Center"
-                                                               FontWeight="SemiBold"
-                                                               Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
-                                                               Text="{Binding PreviewStatusText}" />
-                                                    <TextBlock HorizontalAlignment="Center"
-                                                               TextAlignment="Center"
-                                                               FontSize="12"
-                                                               TextWrapping="Wrap"
-                                                               Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
-                                                               Text="{Binding PreviewErrorMessage}" />
-                                                </StackPanel>
-                                            </Border>
-                                        </Grid>
-                                    </Border>
+                    <!-- 组件标题 - 在右侧内容区顶部 -->
+                    <TextBlock FontSize="28"
+                               FontWeight="SemiBold"
+                               Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
+                               Text="{Binding SelectedComponent.DisplayName}"
+                               Margin="0,0,0,16"/>
 
-                                    <!-- 组件名称 -->
-                                    <TextBlock Grid.Row="1"
-                                               HorizontalAlignment="Center"
+                    <!-- 固定大小的预览卡片 - 与窗口背景有色差 -->
+                    <Border CornerRadius="{DynamicResource DesignCornerRadiusSm}"
+                            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+                            BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}"
+                            BorderThickness="1"
+                            Width="420"
+                            Height="320"
+                            HorizontalAlignment="Center">
+                        <Grid Margin="16">
+                            <!-- 预览图片 -->
+                            <Image Source="{Binding SelectedComponent.PreviewBitmap}"
+                                   Stretch="Uniform"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   RenderOptions.BitmapInterpolationMode="HighQuality"
+                                   IsVisible="{Binding SelectedComponent.IsPreviewReady}"/>
+
+                            <!-- 加载中状态 -->
+                            <Border IsVisible="{Binding SelectedComponent.IsPreviewPending}"
+                                    Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
+                                <StackPanel HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Spacing="12">
+                                    <ProgressBar Width="120"
+                                                 IsIndeterminate="True"/>
+                                    <TextBlock HorizontalAlignment="Center"
+                                               TextAlignment="Center"
+                                               FontSize="14"
+                                               Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
+                                               Text="{Binding SelectedComponent.PreviewStatusText}"/>
+                                </StackPanel>
+                            </Border>
+
+                            <!-- 失败状态 -->
+                            <Border IsVisible="{Binding SelectedComponent.IsPreviewFailed}"
+                                    Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
+                                <StackPanel HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Spacing="8">
+                                    <fi:FluentIcon Icon="ImageOff"
+                                                   IconVariant="Regular"
+                                                   FontSize="48"
+                                                   Opacity="0.5"
+                                                   Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
+                                    <TextBlock HorizontalAlignment="Center"
+                                               TextAlignment="Center"
                                                FontWeight="SemiBold"
                                                Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
-                                               Text="{Binding DisplayName}" />
-
-                                    <!-- 添加按钮 -->
-                                    <Button Grid.Row="2"
-                                            HorizontalAlignment="Center"
-                                            Padding="12,6"
-                                            Tag="{Binding ComponentId}"
-                                            Click="OnAddComponentClick">
-                                        <TextBlock Text="添加到桌面" />
-                                    </Button>
-                                </Grid>
+                                               Text="{Binding SelectedComponent.PreviewStatusText}"/>
+                                    <TextBlock HorizontalAlignment="Center"
+                                               TextAlignment="Center"
+                                               FontSize="12"
+                                               TextWrapping="Wrap"
+                                               Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
+                                               Text="{Binding SelectedComponent.PreviewErrorMessage}"/>
+                                </StackPanel>
                             </Border>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-            </ScrollViewer>
-        </Border>
+                        </Grid>
+                    </Border>
+
+                    <!-- "添加小组件"按钮 - 在预览卡片正下方居中，使用主题强调色 -->
+                    <Button HorizontalAlignment="Center"
+                            Classes="accent"
+                            Padding="24,10"
+                            Margin="0,16,0,0"
+                            Tag="{Binding SelectedComponent.ComponentId}"
+                            Click="OnAddComponentClick">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <fi:FluentIcon Icon="Add" IconVariant="Regular" FontSize="16"/>
+                            <TextBlock Text="添加小组件" FontWeight="SemiBold"/>
+                        </StackPanel>
+                    </Button>
+                </Panel>
+
+                <!-- 空状态 -->
+                <Grid IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNull}}"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      MinHeight="400">
+                    <StackPanel Spacing="16" HorizontalAlignment="Center"
+                                VerticalAlignment="Center">
+                        <fi:FluentIcon Icon="Apps"
+                                       IconVariant="Regular"
+                                       FontSize="64"
+                                       Opacity="0.3"
+                                       Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
+                        <TextBlock HorizontalAlignment="Center"
+                                   FontSize="16"
+                                   Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
+                                   Text="请从左侧选择一个组件"/>
+                    </StackPanel>
+                </Grid>
+            </StackPanel>
+        </ScrollViewer>
     </Grid>
 </UserControl>

LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 using FluentIcons.Common;
 using LanMountainDesktop.ComponentSystem;
 using LanMountainDesktop.Services;
@@ -29,6 +30,8 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
     private readonly IRecommendationInfoService _recommendationInfoService = new RecommendationDataService();
     private readonly ICalculatorDataService _calculatorDataService = new CalculatorDataService();
 
+    private static readonly LocalizationService _localizationService = new();
+
     public FusedDesktopComponentLibraryControl()
     {
         InitializeComponent();
@@ -39,7 +42,9 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
 
         LoadRegistry();
         LoadCategories();
-        SearchBox.KeyUp += (s, e) => FilterComponents();
+
+        // 为 ListBoxItem 添加 category-item 样式类
+        CategoryListBox.ContainerPrepared += OnCategoryListBoxContainerPrepared;
 
         // 默认选择第一个分类
         if (_viewModel.Categories.Count > 0)
@@ -48,6 +53,14 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
         }
     }
 
+    private void OnCategoryListBoxContainerPrepared(object? sender, ContainerPreparedEventArgs e)
+    {
+        if (e.Container is ListBoxItem listBoxItem)
+        {
+            listBoxItem.Classes.Add("category-item");
+        }
+    }
+
     private void LoadRegistry()
     {
         var pluginRuntimeService = (Application.Current as App)?.PluginRuntimeService;
@@ -65,28 +78,16 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
     private void LoadCategories()
     {
         _viewModel.Categories.Clear();
-        _viewModel.Components.Clear();
+
+        var languageCode = _settingsFacade.Region.Get().LanguageCode;
 
         // 添加"全部组件"分类
         _viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
             "all",
-            "全部组件",
+            L(languageCode, "component_category.all", "All"),
             Symbol.Apps,
             Array.Empty<ComponentLibraryItemViewModel>()));
 
-        var categoryMap = new Dictionary<string, (string Display, Symbol Icon)>
-        {
-            { "clock", ("时钟", Symbol.Clock) },
-            { "date", ("日历", Symbol.CalendarDate) },
-            { "weather", ("天气", Symbol.WeatherSunny) },
-            { "board", ("画板", Symbol.Edit) },
-            { "media", ("媒体", Symbol.Play) },
-            { "info", ("资讯", Symbol.News) },
-            { "calculator", ("工具", Symbol.Calculator) },
-            { "study", ("学习", Symbol.Hourglass) },
-            { "file", ("文件", Symbol.Folder) }
-        };
-
         var usedCategories = _allDefinitions
             .Select(d => d.Category)
             .Distinct()
@@ -94,23 +95,62 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
 
         foreach (var cat in usedCategories)
         {
-            if (categoryMap.TryGetValue(cat.ToLower(), out var info))
-            {
-                var categoryComponents = _allDefinitions
-                    .Where(d => string.Equals(d.Category, cat, StringComparison.OrdinalIgnoreCase))
-                    .OrderBy(d => d.DisplayName)
-                    .Select(d => CreateComponentItem(d))
-                    .ToArray();
+            var icon = ResolveCategoryIcon(cat);
+            var title = GetLocalizedCategoryTitle(languageCode, cat);
 
-                _viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
-                    cat,
-                    info.Display,
-                    info.Icon,
-                    categoryComponents));
-            }
+            var categoryComponents = _allDefinitions
+                .Where(d => string.Equals(d.Category, cat, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(d => d.DisplayName)
+                .Select(d => CreateComponentItem(d))
+                .ToArray();
+
+            _viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
+                cat,
+                title,
+                icon,
+                categoryComponents));
         }
     }
 
+    /// <summary>
+    /// 分类图标映射 - 与阑山桌面 Dock 栏组件库 (MainWindow.ComponentSystem) 保持一致
+    /// </summary>
+    private static Symbol ResolveCategoryIcon(string categoryId)
+    {
+        if (string.Equals(categoryId, "Clock", StringComparison.OrdinalIgnoreCase)) return Symbol.Clock;
+        if (string.Equals(categoryId, "Date", StringComparison.OrdinalIgnoreCase)) return Symbol.CalendarDate;
+        if (string.Equals(categoryId, "Weather", StringComparison.OrdinalIgnoreCase)) return Symbol.WeatherSunny;
+        if (string.Equals(categoryId, "Board", StringComparison.OrdinalIgnoreCase)) return Symbol.Edit;
+        if (string.Equals(categoryId, "Media", StringComparison.OrdinalIgnoreCase)) return Symbol.Play;
+        if (string.Equals(categoryId, "Info", StringComparison.OrdinalIgnoreCase)) return Symbol.Apps;
+        if (string.Equals(categoryId, "Calculator", StringComparison.OrdinalIgnoreCase)) return Symbol.Calculator;
+        if (string.Equals(categoryId, "Study", StringComparison.OrdinalIgnoreCase)) return Symbol.Hourglass;
+        if (string.Equals(categoryId, "File", StringComparison.OrdinalIgnoreCase)) return Symbol.Folder;
+        return Symbol.Apps;
+    }
+
+    /// <summary>
+    /// 分类本地化标题 - 与阑山桌面 Dock 栏组件库 (MainWindow.ComponentSystem) 保持一致
+    /// </summary>
+    private string GetLocalizedCategoryTitle(string languageCode, string categoryId)
+    {
+        if (string.Equals(categoryId, "Clock", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.clock", "Clock");
+        if (string.Equals(categoryId, "Date", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.date", "Calendar");
+        if (string.Equals(categoryId, "Weather", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.weather", "Weather");
+        if (string.Equals(categoryId, "Board", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.board", "Board");
+        if (string.Equals(categoryId, "Media", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.media", "Media");
+        if (string.Equals(categoryId, "Info", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.info", "Info");
+        if (string.Equals(categoryId, "Calculator", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.calculator", "Calculator");
+        if (string.Equals(categoryId, "Study", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.study", "Study");
+        if (string.Equals(categoryId, "File", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.file", "File");
+        return categoryId;
+    }
+
+    private string L(string languageCode, string key, string fallback)
+    {
+        return _localizationService.GetString(languageCode, key, fallback);
+    }
+
     private ComponentLibraryItemViewModel CreateComponentItem(DesktopComponentDefinition definition)
     {
         var previewKey = ComponentPreviewKey.ForComponentType(
@@ -130,10 +170,11 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
             definition.Id,
             definition.DisplayName,
             previewKey,
+            description: null,
             "正在加载预览...",
             "预览不可用",
             previewEntry);
-            
+
         if (mainWindow is not null && (previewEntry is null || previewEntry.State == ComponentPreviewImageState.Pending))
         {
             mainWindow.RequestDetachedLibraryPreview(previewKey);
@@ -158,25 +199,49 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
 
     private void OnCategorySelectionChanged(object? sender, SelectionChangedEventArgs e)
     {
-        FilterComponents();
+        UpdateSelectedComponent();
     }
 
-    private void FilterComponents()
+    private void UpdateSelectedComponent()
     {
-        var selectedCategory = (CategoryListBox.SelectedItem as ComponentLibraryCategoryViewModel)?.Id;
-        var searchText = SearchBox.Text?.ToLower() ?? "";
-
-        var filtered = _allDefinitions.Where(d =>
+        var selectedCategory = CategoryListBox.SelectedItem as ComponentLibraryCategoryViewModel;
+        if (selectedCategory is null)
         {
-            var matchesCategory = selectedCategory == "all" || string.Equals(d.Category, selectedCategory, StringComparison.OrdinalIgnoreCase);
-            var matchesSearch = string.IsNullOrEmpty(searchText) || d.DisplayName.ToLower().Contains(searchText) || d.Id.ToLower().Contains(searchText);
-            return matchesCategory && matchesSearch;
-        });
+            _viewModel.SelectedComponent = null;
+            return;
+        }
 
-        _viewModel.Components.Clear();
-        foreach (var def in filtered)
+        // 获取该分类下的组件列表
+        IEnumerable<DesktopComponentDefinition> filtered;
+        if (selectedCategory.Id == "all")
         {
-            _viewModel.Components.Add(CreateComponentItem(def));
+            filtered = _allDefinitions.OrderBy(d => d.DisplayName);
+        }
+        else
+        {
+            filtered = _allDefinitions
+                .Where(d => string.Equals(d.Category, selectedCategory.Id, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(d => d.DisplayName);
+        }
+
+        // 选择该分类下的第一个组件作为默认选中
+        var firstComponent = filtered.FirstOrDefault();
+        if (firstComponent is not null)
+        {
+            // 查找或创建对应的 ViewModel
+            var existingComponent = selectedCategory.Components.FirstOrDefault(c => c.ComponentId == firstComponent.Id);
+            if (existingComponent is not null)
+            {
+                _viewModel.SelectedComponent = existingComponent;
+            }
+            else
+            {
+                _viewModel.SelectedComponent = CreateComponentItem(firstComponent);
+            }
+        }
+        else
+        {
+            _viewModel.SelectedComponent = null;
         }
     }
 
@@ -187,4 +252,22 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
             AddComponentRequested?.Invoke(this, componentId);
         }
     }
+
+    private void OnFindMoreComponentsClick(object? sender, RoutedEventArgs e)
+    {
+        // 打开设置窗口并导航到插件目录页面
+        if (Application.Current is App app && app.SettingsWindowService is { } settingsWindowService)
+        {
+            var mainWindow = (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow as MainWindow;
+            var request = new SettingsWindowOpenRequest(
+                Source: "FusedDesktopComponentLibrary",
+                Owner: mainWindow,
+                PageId: "plugin-catalog");
+            settingsWindowService.Open(request);
+        }
+
+        // 关闭所在窗口
+        var window = this.FindAncestorOfType<Window>();
+        window?.Close();
+    }
 }

LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml

@@ -1,57 +1,73 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:LanMountainDesktop.Views"
-        xmlns:fi="using:FluentIcons.Avalonia"
+        xmlns:fi="using:FluentIcons.Avalonia.Fluent"
         x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryWindow"
         Width="860" Height="620"
         MinWidth="600" MinHeight="500"
+        CanResize="True"
         WindowStartupLocation="CenterScreen"
-        SystemDecorations="Full"
+        SystemDecorations="BorderOnly"
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="NoChrome"
-        ExtendClientAreaTitleBarHeightHint="-1"
+        ExtendClientAreaTitleBarHeightHint="48"
         Background="Transparent"
-        TransparencyLevelHint="Mica"
-        Title="融合桌面组件库">
-    
-    <Panel>
-        <!-- 背景磨砂效果 -->
-        <Border Background="{DynamicResource AdaptiveSurfaceLowBrush}"
-                Opacity="0.85" />
-        
-        <Grid RowDefinitions="Auto,*">
-            <!-- 自定义标题栏 -->
-            <Border Background="Transparent"
-                    IsHitTestVisible="True"
-                    Padding="20,16">
-                <Grid ColumnDefinitions="*,Auto">
-                    <StackPanel Spacing="6" VerticalAlignment="Center">
-                        <TextBlock Text="融合桌面组件库"
-                                   FontWeight="SemiBold"
-                                   FontSize="20"
-                                   Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" />
-                        <TextBlock Text="将精美组件放置在您的系统桌面上（负一屏）"
-                                   Opacity="0.6"
-                                   FontSize="13"
-                                   Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" />
-                    </StackPanel>
-                    
-                    <Button Grid.Column="1"
-                            Classes="accent"
-                            Width="36" Height="36"
-                            Padding="0"
-                            CornerRadius="18"
-                            BorderThickness="0"
-                            Background="{DynamicResource AdaptiveButtonHoverBackgroundBrush}"
-                            Click="OnCloseClick">
-                        <fi:SymbolIcon Symbol="Dismiss" FontSize="18" />
-                    </Button>
-                </Grid>
-            </Border>
-            
-            <!-- 组件库控件 -->
-            <controls:FusedDesktopComponentLibraryControl x:Name="LibraryControl"
-                                                          Grid.Row="1" />
-        </Grid>
-    </Panel>
+        Title="添加小组件">
+
+    <Grid x:Name="RootGrid"
+          Classes="settings-scope"
+          Background="{DynamicResource AdaptiveSettingsWindowBackgroundBrush}"
+          RowDefinitions="Auto,*">
+        <!-- 自定义标题栏 - 与 SettingsWindow 风格一致 -->
+        <Border x:Name="WindowTitleBarHost"
+                Height="48"
+                Padding="12,0,12,0"
+                Background="{DynamicResource AdaptiveSettingsWindowBackgroundBrush}"
+                BorderBrush="{DynamicResource AdaptiveSettingsWindowBorderBrush}"
+                BorderThickness="0,0,0,1"
+                PointerPressed="OnWindowTitleBarPointerPressed">
+            <Grid ColumnDefinitions="Auto,Auto,*,Auto"
+                  ColumnSpacing="8"
+                  VerticalAlignment="Center">
+                <fi:FluentIcon x:Name="WindowBrandIcon"
+                               Icon="Apps"
+                               IconVariant="Filled"
+                               FontSize="16"
+                               IsHitTestVisible="False"
+                               VerticalAlignment="Center" />
+
+                <TextBlock x:Name="WindowTitleTextBlock"
+                           Grid.Column="1"
+                           FontSize="12"
+                           FontWeight="SemiBold"
+                           IsHitTestVisible="False"
+                           Text="添加小组件" />
+
+                <TextBlock Grid.Column="2"
+                           FontSize="12"
+                           Opacity="0.6"
+                           IsHitTestVisible="False"
+                           VerticalAlignment="Center"
+                           Text="将精美组件放置在您的系统桌面上（负一屏）" />
+
+                <Button x:Name="CloseWindowButton"
+                        Grid.Column="3"
+                        Width="40"
+                        Height="32"
+                        Padding="0"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Click="OnCloseClick">
+                    <fi:FluentIcon Icon="Dismiss"
+                                   IconVariant="Regular"
+                                   FontSize="16" />
+                </Button>
+            </Grid>
+        </Border>
+
+        <!-- 组件库控件 -->
+        <controls:FusedDesktopComponentLibraryControl x:Name="LibraryControl"
+                                                      Grid.Row="1"
+                                                      Margin="12,8,16,8" />
+    </Grid>
 </Window>

LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs

@@ -1,6 +1,7 @@
 using System;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using LanMountainDesktop.ComponentSystem;
 using LanMountainDesktop.Services;
@@ -102,6 +103,14 @@ public partial class FusedDesktopComponentLibraryWindow : Window
     {
         Close();
     }
+
+    private void OnWindowTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+        {
+            BeginMoveDrag(e);
+        }
+    }
     
     protected override void OnClosed(EventArgs e)
     {

LanMountainDesktop/installer/LanMountainDesktop.iss

@@ -20,6 +20,14 @@
   #define MyAppArch "x64"
 #endif
 
+#ifndef MyAppSuffix
+  #define MyAppSuffix ""
+#endif
+
+#ifndef IsSelfContained
+  #define IsSelfContained "true"
+#endif
+
 [Setup]
 AppId={#MyAppId}
 AppName={#MyAppName}
@@ -34,7 +42,7 @@ LanguageDetectionMethod=uilanguage
 DefaultGroupName={cm:AppShortcutName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
 OutputDir={#MyOutputDir}
-OutputBaseFilename={#MyAppName}-Setup-{#MyAppVersion}-{#MyAppArch}
+OutputBaseFilename={#MyAppName}-Setup-{#MyAppVersion}-{#MyAppArch}{#MyAppSuffix}
 Compression=lzma2/ultra64
 SolidCompression=yes
 WizardStyle=modern
@@ -93,7 +101,17 @@ chinesesimplified.UpgradeCleanupMissingUninstaller=安装程序发现了现有
 english.UpgradeCleanupFailedPrefix=Setup could not remove the existing installation automatically. Error code:
 chinesesimplified.UpgradeCleanupFailedPrefix=安装程序无法自动移除现有安装。错误代码：
 english.UpgradeCleanupFailedSuffix=Please close LanMountainDesktop, uninstall the current version manually, and then run this installer again.
-chinesesimplified.UpgradeCleanupFailedSuffix=请关闭 LanMountainDesktop，手动卸载当前版本，然后重新运行此安装程序。
+chinesesimplified.UpgradeCleanupFailedSuffix=请关闭 LanMountain Desktop，手动卸载当前版本，然后重新运行此安装程序。
+english.DotNetRuntimeMissingTitle=.NET Desktop Runtime Required
+chinesesimplified.DotNetRuntimeMissingTitle=需要 .NET Desktop Runtime
+english.DotNetRuntimeMissingMessage=This application requires .NET 10.0 Desktop Runtime to run.
+chinesesimplified.DotNetRuntimeMissingMessage=此应用程序需要 .NET 10.0 Desktop Runtime 才能运行。
+english.DotNetRuntimeMissingAction=Click "Yes" to open the official download page. Install it first, then run this installer again.
+chinesesimplified.DotNetRuntimeMissingAction=单击"是"打开官方下载页面。请先完成安装，然后重新运行此安装程序。
+english.DotNetRuntimeOpenFailedMessage=Unable to open the download page automatically.
+chinesesimplified.DotNetRuntimeOpenFailedMessage=无法自动打开下载页面。
+english.DotNetRuntimeOpenFailedAction=Please open this URL manually:
+chinesesimplified.DotNetRuntimeOpenFailedAction=请手动打开以下链接：
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
@@ -127,6 +145,7 @@ const
   UninstallRegSubkey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppRegistryId}_is1';
   WebView2RuntimeKeyPath = 'SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}';
   WebView2RuntimeDownloadUrl = 'https://go.microsoft.com/fwlink/p/?LinkId=2124703';
+  DotNetRuntimeDownloadUrl = 'https://dotnet.microsoft.com/download/dotnet/10.0';
   UpgradeChoiceInPlace = 0;
   UpgradeChoiceRelocate = 1;
 
@@ -435,10 +454,58 @@ begin
     RegQueryStringValue(HKCU32, WebView2RuntimeKeyPath, 'pv', VersionValue);
 end;
 
+function IsDotNetDesktopRuntimeInstalled(): Boolean;
+var
+  RuntimePath: String;
+begin
+  Result := False;
+
+  RuntimePath := ExpandConstant('{commonpf64}\dotnet\shared\Microsoft.WindowsDesktop.App');
+  if DirExists(RuntimePath) then
+  begin
+    Result := True;
+    exit;
+  end;
+
+  RuntimePath := ExpandConstant('{commonpf}\dotnet\shared\Microsoft.WindowsDesktop.App');
+  if DirExists(RuntimePath) then
+  begin
+    Result := True;
+    exit;
+  end;
+end;
+
 function InitializeSetup(): Boolean;
 var
   ErrorCode: Integer;
+  IsSelfContainedBuild: Boolean;
 begin
+  IsSelfContainedBuild := ('{#IsSelfContained}' = 'true');
+
+  if not IsSelfContainedBuild then
+  begin
+    if not IsDotNetDesktopRuntimeInstalled() then
+    begin
+      if MsgBox(
+        CustomMessage('DotNetRuntimeMissingMessage') + #13#10#13#10 +
+        CustomMessage('DotNetRuntimeMissingAction'),
+        mbConfirmation,
+        MB_YESNO) = IDYES then
+      begin
+        if not ShellExec('open', DotNetRuntimeDownloadUrl, '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode) then
+        begin
+          MsgBox(
+            CustomMessage('DotNetRuntimeOpenFailedMessage') + #13#10 +
+            CustomMessage('DotNetRuntimeOpenFailedAction') + #13#10 + DotNetRuntimeDownloadUrl,
+            mbError,
+            MB_OK);
+        end;
+      end;
+      Result := False;
+      exit;
+    end;
+  end;
+
   if IsWebView2RuntimeInstalled() then
   begin
     Result := True;