SVN r526
SVN-Revision: r526
This commit is contained in:
@@ -368,6 +368,10 @@ namespace Lskj.Control
|
||||
/// 聚合多表头控件
|
||||
/// </summary>
|
||||
public BandedGridControlEx CustomGroupBandEx;
|
||||
/// <summary>
|
||||
/// 导出名不包含日期
|
||||
/// </summary>
|
||||
public bool ExportNameWithoutDate = false;
|
||||
|
||||
public GridControlEx()
|
||||
{
|
||||
@@ -3932,7 +3936,7 @@ namespace Lskj.Control
|
||||
mutilLookUp.TextField = model.TextMember;
|
||||
mutilLookUp.SourceSQL = model.SqlSource;
|
||||
mutilLookUp.IsType = model.FieldType;
|
||||
mutilLookUp.ValueMember = (model.FieldType == ControlType.LabMultiSelectValue|| model.FieldType == ControlType.LabMultiSelectValueNew) ||
|
||||
mutilLookUp.ValueMember = (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew) ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueParam ? model.ValueMember : model.TextMember;
|
||||
mutilLookUp.Tag = model;
|
||||
|
||||
@@ -7262,7 +7266,7 @@ namespace Lskj.Control
|
||||
}
|
||||
|
||||
|
||||
if (!SystemInfo.Instance.DisableFilteringQuantity)
|
||||
if (!SystemInfo.Instance.DisableFilteringQuantity)
|
||||
{
|
||||
DataTable filterTable = gridView.GetGridViewFilteredAndSortedDataToDataTable();
|
||||
DataRow[] dataRowArray = filterTable.Select();
|
||||
@@ -7285,7 +7289,7 @@ namespace Lskj.Control
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -8261,4 +8265,36 @@ namespace Lskj.Control
|
||||
{
|
||||
int returnIndex = 0;
|
||||
isContain = false;
|
||||
DataRow dragEn
|
||||
DataRow dragEndRow = sourceTab.Rows[dragEndRowIndex];
|
||||
if (selectRows.Contains(dragEndRow))
|
||||
{
|
||||
isContain = true;
|
||||
dragEndRowIndex = dragEndRowIndex - 1;
|
||||
if (dragEndRowIndex >= 0)
|
||||
{
|
||||
dragEndRow = sourceTab.Rows[dragEndRowIndex];
|
||||
if (selectRows.Contains(dragEndRow))
|
||||
{
|
||||
bool iscontain = false;
|
||||
returnIndex = GetDragEndRowIndex(sourceTab, dragEndRowIndex, selectRows, out iscontain);
|
||||
}
|
||||
else
|
||||
{
|
||||
returnIndex = dragEndRowIndex;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
returnIndex = -1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
returnIndex = dragEndRowIndex;
|
||||
}
|
||||
return returnIndex;
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user