From 5c73af3171bef05b11c18e4884ef3f1d713a4203 Mon Sep 17 00:00:00 2001
From: wxl0430 <141288415+wxl0430@users.noreply.github.com>
Date: Tue, 15 Apr 2025 19:01:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=AD=9B=E9=80=89=E5=90=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=A4=8D=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Simulation/ScreenSimulationPageViewModel.cs      | 7 ++++---
 CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml     | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
index e2f2892..7f834ae 100644
--- a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
+++ b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
@@ -192,8 +192,9 @@ public partial class ScreenSimulationPageViewModel : ObservableObject
     private string _keyWord = string.Empty;
     private string _station = string.Empty;
     private string _type = string.Empty;
-    public List<string> StyleStations { get; private set; } = [.. StylesInfoDataSource.Instance.StylesInfo.Select(x=>x.Station).Distinct()];
-    public List<string> StyleTypes { get; private set; } = [.. StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Type).Distinct()];
+    public List<string> StyleStations { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Station).Distinct())];
+    public List<string> StyleTypes { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Type).Distinct())];
+
     [RelayCommand]
     public void TextSearch(object s)
     {
@@ -223,7 +224,7 @@ public partial class ScreenSimulationPageViewModel : ObservableObject
     }
     private void Search()
     {
-        StyleCards = [.. StylesInfoDataSource.Instance.StylesInfo.Where(x =>(x.Station==_station||_station==string.Empty) && (x.Type==_type||_type==string.Empty) && x.Title.Contains(_keyWord))];
+        StyleCards = [.. StylesInfoDataSource.Instance.StylesInfo.Where(x =>(x.Station==_station||_station==string.Empty||_station=="全部") && (x.Type==_type||_type==string.Empty||_type=="全部") && x.Title.Contains(_keyWord))];
     }
     #endregion
 }
diff --git a/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml b/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml
index 4fe00db..d9dfad5 100644
--- a/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml
+++ b/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml
@@ -84,7 +84,7 @@
                                     <TextBlock Opacity="0.7" VerticalAlignment="Center" FontFamily="{StaticResource SymbolThemeFontFamily}" 
                                                Text="&#xE71C;" FontSize="12" Margin="0,0,8,0"/>
                                     <TextBlock Opacity="0.7" Style="{StaticResource BodyTextBlockStyle}" Text="车站:" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                                    <ComboBox MinWidth="128" ItemsSource="{Binding ViewModel.StyleStations}" x:Name="FilterStationComboBox" Margin="0,0,24,0">
+                                    <ComboBox MinWidth="128" ItemsSource="{Binding ViewModel.StyleStations}" x:Name="FilterStationComboBox" Margin="0,0,24,0" SelectedIndex="0">
                                         <i:Interaction.Triggers>
                                             <i:EventTrigger EventName="SelectionChanged">
                                                 <i:InvokeCommandAction Command="{Binding ViewModel.StationSearchCommand}"
@@ -95,7 +95,7 @@
                                     <TextBlock Opacity="0.7" VerticalAlignment="Center" FontFamily="{StaticResource SymbolThemeFontFamily}" 
                                                Text="&#xE71C;" FontSize="12" Margin="0,0,8,0"/>
                                     <TextBlock Opacity="0.7" Style="{StaticResource BodyTextBlockStyle}" Text="类别:" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                                    <ComboBox MinWidth="128" ItemsSource="{Binding ViewModel.StyleTypes}" x:Name="FilterTypeComboBox">
+                                    <ComboBox MinWidth="128" ItemsSource="{Binding ViewModel.StyleTypes}" x:Name="FilterTypeComboBox" SelectedIndex="0">
                                         <i:Interaction.Triggers>
                                             <i:EventTrigger EventName="SelectionChanged">
                                                 <i:InvokeCommandAction Command="{Binding ViewModel.TypeSearchCommand}"