From ac704870be3e060c6cdc395bcbfcc794424be9bb Mon Sep 17 00:00:00 2001 From: tdx Date: Thu, 13 Feb 2025 06:13:04 +0000 Subject: [PATCH] SVN r267 SVN-Revision: r267 --- 插件库/Lskj.Control/Model/MyControl.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/插件库/Lskj.Control/Model/MyControl.cs b/插件库/Lskj.Control/Model/MyControl.cs index 9ea5b14..26b7c64 100644 --- a/插件库/Lskj.Control/Model/MyControl.cs +++ b/插件库/Lskj.Control/Model/MyControl.cs @@ -1406,7 +1406,7 @@ namespace Lskj.Control.Model model.SourceSql += "and 1<>1"; } DataTable table = new DataTable(); - if (!ControlType.IsNotLoadData(model.FieldType)) + if (!ControlType.IsNotLoadData(model.FieldType) && model.FieldType != ControlType.LabTreeType) { if (mControlSourceDic.ContainsKey(model)) { @@ -2804,9 +2804,9 @@ namespace Lskj.Control.Model valueBuilder.AppendFormat("N'{0}',", ParentKey); } - if (ModuleResultDic!=null&& ModuleResultDic.Count>0) + if (ModuleResultDic != null && ModuleResultDic.Count > 0) { - foreach (string resultKey in ModuleResultDic.Keys) + foreach (string resultKey in ModuleResultDic.Keys) { fieldBuilder.Append(resultKey + ","); valueBuilder.AppendFormat("N'{0}',", ModuleResultDic[resultKey].Replace("'", "''")); @@ -3759,8 +3759,7 @@ namespace Lskj.Control.Model /// System.Windows.Forms.Control. private System.Windows.Forms.Control InitControl(ControlModel model, bool isLoadBorder = true) { - - if (!string.IsNullOrEmpty(model.SourceSql)&& !ControlType.IsNotLoadData(model.FieldType)) + if (!string.IsNullOrEmpty(model.SourceSql) && !ControlType.IsNotLoadData(model.FieldType) && model.FieldType != ControlType.LabTreeType) { Task sourceTask = null; if (StaticControl.AddParentGrid.Key != null && Model != null && StaticControl.AddParentGrid.Key.Equals(Model.ModuleCode)) @@ -4235,7 +4234,7 @@ namespace Lskj.Control.Model moduleReturnsIdNew.IsRadio = model.IsRadio; moduleReturnsIdNew.ConfigureColumnMode = model.ConfigureColumnMode; moduleReturnsIdNew.InitialFrame(); - + // DataTable dataSource = new DataTable(); //moduleReturnsIdNew.SetDataSource(dataSource); moduleReturnsIdNew.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);