Merge pull request #5 from rqx110/property_extesion

Implements property extesion

lsw.Abp.AntDesignUI.sln

@@ -6,12 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.AntDesignUI", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{0C432416-770F-4331-84E6-5835408A9BD8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme", "modules\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj", "{75753009-1BE9-4994-8D2E-890829844C46}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme", "modules\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj", "{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme", "modules\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj", "{84F26612-0056-4CD1-849B-B0B8F046350D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E36D7268-C7A6-4A7F-81DB-57070F4B049C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BookStore", "BookStore", "{1F85F600-70F9-4286-B8BD-6A124D9DC43D}"
@@ -76,10 +70,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.SettingManagement.B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI", "modules\SettingManagement\Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI\Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI.csproj", "{F3ADEF50-755E-4FCB-9746-C946CB0306B3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookStore.BlazorServer", "samples\BookStore\BookStore.BlazorServer\BookStore.BlazorServer.csproj", "{1E5B082C-96F6-44B4-856E-AC26A5395243}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AntDesignTheme", "AntDesignTheme", "{9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme", "modules\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj", "{BBA243C1-EEAD-42EE-ABA3-6912BE5F41D8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme", "modules\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj", "{2DCCFE7C-4BC5-46F8-8493-82352CE0EE71}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme", "modules\AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj", "{90DBF0A4-253D-4E75-8221-17455B404551}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookStore.BlazorServer", "samples\BookStore\src\BookStore.BlazorServer\BookStore.BlazorServer.csproj", "{2B617147-6496-44E9-8D49-B571E7EBF2D6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -118,29 +118,17 @@ Global
 		{2E033BD6-16C2-4F3A-ADD5-C08D6FB8482B} = {CCAB1F41-EAB4-4564-B956-C32ED0B03EC2}
 		{3D8714C4-B78B-4B5E-8675-F6531C21AE2C} = {CCAB1F41-EAB4-4564-B956-C32ED0B03EC2}
 		{F3ADEF50-755E-4FCB-9746-C946CB0306B3} = {CCAB1F41-EAB4-4564-B956-C32ED0B03EC2}
-		{1E5B082C-96F6-44B4-856E-AC26A5395243} = {1F85F600-70F9-4286-B8BD-6A124D9DC43D}
 		{9F013513-EC16-46DF-BDEF-C9B5F0DA6C12} = {0C432416-770F-4331-84E6-5835408A9BD8}
-		{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
-		{75753009-1BE9-4994-8D2E-890829844C46} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
-		{84F26612-0056-4CD1-849B-B0B8F046350D} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
+		{BBA243C1-EEAD-42EE-ABA3-6912BE5F41D8} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
+		{2DCCFE7C-4BC5-46F8-8493-82352CE0EE71} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
+		{90DBF0A4-253D-4E75-8221-17455B404551} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
+		{2B617147-6496-44E9-8D49-B571E7EBF2D6} = {1F85F600-70F9-4286-B8BD-6A124D9DC43D}
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9EA4AA35-DEFC-4C25-8333-78137853EC5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9EA4AA35-DEFC-4C25-8333-78137853EC5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9EA4AA35-DEFC-4C25-8333-78137853EC5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EA4AA35-DEFC-4C25-8333-78137853EC5D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75753009-1BE9-4994-8D2E-890829844C46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75753009-1BE9-4994-8D2E-890829844C46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75753009-1BE9-4994-8D2E-890829844C46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75753009-1BE9-4994-8D2E-890829844C46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84F26612-0056-4CD1-849B-B0B8F046350D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84F26612-0056-4CD1-849B-B0B8F046350D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84F26612-0056-4CD1-849B-B0B8F046350D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84F26612-0056-4CD1-849B-B0B8F046350D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39E479A5-92DB-4F5B-918A-1920886D4D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39E479A5-92DB-4F5B-918A-1920886D4D60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39E479A5-92DB-4F5B-918A-1920886D4D60}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -241,9 +229,21 @@ Global
 		{F3ADEF50-755E-4FCB-9746-C946CB0306B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3ADEF50-755E-4FCB-9746-C946CB0306B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3ADEF50-755E-4FCB-9746-C946CB0306B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1E5B082C-96F6-44B4-856E-AC26A5395243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E5B082C-96F6-44B4-856E-AC26A5395243}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E5B082C-96F6-44B4-856E-AC26A5395243}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E5B082C-96F6-44B4-856E-AC26A5395243}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBA243C1-EEAD-42EE-ABA3-6912BE5F41D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBA243C1-EEAD-42EE-ABA3-6912BE5F41D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBA243C1-EEAD-42EE-ABA3-6912BE5F41D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBA243C1-EEAD-42EE-ABA3-6912BE5F41D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DCCFE7C-4BC5-46F8-8493-82352CE0EE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DCCFE7C-4BC5-46F8-8493-82352CE0EE71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DCCFE7C-4BC5-46F8-8493-82352CE0EE71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DCCFE7C-4BC5-46F8-8493-82352CE0EE71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90DBF0A4-253D-4E75-8221-17455B404551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90DBF0A4-253D-4E75-8221-17455B404551}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90DBF0A4-253D-4E75-8221-17455B404551}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90DBF0A4-253D-4E75-8221-17455B404551}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B617147-6496-44E9-8D49-B571E7EBF2D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B617147-6496-44E9-8D49-B571E7EBF2D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B617147-6496-44E9-8D49-B571E7EBF2D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B617147-6496-44E9-8D49-B571E7EBF2D6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

