From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；

---
 HMI.MenuManage/UserManage.xaml.cs |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/HMI.MenuManage/UserManage.xaml.cs b/HMI.MenuManage/UserManage.xaml.cs
index e4bd390..44a6dde 100644
--- a/HMI.MenuManage/UserManage.xaml.cs
+++ b/HMI.MenuManage/UserManage.xaml.cs
@@ -1,4 +1,5 @@
 锘縰sing HMI.Base;
+using HMI.Core.Util;
 using HMI.MenuManage.Entity;
 using HMI.MenuManage.Model;
 using HMI.UI.Util;
@@ -31,6 +32,18 @@
             this.Loaded -= UserManage_Loaded;
         }
 
+        public override void DoClose(object sender, EventArgs e)
+        {
+            try
+            {
+                Model?.sqliteHelper?.Close();
+            }
+            catch (Exception ex)
+            {
+                log.Warn("Do Close Failed.", ex);
+            }
+        }
+
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             Button btn = (Button)sender;
@@ -40,7 +53,7 @@
                 {
                     UserModal userModal = new UserModal
                     {
-                        Title = "鏂板鐢ㄦ埛",
+                        Title = LangUtil.Get("HMI.User.Add"),
                         Owner = Window.GetWindow(this),
                         sqliteHelper = Model.sqliteHelper
                     };
@@ -52,7 +65,7 @@
                 catch (Exception ex)
                 {
                     log.Error("Add User Failed.", ex);
-                    ToastHelper.Error(Window.GetWindow(this), $"鏂板澶辫触锛亄ex.Message}");
+                    ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.AddFailed")}: {ex.Message}");
                 }
             }
             else if (btn.Name == "refreshBtn")
@@ -64,7 +77,7 @@
                 catch (Exception ex)
                 {
                     log.Error("Refresh User Failed.", ex);
-                    ToastHelper.Error(Window.GetWindow(this), $"鍒锋柊澶辫触锛亄ex.Message}");
+                    ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.RefreshFailed")}: {ex.Message}");
                 }
             }
             else if (btn.Name == "editBtn")
@@ -73,7 +86,7 @@
                 {
                     UserModal userModal = new UserModal
                     {
-                        Title = "缂栬緫鐢ㄦ埛",
+                        Title = LangUtil.Get("HMI.User.Edit"),
                         Owner = Window.GetWindow(this),
                         sqliteHelper = Model.sqliteHelper
                     };
@@ -85,7 +98,7 @@
                 catch (Exception ex)
                 {
                     log.Error("Edit User Failed.", ex);
-                    ToastHelper.Error(Window.GetWindow(this), $"缂栬緫澶辫触锛亄ex.Message}");
+                    ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.EditFailed")}: {ex.Message}");
                 }
             }
             else if (btn.Name == "deleteBatchBtn")
@@ -95,23 +108,22 @@
                     List<string> usernames = Model.DataSource.Where(x => x.Selected).Select(x => x.Username).ToList();
                     if (usernames == null || usernames.Count <= 0)
                     {
-                        ToastHelper.Warning(Window.GetWindow(this), "璇烽�夋嫨瑕佸垹闄ょ殑鐢ㄦ埛锛�");
+                        ToastHelper.Warning(Window.GetWindow(this), LangUtil.Get("HMI.NoDeleteData"));
                         return;
                     }
 
                     var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
-                        $"纭畾鍒犻櫎閫変腑鐨刐{usernames.Count}]鏉＄敤鎴峰悧锛熻鎿嶄綔涓嶅彲閫嗭紒");
+                        string.Format(LangUtil.Get("HMI.MakeSureDeletes"), usernames.Count));
                     if (res == MessageBoxResult.OK)
                     {
                         Model.DeleteUserByUsernames(usernames);
                         Model.LoadData();
-                        ToastHelper.Success(Window.GetWindow(this), "鍒犻櫎鎴愬姛");
                     }
                 }
                 catch (Exception ex)
                 {
                     log.Error("Delete User Batch Failed.", ex);
-                    ToastHelper.Error(Window.GetWindow(this), $"鍒犻櫎澶辫触锛亄ex.Message}");
+                    ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.DeleteFailed")}: {ex.Message}");
                 }
             }
             else if (btn.Name == "delBtn")
@@ -120,7 +132,7 @@
                 {
                     var data = (UserData)((Button)sender).DataContext;
                     var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
-                        $"纭畾鍒犻櫎鐢ㄦ埛[{data.Name}]鍚楋紵璇ユ搷浣滀笉鍙�嗭紒");
+                        string.Format(LangUtil.Get("HMI.MakeSureDeleteSingle"), data.Name));
                     if (res == MessageBoxResult.OK)
                     {
                         Model.DeleteUserByUsername(data.Username);
@@ -130,7 +142,7 @@
                 catch (Exception ex)
                 {
                     log.Error("Delete User Failed.", ex);
-                    ToastHelper.Error(Window.GetWindow(this), $"鍒犻櫎澶辫触锛亄ex.Message}");
+                    ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.DeleteFailed")}: {ex.Message}");
                 }
             }
             else if (btn.Name == "saveRoleBtn")
@@ -139,12 +151,12 @@
                 {
                     Model.SaveUserRole();
                     Model.LoadUserRole();
-                    ToastHelper.Success(Window.GetWindow(this), "淇濆瓨鎴愬姛");
+                    ToastHelper.Success(Window.GetWindow(this), LangUtil.Get("App.SaveSuccess"));
                 }
                 catch (Exception ex)
                 {
                     log.Error("Update User-Role Rel Failed.", ex);
-                    ToastHelper.Error(Window.GetWindow(this), $"淇濆瓨澶辫触锛亄ex.Message}");
+                    ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.SaveFailed")}: {ex.Message}");
                 }
             }
         }

--
Gitblit v1.9.1