From b544d5cccd76735e034c8055918a50927b437474 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期二, 10 十一月 2026 08:29:04 +0800
Subject: [PATCH] fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例
---
HMI.MenuManage/UserManage.xaml.cs | 197 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 166 insertions(+), 31 deletions(-)
diff --git a/HMI.MenuManage/UserManage.xaml.cs b/HMI.MenuManage/UserManage.xaml.cs
index 05d575f..dcf1c22 100644
--- a/HMI.MenuManage/UserManage.xaml.cs
+++ b/HMI.MenuManage/UserManage.xaml.cs
@@ -1,12 +1,14 @@
-锘縰sing System;
-using System.Windows;
-using System.Windows.Controls;
-using HMI.Base;
-using HMI.Core.Api;
+锘縰sing HMI.Base;
+using HMI.Core.Util;
using HMI.MenuManage.Entity;
using HMI.MenuManage.Model;
using HMI.UI.Util;
-using log4net;
+using HMI.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
namespace HMI.MenuManage
{
@@ -16,7 +18,7 @@
public partial class UserManage : PluginControl
{
UserManageModel Model;
- private ILog log;
+
public UserManage()
{
Model = new UserManageModel();
@@ -31,63 +33,196 @@
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;
if (btn.Name == "addBtn")
{
- UserModal userModal = new UserModal
+ try
{
- Title = "鏂板鐢ㄦ埛",
- Owner = Window.GetWindow(this),
- sqliteHelper = Model.sqliteHelper
- };
- if (userModal.Open(new UserData()) == true)
+ UserModal userModal = new UserModal
+ {
+ Title = LangUtil.Get("HMI.User.Add"),
+ Owner = Window.GetWindow(this),
+ sqliteHelper = Model.sqliteHelper
+ };
+ if (userModal.Open(new UserData()) == true)
+ {
+ Model.LoadData();
+ }
+ }
+ catch (Exception ex)
{
- Model.LoadData();
+ log.Error("Add User Failed.", ex);
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.AddFailed")}: {ex.Message}");
}
}
else if (btn.Name == "refreshBtn")
{
- Model.LoadData();
- }
- else if (btn.Name == "editBtn")
- {
- UserModal userModal = new UserModal
- {
- Title = "缂栬緫鐢ㄦ埛",
- Owner = Window.GetWindow(this),
- sqliteHelper = Model.sqliteHelper
- };
- if (userModal.Open((UserData)btn.DataContext) == true)
+ try
{
Model.LoadData();
}
+ catch (Exception ex)
+ {
+ log.Error("Refresh User Failed.", ex);
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.RefreshFailed")}: {ex.Message}");
+ }
}
- else if (btn.Name == "delBtn") { }
+ else if (btn.Name == "editBtn")
+ {
+ try
+ {
+ UserModal userModal = new UserModal
+ {
+ Title = LangUtil.Get("HMI.User.Edit"),
+ Owner = Window.GetWindow(this),
+ sqliteHelper = Model.sqliteHelper
+ };
+ if (userModal.Open((UserData)btn.DataContext) == true)
+ {
+ Model.LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("Edit User Failed.", ex);
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.EditFailed")}: {ex.Message}");
+ }
+ }
+ else if (btn.Name == "deleteBatchBtn")
+ {
+ try
+ {
+ 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), LangUtil.Get("HMI.NoDeleteData"));
+ return;
+ }
+
+ var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
+ string.Format(LangUtil.Get("HMI.MakeSureDeletes"), usernames.Count));
+ if (res == MessageBoxResult.OK)
+ {
+ Model.DeleteUserByUsernames(usernames);
+ Model.LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("Delete User Batch Failed.", ex);
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.DeleteFailed")}: {ex.Message}");
+ }
+ }
+ else if (btn.Name == "delBtn")
+ {
+ try
+ {
+ var data = (UserData)((Button)sender).DataContext;
+ var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
+ string.Format(LangUtil.Get("HMI.MakeSureDeleteSingle"), data.Name));
+ if (res == MessageBoxResult.OK)
+ {
+ Model.DeleteUserByUsername(data.Username);
+ Model.LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("Delete User Failed.", ex);
+ ToastHelper.Error(Window.GetWindow(this), $"{LangUtil.Get("App.DeleteFailed")}: {ex.Message}");
+ }
+ }
else if (btn.Name == "saveRoleBtn")
{
try
{
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), $"{LangUtil.Get("App.SaveFailed")}: {ex.Message}");
}
+ }
+ else if (btn.Name == "exportBtn")
+ {
+ ExportToExcel();
+ }
+ else if (btn.Name == "importBtn")
+ {
+ ImportFromExcel();
}
}
- public void SetLogger(ILog logger)
+ public void ExportToExcel()
{
- log = logger;
+ try
+ {
+ if (Model.DataSource == null || Model.DataSource.Count <= 0)
+ {
+ ToastHelper.Warning(this.lang("App.NoExportData"));
+ return;
+ }
+ System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
+
+ string fname = string.Empty;
+ sfd.Filter = "";
+ sfd.DefaultExt = "xls";
+ sfd.FileName = this.lang("HMI.User.Title");
+ if (sfd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ fname = sfd.FileName;
+ ExcelHelper.ExportExcel(fname, Model.DataSource);
+ ToastHelper.Success(this.lang("App.ExportSuccess"));
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("Export User Data Failed.", ex);
+ ToastHelper.Error(ex.Message);
+ }
}
- public void SetBaseFolder(string folder)
+ public void ImportFromExcel()
{
- throw new NotImplementedException();
+ try
+ {
+ System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog();
+ openDialog.Filter = "execl(*.xlsx;*.xls)|*.xlsx;*.xls";
+ if (openDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ List<UserData> users = ExcelHelper.ReadFromExcel<UserData>(openDialog.FileName);
+ if (users == null || users.Count <= 0)
+ {
+ ToastHelper.Warning(this.lang("App.NoImportData"));
+ return;
+ }
+ Model.ImportUser(users);
+ Model.LoadData();
+ ToastHelper.Success(this.lang("App.ImportSuccess"));
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("AlarmText Import Failed.", ex);
+ ToastHelper.Error(Window.GetWindow(this), $"{this.lang("App.ImportFailed")}: {ex.Message}");
+ }
}
}
}
--
Gitblit v1.9.1