SVN r263
SVN-Revision: r263
This commit is contained in:
@@ -669,7 +669,7 @@ namespace Lskj.Control
|
||||
return;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(model.SqlSource))
|
||||
if (!string.IsNullOrEmpty(model.SqlSource) && !(model.FieldType == ControlType.LabSelectReturnIdNew || model.FieldType == ControlType.LabSelectReturnTextNew))
|
||||
{
|
||||
Task<DataTable> sourceTask = new Task<DataTable>(() =>
|
||||
{
|
||||
@@ -1047,6 +1047,7 @@ namespace Lskj.Control
|
||||
mLoading = true;
|
||||
try
|
||||
{
|
||||
if (this.OnDataSourceBindCallBack != null) this.OnDataSourceBindCallBack(null, null);
|
||||
SetColumnsSource();
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -1056,7 +1057,7 @@ namespace Lskj.Control
|
||||
finally
|
||||
{
|
||||
mControlSourceDic.Clear();
|
||||
if (this.OnDataSourceBindCallBack != null) this.OnDataSourceBindCallBack(null, null);
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1070,6 +1071,7 @@ namespace Lskj.Control
|
||||
foreach (GridColumnModel item in mControlList)
|
||||
{
|
||||
if (this.DisableFieldSources && item.isVislble) continue;
|
||||
if(item.FieldType == ControlType.LabSelectReturnIdNew || item.FieldType == ControlType.LabSelectReturnTextNew) continue;
|
||||
if (!string.IsNullOrWhiteSpace(item.SqlSource))
|
||||
{
|
||||
DataTable dataTable = new DataTable();
|
||||
|
||||
Reference in New Issue
Block a user