Move menu items to Administration

EasyAbp · Aug 20, 2023 · 047cea7 · 047cea7
1 parent 17cbf23
commit 047cea7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 
         <AbpVersion>7.3.0</AbpVersion>
         <EasyAbpAbpDynamicQueryModuleVersion>0.8.0</EasyAbpAbpDynamicQueryModuleVersion>
-        <EasyAbpAbpDynamicPermissionModuleVersion>1.3.0</EasyAbpAbpDynamicPermissionModuleVersion>
+        <EasyAbpAbpDynamicPermissionModuleVersion>1.4.0</EasyAbpAbpDynamicPermissionModuleVersion>
 
     </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.10.0</Version>
+    <Version>0.11.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/Menus/DynamicEntityMenuContributor.cs b/src/EasyAbp.Abp.DynamicEntity.Web/Menus/DynamicEntityMenuContributor.cs
@@ -22,25 +22,28 @@ private async Task ConfigureMainMenu(MenuConfigurationContext context)
 
             if (await context.IsGrantedAsync(DynamicEntityPermissions.FieldDefinition.Default) ||
                 await context.IsGrantedAsync(DynamicEntityPermissions.ModelDefinition.Default)
-            )
+               )
             {
-                var menu = new ApplicationMenuItem(DynamicEntityMenus.DynamicEntityManagement, l["Menu:DynamicEntityManagement"]);
-
+                var menu = new ApplicationMenuItem(DynamicEntityMenus.DynamicEntityManagement,
+                    l["Menu:DynamicEntityManagement"], icon: "fa fa-database");
+
                 if (await context.IsGrantedAsync(DynamicEntityPermissions.FieldDefinition.Default))
                 {
                     menu.AddItem(
-                        new ApplicationMenuItem(DynamicEntityMenus.FieldDefinition, l["Menu:FieldDefinition"], "/DynamicEntity/FieldDefinition")
+                        new ApplicationMenuItem(DynamicEntityMenus.FieldDefinition, l["Menu:FieldDefinition"],
+                            "/DynamicEntity/FieldDefinition")
                     );
                 }
 
                 if (await context.IsGrantedAsync(DynamicEntityPermissions.ModelDefinition.Default))
                 {
                     menu.AddItem(
-                        new ApplicationMenuItem(DynamicEntityMenus.ModelDefinition, l["Menu:ModelDefinition"], "/DynamicEntity/ModelDefinition")
+                        new ApplicationMenuItem(DynamicEntityMenus.ModelDefinition, l["Menu:ModelDefinition"],
+                            "/DynamicEntity/ModelDefinition")
                     );
                 }
 
-                context.Menu.AddItem(menu);
+                context.Menu.GetAdministration().AddItem(menu);
             }
         }
     }