cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r267

Browse Source 
SVN-Revision: r267
This commit is contained in:
tdx
2025-02-13 06:13:04 +00:00
parent af0f77e361
commit ac704870be
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/Model/MyControl.cs
+3 -4
View File
@@ -1406,7 +1406,7 @@ namespace Lskj.Control.Model
model.SourceSql += "and 1<>1"; model.SourceSql += "and 1<>1";
} }
DataTable table = new DataTable(); DataTable table = new DataTable();
if (!ControlType.IsNotLoadData(model.FieldType)) if (!ControlType.IsNotLoadData(model.FieldType) && model.FieldType != ControlType.LabTreeType)
{ {
if (mControlSourceDic.ContainsKey(model)) if (mControlSourceDic.ContainsKey(model))
{ {
@@ -2804,7 +2804,7 @@ namespace Lskj.Control.Model
valueBuilder.AppendFormat("N'{0}',", ParentKey); 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)
{ {
@@ -3759,8 +3759,7 @@ namespace Lskj.Control.Model
/// <returns>System.Windows.Forms.Control.</returns> /// <returns>System.Windows.Forms.Control.</returns>
private System.Windows.Forms.Control InitControl(ControlModel model, bool isLoadBorder = true) private System.Windows.Forms.Control InitControl(ControlModel model, bool isLoadBorder = true)
{ {
if (!string.IsNullOrEmpty(model.SourceSql) && !ControlType.IsNotLoadData(model.FieldType) && model.FieldType != ControlType.LabTreeType)
if (!string.IsNullOrEmpty(model.SourceSql)&& !ControlType.IsNotLoadData(model.FieldType))
{ {
Task<DataTable> sourceTask = null; Task<DataTable> sourceTask = null;
if (StaticControl.AddParentGrid.Key != null && Model != null && StaticControl.AddParentGrid.Key.Equals(Model.ModuleCode)) if (StaticControl.AddParentGrid.Key != null && Model != null && StaticControl.AddParentGrid.Key.Equals(Model.ModuleCode))