modules/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj → modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 
-    <Import Project="..\..\common.props" />
-    <Import Project="..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\configureawait.props" />
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>

modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj → modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 
-    <Import Project="..\..\common.props" />
-    <Import Project="..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\configureawait.props" />
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -13,7 +13,7 @@
     </ItemGroup>
     
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Lsw.Abp.AntDesignUI\Lsw.Abp.AntDesignUI.csproj" />
+      <ProjectReference Include="..\..\..\src\Lsw.Abp.AntDesignUI\Lsw.Abp.AntDesignUI.csproj" />
     </ItemGroup>
     
 

modules/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj → modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-    <Import Project="..\..\common.props" />
-    <Import Project="..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\configureawait.props" />
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>

modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj

@@ -14,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj" />
     </ItemGroup>
 
 </Project>

modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.Server.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.Server.AntDesignUI.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
       <ProjectReference Include="..\Lsw.Abp.FeatureManagement.Blazor.AntDesignUI\Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI.csproj

@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj" />
+        <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj" />
         <ProjectReference Include="..\Lsw.Abp.FeatureManagement.Blazor.AntDesignUI\Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj

@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj" />
       <ProjectReference Include="..\..\PermissionManagement\Lsw.Abp.PermissionManagement.Blazor.AntDesignUI\Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor

@@ -32,6 +32,7 @@
             <FormItem Label="@L["DisplayName:RoleName"]">
                 <Input @bind-Value="@context.Name"/>
             </FormItem>
+            <ExtensionProperties TEntityType="IdentityRoleCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH"/>
             <FormItem>
                 <Checkbox @bind-Value="context.IsDefault">@L["DisplayName:IsDefault"]</Checkbox>
             </FormItem>
@@ -53,6 +54,7 @@
             <FormItem Label="@L["DisplayName:RoleName"]">
                 <Input @bind-Value="@context.Name"/>
             </FormItem>
+            <ExtensionProperties TEntityType="IdentityRoleUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH"/>
             <FormItem>
                 <Checkbox @bind-Value="context.IsDefault">@L["DisplayName:IsDefault"]</Checkbox>
             </FormItem>
@@ -67,4 +69,4 @@
 @if (HasManagePermissionsPermission)
 {
     <PermissionManagementModal @ref="PermissionManagementModal"/>
-}
+}

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/RoleManagement.razor.cs

@@ -10,6 +10,7 @@ using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions;
 using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns;
 using Volo.Abp.Identity;
 using Volo.Abp.Identity.Localization;
+using Volo.Abp.ObjectExtending;
 
 namespace Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.Pages;
 
@@ -90,19 +91,18 @@ public partial class RoleManagement
                         Title = L["RoleName"],
                         Data = nameof(IdentityRoleDto.Name),
                         Component = typeof(RoleNameComponent)
-                    },
-                    new TableColumn
-                    {
-                        Title = L["Actions"],
-                        Actions = EntityActions.Get<RoleManagement>()
-                    },
+                    }
             });
         
+        RoleManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName,
+            IdentityModuleExtensionConsts.EntityNames.Role));
+        
+        RoleManagementTableColumns.Add(new TableColumn
+        {
+            Title = L["Actions"],
+            Actions = EntityActions.Get<RoleManagement>()
+        });
         
-        //TODO Implement object extensions
-        // RoleManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName,
-        //     IdentityModuleExtensionConsts.EntityNames.Role));
-
         return base.SetTableColumnsAsync();
     }
 

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor

@@ -41,7 +41,7 @@
                             <Input @bind-Value="@context.Surname"/>
                         </FormItem>
                         <FormItem Label="@L["DisplayName:Password"]">
-                            <InputPassword  @bind-Value="@context.Password"/>
+                            <InputPassword @bind-Value="@context.Password"/>
                         </FormItem>
                         <FormItem Label="@L["DisplayName:Email"]">
                             <Input @bind-Value="@context.Email"/>
