Revert "fix(ITableColumn): add GetTooltipText method (#4889)"

This reverts commit 06ed5f0.

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor

@@ -71,7 +71,7 @@
         <TableColumns>
             <TableColumn @bind-Field="@context.DateTime" Width="180" Text="@Localizer["TablesWrapDataResizingColumHeaderText_DateTime"]" />
             <TableColumn @bind-Field="@context.Name" Text="@Localizer["TablesWrapDataResizingColumHeaderText_Name"]" />
-            <TableColumn @bind-Field="@context.Address" Text="@Localizer["TablesWrapDataResizingColumHeaderText_Address"]" Width="200" TextEllipsis="true" ShowTips="true" GetTooltipText="GetTooltipText" />
+            <TableColumn @bind-Field="@context.Address" Text="@Localizer["TablesWrapDataResizingColumHeaderText_Address"]" Width="200" TextEllipsis="true" ShowTips="true" GetTooltipTextCallback="GetTooltipTextCallback" />
             <TableColumn @bind-Field="@context.Education" />
             <TableColumn @bind-Field="@context.Count" />
             <TableColumn @bind-Field="@context.Complete" />

src/BootstrapBlazor.Server/Components/Samples/Table/TablesWrap.razor.cs

@@ -38,12 +38,14 @@ private Task<QueryData<Foo>> OnQueryAsync(QueryPageOptions options)
         return Task.FromResult(new QueryData<Foo>() { Items = items, TotalCount = total, IsSorted = true, IsFiltered = true, IsSearch = true });
     }
 
-    private static string? GetTooltipText(object? v)
+    private async Task<string?> GetTooltipTextCallback(object? v)
     {
+        await Task.Delay(0);
+
         var ret = string.Empty;
         if (v is Foo foo)
         {
-            ret = $"{foo.Name}-{foo.Address}";
+            ret = $"{foo.Name}-{DateTime.Now}";
         }
         return ret;
     }

src/BootstrapBlazor.Server/Locales/en-US.json

@@ -5265,7 +5265,7 @@
     "TablesWrapDataResizingTips1": "You can drag the window size, and the <b>address</b> column will be automatically omitted if the window is too small",
     "TablesWrapDataResizingTips2": "Enable text ellipsis by setting <code>TextEllipsis</code>",
     "TablesWrapDataResizingTips3": "<b>Note:</b> It is recommended to use <code>Width</code> 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 <code>ShowTips</code> property to control whether to display all the text on mouse hover, the default is <code>false</code>, You can customize the display content of <code>Tooltip</code> by setting the <code>GetTooltipText</code> callback method",
+    "TablesWrapDataResizingTips4": "After the text in the cell is omitted, you can use the <code>ShowTips</code> property to control whether to display all the text on mouse hover, the default is <code>false</code>, You can customize the display content of <code>Tooltip</code> by setting the <code>GetTooltipTextCallback</code> 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",

src/BootstrapBlazor.Server/Locales/zh-CN.json

@@ -5265,7 +5265,7 @@
     "TablesWrapDataResizingTips1": "可以拖动窗口大小，窗口过小时 <b>地址</b> 列自动进行省略处理",
     "TablesWrapDataResizingTips2": "通过设置 <code>TextEllipsis</code> 来开启文本超长省略功能",
     "TablesWrapDataResizingTips3": "<b>注意：</b>推荐使用 <code>Width</code> 对列宽度进行设置，如未设置列宽内部自动使用 200px 宽度",
-    "TablesWrapDataResizingTips4": "单元格内文本被省略后，可以通过 <code>ShowTips</code> 属性来控制鼠标悬停是否显示全部文本，默认为 <code>false</code>，通过设置 <code>GetTooltipText</code> 回调方法可以自定义 <code>Tooltip</code> 显示内容；注意异步方法 <code>GetTooltipTextCallback</code> 已弃用请勿使用",
+    "TablesWrapDataResizingTips4": "单元格内文本被省略后，可以通过 <code>ShowTips</code> 属性来控制鼠标悬停是否显示全部文本，默认为 <code>false</code>，通过设置 <code>GetTooltipTextCallback</code> 回调方法可以自定义 <code>Tooltip</code> 显示内容",
     "TablesWrapDataResizingTips5": "拖动地址列，单元格显示内容自动增加与减少",
     "TablesWrapCustomCellTitle": "自定义单元格内排版",
     "TablesWrapCustomCellIntro": "使用模板对单元格内数据进行特殊布局",

src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs

@@ -203,15 +203,8 @@ public class AutoGenerateColumnAttribute : AutoGenerateBaseAttribute, ITableColu
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")]
-    [ExcludeFromCodeCoverage]
     Func<object?, Task<string?>>? ITableColumn.GetTooltipTextCallback { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    Func<object?, string?>? ITableColumn.GetTooltipText { get; set; }
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/Table/ITableColumn.cs

@@ -143,15 +143,8 @@ public interface ITableColumn : IEditorItem
     /// <summary>
     /// 获得/设置 鼠标悬停提示自定义内容回调委托 默认 null 使用当前值
     /// </summary>
-    [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")]
-    [ExcludeFromCodeCoverage]
     Func<object?, Task<string?>>? GetTooltipTextCallback { get; set; }
 
-    /// <summary>
-    /// 获得/设置 鼠标悬停提示自定义内容回调委托 默认 null 使用当前值
-    /// </summary>
-    Func<object?, string?>? GetTooltipText { get; set; }
-
     /// <summary>
     /// 获得/设置 单元格回调方法
     /// </summary>

src/BootstrapBlazor/Components/Table/InternalTableColumn.cs

@@ -133,18 +133,8 @@ class InternalTableColumn(string fieldName, Type fieldType, string? fieldText =
 
     public bool? ShowTips { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")]
-    [ExcludeFromCodeCoverage]
     public Func<object?, Task<string?>>? GetTooltipTextCallback { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public Func<object?, string?>? GetTooltipText { get; set; }
-
     public Type PropertyType { get; } = fieldType;
 
     [ExcludeFromCodeCoverage]

src/BootstrapBlazor/Components/Table/TableColumn.cs

@@ -269,16 +269,8 @@ public class TableColumn<TItem, TType> : BootstrapComponentBase, ITableColumn
     /// <inheritdoc/>
     /// </summary>
     [Parameter]
-    [Obsolete("已弃用，请使用同步方法 GetTooltipText；Deprecated, please use the synchronous method GetTooltipText")]
-    [ExcludeFromCodeCoverage]
     public Func<object?, Task<string?>>? GetTooltipTextCallback { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    [Parameter]
-    public Func<object?, string?>? GetTooltipText { get; set; }
-
     /// <summary>
     /// 获得/设置 列 td 自定义样式 默认为 null 未设置
     /// </summary>

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;
@@ -238,14 +238,14 @@ internal static RenderFragment RenderColor<TItem>(this ITableColumn col, TItem i
         builder.CloseElement();
     };
 
-    private static RenderFragment RenderTooltip<TItem>(this ITableColumn col, string? text, TItem item) => pb =>
+    private static RenderFragment RenderTooltip<TItem>(this ITableColumn col, string? text, TItem item) => async pb =>
     {
         if (col.GetShowTips())
         {
             var tooltipText = text;
-            if (col.GetTooltipText != null)
+            if (col.GetTooltipTextCallback != null)
             {
-                tooltipText = col.GetTooltipText(item);
+                tooltipText = await col.GetTooltipTextCallback(item);
             }
             pb.OpenComponent<Tooltip>(0);
             pb.AddAttribute(1, nameof(Tooltip.Title), tooltipText);

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);