diff --git a/ViewModel/Configuration/SettingBaseVM.cs b/ViewModel/Configuration/SettingBaseVM.cs index 0d8b3bd..16d7162 100644 --- a/ViewModel/Configuration/SettingBaseVM.cs +++ b/ViewModel/Configuration/SettingBaseVM.cs @@ -1,15 +1,24 @@ using SparkClient.ViewModel.Configuration.SettingsPages; +using System.Windows.Input; namespace SparkClient.ViewModel.Configuration; public class SettingBaseVM : BaseViewModel { - public object CustomSetContent { get; } - public object ModelColorSetContent { get; } + public SettingsVM CustomSetContent { get; } + public ModelColorSetPageVM ModelColorSetContent { get; } + + public ICommand SaveCommand { get; } public SettingBaseVM() { CustomSetContent = new SettingsVM(); ModelColorSetContent = new ModelColorSetPageVM(); + SaveCommand = new RelayCommand(Save); + } + + public void Save(object param) + { + CustomSetContent.SaveUpdate(param); } } \ No newline at end of file diff --git a/ViewModel/Configuration/SettingsPages/SettingsVM.cs b/ViewModel/Configuration/SettingsPages/SettingsVM.cs index 5bc626b..0ef25df 100644 --- a/ViewModel/Configuration/SettingsPages/SettingsVM.cs +++ b/ViewModel/Configuration/SettingsPages/SettingsVM.cs @@ -15,7 +15,7 @@ using System.Windows.Input; namespace SparkClient.ViewModel.Configuration.SettingsPages { - class SettingsVM : BaseViewModel + public class SettingsVM : BaseViewModel { public ICommand SaveUpdateCommand { get; } public ICommand SelectFileCommand { get; } @@ -79,13 +79,13 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages Rules = new DataTable(); Rules.Columns.Add("Key"); Rules.Columns.Add("Value"); - //string sql = $"SELECT * FROM RULE;"; - //DataTable db = DataBaseHelper.ExecuteQuery(sql); - //foreach (DataRow row in db.Rows) - //{ - // Rules.Rows.Add(row[MultilingualHelper.getString("RULE_NAME")].ToString(), row["RULE_ID"].ToString()); - //} - Rules.Rows.Add("IGI 2023", "IGI2023"); + string sql = $"SELECT * FROM RULE;"; + DataTable db = DataBaseHelper.ExecuteQuery(sql); + foreach (DataRow row in db.Rows) + { + Rules.Rows.Add(row[MultilingualHelper.getString("RULE_NAME")].ToString(), row["RULE_ID"].ToString()); + } + //Rules.Rows.Add("IGI 2023", "IGI2023"); } public void SaveUpdate(object param) { @@ -227,7 +227,7 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages } else { - return ""; + return "zh-cn"; } } } diff --git a/Views/Configuration/SettingPageBase.xaml b/Views/Configuration/SettingPageBase.xaml index a311505..5eefc5a 100644 --- a/Views/Configuration/SettingPageBase.xaml +++ b/Views/Configuration/SettingPageBase.xaml @@ -143,7 +143,7 @@