@@ -55,15 +55,16 @@
                         <FormItem>
                             <Checkbox @bind-Value="context.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Checkbox>
                         </FormItem>
+                        <ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH"/>
                     </TabPane>
-                    
+
                     <TabPane Tab="@L["Roles"]">
-                          @foreach (var role in NewUserRoles)
-                          {
-                              <FormItem WrapperColOffset="2">
-                                  <Checkbox @bind-Value="role.IsAssigned">@role.Name</Checkbox>
-                              </FormItem>
-                          }
+                        @foreach (var role in NewUserRoles)
+                        {
+                            <FormItem WrapperColOffset="2">
+                                <Checkbox @bind-Value="role.IsAssigned">@role.Name</Checkbox>
+                            </FormItem>
+                        }
                     </TabPane>
                 </Tabs>
             }
@@ -92,7 +93,7 @@
                             <Input @bind-Value="@context.Surname"/>
                         </FormItem>
                         <FormItem Label="@L["DisplayName:Password"]">
-                            <InputPassword  @bind-Value="@context.Password"/>
+                            <InputPassword @bind-Value="@context.Password"/>
                         </FormItem>
                         <FormItem Label="@L["DisplayName:Email"]">
                             <Input @bind-Value="@context.Email"/>
@@ -106,15 +107,17 @@
                         <FormItem>
                             <Checkbox @bind-Value="context.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Checkbox>
                         </FormItem>
+                        <ExtensionProperties TEntityType="IdentityUserUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH"/>
+
                     </TabPane>
-                    
+
                     <TabPane Tab="@L["Roles"]">
-                          @foreach (var role in EditUserRoles)
-                          {
-                              <FormItem WrapperColOffset="2">
-                                  <Checkbox @bind-Value="role.IsAssigned">@role.Name</Checkbox>
-                              </FormItem>
-                          }
+                        @foreach (var role in EditUserRoles)
+                        {
+                            <FormItem WrapperColOffset="2">
+                                <Checkbox @bind-Value="role.IsAssigned">@role.Name</Checkbox>
+                            </FormItem>
+                        }
                     </TabPane>
                 </Tabs>
             }
@@ -126,4 +129,4 @@
 @if (HasManagePermissionsPermission)
 {
     <PermissionManagementModal @ref="PermissionManagementModal"/>
-}
+}

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Pages/UserManagement.razor.cs

@@ -11,6 +11,7 @@ using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions;
 using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns;
 using Volo.Abp.Identity;
 using Volo.Abp.Identity.Localization;
+using Volo.Abp.ObjectExtending;
 
 namespace Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.Pages;
 
@@ -177,14 +178,18 @@ public partial class UserManagement
                     {
                         Title = L["PhoneNumber"],
                         Data = nameof(IdentityUserDto.PhoneNumber),
-                    },
-                    new TableColumn
-                    {
-                        Title = L["Actions"],
-                        Actions = EntityActions.Get<UserManagement>()
-                    },
+                    }
             });
         
+        UserManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName,
+            IdentityModuleExtensionConsts.EntityNames.User));
+        
+        UserManagementTableColumns.Add(new TableColumn
+        {
+            Title = L["Actions"],
+            Actions = EntityActions.Get<UserManagement>()
+        });
+        
         return base.SetEntityActionsAsync();
     }
 

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/_Imports.razor

@@ -2,6 +2,7 @@
 @using Volo.Abp.AspNetCore.Components.Web
 @using Lsw.Abp.AntDesignUI
 @using Lsw.Abp.AntDesignUI.Components
+@using Lsw.Abp.AntDesignUI.Components.ObjectExtending
 @using AntDesign
 @using AntDesign.TableModels
 @using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.Layout

modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.Server.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.Server.AntDesignUI.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
       <ProjectReference Include="..\Lsw.Abp.IdentityManagement.Blazor.AntDesignUI\Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.Server.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.Server.AntDesignUI.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
       <ProjectReference Include="..\Lsw.Abp.PermissionManagement.Blazor.AntDesignUI\Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI.csproj

@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj" />
       <ProjectReference Include="..\Lsw.Abp.PermissionManagement.Blazor.AntDesignUI\Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
       <ProjectReference Include="..\Lsw.Abp.SettingManagement.Blazor.AntDesignUI\Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI.csproj

@@ -12,7 +12,7 @@
     </ItemGroup>
     
     <ItemGroup>
-      <ProjectReference Include="..\..\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj" />
+      <ProjectReference Include="..\..\AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme\Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj" />
       <ProjectReference Include="..\Lsw.Abp.SettingManagement.Blazor.AntDesignUI\Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj" />
     </ItemGroup>
 

modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor

@@ -39,7 +39,7 @@
             <FormItem Label="@L["DisplayName:AdminPassword"]">
                 <InputPassword @bind-Value="@context.AdminPassword"/>
             </FormItem>
