From 966e81bc129708b5bcc20040ec37a66a469205b8 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Thu, 30 Dec 2021 14:51:36 +0800
Subject: [PATCH] Improve

---
 .../Layout/PageHeader.razor.cs                |  4 +--
 .../Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs   |  4 +--
 .../LookupExtensionProperty.razor             |  5 +--
 .../LookupExtensionProperty.razor.cs          | 33 ++++---------------
 4 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs
index 594909cd52..fd6bd50942 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor.cs
@@ -37,7 +37,7 @@ public partial class PageHeader : ComponentBase
         ToolbarItemRenders = new List<RenderFragment>();
     }
 
-    protected override async Task OnParametersSetAsync()
+    protected async override Task OnParametersSetAsync()
     {
         await base.OnParametersSetAsync();
         if (Toolbar != null)
@@ -65,7 +65,7 @@ public partial class PageHeader : ComponentBase
         }
     }
 
-    protected override async Task OnInitializedAsync()
+    protected async override Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
     }
diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
index e2b188eec3..bcd07221e4 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
@@ -212,7 +212,7 @@ public abstract class AbpCrudPageBase<
         EntityActions = new EntityActionDictionary();
     }
 
-    protected override async Task OnInitializedAsync()
+    protected async override Task OnInitializedAsync()
     {
         await SetPermissionsAsync();
         await SetEntityActionsAsync();
@@ -220,7 +220,7 @@ public abstract class AbpCrudPageBase<
         await InvokeAsync(StateHasChanged);
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+    protected async override Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
         {
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
index 5a6a7c7c3e..52369d6b46 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
@@ -9,8 +9,9 @@
     <Autocomplete Data="@lookupItems"
                   TItem="SelectItem<object>"
                   TValue="object"
-                  TextField="item => item.Text"
-                  ValueField="item => item.Value"
+                  TextField="item => item?.Text"
+                  ValueField="item => item?.Value"
+                  SelectedText="@SelectedText"
                   SelectedValue="@SelectedValue"
                   SelectedValueChanged="@SelectedValueChanged"
                   SearchChanged="@SearchFilterChangedAsync"
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs
index 516193d220..c21db1352d 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs
@@ -37,26 +37,17 @@ public partial class LookupExtensionProperty<TEntity, TResourceType>
         }
     }
 
+    public string SelectedText => Entity.GetProperty<string>(TextPropertyName);
+
     public LookupExtensionProperty()
     {
         lookupItems = new List<SelectItem<object>>();
     }
 
-    protected override void OnParametersSet()
+    protected async override Task OnInitializedAsync()
     {
-        var value = Entity.GetProperty(PropertyInfo.Name);
-        var text = Entity.GetProperty(TextPropertyName);
-        if (value != null && text != null)
-        {
-            if (lookupItems.All(x => !x.Value.Equals(value)))
-            {
-                lookupItems.Add(new SelectItem<object>
-                {
-                    Text = Entity.GetProperty(TextPropertyName).ToString(),
-                    Value = value
-                });
-            }
-        }
+        await base.OnInitializedAsync();
+        await SearchFilterChangedAsync(string.Empty);
     }
 
     protected virtual void UpdateLookupTextProperty(object value)
@@ -84,8 +75,7 @@ public partial class LookupExtensionProperty<TEntity, TResourceType>
             selectItems.Add(new SelectItem<object>
             {
                 Text = item.GetProperty(PropertyInfo.Lookup.DisplayPropertyName).GetString(),
-                Value = JsonSerializer.Deserialize(
-                    item.GetProperty(PropertyInfo.Lookup.ValuePropertyName).GetRawText(), PropertyInfo.Type)
+                Value = JsonSerializer.Deserialize(item.GetProperty(PropertyInfo.Lookup.ValuePropertyName).GetRawText(), PropertyInfo.Type)
             });
         }
 
@@ -95,7 +85,6 @@ public partial class LookupExtensionProperty<TEntity, TResourceType>
     protected virtual Task SelectedValueChanged(object selectedItem)
     {
         SelectedValue = selectedItem;
-
         return Task.CompletedTask;
     }
 
@@ -103,14 +92,4 @@ public partial class LookupExtensionProperty<TEntity, TResourceType>
     {
         lookupItems = await GetLookupItemsAsync(filter);
     }
-
-    protected async override Task OnAfterRenderAsync(bool firstRender)
-    {
-        await base.OnAfterRenderAsync(firstRender);
-
-        if (firstRender)
-        {
-            await SearchFilterChangedAsync(string.Empty);
-        }
-    }
 }