SVN r500
SVN-Revision: r500
This commit is contained in:
@@ -2122,7 +2122,7 @@ namespace Lskj.Control
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(model.EnableCond))
|
||||
{
|
||||
GridColumnModel[] columns = this.ColumnList.Where(x => x.EnableCond.Contains("{" + model.FieldName + "}")).ToArray();
|
||||
GridColumnModel[] columns = this.ColumnList.Where(x => x.EnableCond.Contains("{" + model.FieldName + "}")).ToArray();
|
||||
DataRow rowItem = this.gridView.GetDataRow(rowHandler);
|
||||
foreach (GridColumnModel item in columns)
|
||||
{
|
||||
@@ -2132,6 +2132,8 @@ namespace Lskj.Control
|
||||
string diaableType = item.DisableType;
|
||||
//this.gridView.Columns.ColumnByFieldName(model.FieldName).Visible = ("true".Equals(EvalHelper.Eval(ReplaceHelper.ReplaceEvalCond(disableCond)) + "", StringComparison.OrdinalIgnoreCase));
|
||||
this.gridView.Columns.ColumnByFieldName(model.FieldName).Visible = ("true".Equals(ValidateCond(disableCond, null) + "", StringComparison.OrdinalIgnoreCase));
|
||||
//设置编辑状态
|
||||
//this.gridView.Columns.ColumnByFieldName("").OptionsColumn.AllowEdit = true;
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
@@ -8255,36 +8257,4 @@ namespace Lskj.Control
|
||||
{
|
||||
int returnIndex = 0;
|
||||
isContain = false;
|
||||
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
|
||||
|
||||
}
|
||||
}
|
||||
DataRow dragEn
|
||||
Reference in New Issue
Block a user