|
@@ -881,14 +881,7 @@ public abstract class DynamicGrid<T> : DynamicGrid, IDynamicGridUIComponentParen
|
|
|
|
|
|
protected virtual DynamicGridColumns LoadColumns()
|
|
|
{
|
|
|
- var result = new DynamicGridColumns();
|
|
|
-
|
|
|
- var cols = IsDirectEditMode()
|
|
|
- ? new Columns<T>(ColumnTypeFlags.IncludeVisible | ColumnTypeFlags.IncludeForeignKeys)
|
|
|
- : new Columns<T>(ColumnTypeFlags.IncludeVisible | ColumnTypeFlags.IncludeLinked);
|
|
|
- result.AddRange(MasterColumns.Where(x => cols.Contains(x.ColumnName))
|
|
|
- .OrderBy(x => CoreUtils.GetPropertySequence(typeof(T), x.ColumnName)));
|
|
|
- return result;
|
|
|
+ return GenerateColumns();
|
|
|
}
|
|
|
|
|
|
|
|
@@ -903,15 +896,12 @@ public abstract class DynamicGrid<T> : DynamicGrid, IDynamicGridUIComponentParen
|
|
|
? new Columns<T>(ColumnTypeFlags.IncludeVisible | ColumnTypeFlags.IncludeForeignKeys)
|
|
|
: new Columns<T>(ColumnTypeFlags.IncludeVisible | ColumnTypeFlags.IncludeLinked);
|
|
|
|
|
|
- if (cols != null)
|
|
|
- {
|
|
|
foreach (var col in cols)
|
|
|
{
|
|
|
var mc = MasterColumns.FirstOrDefault(x => x.ColumnName.Equals(col.Property));
|
|
|
if (mc != null && mc.Editor is not NullEditor && mc.Editor.Visible != Visible.Hidden)
|
|
|
columns.Add(mc);
|
|
|
}
|
|
|
- }
|
|
|
return columns;
|
|
|
}
|
|
|
|