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 StyleStations { get; private set; } = [.. StylesInfoDataSource.Instance.StylesInfo.Select(x=>x.Station).Distinct()]; - public List StyleTypes { get; private set; } = [.. StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Type).Distinct()]; + public List StyleStations { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Station).Distinct())]; + public List 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 @@ - + - +