修复抽取页面问题

lzy98276 · lzy98276 · commit 34a0f2fb4e9e · 2026-02-24T15:46:38.000+08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,9 +10,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // 如果已更改目标框架，请确保更新程序路径。
-            "program": "${workspaceFolder}/SecRandom.Desktop/bin/Debug/net10.0/SecRandom.Desktop.dll",
+            "program": "${workspaceFolder}/SecRandom.Desktop/bin/Debug/net9.0/SecRandom.Desktop.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/SecRandom.Desktop/bin/Debug/net10.0/",
+            "cwd": "${workspaceFolder}/SecRandom.Desktop/bin/Debug/net9.0/",
             // 有关“控制台”字段的详细信息，请参阅 https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "internalConsole",
             "stopAtEntry": false
diff --git a/CHANGELOG/v2.3.2/CHANGELOG.md b/CHANGELOG/v2.3.2/CHANGELOG.md
@@ -12,15 +12,12 @@ v2.3 - Shiroko (砂狼白子) release 3
 
 ## 💡 功能优化
 
-- 优化 **闪抽设置**，新增独立入口
-- 优化 **点名设置**，新增独立入口
-- 优化 **抽奖设置**，新增独立入口
-- 优化 **抽奖设置**，补全显示选项
-- 优化 **抽奖设置**，补全动画/主题
+- 无
 
 ## 🐛 修复问题
 
 - 修复 **打开学生图片文件夹**，避免崩溃
+- 修复 **浮窗拖动**，跟随鼠标位置
 
 ## 🔧 其它变更
 
