From 8d5468f734fb9588c4a6b4707fa3251ac7a0fe29 Mon Sep 17 00:00:00 2001 From: wyf Date: Fri, 21 Mar 2025 04:16:46 +0000 Subject: [PATCH] SVN r367 SVN-Revision: r367 --- 插件库/Lskj.Control/LabelMultiAutoTextEdit.cs | 39 ++++--------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/插件库/Lskj.Control/LabelMultiAutoTextEdit.cs b/插件库/Lskj.Control/LabelMultiAutoTextEdit.cs index 73c6488..6b569c0 100644 --- a/插件库/Lskj.Control/LabelMultiAutoTextEdit.cs +++ b/插件库/Lskj.Control/LabelMultiAutoTextEdit.cs @@ -180,6 +180,8 @@ namespace Lskj.Control else { this.txtEdit.Text = ""; + _lookUpForm.EditText = ""; + _lookUpForm.EditValue = ""; } } } @@ -282,7 +284,7 @@ namespace Lskj.Control /// /// 文本禁编,但可以点击按钮 /// - public bool TextBoxProhibition + public bool TextBoxProhibition { get { @@ -309,8 +311,8 @@ namespace Lskj.Control set { base.ReadOnly = value; - this.txtEdit.Properties.ReadOnly = value|| this.ProhibitInput; - this.lblText.ForeColor = value|| this.ProhibitInput ? base.ReadOnlyLabelForceColor : Required ? base.RequiredLabelForceColor : base.DefaultLabelForceColor; + this.txtEdit.Properties.ReadOnly = value || this.ProhibitInput; + this.lblText.ForeColor = value || this.ProhibitInput ? base.ReadOnlyLabelForceColor : Required ? base.RequiredLabelForceColor : base.DefaultLabelForceColor; } } /// @@ -401,7 +403,7 @@ namespace Lskj.Control { try { - if (this.ReadOnly) + if (this.ReadOnly) { //只读状态,点击按钮无效 return; @@ -414,31 +416,4 @@ namespace Lskj.Control string sqlValue = string.Empty; if (this.ControlObj != null) { - sqlValue = this.ControlObj.ReplaceControlValue(Model.SourceSql); - sqlValue = sqlValue.Replace("#", ""); - _lookUpForm.DataSource = MainImpl.GetDataTableResult(sqlValue); - } - - DialogResult result = _lookUpForm.ShowDialog(); - if (result == DialogResult.OK) - { - string value = Model.FieldType == ControlType.LabMultiSelectValue || Model.FieldType == ControlType.LabCheckMultiSelectValue || Model.FieldType == ControlType.LabMultiSelectValueParam ? _lookUpForm.EditValue : _lookUpForm.EditText; - - this.EditValue = value; - this.TextEdit.Text = _lookUpForm.EditText; - } - } - } - catch (Exception ex) - { - string Message = ErrorMessage.PromptErrorMessage(ex); - MessageUtil.Show(Message, ex.Message); - } - - } - - - - - } -} + sqlValue = this.Co \ No newline at end of file