refactor: 增加 LookupService 扩展方法

Author: ArgoZhang

src/BootstrapBlazor/Components/EditorForm/EditorForm.razor

@@ -40,12 +40,9 @@
         </div>
     }
 
-    @if (!_inited)
-    {
-        <div class="ef-loading">
-            <Spinner Color="Color.Primary" />
-        </div>
-    }
+    <div class="ef-loading">
+        <Spinner Color="Color.Primary" />
+    </div>
 </div>
 
 @code

src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs

@@ -191,7 +191,6 @@ public partial class EditorForm<TModel> : IShowLabel
         .GroupBy(i => i.GroupOrder).OrderBy(i => i.Key)
         .Select(i => new KeyValuePair<string, IOrderedEnumerable<IEditorItem>>(i.First().GroupName!, i.OrderBy(x => x.Order)));
 
-    private bool _inited;
     private List<IEditorItem>? _itemsCache;
 
     private List<IEditorItem> RenderItems
@@ -238,29 +237,6 @@ protected override void OnParametersSet()
         _itemsCache = null;
     }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="firstRender"></param>
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        await base.OnAfterRenderAsync(firstRender);
-
-        if (firstRender)
-        {
-            foreach (var item in RenderItems)
-            {
-                if (item.Lookup == null && !string.IsNullOrEmpty(item.LookupServiceKey))
-                {
-                    var lookupServcie = item.LookupService ?? LookupService;
-                    item.Lookup = await lookupServcie.GetItemsAsync(item.LookupServiceKey, item.LookupServiceData);
-                }
-            }
-            _inited = true;
-            StateHasChanged();
-        }
-    }
-
     private List<IEditorItem> GetRenderItems()
     {
         var items = new List<IEditorItem>();
@@ -315,7 +291,7 @@ private RenderFragment AutoGenerateTemplate(IEditorItem item) => builder =>
         else
         {
             item.PlaceHolder ??= PlaceHolderText;
-            builder.CreateComponentByFieldType(this, item, Model, ItemChangedType, IsSearch.Value);
+            builder.CreateComponentByFieldType(this, item, Model, ItemChangedType, IsSearch.Value, item.GetLookupService(LookupService));
         }
     };
 

src/BootstrapBlazor/Components/Table/Table.razor.cs

@@ -1141,12 +1141,6 @@ private async Task ProcessFirstRender()
         Columns.Clear();
         Columns.AddRange(cols.OrderFunc());
 
-        // 准备 Lookup 数据
-        foreach (var column in Columns)
-        {
-            column.Lookup ??= await LookupService.GetItemsAsync(column.LookupServiceKey, column.LookupServiceData);
-        }
-
         // 查看是否开启列宽序列化
         _clientColumnWidths = await ReloadColumnWidthFromBrowserAsync();
         ResetColumnWidth();
@@ -1329,7 +1323,7 @@ RenderFragment RenderTemplate() => col.Template == null
             : col.Template(item);
 
         RenderFragment RenderEditTemplate() => col.EditTemplate == null
-            ? new RenderFragment(builder => builder.CreateComponentByFieldType(this, col, item, changedType, false))
+            ? new RenderFragment(builder => builder.CreateComponentByFieldType(this, col, item, changedType, false, col.GetLookupService(LookupService)))
             : col.EditTemplate(item);
     }
 
@@ -1371,7 +1365,7 @@ void SetDynamicEditTemplate()
                     parameters.Add(new(nameof(ValidateBase<string>.OnValueChanged), onValueChanged.Invoke(d, col, (model, column, val) => DynamicContext.OnValueChanged(model, column, val))));
                     col.ComponentParameters = parameters;
                 }
-                builder.CreateComponentByFieldType(this, col, row, changedType, false);
+                builder.CreateComponentByFieldType(this, col, row, changedType, false, col.GetLookupService(LookupService));
             };
         }
 

src/BootstrapBlazor/Extensions/IEditorItemExtensions.cs

@@ -110,4 +110,12 @@ bool ComplexCanWrite()
     internal static bool GetIgnore(this IEditorItem col) => col.Ignore ?? false;
 
     internal static bool GetReadonly(this IEditorItem col) => col.Readonly ?? false;
+
+    /// <summary>
+    /// 获得 ILookupService 实例
+    /// </summary>
+    /// <param name="item"></param>
+    /// <param name="service"></param>
+    /// <returns></returns>
+    public static ILookupService GetLookupService(this IEditorItem item, ILookupService service) => item.LookupService ?? service;
 }

src/BootstrapBlazor/Utils/Utility.cs

@@ -459,7 +459,8 @@ public static void CreateDisplayByFieldType(this RenderTreeBuilder builder, IEdi
     /// <param name="item"></param>
     /// <param name="changedType"></param>
     /// <param name="isSearch"></param>
-    public static void CreateComponentByFieldType(this RenderTreeBuilder builder, ComponentBase component, IEditorItem item, object model, ItemChangedType changedType = ItemChangedType.Update, bool isSearch = false)
+    /// <param name="lookUpService"></param>
+    public static void CreateComponentByFieldType(this RenderTreeBuilder builder, ComponentBase component, IEditorItem item, object model, ItemChangedType changedType = ItemChangedType.Update, bool isSearch = false, ILookupService? lookUpService = null)
     {
         var fieldType = item.PropertyType;
         var fieldName = item.GetFieldName();