From 7c26d330ff94b4aaa7d844407b4da758c3ed3cf8 Mon Sep 17 00:00:00 2001
From: wxl0430 <141288415+wxl0430@users.noreply.github.com>
Date: Sun, 20 Apr 2025 17:06:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BD=9C=E8=80=85?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Simulation/ScreenSimulationPageViewModel.cs   | 15 +++++++++++++--
 .../Pages/Simulation/ScreenSimulationPage.xaml    | 11 +++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
index 036a7fe..4b7bdf2 100644
--- a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
+++ b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
@@ -194,9 +194,11 @@ public partial class ScreenSimulationPageViewModel : ObservableObject
     private string _keyWord = string.Empty;
     private string _station = string.Empty;
     private string _type = string.Empty;
+    private string _author = string.Empty;
     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())];
-
+    public List<string> StyleAuthors { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Author).Distinct())];
+    
     [RelayCommand]
     public void TextSearch(object s)
     {
@@ -224,9 +226,18 @@ public partial class ScreenSimulationPageViewModel : ObservableObject
             Search();
         }
     }
+    [RelayCommand]
+    public void AuthorSearch(object s)
+    {
+        if (s is string str)
+        {
+            _author = str;
+            Search();
+        }
+    }
     private void Search()
     {
-        StyleCards = [.. StylesInfoDataSource.Instance.StylesInfo.Where(x =>(x.Station==_station||_station==string.Empty||_station=="全部") && (x.Type==_type||_type==string.Empty||_type=="全部") && 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.Author==_author||_author==string.Empty||_author=="全部") && x.Title.Contains(_keyWord))];
     }
     #endregion
 }
diff --git a/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml b/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml
index d9dfad5..fcbb27f 100644
--- a/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml
+++ b/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml
@@ -81,6 +81,17 @@
                                     <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text=" 个样式" VerticalAlignment="Center"/>
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal" Grid.Column="2" Margin="0,12">
+                                    <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.StyleAuthors}" x:Name="FilterAuthorComboBox" Margin="0,0,24,0" SelectedIndex="0">
+                                        <i:Interaction.Triggers>
+                                            <i:EventTrigger EventName="SelectionChanged">
+                                                <i:InvokeCommandAction Command="{Binding ViewModel.AuthorSearchCommand}"
+                                                           CommandParameter="{Binding SelectedItem,ElementName=FilterAuthorComboBox}"/>
+                                            </i:EventTrigger>
+                                        </i:Interaction.Triggers>
+                                    </ComboBox>
                                     <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"/>