diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor index 8addf587309..25058f8a333 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor @@ -71,7 +71,7 @@ - + diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor.cs index 594dca8afdc..01e861327ba 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor.cs @@ -38,8 +38,10 @@ private Task> OnQueryAsync(QueryPageOptions options) return Task.FromResult(new QueryData() { Items = items, TotalCount = total, IsSorted = true, IsFiltered = true, IsSearch = true }); } - private static string? GetTooltipText(object? v) + private static async Task GetTooltipTextCallback(object? v) { + await Task.Delay(5); + var ret = string.Empty; if (v is Foo foo) { diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 26f452c2375..5e1703492b5 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -5265,7 +5265,7 @@ "TablesWrapDataResizingTips1": "You can drag the window size, and the address column will be automatically omitted if the window is too small", "TablesWrapDataResizingTips2": "Enable text ellipsis by setting TextEllipsis", "TablesWrapDataResizingTips3": "Note: It is recommended to use Width to set the column width. If the column width is not set, it will automatically use 200px width inside", - "TablesWrapDataResizingTips4": "After the text in the cell is omitted, you can use the ShowTips property to control whether to display all the text on mouse hover, the default is false, You can customize the display content of Tooltip by setting the GetTooltipText callback method", + "TablesWrapDataResizingTips4": "After the text in the cell is omitted, you can use the ShowTips property to control whether to display all the text on mouse hover, the default is false, You can customize the display content of Tooltip by setting the GetTooltipTextCallback callback method", "TablesWrapDataResizingTips5": "Drag the address column, the cell display content will automatically increase and decrease", "TablesWrapCustomCellTitle": "Custom in-cell typography", "TablesWrapCustomCellIntro": "Use templates for special layout of in-cell data", diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index 717d5cd4020..90ab5c6286b 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -5265,7 +5265,7 @@ "TablesWrapDataResizingTips1": "可以拖动窗口大小，窗口过小时 地址 列自动进行省略处理", "TablesWrapDataResizingTips2": "通过设置 TextEllipsis 来开启文本超长省略功能", "TablesWrapDataResizingTips3": "注意：推荐使用 Width 对列宽度进行设置，如未设置列宽内部自动使用 200px 宽度", - "TablesWrapDataResizingTips4": "单元格内文本被省略后，可以通过 ShowTips 属性来控制鼠标悬停是否显示全部文本，默认为 false，通过设置 GetTooltipText 回调方法可以自定义 Tooltip 显示内容；注意异步方法 GetTooltipTextCallback 已弃用请勿使用", + "TablesWrapDataResizingTips4": "单元格内文本被省略后，可以通过 ShowTips 属性来控制鼠标悬停是否显示全部文本，默认为 false，通过设置 GetTooltipTextCallback 回调方法可以自定义 Tooltip 显示内容", "TablesWrapDataResizingTips5": "拖动地址列，单元格显示内容自动增加与减少", "TablesWrapCustomCellTitle": "自定义单元格内排版", "TablesWrapCustomCellIntro": "使用模板对单元格内数据进行特殊布局", diff --git a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs index f8abcf4bee2..4f4d105913a 100644 --- a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs +++ b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs @@ -203,15 +203,8 @@ public class AutoGenerateColumnAttribute : AutoGenerateBaseAttribute, ITableColu /// /// /// - [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")] - [ExcludeFromCodeCoverage] Func>? ITableColumn.GetTooltipTextCallback { get; set; } - /// - /// - /// - Func? ITableColumn.GetTooltipText { get; set; } - /// /// /// diff --git a/src/BootstrapBlazor/Components/Table/ITableColumn.cs b/src/BootstrapBlazor/Components/Table/ITableColumn.cs index 9092c601fdf..ab4eb4561eb 100644 --- a/src/BootstrapBlazor/Components/Table/ITableColumn.cs +++ b/src/BootstrapBlazor/Components/Table/ITableColumn.cs @@ -143,15 +143,8 @@ public interface ITableColumn : IEditorItem /// /// 获得/设置 鼠标悬停提示自定义内容回调委托 默认 null 使用当前值 /// - [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")] - [ExcludeFromCodeCoverage] Func>? GetTooltipTextCallback { get; set; } - /// - /// 获得/设置 鼠标悬停提示自定义内容回调委托 默认 null 使用当前值 - /// - Func? GetTooltipText { get; set; } - /// /// 获得/设置 单元格回调方法 /// diff --git a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs index 6bdfbdb0a2b..e5e574d86fe 100644 --- a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs +++ b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs @@ -133,18 +133,8 @@ class InternalTableColumn(string fieldName, Type fieldType, string? fieldText = public bool? ShowTips { get; set; } - /// - /// - /// - [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")] - [ExcludeFromCodeCoverage] public Func>? GetTooltipTextCallback { get; set; } - /// - /// - /// - public Func? GetTooltipText { get; set; } - public Type PropertyType { get; } = fieldType; [ExcludeFromCodeCoverage] diff --git a/src/BootstrapBlazor/Components/Table/TableColumn.cs b/src/BootstrapBlazor/Components/Table/TableColumn.cs index 76828c83a74..217091be838 100644 --- a/src/BootstrapBlazor/Components/Table/TableColumn.cs +++ b/src/BootstrapBlazor/Components/Table/TableColumn.cs @@ -269,16 +269,8 @@ public class TableColumn : BootstrapComponentBase, ITableColumn /// /// [Parameter] - [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")] - [ExcludeFromCodeCoverage] public Func>? GetTooltipTextCallback { get; set; } - /// - /// - /// - [Parameter] - public Func? GetTooltipText { get; set; } - /// /// 获得/设置 列 td 自定义样式 默认为 null 未设置 /// diff --git a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs index 9f15dd9ed22..5999ea3625e 100644 --- a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs +++ b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs @@ -55,6 +55,12 @@ public partial class Tooltip : ITooltip [Parameter] public string? Title { get; set; } + /// + /// 获得/设置 获得显示内容异步回调方法 默认 null + /// + [Parameter] + public Func>? GetTitleCallback { get; set; } + /// /// 获得/设置 显示文字是否为 Html 默认为 false /// @@ -119,6 +125,20 @@ protected override void OnParametersSet() Trigger ??= "focus hover"; } + /// + /// + /// + /// + protected override async Task OnParametersSetAsync() + { + await base.OnParametersSetAsync(); + + if (string.IsNullOrEmpty(Title) && GetTitleCallback != null) + { + Title ??= await GetTitleCallback(); + } + } + /// /// 设置参数方法 /// diff --git a/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs b/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs index d19db18bba5..01f0d7646b1 100644 --- a/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs +++ b/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs @@ -105,7 +105,7 @@ private static void CopyValue(this ITableColumn col, ITableColumn dest) if (col.IsVisibleWhenEdit.HasValue) dest.IsVisibleWhenEdit = col.IsVisibleWhenEdit; if (col.IsReadonlyWhenAdd.HasValue) dest.IsReadonlyWhenAdd = col.IsReadonlyWhenAdd; if (col.IsReadonlyWhenEdit.HasValue) dest.IsReadonlyWhenEdit = col.IsReadonlyWhenEdit; - if (col.GetTooltipText != null) dest.GetTooltipText = col.GetTooltipText; + if (col.GetTooltipTextCallback != null) dest.GetTooltipTextCallback = col.GetTooltipTextCallback; if (col.CustomSearch != null) dest.CustomSearch = col.CustomSearch; if (col.ToolboxTemplate != null) dest.ToolboxTemplate = col.ToolboxTemplate; if (col.IsRequiredWhenAdd.HasValue) dest.IsRequiredWhenAdd = col.IsRequiredWhenAdd; @@ -242,32 +242,36 @@ private static RenderFragment RenderTooltip(this ITableColumn col, string { if (col.GetShowTips()) { + pb.OpenComponent(0); + pb.SetKey(item); var tooltipText = text; - if (col.GetTooltipText != null) + if (col.GetTooltipTextCallback != null) { - tooltipText = col.GetTooltipText(item); + pb.AddAttribute(10, nameof(Tooltip.GetTitleCallback), new Func>(() => col.GetTooltipTextCallback(item))); } - pb.OpenComponent(0); - pb.AddAttribute(1, nameof(Tooltip.Title), tooltipText); - pb.AddAttribute(2, "class", "text-truncate d-block"); + else + { + pb.AddAttribute(11, nameof(Tooltip.Title), tooltipText); + } + pb.AddAttribute(12, "class", "text-truncate d-block"); if (col.IsMarkupString) { - pb.AddAttribute(3, nameof(Tooltip.ChildContent), new RenderFragment(builder => builder.AddMarkupContent(0, text))); - pb.AddAttribute(4, nameof(Tooltip.IsHtml), true); + pb.AddAttribute(13, nameof(Tooltip.ChildContent), new RenderFragment(builder => builder.AddMarkupContent(0, text))); + pb.AddAttribute(14, nameof(Tooltip.IsHtml), true); } else { - pb.AddAttribute(3, nameof(Tooltip.ChildContent), new RenderFragment(builder => builder.AddContent(0, text))); + pb.AddAttribute(15, nameof(Tooltip.ChildContent), new RenderFragment(builder => builder.AddContent(0, text))); } pb.CloseComponent(); } else if (col.IsMarkupString) { - pb.AddMarkupContent(3, text); + pb.AddMarkupContent(20, text); } else { - pb.AddContent(4, text); + pb.AddContent(30, text); } }; diff --git a/test/UnitTest/Attributes/AutoGenerateClassTest.cs b/test/UnitTest/Attributes/AutoGenerateClassTest.cs index 686ed3b0686..f77ed200a4d 100644 --- a/test/UnitTest/Attributes/AutoGenerateClassTest.cs +++ b/test/UnitTest/Attributes/AutoGenerateClassTest.cs @@ -156,8 +156,8 @@ public void AutoGenerateColumn_Ok() attrInterface.IsReadonlyWhenEdit = true; Assert.True(attrInterface.IsReadonlyWhenEdit); - attrInterface.GetTooltipText = _ => "Test"; - Assert.NotNull(attrInterface.GetTooltipText); + attrInterface.GetTooltipTextCallback = _ => Task.FromResult((string?)"Test"); + Assert.NotNull(attrInterface.GetTooltipTextCallback); attrInterface.CustomSearch = (_, _) => new SearchFilterAction("test", "test"); Assert.NotNull(attrInterface.CustomSearch); diff --git a/test/UnitTest/Components/TableColumnTest.cs b/test/UnitTest/Components/TableColumnTest.cs index e98861997a3..a4b48452c31 100644 --- a/test/UnitTest/Components/TableColumnTest.cs +++ b/test/UnitTest/Components/TableColumnTest.cs @@ -77,7 +77,7 @@ public void InternalTableColumn_Ok() SetValue("HeaderTextTooltip", "Test"); SetValue("HeaderTextEllipsis", true); SetValue("IsMarkupString", true); - SetValue("GetTooltipText", new Func(_ => "")); + SetValue("GetTooltipTextCallback", new Func>(_ => Task.FromResult((string?)""))); SetValue("CustomSearch", new Func((_, _) => new SearchFilterAction("test", "test"))); SetValue("Required", true); diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index 376f1aa22b2..76503ae1d35 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -4916,7 +4916,7 @@ public void ShowTips_Ok(bool markup) } [Fact] - public void GetTooltipText_Ok() + public void GetTooltipTextCallback_Ok() { var localizer = Context.Services.GetRequiredService>(); var items = Foo.GenerateFoo(localizer, 2); @@ -4934,8 +4934,9 @@ public void GetTooltipText_Ok() builder.AddAttribute(3, "Editable", true); builder.AddAttribute(7, "Text", "test"); builder.AddAttribute(9, "ShowTips", true); - builder.AddAttribute(10, "GetTooltipText", new Func(v => + builder.AddAttribute(10, "GetTooltipTextCallback", new Func>(async v => { + await Task.Delay(0); return "test-tips-callback"; })); builder.CloseComponent(); diff --git a/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs b/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs index e86cd17dd30..91de55e0d53 100644 --- a/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs +++ b/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs @@ -106,7 +106,7 @@ public void CopyValue_Ok() Step = "0.01", Order = -1, IsMarkupString = true, - GetTooltipText = _ => null, + GetTooltipTextCallback = _ => Task.FromResult(null), CustomSearch = (_, _) => new SearchFilterAction("test", "test"), Required = true, @@ -169,7 +169,7 @@ public void CopyValue_Ok() Assert.True(col.ShowCopyColumn); Assert.Equal("0.01", col.Step); Assert.Equal(-1, col.Order); - Assert.NotNull(col.GetTooltipText); + Assert.NotNull(col.GetTooltipTextCallback); Assert.True(col.IsMarkupString); Assert.NotNull(col.CustomSearch);