diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index dfb5556c0d05dd9c04bbc7ba9e7056eba46fda48..363aa2f31e78d6b486b78817a55a6bae546c0a29 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 7.2.0 + 7.2.1-beta01 diff --git a/src/BootstrapBlazor/Components/Filters/BoolFilter.razor b/src/BootstrapBlazor/Components/Filters/BoolFilter.razor index 7bfc6b0c9933d8925ef8fdd665a8c7245f7d82fb..4b340ef825716b7c5ef48b02f60bec55b6ed0434 100644 --- a/src/BootstrapBlazor/Components/Filters/BoolFilter.razor +++ b/src/BootstrapBlazor/Components/Filters/BoolFilter.razor @@ -3,7 +3,7 @@ @if (IsHeaderRow) { - + } else { diff --git a/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor b/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor index f022f5d159c9ee7502b87a3ff5a4edfc95c0304c..68d693bfd372d11541e0a26252e68c7c4d2cfd10 100644 --- a/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor +++ b/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor @@ -4,7 +4,7 @@ @if (IsHeaderRow) {
- +
} diff --git a/src/BootstrapBlazor/Components/Filters/EnumFilter.razor b/src/BootstrapBlazor/Components/Filters/EnumFilter.razor index 7bfc6b0c9933d8925ef8fdd665a8c7245f7d82fb..4b340ef825716b7c5ef48b02f60bec55b6ed0434 100644 --- a/src/BootstrapBlazor/Components/Filters/EnumFilter.razor +++ b/src/BootstrapBlazor/Components/Filters/EnumFilter.razor @@ -3,7 +3,7 @@ @if (IsHeaderRow) { - + } else { diff --git a/src/BootstrapBlazor/Components/Filters/LookupFilter.razor b/src/BootstrapBlazor/Components/Filters/LookupFilter.razor index e5eaa493985c6c6fa6d2891c7542f932bbd2075e..8ed4a48d0a51f72261960c0763a7cf83451411d6 100644 --- a/src/BootstrapBlazor/Components/Filters/LookupFilter.razor +++ b/src/BootstrapBlazor/Components/Filters/LookupFilter.razor @@ -3,7 +3,7 @@ @if (IsHeaderRow) { - + } else { diff --git a/src/BootstrapBlazor/Components/Filters/TableFilter.razor b/src/BootstrapBlazor/Components/Filters/TableFilter.razor index 9209db91b0709c7dd1ffb9f8818d5e73ca1fec75..35d5de36624a17ebacd9293e686939b7e2a0fc64 100644 --- a/src/BootstrapBlazor/Components/Filters/TableFilter.razor +++ b/src/BootstrapBlazor/Components/Filters/TableFilter.razor @@ -78,7 +78,7 @@ else break; default: -
不支持的类型
+
@NotSupportedMessage
break; }; } diff --git a/src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs index a941e6129f64b8f93f2e56b5448bc6d04ee7d5a7..fcf07e090e46038622f42018ade4623d5d316069 100644 --- a/src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs @@ -38,6 +38,12 @@ public partial class TableFilter : IFilter [Parameter] public string? Icon { get; set; } + /// + /// 获得/设置 不支持过滤类型提示信息 默认 null 读取资源文件内容 + /// + [Parameter] + public string? NotSupportedMessage { get; set; } + /// /// 获得/设置 Header 显示文字 /// @@ -134,6 +140,7 @@ public partial class TableFilter : IFilter FilterButtonText ??= Localizer[nameof(FilterButtonText)]; ClearButtonText ??= Localizer[nameof(ClearButtonText)]; + NotSupportedMessage ??= Localizer[nameof(NotSupportedMessage)]; } /// diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index 46b881493e0050361e25b3893418acf27be0baf6..926c7a45dd11471bf90b021214bbb40e4e7fd5cd 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -548,22 +548,20 @@ RenderFragment RenderHeader => hasScroll =>
 
} - - @foreach (var col in GetColumns()) + @foreach (var col in GetColumns()) + { + if (CheckShownWithBreakpoint(col)) { - if (CheckShownWithBreakpoint(col)) - { - -
- @if(col.Filterable) - { - - } -
- - } + +
+ @if(col.Filterable) + { + + } +
+ } -
+ } @if (ShowExtendButtons && !IsExtendButtonsInRowHeader) { diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json index 4947ea9a42f2286475ac50621c6f5e7b577f9398..89713f09d58eaf68b01831e5f4052facf344ef68 100644 --- a/src/BootstrapBlazor/Locales/en.json +++ b/src/BootstrapBlazor/Locales/en.json @@ -255,7 +255,8 @@ "NotEqual": "NotEqual", "Contains": "Contains", "NotContains": "NotContains", - "EnumFilter.AllText": "All" + "EnumFilter.AllText": "All", + "NotSupportedMessage": "Not supported filter type, Please custom filter use FilterTemplate" }, "BootstrapBlazor.Components.FilterLogicItem": { "And": "And", diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json index e59762b1dee1bef169d2aa2a4639ba8461865e7b..eb5fb957c10c2bf69455c56f60f026ebe4448565 100644 --- a/src/BootstrapBlazor/Locales/zh.json +++ b/src/BootstrapBlazor/Locales/zh.json @@ -255,7 +255,8 @@ "NotEqual": "不等于", "Contains": "包含", "NotContains": "不包含", - "EnumFilter.AllText": "全选" + "EnumFilter.AllText": "全选", + "NotSupportedMessage": "不支持的类型,请使用 FilterTemplate 自定义过滤组件" }, "BootstrapBlazor.Components.FilterLogicItem": { "And": "并且",