SVN r267
SVN-Revision: r267
This commit is contained in:
@@ -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,7 +2804,7 @@ 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)
|
||||
{
|
||||
@@ -3759,8 +3759,7 @@ namespace Lskj.Control.Model
|
||||
/// <returns>System.Windows.Forms.Control.</returns>
|
||||
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<DataTable> sourceTask = null;
|
||||
if (StaticControl.AddParentGrid.Key != null && Model != null && StaticControl.AddParentGrid.Key.Equals(Model.ModuleCode))
|
||||
|
||||
Reference in New Issue
Block a user