|
@@ -667,8 +667,6 @@ public class DynamicGridTreeUIComponent<T, TKey> : IDynamicGridUIComponent<T>, I
|
|
|
reloadColumns = true;
|
|
|
}
|
|
|
|
|
|
- _tree.AllowFiltering = Parent.Options.FilterRows;
|
|
|
-
|
|
|
if (Parent.Options.DragSource)
|
|
|
{
|
|
|
if (!_tree.AllowDraggingRows)
|
|
@@ -1061,8 +1059,6 @@ public class DynamicGridTreeUIComponent<T, TKey> : IDynamicGridUIComponent<T>, I
|
|
|
|
|
|
private void ApplyFilterStyle(TreeGridColumn column, bool filtering, bool isactioncolumn)
|
|
|
{
|
|
|
- column.AllowFiltering = false;
|
|
|
-
|
|
|
var filterstyle = new Style();
|
|
|
if (filtering)
|
|
|
{
|
|
@@ -1079,7 +1075,6 @@ public class DynamicGridTreeUIComponent<T, TKey> : IDynamicGridUIComponent<T>, I
|
|
|
filterstyle.Setters.Add(new Setter(Control.BackgroundProperty, new SolidColorBrush(Colors.Gainsboro)));
|
|
|
filterstyle.Setters.Add(new Setter(Control.IsEnabledProperty, false));
|
|
|
column.ColumnFilter = ColumnFilter.Value;
|
|
|
- column.AllowFiltering = false;
|
|
|
column.AllowSorting = false;
|
|
|
}
|
|
|
}
|
|
@@ -1104,6 +1099,8 @@ public class DynamicGridTreeUIComponent<T, TKey> : IDynamicGridUIComponent<T>, I
|
|
|
|
|
|
private void SetFilterUIButton(TreeGridColumn gridColumn, DynamicColumnBase column)
|
|
|
{
|
|
|
+ if (!Parent.Options.FilterRows || !Parent.CanFilter()) return;
|
|
|
+
|
|
|
if (Parent.GetColumnFilter(column) is not IDynamicGridColumnFilter filter) return;
|
|
|
|
|
|
var vertical = column is DynamicActionColumn ac && ac.VerticalHeader && !ac.HeaderText.IsNullOrWhiteSpace();
|
|
@@ -1219,7 +1216,6 @@ public class DynamicGridTreeUIComponent<T, TKey> : IDynamicGridUIComponent<T>, I
|
|
|
newcol.Width = column.Width;
|
|
|
newcol.ColumnSizer = TreeColumnSizer.None;
|
|
|
newcol.HeaderText = column.HeaderText;
|
|
|
- //newcol.AllowFiltering = column.Filters != null && column.Filters.Any();
|
|
|
newcol.AllowSorting = false;
|
|
|
newcol.ShowHeaderToolTip = column.ToolTip != null;
|
|
|
|
|
@@ -1243,7 +1239,6 @@ public class DynamicGridTreeUIComponent<T, TKey> : IDynamicGridUIComponent<T>, I
|
|
|
newcol.Width = tmplCol.Width;
|
|
|
newcol.ColumnSizer = TreeColumnSizer.None;
|
|
|
newcol.HeaderText = column.HeaderText;
|
|
|
- //newcol.AllowFiltering = false;
|
|
|
newcol.AllowSorting = false;
|
|
|
newcol.ShowToolTip = false;
|
|
|
newcol.ShowHeaderToolTip = false;
|