feat(LookupFilter): support LookupServiceKey (#2406)

* LookupService bug

* feat: 增加 TableFilter Lookup 支持

* Revert "LookupService bug"

This reverts commit ab9c32b.

* refactor: 重构部分代码

* doc: 更新注释文档

---------

Co-authored-by: Alex chow <[email protected]>

Author: ArgoZhang

src/BootstrapBlazor/Components/Filters/TableFilter.razor

@@ -12,7 +12,7 @@ else
         <i class="@FilterClassString" data-bs-placement="bottom" data-bs-auto-close="outside" data-bs-toggle="bb.dropdown" data-bs-custom-class="shadow">
         </i>
         <div class="card filter-item">
-            <div class="card-header"><span>@Title</span></div>
+            <div class="card-header"><span>@_title</span></div>
             <div class="card-body">
                 @RenderFilter(Column)
             </div>
@@ -21,8 +21,8 @@ else
                     <RenderTemplate>
                         @if (ShowMoreButton)
                         {
-                            <Button Color="Color.None" OnClick="OnClickPlus" Icon="@PlusIcon" IsDisabled="@(Count == 1)"></Button>
-                            <Button Color="Color.None" OnClick="OnClickMinus" Icon="@MinusIcon" IsDisabled="@(Count == 0)"></Button>
+                            <Button Color="Color.None" OnClick="OnClickPlus" Icon="@PlusIcon" IsDisabled="@(_count == 1)"></Button>
+                            <Button Color="Color.None" OnClick="OnClickMinus" Icon="@MinusIcon" IsDisabled="@(_count == 0)"></Button>
                         }
                     </RenderTemplate>
                 </div>
@@ -42,11 +42,11 @@ else
         }
         else if (Column.PropertyType.IsEnum())
         {
-            <EnumFilter Type="Column.PropertyType" Count="Count"></EnumFilter>
+            <EnumFilter Type="Column.PropertyType" Count="_count"></EnumFilter>
         }
-        else if (Column.Lookup != null)
+        else if (IsLookup)
         {
-            <LookupFilter Lookup="Column.Lookup" LookupStringComparison="Column.LookupStringComparison" Type="Column.PropertyType"></LookupFilter>
+            <LookupFilter Lookup="_lookup.Value" LookupStringComparison="Column.LookupStringComparison" Type="Column.PropertyType"></LookupFilter>
         }
         else
         {
@@ -57,28 +57,28 @@ else
                     <BoolFilter />
                     break;
                 case nameof(DateTime):
-                    <DateTimeFilter Count="Count" />
+                    <DateTimeFilter Count="_count" />
                     break;
                 case nameof(Int16):
-                    <NumberFilter TType="Int16" Count="@Count" Step="@Step" />
+                    <NumberFilter TType="Int16" Count="@_count" Step="@_step" />
                     break;
                 case nameof(Int32):
-                    <NumberFilter TType="Int32" Count="@Count" Step="@Step" />
+                    <NumberFilter TType="Int32" Count="@_count" Step="@_step" />
                     break;
                 case nameof(Int64):
-                    <NumberFilter TType="Int64" Count="@Count" Step="@Step" />
+                    <NumberFilter TType="Int64" Count="@_count" Step="@_step" />
                     break;
                 case nameof(Single):
-                    <NumberFilter TType="Single" Count="@Count" Step="@Step" />
+                    <NumberFilter TType="Single" Count="@_count" Step="@_step" />
                     break;
                 case nameof(Double):
-                    <NumberFilter TType="Double" Count="@Count" Step="@Step" />
+                    <NumberFilter TType="Double" Count="@_count" Step="@_step" />
                     break;
                 case nameof(Decimal):
-                    <NumberFilter TType="Decimal" Count="@Count" Step="@Step" />
+                    <NumberFilter TType="Decimal" Count="@_count" Step="@_step" />
                     break;
                 case nameof(String):
-                    <StringFilter Count="Count" />
+                    <StringFilter Count="_count" />
                     break;
                 default:
                     <div>@NotSupportedMessage</div>

src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs

@@ -58,8 +58,7 @@ public partial class TableFilter : IFilter
     /// <summary>
     /// 获得/设置 Header 显示文字
     /// </summary>
-    [NotNull]
-    private string? Title { get; set; }
+    private string? _title;
 
     /// <summary>
     /// 获得/设置 相关 Field 字段名称
@@ -70,7 +69,7 @@ public partial class TableFilter : IFilter
     /// <summary>
     /// 获得/设置 条件数量
     /// </summary>
-    private int Count { get; set; }
+    private int _count;
 
     /// <summary>
     /// 获得/设置 是否显示增加减少条件按钮
@@ -132,7 +131,19 @@ public partial class TableFilter : IFilter
     [NotNull]
     private IIconTheme? IconTheme { get; set; }
 
-    private string? Step => Column.Step?.ToString();
+    [Inject]
+    [NotNull]
+    private ILookupService? LookupService { get; set; }
+
+    /// <summary>
+    /// 组件步长
+    /// </summary>
+    private string? _step;
+
+    /// <summary>
+    /// 外键数据源集合
+    /// </summary>
+    private Lazy<IEnumerable<SelectedItem>?> _lookup = default!;
 
     /// <summary>
     /// <inheritdoc/>
@@ -141,9 +152,15 @@ protected override void OnInitialized()
     {
         base.OnInitialized();
 
-        Title = Column.GetDisplayName();
+        _title = Column.GetDisplayName();
         FieldKey = Column.GetFieldName();
         Column.Filter = this;
+
+        _lookup = new(() => Column.Lookup ?? (!string.IsNullOrEmpty(Column.LookupServiceKey)
+            ? LookupService.GetItemsByKey(Column.LookupServiceKey)
+            : null)
+        );
+        _step = Column.Step?.ToString();
     }
 
     /// <summary>
@@ -165,7 +182,7 @@ protected override void OnParametersSet()
             var filter = action.GetFilterConditions();
             if (filter.Filters?.Count > 1)
             {
-                Count = 1;
+                _count = 1;
             }
         }
     }
@@ -188,7 +205,7 @@ protected override async Task InvokeInitAsync()
     /// <returns></returns>
     private async Task OnClickReset()
     {
-        Count = 0;
+        _count = 0;
 
         if (Table != null)
         {
@@ -231,9 +248,9 @@ internal async Task OnFilterAsync()
     /// <returns></returns>
     private void OnClickPlus()
     {
-        if (Count == 0)
+        if (_count == 0)
         {
-            Count++;
+            _count++;
         }
     }
 
@@ -243,9 +260,11 @@ private void OnClickPlus()
     /// <returns></returns>
     private void OnClickMinus()
     {
-        if (Count == 1)
+        if (_count == 1)
         {
-            Count--;
+            _count--;
         }
     }
+
+    private bool IsLookup => Column.Lookup != null || !string.IsNullOrEmpty(Column.LookupServiceKey);
 }