diff --git a/SecRandom.Core/Extensions/PageItemsExtensions.cs b/SecRandom.Core/Extensions/PageItemsExtensions.cs
@@ -34,7 +34,7 @@ public static List<NavigationViewItemBase> ToNavigationViewItems(this IEnumerabl
                 {
                     IconSource = new FluentIconSource(group.IconGlyph),
                     Content = group.Name,
-                    Tag = i
+                    Tag = group
                 };
 
                 if (groups.FirstOrDefault(x => x.Key == i.GroupId) is {} groupItems)
diff --git a/SecRandom/App.axaml.cs b/SecRandom/App.axaml.cs
@@ -186,7 +186,10 @@ public static void Stop()
         var logger = IAppHost.GetService<ILogger<App>>();
         logger.LogInformation("正在停止应用");
 
-        _floatingWindow?.CanClose = true;
+        if (_floatingWindow != null)
+        {
+            _floatingWindow.CanClose = true;
+        }
         
         var configHandler = IAppHost.GetService<MainConfigHandler>();
         configHandler.Save();
diff --git a/SecRandom/Views/MainView.axaml.cs b/SecRandom/Views/MainView.axaml.cs
@@ -118,7 +118,18 @@ private void CoreNavigate(PageInfo info)
     
     private void NavigationView_OnItemInvoked(object? sender, NavigationViewItemInvokedEventArgs e)
     {
-        if (e.InvokedItemContainer is NavigationViewItem { Tag: PageInfo info })
+        PageInfo? info = null;
+        
+        if (e.InvokedItemContainer is NavigationViewItem { Tag: PageInfo containerInfo })
+        {
+            info = containerInfo;
+        }
+        else if (e.InvokedItem is PageInfo invokedInfo)
+        {
+            info = invokedInfo;
+        }
+        
+        if (info != null)
         {
             CoreNavigate(info);
         }
diff --git a/SecRandom/Views/SettingsPages/DrawSettingsSubPages/FaceDetectorSettingsSubPage.axaml b/SecRandom/Views/SettingsPages/DrawSettingsSubPages/FaceDetectorSettingsSubPage.axaml
@@ -11,7 +11,7 @@
              x:DataType="configModels:FaceDetectorSettingsConfig">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto">
-        <StackPanel Orientation="Vertical" Spacing="12">
+        <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
             <TextBlock Text="{x:Static pageLangs:Resources.FaceDetectorExtractionFunction}"
                        FontSize="14"
                        FontWeight="SemiBold" />
diff --git a/SecRandom/Views/SettingsPages/DrawSettingsSubPages/LotteryListSpecificSettings/LotteryListSpecificSettingsPage.axaml b/SecRandom/Views/SettingsPages/DrawSettingsSubPages/LotteryListSpecificSettings/LotteryListSpecificSettingsPage.axaml
@@ -12,7 +12,7 @@
              x:DataType="vm:LotteryListSpecificSettingsViewModel">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto">
-        <StackPanel Orientation="Vertical" Spacing="12">
+        <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
             <TextBlock Text="{x:Static pageLangs:Resources.ListSpecificSettings}"
                        FontSize="14"
                        FontWeight="SemiBold"/>
diff --git a/SecRandom/Views/SettingsPages/DrawSettingsSubPages/LotterySettingsSubPage.axaml b/SecRandom/Views/SettingsPages/DrawSettingsSubPages/LotterySettingsSubPage.axaml
@@ -13,7 +13,7 @@
              x:DataType="configModels:LotterySettingsConfig">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto">
-        <StackPanel Orientation="Vertical" Spacing="12">
+        <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
             <TextBlock Text="{x:Static pageLangs:Resources.ListSpecificSettings}"
                        FontSize="14"
                        FontWeight="SemiBold"/>
diff --git a/SecRandom/Views/SettingsPages/DrawSettingsSubPages/QuickDrawListSpecificSettings/QuickDrawListSpecificSettingsPage.axaml b/SecRandom/Views/SettingsPages/DrawSettingsSubPages/QuickDrawListSpecificSettings/QuickDrawListSpecificSettingsPage.axaml
@@ -12,7 +12,7 @@
              x:DataType="vm:QuickDrawListSpecificSettingsViewModel">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto">
-        <StackPanel Orientation="Vertical" Spacing="12">
+        <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
             <TextBlock Text="{x:Static pageLangs:Resources.ListSpecificSettings}"
                        FontSize="14"
                        FontWeight="SemiBold"/>
diff --git a/SecRandom/Views/SettingsPages/DrawSettingsSubPages/QuickDrawSettingsSubPage.axaml b/SecRandom/Views/SettingsPages/DrawSettingsSubPages/QuickDrawSettingsSubPage.axaml
@@ -13,7 +13,7 @@
              x:DataType="configModels:QuickDrawSettingsConfig">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto">
-        <StackPanel Orientation="Vertical" Spacing="12">
+        <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
             <TextBlock Text="{x:Static pageLangs:Resources.ListSpecificSettings}"
                        FontSize="14"
                        FontWeight="SemiBold"/>
diff --git a/SecRandom/Views/SettingsPages/DrawSettingsSubPages/RollCallListSpecificSettings/RollCallListSpecificSettingsPage.axaml b/SecRandom/Views/SettingsPages/DrawSettingsSubPages/RollCallListSpecificSettings/RollCallListSpecificSettingsPage.axaml
@@ -12,7 +12,7 @@
              x:DataType="vm:RollCallListSpecificSettingsViewModel">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto">
-        <StackPanel Orientation="Vertical" Spacing="12">
+        <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
             <TextBlock Text="{x:Static pageLangs:Resources.ListSpecificSettings}"
                        FontSize="14"
                        FontWeight="SemiBold"/>
diff --git a/SecRandom/Views/SettingsPages/DrawSettingsSubPages/RollCallSettingsSubPage.axaml b/SecRandom/Views/SettingsPages/DrawSettingsSubPages/RollCallSettingsSubPage.axaml
@@ -13,7 +13,7 @@
              x:DataType="configModels:RollCallSettingsConfig">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto">
-        <StackPanel Orientation="Vertical" Spacing="12">
+        <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
             <TextBlock Text="{x:Static pageLangs:Resources.ListSpecificSettings}"
                        FontSize="14"
                        FontWeight="SemiBold"/>
diff --git a/SecRandom/Views/SettingsPages/HistoryPage.axaml b/SecRandom/Views/SettingsPages/HistoryPage.axaml
@@ -5,7 +5,7 @@
              xmlns:langs="using:SecRandom.Langs.Common"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SecRandom.Views.SettingsPages.HistoryPage">
-    <StackPanel Orientation="Vertical" Margin="12 12 18 12">
+    <StackPanel Orientation="Vertical" Margin="12 12 18 12" Spacing="12">
         <TextBlock Text="{x:Static langs:Resources.History}" />
     </StackPanel>
 </UserControl>
diff --git a/SecRandom/Views/SettingsView.axaml.cs b/SecRandom/Views/SettingsView.axaml.cs
@@ -121,7 +121,18 @@ private void CoreNavigate(PageInfo info)
     
     private void NavigationView_OnItemInvoked(object? sender, NavigationViewItemInvokedEventArgs e)
     {
-        if (e.InvokedItemContainer is NavigationViewItem { Tag: PageInfo info })
+        PageInfo? info = null;
+        
+        if (e.InvokedItemContainer is NavigationViewItem { Tag: PageInfo containerInfo })
+        {
+            info = containerInfo;
+        }
+        else if (e.InvokedItem is PageInfo invokedInfo)
+        {
+            info = invokedInfo;
+        }
+        
+        if (info != null)
         {
             CoreNavigate(info);
         }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static List<NavigationViewItemBase> ToNavigationViewItems(this IEnumerabl`
`34`	`34`	`{`
`35`	`35`	`IconSource = new FluentIconSource(group.IconGlyph),`
`36`	`36`	`Content = group.Name,`
`37`		`- Tag = i`
	`37`	`+ Tag = group`
`38`	`38`	`};`
`39`	`39`
`40`	`40`	`if (groups.FirstOrDefault(x => x.Key == i.GroupId) is {} groupItems)`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,18 @@ private void CoreNavigate(PageInfo info)`
`118`	`118`
`119`	`119`	`private void NavigationView_OnItemInvoked(object? sender, NavigationViewItemInvokedEventArgs e)`
`120`	`120`	`{`
`121`		`- if (e.InvokedItemContainer is NavigationViewItem { Tag: PageInfo info })`
	`121`	`+ PageInfo? info = null;`
	`122`	`+`
	`123`	`+ if (e.InvokedItemContainer is NavigationViewItem { Tag: PageInfo containerInfo })`
	`124`	`+ {`
	`125`	`+ info = containerInfo;`
	`126`	`+ }`
	`127`	`+ else if (e.InvokedItem is PageInfo invokedInfo)`
	`128`	`+ {`
	`129`	`+ info = invokedInfo;`
	`130`	`+ }`
	`131`	`+`
	`132`	`+ if (info != null)`
`122`	`133`	`{`
`123`	`134`	`CoreNavigate(info);`
`124`	`135`	`}`