Merge branch 'ui-extensions-blazor' of https://github.com/abpframework/abp into ui-extensions-blazor

framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor.cs

@@ -26,7 +26,7 @@ namespace Volo.Abp.BlazoriseUI.Components.ObjectExtending
             }
             set
             {
-                Entity.SetProperty(PropertyInfo.Name, value);
+                Entity.SetProperty(PropertyInfo.Name, value, validate: false);
             }
         }
     }

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -2,6 +2,7 @@
 @attribute [Authorize( IdentityPermissions.Users.Default )]
 @using Microsoft.AspNetCore.Authorization
 @using Volo.Abp.PermissionManagement.Blazor.Components
+@using Volo.Abp.BlazoriseUI.Components.ObjectExtending
 @using Volo.Abp.Identity.Localization
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
@@ -111,6 +112,7 @@
                                     <Field>
                                         <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
                                     </Field>
+                                    <ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH"/>
                                 </TabPanel>
                                 <TabPanel Name="Roles">
                                     @if (NewUserRoles != null)
@@ -222,6 +224,7 @@
                                     <Field>
                                         <Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
                                     </Field>
+                                    <ExtensionProperties TEntityType="IdentityUserUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH"/>
                                 </TabPanel>
                                 <TabPanel Name="Roles">
                                     @if (EditUserRoles != null)

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@@ -11,6 +11,7 @@ using Volo.Abp.AspNetCore.Components.Extensibility.EntityActions;
 using Volo.Abp.AspNetCore.Components.Extensibility.TableColumns;
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.PageToolbars;
 using Volo.Abp.Identity.Localization;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.PermissionManagement.Blazor.Components;
 
 namespace Volo.Abp.Identity.Blazor.Pages.Identity
@@ -153,8 +154,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected override ValueTask SetTableColumnsAsync()
         {
-            TableColumns
+            UserManagementTableColumns
-                .Get<UserManagement>()
                 .AddRange(new TableColumn[]
                 {
                     new TableColumn
@@ -179,6 +179,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
                     }
                 });
 
+            UserManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName, IdentityModuleExtensionConsts.EntityNames.User));
             return base.SetEntityActionsAsync();
         }