From 771a0e7b6b1276087515bbe94de28358cb92963b Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 04 六月 2026 10:32:27 +0800
Subject: [PATCH] 优化老化；
---
HMI.MenuManage/RoleManage.xaml.cs | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/HMI.MenuManage/RoleManage.xaml.cs b/HMI.MenuManage/RoleManage.xaml.cs
index 8b3300a..2de1f01 100644
--- a/HMI.MenuManage/RoleManage.xaml.cs
+++ b/HMI.MenuManage/RoleManage.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;
@@ -34,9 +35,17 @@
this.Loaded -= RoleManage_Loaded;
}
- #region 灞炴��
-
- #endregion
+ 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)
{
try
@@ -48,7 +57,7 @@
{
RoleModal modal = new RoleModal
{
- Title = "鏂板瑙掕壊",
+ Title = this.lang("HMI.Role.Add"),
Owner = Window.GetWindow(this),
sqliteHelper = Model.sqliteHelper
};
@@ -60,7 +69,7 @@
catch (Exception ex)
{
log.Error("Add Role 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")
@@ -72,7 +81,7 @@
catch (Exception ex)
{
log.Error("Refresh Role Failed.", ex);
- ToastHelper.Error(Window.GetWindow(this), $"鍒锋柊澶辫触锛亄ex.Message}");
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.RefreshFailed")}: {ex.Message}");
}
}
else if (btn.Name == "menuBtn")
@@ -84,7 +93,7 @@
catch (Exception ex)
{
log.Error("Load Role-Menu 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")
@@ -93,7 +102,7 @@
{
RoleModal modal = new RoleModal
{
- Title = "缂栬緫瑙掕壊",
+ Title = this.lang("HMI.Role.Edit"),
Owner = Window.GetWindow(this),
sqliteHelper = Model.sqliteHelper
};
@@ -105,7 +114,7 @@
catch (Exception ex)
{
log.Error("Edit Role 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")
@@ -115,12 +124,12 @@
List<string> codes = Model.DataSource.Where(x => x.Selected).Select(x => x.Code).ToList();
if (codes == null || codes.Count <= 0)
{
- ToastHelper.Warning(Window.GetWindow(this), "璇烽�夋嫨瑕佸垹闄ょ殑瑙掕壊锛�");
+ ToastHelper.Warning(Window.GetWindow(this), this.lang("HMI.NoDeleteData"));
return;
}
var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
- $"纭畾鍒犻櫎閫変腑鐨刐{codes.Count}]鏉¤鑹插悧锛熻鎿嶄綔涓嶅彲閫嗭紒");
+ this.lang("HMI.MakeSureDeletes", codes.Count));
if (res == MessageBoxResult.OK)
{
Model.DeleteRoleByCodes(codes);
@@ -130,7 +139,7 @@
catch (Exception ex)
{
log.Error("Delete Role 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")
@@ -139,7 +148,7 @@
{
var data = (RoleData)((Button)sender).DataContext;
var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
- $"纭畾鍒犻櫎瑙掕壊[{data.Name}]鍚楋紵璇ユ搷浣滀笉鍙�嗭紒");
+ this.lang("HMI.MakeSureDeleteSingle", data.Name));
if (res == MessageBoxResult.OK)
{
Model.DelSingleData(data);
@@ -149,7 +158,7 @@
catch (Exception ex)
{
log.Error("Delete Role Failed.", ex);
- Toast.Show((WindowX)Window.GetWindow(this), "鍒犻櫎澶辫触", ToastPosition.Top);
+ ToastHelper.Error((WindowX)Window.GetWindow(this), LangUtil.Get("App.DeleteFailed"));
}
}
else if (btn.Name == "saveMenuBtn")
@@ -157,12 +166,12 @@
try
{
Model.SaveRelData(Model.SelectedValue);
- Toast.Show((WindowX)Window.GetWindow(this), "淇濆瓨鎴愬姛", ToastPosition.Top);
+ ToastHelper.Success((WindowX)Window.GetWindow(this), LangUtil.Get("App.SaveSuccess"));
}
catch (Exception ex)
{
log.Error("Save Role-Menu Failed.", ex);
- Toast.Show((WindowX)Window.GetWindow(this), "淇濆瓨澶辫触", ToastPosition.Top);
+ ToastHelper.Error((WindowX)Window.GetWindow(this), LangUtil.Get("App.SaveFailed"));
}
}
}
--
Gitblit v1.9.1