From c401a2f2fd1a509cdeb33e850bb5c2827074af48 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 17 三月 2025 08:44:51 +0800
Subject: [PATCH] 完善框架，新增两个close方法；
---
HMI.MenuManage/MenuManage.xaml.cs | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/HMI.MenuManage/MenuManage.xaml.cs b/HMI.MenuManage/MenuManage.xaml.cs
index 1e4a0e5..fa38a3a 100644
--- a/HMI.MenuManage/MenuManage.xaml.cs
+++ b/HMI.MenuManage/MenuManage.xaml.cs
@@ -1,15 +1,14 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Windows;
-using System.Windows.Controls;
-using HMI.Base;
+锘縰sing HMI.Base;
+using HMI.Core.Util;
using HMI.MenuManage.Entity;
using HMI.MenuManage.Model;
using HMI.UI.Util;
-using log4net;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
namespace HMI.MenuManage
{
@@ -29,11 +28,7 @@
InitializeComponent();
}
- #region 灞炴��
-
- #endregion
-
- private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
+ private void Button_Click(object sender, RoutedEventArgs e)
{
var btn = ((Button)sender);
if (btn.Name == "addBtn")
@@ -42,7 +37,7 @@
{
MenuModal window = new MenuModal
{
- Title = "鏂板鑿滃崟",
+ Title = $"{LangUtil.Get("HMI.Menu.Add")}",
sqliteHelper = Model.sqliteHelper,
Owner = Window.GetWindow(this)
};
@@ -55,7 +50,7 @@
catch (Exception ex)
{
log.Error("Add Menu 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")
@@ -67,7 +62,7 @@
catch (Exception ex)
{
log.Error("Refresh Menu List Failed.", ex);
- ToastHelper.Error(Window.GetWindow(this), $"鍒锋柊澶辫触锛亄ex.Message}");
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.RefreshFailed")}: {ex.Message}");
}
}
else if (btn.Name == "deleteBatchBtn")
@@ -77,12 +72,12 @@
List<string> ids = Model.DataSource.Where(x => x.Selected).Select(x => x.Id).ToList();
if (ids == null || ids.Count <= 0)
{
- ToastHelper.Warning(Window.GetWindow(this), "璇烽�夋嫨瑕佸垹闄ょ殑鑿滃崟锛�");
+ ToastHelper.Warning(Window.GetWindow(this), LangUtil.Get("HMI.NoDeleteData"));
return;
}
var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
- $"纭畾鍒犻櫎閫変腑鐨刐{ids.Count}]鏉¤彍鍗曞悧锛熻鎿嶄綔涓嶅彲閫嗭紒");
+ string.Format(LangUtil.Get("HMI.MakeSureDeletes"), ids.Count));
if (res == MessageBoxResult.OK)
{
Model.DeleteMenuByIds(ids);
@@ -92,7 +87,7 @@
catch (Exception ex)
{
log.Error("Delete Menu 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 == "editBtn")
@@ -102,7 +97,7 @@
var data = (MenuData)btn.DataContext;
MenuModal window = new MenuModal
{
- Title = "缂栬緫鑿滃崟",
+ Title = $"{LangUtil.Get("HMI.Menu.Edit")}",
sqliteHelper = Model.sqliteHelper,
Owner = Window.GetWindow(this)
};
@@ -115,7 +110,7 @@
catch (Exception ex)
{
log.Error("Edit Menu Failed.", ex);
- ToastHelper.Error(Window.GetWindow(this), $"缂栬緫澶辫触锛亄ex.Message}");
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("HMI.EditFailed")}: {ex.Message}");
}
}
else if (btn.Name == "delBtn")
@@ -124,7 +119,7 @@
{
var data = (MenuData)((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.DeleteMenuById(data.Id);
@@ -134,11 +129,23 @@
catch (Exception ex)
{
log.Error("Delete Menu Failed.", ex);
- ToastHelper.Error(Window.GetWindow(this), $"鍒犻櫎澶辫触锛亄ex.Message}");
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("HMI.DeleteFailed")}: {ex.Message}");
}
}
}
+ public override void DoClose(object sender, EventArgs e)
+ {
+ try
+ {
+ Model?.sqliteHelper?.Close();
+ }
+ catch (Exception ex)
+ {
+ log.Warn("Do Close Failed.", ex);
+ }
+ }
+
private void DataGrid_Loaded(object sender, RoutedEventArgs e)
{
Model.LoadData();
--
Gitblit v1.9.1