|
@@ -186,7 +186,6 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
DataGrid.RowDragDropController ??= new GridRowDragDropController();
|
|
DataGrid.RowDragDropController ??= new GridRowDragDropController();
|
|
|
|
|
|
DataGrid.CurrentCellBorderThickness = new Thickness(0);
|
|
DataGrid.CurrentCellBorderThickness = new Thickness(0);
|
|
- DataGrid.AllowFiltering = false;
|
|
|
|
DataGrid.EnableDataVirtualization = true;
|
|
DataGrid.EnableDataVirtualization = true;
|
|
DataGrid.RowHeight = 30;
|
|
DataGrid.RowHeight = 30;
|
|
DataGrid.QueryRowHeight += DataGrid_QueryRowHeight;
|
|
DataGrid.QueryRowHeight += DataGrid_QueryRowHeight;
|
|
@@ -500,7 +499,6 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
DataGrid.AllowEditing = allowEditing;
|
|
DataGrid.AllowEditing = allowEditing;
|
|
reloadColumns = true;
|
|
reloadColumns = true;
|
|
}
|
|
}
|
|
- DataGrid.AllowFiltering = Parent.Options.FilterRows && Parent.CanFilter();
|
|
|
|
DataGrid.FilterRowPosition = Parent.Options.FilterRows && Parent.CanFilter() ? FilterRowPosition.FixedTop : FilterRowPosition.None;
|
|
DataGrid.FilterRowPosition = Parent.Options.FilterRows && Parent.CanFilter() ? FilterRowPosition.FixedTop : FilterRowPosition.None;
|
|
|
|
|
|
if (Parent.Options.DragSource || Parent.Options.ReorderRows)
|
|
if (Parent.Options.DragSource || Parent.Options.ReorderRows)
|
|
@@ -888,8 +886,6 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
|
|
|
private void ApplyFilterStyle(GridColumn column, bool filtering, bool allowSorting)
|
|
private void ApplyFilterStyle(GridColumn column, bool filtering, bool allowSorting)
|
|
{
|
|
{
|
|
- column.AllowFiltering = false;
|
|
|
|
-
|
|
|
|
var filterstyle = new Style();
|
|
var filterstyle = new Style();
|
|
if (filtering)
|
|
if (filtering)
|
|
{
|
|
{
|
|
@@ -906,7 +902,6 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
filterstyle.Setters.Add(new Setter(Control.BackgroundProperty, new SolidColorBrush(Colors.Gainsboro)));
|
|
filterstyle.Setters.Add(new Setter(Control.BackgroundProperty, new SolidColorBrush(Colors.Gainsboro)));
|
|
filterstyle.Setters.Add(new Setter(Control.IsEnabledProperty, false));
|
|
filterstyle.Setters.Add(new Setter(Control.IsEnabledProperty, false));
|
|
column.ColumnFilter = ColumnFilter.Value;
|
|
column.ColumnFilter = ColumnFilter.Value;
|
|
- column.AllowFiltering = false;
|
|
|
|
column.AllowSorting = false;
|
|
column.AllowSorting = false;
|
|
column.FilterRowEditorType = "TextBox";
|
|
column.FilterRowEditorType = "TextBox";
|
|
column.FilterRowOptionsVisibility = Visibility.Collapsed;
|
|
column.FilterRowOptionsVisibility = Visibility.Collapsed;
|
|
@@ -935,6 +930,8 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
|
|
|
private void SetFilterUIButton(GridColumn gridColumn, DynamicColumnBase column)
|
|
private void SetFilterUIButton(GridColumn gridColumn, DynamicColumnBase column)
|
|
{
|
|
{
|
|
|
|
+ if (!Parent.Options.FilterRows || !Parent.CanFilter()) return;
|
|
|
|
+
|
|
if (Parent.GetColumnFilter(column) is not IDynamicGridColumnFilter filter) return;
|
|
if (Parent.GetColumnFilter(column) is not IDynamicGridColumnFilter filter) return;
|
|
|
|
|
|
var vertical = column is DynamicActionColumn ac && ac.VerticalHeader && !ac.HeaderText.IsNullOrWhiteSpace();
|
|
var vertical = column is DynamicActionColumn ac && ac.VerticalHeader && !ac.HeaderText.IsNullOrWhiteSpace();
|
|
@@ -1183,7 +1180,6 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
newcol.Width = tmplCol.Width;
|
|
newcol.Width = tmplCol.Width;
|
|
newcol.ColumnSizer = GridLengthUnitType.None;
|
|
newcol.ColumnSizer = GridLengthUnitType.None;
|
|
newcol.HeaderText = column.HeaderText;
|
|
newcol.HeaderText = column.HeaderText;
|
|
- newcol.AllowFiltering = false;
|
|
|
|
newcol.AllowSorting = false;
|
|
newcol.AllowSorting = false;
|
|
newcol.FilterRowOptionsVisibility = Visibility.Collapsed;
|
|
newcol.FilterRowOptionsVisibility = Visibility.Collapsed;
|
|
|
|
|