Improve the management page UI

gdlcf88 · gdlcf88 · commit a79dded26baa · 2025-07-18T16:44:01.000+08:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <AbpVersion>9.2.1</AbpVersion>
     <NatashaVersion>9.0.0.*</NatashaVersion>
-    <EasyAbpAbpDynamicPermissionModuleVersion>1.12.0</EasyAbpAbpDynamicPermissionModuleVersion>
-    <EasyAbpAbpDynamicEntityModuleVersion>0.19.0</EasyAbpAbpDynamicEntityModuleVersion>
-    <EasyAbpAbpDynamicMenuModuleVersion>1.8.0</EasyAbpAbpDynamicMenuModuleVersion>
+    <EasyAbpAbpDynamicPermissionModuleVersion>1.13.0-preview.1</EasyAbpAbpDynamicPermissionModuleVersion>
+    <EasyAbpAbpDynamicEntityModuleVersion>0.20.0-preview.1</EasyAbpAbpDynamicEntityModuleVersion>
+    <EasyAbpAbpDynamicMenuModuleVersion>1.9.0-preview.1</EasyAbpAbpDynamicMenuModuleVersion>
   </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.8.0</Version>
+    <Version>1.9.0-preview.1</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/providers/dynamic-entity/EasyAbp.Abp.EntityUi.DynamicEntity.Domain.Shared/EasyAbp/Abp/EntityUi/DynamicEntity/Localization/en.json b/providers/dynamic-entity/EasyAbp.Abp.EntityUi.DynamicEntity.Domain.Shared/EasyAbp/Abp/EntityUi/DynamicEntity/Localization/en.json
@@ -1,6 +1,6 @@
 {
   "culture": "en",
   "texts": {
-    "Menu:DynamicEntity": "Dynamic entities"
+    "Menu:EasyAbp.Abp.DynamicEntity": "Dynamic entities"
   }
 }
diff --git a/providers/dynamic-entity/EasyAbp.Abp.EntityUi.DynamicEntity.Domain.Shared/EasyAbp/Abp/EntityUi/DynamicEntity/Localization/zh-Hans.json b/providers/dynamic-entity/EasyAbp.Abp.EntityUi.DynamicEntity.Domain.Shared/EasyAbp/Abp/EntityUi/DynamicEntity/Localization/zh-Hans.json
@@ -1,6 +1,6 @@
 {
   "culture": "zh-Hans",
   "texts": {
-    "Menu:DynamicEntity": "动态实体"
+    "Menu:EasyAbp.Abp.DynamicEntity": "动态实体"
   }
 }
diff --git a/providers/dynamic-entity/EasyAbp.Abp.EntityUi.DynamicEntity.Domain.Shared/EasyAbp/Abp/EntityUi/DynamicEntity/Localization/zh-Hant.json b/providers/dynamic-entity/EasyAbp.Abp.EntityUi.DynamicEntity.Domain.Shared/EasyAbp/Abp/EntityUi/DynamicEntity/Localization/zh-Hant.json
@@ -1,6 +1,6 @@
 {
   "culture": "zh-Hant",
   "texts": {
-    "Menu:DynamicEntity": "動態實體"
+    "Menu:EasyAbp.Abp.DynamicEntity": "動態實體"
   }
 }
