From fe2aa4880d5c9fd88088ad0ed81ebaca05629f5f Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 17:59:45 +0800
Subject: [PATCH] feat: 集成CAN驱动/模拟器 + 仪器仪表注册/硬件调试模块
---
HMI.MenuManage/Modal/UserModal.xaml.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/HMI.MenuManage/Modal/UserModal.xaml.cs b/HMI.MenuManage/Modal/UserModal.xaml.cs
index 2c9aff7..c48ff24 100644
--- a/HMI.MenuManage/Modal/UserModal.xaml.cs
+++ b/HMI.MenuManage/Modal/UserModal.xaml.cs
@@ -2,6 +2,7 @@
using HMI.MenuManage.Entity;
using HMI.MenuManage.Util;
using HMI.UI.DpUtil;
+using HMI.UI.Util;
using Panuon.WPF.UI;
using System;
using System.Collections.ObjectModel;
@@ -56,7 +57,7 @@
}
catch (Exception ex)
{
- Panuon.WPF.UI.Toast.Show(this, "Error锛�", ToastPosition.Top);
+ ToastHelper.Error(this, $"Error锛亄ex.Message}");
e.Cancel = true;
return;
}
@@ -82,14 +83,28 @@
return true;
}
+ private bool ValidateCode(object value, out string err)
+ {
+ err = null;
+ string segment = string.IsNullOrEmpty(Data.Id) ? "" : $" AND id!='{Data.Id}'";
+ string sql = $"SELECT 1 FROM user WHERE code='{TbCode.Text}'{segment};";
+ if (sqliteHelper.HasData(sql))
+ {
+ err = string.Format(LangUtil.Get("App.MustBeUnique"), LangUtil.Get("HMI.User.Code"));
+ return false;
+ }
+ return true;
+ }
+
private bool ValidateForm()
{
bool flag = FormGroupHelper.ValidateForm(formPanel);
if (flag)
{
+ Data.Code = TbCode.Text;
Data.Username = TbUsername.Text;
Data.Name = TbName.Text;
- Data.Password = TbPassword.Text;
+ Data.Password = TbPassword.Password;
}
return flag;
@@ -98,9 +113,10 @@
public bool? Open(UserData data)
{
Data = data;
+ TbCode.Text = Data.Code;
TbUsername.Text = Data.Username;
TbName.Text = Data.Name;
- TbPassword.Text = Data.Password;
+ TbPassword.Password = Data.Password;
Roles = UserRoleRelHelper.SelectUserRoleData(sqliteHelper, Data.Username);
@@ -121,15 +137,15 @@
public void InsertData(UserData data)
{
- string sql = $@"INSERT INTO user (username,password,name)
+ string sql = $@"INSERT INTO user (code, username,password,name)
VALUES
- ('{data.Username}','{data.Password}','{data.Name}');";
+ ('{data.Code}', '{data.Username}','{data.Password}','{data.Name}');";
UserRoleRelHelper.SaveUserRoleRel(sqliteHelper, Roles, data, sql, null);
}
public void UpdateData(UserData data)
{
- string sql = $@"UPDATE user SET username='{data.Username}',password='{data.Password}',name='{data.Name}'
+ string sql = $@"UPDATE user SET code='{data.Code}', username='{data.Username}',password='{data.Password}',name='{data.Name}'
WHERE id='{data.Id}';";
UserRoleRelHelper.SaveUserRoleRel(sqliteHelper, Roles, data, sql, null);
}
--
Gitblit v1.9.1