Merge remote-tracking branch 'origin/master'

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);
     }
 }

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";
             }
         }
     }

Views/Configuration/SettingPageBase.xaml

@@ -143,7 +143,7 @@
 
                                 <!-- 保存按钮在右侧 -->
                                 <Button x:Name="SaveButton" Grid.Column="1" Padding="0" Margin="0" Height="40"
-                                        BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}">
+                                        BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}" Command="{Binding SaveCommand}">
                                     <Border
                                             HorizontalAlignment="Right"
                                             VerticalAlignment="Center"