diff --git a/src/EasyAbp.Abp.EntityUi.Domain.Shared/EasyAbp/Abp/EntityUi/Localization/en.json b/src/EasyAbp.Abp.EntityUi.Domain.Shared/EasyAbp/Abp/EntityUi/Localization/en.json
@@ -1,7 +1,7 @@
 {
   "culture": "en",
   "texts": {
-    "Menu:EntityUi": "Entity UI",
+    "Menu:EasyAbp.Abp.EntityUi": "Entity UI",
     "Menu:Module": "Module",
     "Module": "Module",
     "ModuleName": "Name",
diff --git a/src/EasyAbp.Abp.EntityUi.Domain.Shared/EasyAbp/Abp/EntityUi/Localization/zh-Hans.json b/src/EasyAbp.Abp.EntityUi.Domain.Shared/EasyAbp/Abp/EntityUi/Localization/zh-Hans.json
@@ -1,7 +1,7 @@
 {
   "culture": "zh-Hans",
   "texts": {
-    "Menu:EntityUi": "实体 UI",
+    "Menu:EasyAbp.Abp.EntityUi": "实体 UI",
     "Menu:Module": "模块",
     "Module": "模块",
     "ModuleName": "名称",
diff --git a/src/EasyAbp.Abp.EntityUi.Domain.Shared/EasyAbp/Abp/EntityUi/Localization/zh-Hant.json b/src/EasyAbp.Abp.EntityUi.Domain.Shared/EasyAbp/Abp/EntityUi/Localization/zh-Hant.json
@@ -1,7 +1,7 @@
 {
   "culture": "zh-Hant",
   "texts": {
-    "Menu:EntityUi": "實體 UI",
+    "Menu:EasyAbp.Abp.EntityUi": "實體 UI",
     "Menu:Module": "模塊",
     "Module": "模塊",
     "ModuleName": "名稱",
diff --git a/src/EasyAbp.Abp.EntityUi.Domain/EasyAbp/Abp/EntityUi/EntityUiSeed.json b/src/EasyAbp.Abp.EntityUi.Domain/EasyAbp/Abp/EntityUi/EntityUiSeed.json
@@ -709,7 +709,7 @@
       "parentName": null,
       "inAdministration": true,
       "name": "EasyAbp.Abp.EntityUi",
-      "displayName": "Menu:EntityUi",
+      "displayName": "Menu:EasyAbp.Abp.EntityUi",
       "url": null,
       "urlMvc": null,
       "urlBlazor": null,
diff --git a/src/EasyAbp.Abp.EntityUi.Web/Pages/EntityUi/Index.cshtml b/src/EasyAbp.Abp.EntityUi.Web/Pages/EntityUi/Index.cshtml
@@ -2,11 +2,17 @@
 @using EasyAbp.Abp.EntityUi.Web.Pages.EntityUi
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @model EasyAbp.Abp.EntityUi.Web.Pages.EntityUi.IndexModel
-@inject IPageLayout _pageLayout
+@inject IPageLayout PageLayout
 @{
-    _pageLayout.Content.Title = await Model.GetPageTitleAsync();
-    _pageLayout.Content.BreadCrumb.Add(await Model.GetBreadCrumbTextAsync());
-    _pageLayout.Content.MenuItemName = await Model.GetMenuItemNameAsync();
+    PageLayout.Content.Title = await Model.GetPageTitleAsync();
+
+    var breadcrumbs = await Model.GetBreadCrumbsAsync();
+    foreach (var breadcrumb in breadcrumbs)
+    {
+        PageLayout.Content.BreadCrumb.Add(breadcrumb);
+    }
+
+    PageLayout.Content.MenuItemName = await Model.GetMenuItemNameAsync();
 }
 
 <script type="text/javascript">
@@ -41,31 +47,26 @@
 {
     @if (Model.IsSubEntity)
     {
-        <abp-script src="/Pages/EntityUi/index-sub-entity.js" />
+        <abp-script src="/Pages/EntityUi/index-sub-entity.js"/>
     }
     else
     {
-        <abp-script src="/Pages/EntityUi/index.js" />
+        <abp-script src="/Pages/EntityUi/index.js"/>
+    }
+}
+@section content_toolbar
+{
+    @if (Model.Entity.CreationEnabled && await Model.IsCreationPermissionGrantedOrNullAsync())
+    {
+        <abp-button id="@await Model.GetNewButtonIdAsync()"
+                    text="@await Model.GetNewButtonTextAsync()"
+                    icon="plus"
+                    icon="Small"
+                    button-type="Primary"/>
     }
 }
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@await Model.GetPageTitleAsync()</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-			    @if (Model.Entity.CreationEnabled && await Model.IsCreationPermissionGrantedOrNullAsync())
-                {
-                <abp-button id="@await Model.GetNewButtonIdAsync()"
-                            text="@await Model.GetNewButtonTextAsync()"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="@await Model.GetTableIdAsync()" class="nowrap"/>
     </abp-card-body>
diff --git a/src/EasyAbp.Abp.EntityUi.Web/Pages/EntityUi/Index.cshtml.cs b/src/EasyAbp.Abp.EntityUi.Web/Pages/EntityUi/Index.cshtml.cs
@@ -22,28 +22,26 @@ public class IndexModel : PageModel
         private readonly IAuthorizationService _authorizationService;
         private readonly IIntegrationAppService _integrationAppService;
         private readonly IEntityUiStringLocalizerProvider _stringLocalizerProvider;
-        
+
         private IEntityUiPageDataProvider PageDataProvider;
         private IStringLocalizer StringLocalizer { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string ModuleName { get; set; }
-        
-        [BindProperty(SupportsGet = true)]
-        public string EntityName { get; set; }
-        
+        [BindProperty(SupportsGet = true)] public string ModuleName { get; set; }
+
+        [BindProperty(SupportsGet = true)] public string EntityName { get; set; }
+
         public ModuleDto Module { get; set; }
-        
+
         public EntityDto Entity { get; set; }
-        
+
         public EntityDto ParentEntity { get; set; }
-        
+
         public string[] EntityKeys { get; set; }
-        
+
         public string[] ParentEntityKeys { get; set; }
 
         public bool IsSubEntity => !Entity.BelongsTo.IsNullOrEmpty();
-        
+
         public IndexModel(
             IAbpLazyServiceProvider lazyServiceProvider,
             IAuthorizationService authorizationService,
@@ -55,7 +53,7 @@ public IndexModel(
             _integrationAppService = integrationAppService;
             _stringLocalizerProvider = stringLocalizerProvider;
         }
-        
+
         public virtual async Task OnGetAsync()
         {
             var integration = await _integrationAppService.GetModuleAsync(ModuleName);
@@ -68,20 +66,20 @@ public virtual async Task OnGetAsync()
                 ParentEntity = integration.Entities.Single(x => x.Name == Entity.BelongsTo);
                 ParentEntityKeys = ParentEntity.Keys.Split(',');
             }
-            
+
             Module = integration.Modules.Single(x => x.Name == ModuleName);
 
             StringLocalizer = await _stringLocalizerProvider.GetAsync(Module);
             PageDataProvider = _lazyServiceProvider.GetEntityUiPageDataProviderOrDefault(Entity.ProviderName);
         }
-        
+
         public virtual async Task<bool> IsCreationPermissionGrantedOrNullAsync()
         {
             if (Entity.CreationPermission.IsNullOrWhiteSpace())
             {
                 return true;
             }
-            
+
             return await _authorizationService.IsGrantedAsync(Entity.CreationPermission);
         }
 
@@ -100,11 +98,21 @@ public virtual Task<string> GetPageTitleAsync()
             return Task.FromResult(StringLocalizer[Entity.Name].Value);
         }
 
-        public virtual Task<string> GetBreadCrumbTextAsync()
+        public virtual Task<List<string>> GetBreadCrumbsAsync()
         {
-            var localizationItemName = IsSubEntity ? $"Menu:{Entity.BelongsTo}" : $"Menu:{Entity.Name}";
-            
-            return Task.FromResult(StringLocalizer[localizationItemName].Value);
+            var breadcrumbs = new List<string>();
+
+            if (IsSubEntity)
+            {
+                breadcrumbs.Add(StringLocalizer[$"Menu:{Entity.BelongsTo}"].Value);
+            }
+
+            if (!ModuleName.IsNullOrWhiteSpace())
+            {
+                breadcrumbs.Add(StringLocalizer[$"Menu:{Entity.ModuleName}"].Value);
+            }
+
+            return Task.FromResult(breadcrumbs);
         }
 
         public virtual Task<string> GetMenuItemNameAsync()
@@ -137,7 +145,7 @@ public virtual Task<string> GetJsCreateModalSubPathAsync()
                 ? Task.FromResult($"EntityUi/{ModuleName}/{EntityName}/CreateSubEntityModal")
                 : Task.FromResult($"EntityUi/{ModuleName}/{EntityName}/CreateModal");
         }
-        
+
         public virtual Task<string> GetJsEditModalSubPathAsync()
         {
             return IsSubEntity
@@ -155,7 +163,8 @@ public virtual Task<string> GetJsSuccessfullyDeletedNotificationTextAsync()
             return Task.FromResult(StringLocalizer["SuccessfullyDeleted"].Value);
         }
 
-        public virtual Task<string> GetJsDataTableDataRecordKeysCodeAsync(bool withKeys = true, string keyPrefix = "EntityKey_")
+        public virtual Task<string> GetJsDataTableDataRecordKeysCodeAsync(bool withKeys = true,
+            string keyPrefix = "EntityKey_")
         {
             var entityKeys = EntityKeys.Select(key => key.ToCamelCase())
                 .Select(key => withKeys ? $"{keyPrefix}{key}: data.record.{key}" : $"data.record.{key}");
@@ -165,7 +174,7 @@ public virtual Task<string> GetJsDataTableDataRecordKeysCodeAsync(bool withKeys
                     withKeys
                         ? $"{keyWithPrefix}: '{HttpContext.Request.Query[keyWithPrefix]}'"
                         : $"'{HttpContext.Request.Query[keyWithPrefix]}'");
-            
+
             return Task.FromResult(entityKeys.Concat(parentEntityKeys).JoinAsString(", "));
         }
 
@@ -241,20 +250,21 @@ public virtual Task<string> GetJsFindSubEntityIndexCodeAsync([NotNull] string li
         public virtual Task<string> GetJsBuildSubEntitiesRowActionItemsAsync()
         {
             var subEntities = Entity.Properties.Where(x => x.IsEntityCollection).ToList();
-            
+
             if (subEntities.IsNullOrEmpty())
             {
                 return Task.FromResult("var subEntitiesRowActionItems = []");
             }
 
             const string prefix = EntityUiModalModelBase.QueryPrefixParentEntityKey;
 
-            var keys = EntityKeys.Select(x => x.ToCamelCase()).Select(key => $"'{prefix}{key}=' + data.record.{key}").JoinAsString(" + '&' + ");
+            var keys = EntityKeys.Select(x => x.ToCamelCase()).Select(key => $"'{prefix}{key}=' + data.record.{key}")
+                .JoinAsString(" + '&' + ");
 
             var obj = subEntities.Select(x =>
                     $"{{ text: l('{Entity.Name}{x.Name}'), action: function (data) {{ document.location.href = document.location.origin + '/EntityUi/{ModuleName}/{x.GetTypeOrEntityNameWithoutNamespace()}?' + {keys}; }} }}")
                 .JoinAsString(", ");
-            
+
             return Task.FromResult($"var subEntitiesRowActionItems = [ {obj} ]");
         }
 
@@ -263,9 +273,10 @@ public virtual Task<string> GetJsDataTablePropertyNameTitleMappingAsync()
             var properties = Entity.Properties;
 
             properties.Reverse();
-            
+
             return Task.FromResult(properties.Where(x => x.ShowIn.List)
-                .Select(async x => $"\"{await PageDataProvider.GetJsEntityListPropertyObjectCodeAsync(x)}\": `{await GetPropertyTitleTextAsync(x)}`")
+                .Select(async x =>
+                    $"\"{await PageDataProvider.GetJsEntityListPropertyObjectCodeAsync(x)}\": `{await GetPropertyTitleTextAsync(x)}`")
                 .Select(x => x.Result).JoinAsString(", "));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"culture": "en",`
`3`	`3`	`"texts": {`
`4`		`- "Menu:DynamicEntity": "Dynamic entities"`
	`4`	`+ "Menu:EasyAbp.Abp.DynamicEntity": "Dynamic entities"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"culture": "zh-Hans",`
`3`	`3`	`"texts": {`
`4`		`- "Menu:DynamicEntity": "动态实体"`
	`4`	`+ "Menu:EasyAbp.Abp.DynamicEntity": "动态实体"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"culture": "zh-Hant",`
`3`	`3`	`"texts": {`
`4`		`- "Menu:DynamicEntity": "動態實體"`
	`4`	`+ "Menu:EasyAbp.Abp.DynamicEntity": "動態實體"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"culture": "en",`
`3`	`3`	`"texts": {`
`4`		`- "Menu:EntityUi": "Entity UI",`
	`4`	`+ "Menu:EasyAbp.Abp.EntityUi": "Entity UI",`
`5`	`5`	`"Menu:Module": "Module",`
`6`	`6`	`"Module": "Module",`
`7`	`7`	`"ModuleName": "Name",`