diff --git a/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor b/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor
index f68db863a7c..3e69a064fa6 100644
--- a/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor
+++ b/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor
@@ -1,4 +1,4 @@
@namespace BootstrapBlazor.Components
@inherits FilterBase
-
@NotSupportedMessage
+@(new MarkupString(NotSupportedColumnFilterMessage))
diff --git a/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs
index 3080a5b7021..ed55ea50916 100644
--- a/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs
+++ b/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs
@@ -14,7 +14,8 @@ public partial class NotSupportFilter
/// 获得/设置 不支持过滤类型提示信息 默认 null 读取资源文件内容
///
[Parameter]
- public string? NotSupportedMessage { get; set; }
+ [NotNull]
+ public string? NotSupportedColumnFilterMessage { get; set; }
///
///
@@ -23,7 +24,7 @@ protected override void OnParametersSet()
{
base.OnParametersSet();
- NotSupportedMessage ??= Localizer[nameof(NotSupportedMessage)];
+ NotSupportedColumnFilterMessage ??= Localizer[nameof(NotSupportedColumnFilterMessage)];
}
///
diff --git a/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor b/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor
index 8e13d931832..3ac2891ac67 100644
--- a/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor
+++ b/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor
@@ -89,7 +89,8 @@ else
break;
default:
-
+
+
break;
}
diff --git a/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor.cs
index 144d11d10ec..3d5cfe282c0 100644
--- a/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor.cs
+++ b/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor.cs
@@ -28,7 +28,15 @@ public partial class TableColumnFilter : IFilter
/// 获得/设置 不支持过滤类型提示信息 默认 null 读取资源文件内容
///
[Parameter]
- public string? NotSupportedMessage { get; set; }
+ [ExcludeFromCodeCoverage]
+ [Obsolete("已弃用,请使用 NotSupportedColumnFilterMessage 参数; Deprecated, please use NotSupportedColumnFilterMessage parameter")]
+ public string? NotSupportedMessage { get => NotSupportedColumnFilterMessage; set => NotSupportedColumnFilterMessage = value; }
+
+ ///
+ /// 获得/设置 不支持过滤类型提示信息 默认 null 读取资源文件内容
+ ///
+ [Parameter]
+ public string? NotSupportedColumnFilterMessage { get; set; }
///
/// 获得 相关联 ITableColumn 实例
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 3a3d295b12b..015bc9f1397 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -586,7 +586,11 @@
}
@if (col.GetFilterable() && !ShowFilterHeader)
{
-
+
+
}
@if (col.GetSortable())
{
@@ -655,7 +659,9 @@
@if(col.GetFilterable())
{
-
+
+
}
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index fc49e0d2cdb..31eb1c3c2d2 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -16,6 +16,12 @@ namespace BootstrapBlazor.Components;
[CascadingTypeParameter(nameof(TItem))]
public partial class Table : ITable, IModelEqualityComparer where TItem : class
{
+ ///
+ /// 获得/设置 不支持过滤类型提示信息 默认 null 读取资源文件内容
+ ///
+ [Parameter]
+ public string? NotSupportedColumnFilterMessage { get; set; }
+
///
/// 获得/设置 Loading 模板
///
diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json
index 4ac10f71911..bab4144d7ae 100644
--- a/src/BootstrapBlazor/Locales/en.json
+++ b/src/BootstrapBlazor/Locales/en.json
@@ -274,7 +274,7 @@
"Contains": "Contains",
"NotContains": "NotContains",
"EnumFilter.AllText": "All",
- "NotSupportedMessage": "Unsupported filter type, Please customize the filter use FilterTemplate",
+ "NotSupportedColumnFilterMessage": "Unsupported filter type, Please customize the filter use FilterTemplate
",
"MultiFilterSearchPlaceHolderText": "Please enter ...",
"MultiFilterSelectAllText": "Select All"
},
diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json
index 84ba7dc3a27..043e283ba57 100644
--- a/src/BootstrapBlazor/Locales/zh.json
+++ b/src/BootstrapBlazor/Locales/zh.json
@@ -274,7 +274,7 @@
"Contains": "包含",
"NotContains": "不包含",
"EnumFilter.AllText": "全选",
- "NotSupportedMessage": "不支持的类型,请使用 FilterTemplate 自定义过滤组件",
+ "NotSupportedColumnFilterMessage": "不支持的类型,请使用 FilterTemplate 自定义过滤组件
",
"MultiFilterSearchPlaceHolderText": "请输入 ...",
"MultiFilterSelectAllText": "全选"
},
diff --git a/test/UnitTest/Components/TableNotSupportFilterTest.cs b/test/UnitTest/Components/TableNotSupportFilterTest.cs
index ddefe72a1c8..f522c8cf0b6 100644
--- a/test/UnitTest/Components/TableNotSupportFilterTest.cs
+++ b/test/UnitTest/Components/TableNotSupportFilterTest.cs
@@ -12,11 +12,12 @@ public void OnFilterAsync_Ok()
{
var cut = Context.RenderComponent(pb =>
{
+ pb.Add(a => a.NotSupportedColumnFilterMessage, "不支持的类型");
pb.Add(a => a.Table, new MockTable());
pb.Add(a => a.Column, new MockColumn());
});
- cut.Contains("不支持的类型,请使用 FilterTemplate 自定义过滤组件");
+ cut.Contains("不支持的类型");
var filter = cut.FindComponent();
var conditions = filter.Instance.GetFilterConditions();
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index 4ed8392766a..cf3fb5b1278 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -451,6 +451,7 @@ public async Task CustomSearch_Ok()
{
pb.AddChildContent>(pb =>
{
+ pb.Add(a => a.NotSupportedColumnFilterMessage, "test-not-support");
pb.Add(a => a.SearchText, "张三");
pb.Add(a => a.TableColumns, foo => builder =>
{