From ef52fd6fd07508883dce4eb002acda59f0169e59 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 23 四月 2026 10:19:33 +0800
Subject: [PATCH] 优化;

---
 HMI.MenuManage/Modal/UserModal.xaml.cs |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/HMI.MenuManage/Modal/UserModal.xaml.cs b/HMI.MenuManage/Modal/UserModal.xaml.cs
index d88c6c6..c48ff24 100644
--- a/HMI.MenuManage/Modal/UserModal.xaml.cs
+++ b/HMI.MenuManage/Modal/UserModal.xaml.cs
@@ -83,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;
@@ -99,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);
 
@@ -122,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