-
+            <ExtensionProperties TEntityType="TenantCreateDto" TResourceType="AbpTenantManagementResource" Entity="@NewEntity" LH="@LH"/>
         </Form>
     </Modal>
 }
@@ -55,7 +55,7 @@
             <FormItem Label="@L["TenantName"]">
                 <Input @bind-Value="@context.Name"/>
             </FormItem>
-
+            <ExtensionProperties TEntityType="TenantUpdateDto" TResourceType="AbpTenantManagementResource" Entity="@EditingEntity" LH="@LH"/>
         </Form>
     </Modal>
 }
@@ -63,4 +63,4 @@
 @if (HasManageFeaturesPermission)
 {
     <FeatureManagementModal @ref="FeatureManagementModal"/>
-}
+}

modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Pages/TenantManagement.razor.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions;
 using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns;
 using Volo.Abp.FeatureManagement;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.TenantManagement;
 using Volo.Abp.TenantManagement.Localization;
 
@@ -117,18 +118,19 @@ public partial class TenantManagement
                 {
                     Title = L["TenantName"],
                     Data = nameof(TenantDto.Name),
-                },
-                new TableColumn
-                {
-                    Title = L["Actions"],
-                    Actions = EntityActions.Get<TenantManagement>()
-                },
+                }
             });
 
-        // TenantManagementTableColumns.AddRange(GetExtensionTableColumns(
-        //     TenantManagementModuleExtensionConsts.ModuleName,
-        //     TenantManagementModuleExtensionConsts.EntityNames.Tenant));
+        TenantManagementTableColumns.AddRange(GetExtensionTableColumns(
+            TenantManagementModuleExtensionConsts.ModuleName,
+            TenantManagementModuleExtensionConsts.EntityNames.Tenant));
 
+        TenantManagementTableColumns.Add(new TableColumn
+        {
+            Title = L["Actions"],
+            Actions = EntityActions.Get<TenantManagement>()
+        });
+        
         return base.SetTableColumnsAsync();
     }
 }

modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/_Imports.razor

@@ -3,5 +3,6 @@
 @using AntDesign
 @using Lsw.Abp.AntDesignUI
 @using Lsw.Abp.AntDesignUI.Components
+@using Lsw.Abp.AntDesignUI.Components.ObjectExtending
 @using Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.Components
 @using Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.Layout

samples/BookStore/BookStore.BlazorServer/BookStore.BlazorServer.csproj → samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj

@@ -17,13 +17,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\modules\IdentityManagement\Lsw.Abp.IdentityManagement.Blazor.Server.AntDesignUI\Lsw.Abp.IdentityManagement.Blazor.Server.AntDesignUI.csproj" />
-        <ProjectReference Include="..\..\..\modules\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
-        <ProjectReference Include="..\..\..\modules\SettingManagement\Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI\Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI.csproj" />
-        <ProjectReference Include="..\..\..\modules\TenantManagement\Lsw.Abp.TenantManagement.Blazor.Server.AntDesignUI\Lsw.Abp.TenantManagement.Blazor.Server.AntDesignUI.csproj" />
-        <ProjectReference Include="..\src\BookStore.Application\BookStore.Application.csproj" />
-        <ProjectReference Include="..\src\BookStore.HttpApi\BookStore.HttpApi.csproj" />
-        <ProjectReference Include="..\src\BookStore.EntityFrameworkCore\BookStore.EntityFrameworkCore.csproj" />
+        <ProjectReference Include="..\..\..\..\modules\IdentityManagement\Lsw.Abp.IdentityManagement.Blazor.Server.AntDesignUI\Lsw.Abp.IdentityManagement.Blazor.Server.AntDesignUI.csproj" />
+        <ProjectReference Include="..\..\..\..\modules\AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme\Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj" />
+        <ProjectReference Include="..\..\..\..\modules\SettingManagement\Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI\Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI.csproj" />
+        <ProjectReference Include="..\..\..\..\modules\TenantManagement\Lsw.Abp.TenantManagement.Blazor.Server.AntDesignUI\Lsw.Abp.TenantManagement.Blazor.Server.AntDesignUI.csproj" />
+        <ProjectReference Include="..\..\src\BookStore.Application\BookStore.Application.csproj" />
+        <ProjectReference Include="..\..\src\BookStore.HttpApi\BookStore.HttpApi.csproj" />
+        <ProjectReference Include="..\..\src\BookStore.EntityFrameworkCore\BookStore.EntityFrameworkCore.csproj" />
         <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.2.2" />
         <PackageReference Include="Volo.Abp.Autofac" Version="5.2.2" />
         <PackageReference Include="Volo.Abp.Swashbuckle" Version="5.2.2" />