diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 08b305101ad73476b0bf9055bf1de7f43070540c..4263800b8d5b525ae2ad3c7ce8feb0adefeb119b 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 6.3.3-beta02 + 6.3.3-beta03 diff --git a/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs b/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs index a60040e3c8999d7f6e6d3308f65d1407fe7fac3d..aadbb4eafcc1ed57e99210159d816b8f745f51ca 100644 --- a/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs +++ b/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs @@ -67,15 +67,15 @@ public class DataTableDynamicContext : DynamicObjectContext DynamicObjectType = dynamicType; // 获得显示列 - Columns = InternalTableColumn.GetProperties(DynamicObjectType, cols).Where(col => GetShownColumns(col.GetFieldName(), invisibleColumns, shownColumns, hiddenColumns)).ToList(); + Columns = InternalTableColumn.GetProperties(DynamicObjectType, cols).Where(col => GetShownColumns(col, invisibleColumns, shownColumns, hiddenColumns)).ToList(); OnValueChanged = OnCellValueChanged; } - private static bool GetShownColumns(string columnName, IEnumerable? invisibleColumns, IEnumerable? shownColumns, IEnumerable? hiddenColumns) + private static bool GetShownColumns(ITableColumn col, IEnumerable? invisibleColumns, IEnumerable? shownColumns, IEnumerable? hiddenColumns) { var ret = true; - + var columnName = col.GetFieldName(); if (invisibleColumns != null && invisibleColumns.Any(c => c.Equals(columnName, StringComparison.OrdinalIgnoreCase))) { ret = false; @@ -84,13 +84,13 @@ public class DataTableDynamicContext : DynamicObjectContext // 隐藏列优先 移除隐藏列 if (ret && hiddenColumns != null && hiddenColumns.Any(c => c.Equals(columnName, StringComparison.OrdinalIgnoreCase))) { - ret = false; + col.Visible = false; } // 显示列不存在时 不显示 if (ret && shownColumns != null && !shownColumns.Any(c => c.Equals(columnName, StringComparison.OrdinalIgnoreCase))) { - ret = false; + col.Visible = true; } return ret; }