fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例

wenxiangchao

3 天以前 b544d5cccd76735e034c8055918a50927b437474

 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);
        }