From 296c643f169b28f9de96625322e7e9b804f151ad Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Sun, 20 Aug 2023 21:57:53 +0800 Subject: [PATCH] Update `TryCreateMenuItemEto` --- common.props | 2 +- .../MenuItems/TryCreateMenuItemEto.cs | 19 +++++++++++++++++-- .../MenuItems/MenuItemDomainTests.cs | 10 +++++----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/common.props b/common.props index 241298e..e22214b 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 1.0.0 + 1.0.1 $(NoWarn);CS1591;CS0436 module true diff --git a/src/EasyAbp.Abp.DynamicMenu.Domain.Shared/EasyAbp/Abp/DynamicMenu/MenuItems/TryCreateMenuItemEto.cs b/src/EasyAbp.Abp.DynamicMenu.Domain.Shared/EasyAbp/Abp/DynamicMenu/MenuItems/TryCreateMenuItemEto.cs index e95d798..2efad6f 100644 --- a/src/EasyAbp.Abp.DynamicMenu.Domain.Shared/EasyAbp/Abp/DynamicMenu/MenuItems/TryCreateMenuItemEto.cs +++ b/src/EasyAbp.Abp.DynamicMenu.Domain.Shared/EasyAbp/Abp/DynamicMenu/MenuItems/TryCreateMenuItemEto.cs @@ -24,14 +24,25 @@ public class TryCreateMenuItemEto : ExtensibleObject, IMenuItem public string Permission { get; set; } + public int? Order { get; set; } + + public string Icon { get; set; } + + public string Target { get; set; } + + public bool IsDisabled { get; set; } + public string LResourceTypeName { get; set; } public string LResourceTypeAssemblyName { get; set; } + public TryCreateMenuItemEto() + { + } public TryCreateMenuItemEto(string parentName, bool inAdministration, string name, string displayName, - string url, string urlMvc, string urlBlazor, string urlAngular, string permission, string lResourceTypeName, - string lResourceTypeAssemblyName) + string url, string urlMvc, string urlBlazor, string urlAngular, string permission, int? order, string icon, + string target, bool isDisabled, string lResourceTypeName, string lResourceTypeAssemblyName) { ParentName = parentName; InAdministration = inAdministration; @@ -42,6 +53,10 @@ public TryCreateMenuItemEto(string parentName, bool inAdministration, string nam UrlBlazor = urlBlazor; UrlAngular = urlAngular; Permission = permission; + Order = order; + Icon = icon; + Target = target; + IsDisabled = isDisabled; LResourceTypeName = lResourceTypeName; LResourceTypeAssemblyName = lResourceTypeAssemblyName; } diff --git a/test/EasyAbp.Abp.DynamicMenu.Domain.Tests/MenuItems/MenuItemDomainTests.cs b/test/EasyAbp.Abp.DynamicMenu.Domain.Tests/MenuItems/MenuItemDomainTests.cs index 2872b6c..ad9d9a9 100644 --- a/test/EasyAbp.Abp.DynamicMenu.Domain.Tests/MenuItems/MenuItemDomainTests.cs +++ b/test/EasyAbp.Abp.DynamicMenu.Domain.Tests/MenuItems/MenuItemDomainTests.cs @@ -22,7 +22,7 @@ public async Task Should_Create_A_Menu_Item() var handler = ServiceProvider.GetRequiredService(); var eto = new TryCreateMenuItemEto(null, false, "GoogleLink", "Google", "https://google.com", null, null, - null, null, null, null); + null, null, null, null, null, false, null, null); // Act @@ -50,7 +50,7 @@ public async Task Should_Create_An_Administration_Menu_Item() var handler = ServiceProvider.GetRequiredService(); var eto = new TryCreateMenuItemEto(null, true, "GoogleLink", "Google", "https://google.com", null, null, - null, null, null, null); + null, null, null, null, null, false, null, null); // Act @@ -78,10 +78,10 @@ public async Task Should_Create_Menu_Items() var handler = ServiceProvider.GetRequiredService(); var itemEto1 = new TryCreateMenuItemEto(null, false, "SearchEngines", "Search engines", null, null, null, - null, null, null, null); + null, null, null, null, null, false, null, null); var itemEto2 = new TryCreateMenuItemEto(itemEto1.Name, false, "GoogleLink", "Google", "https://google.com", - null, null, null, null, null, null); + null, null, null, null, null, null, null, false, null, null); var eto = new TryCreateMenuItemsEto(new List { itemEto1, itemEto2 }); @@ -122,7 +122,7 @@ public async Task Should_Skip_Creating_An_Existing_Menu_Item() await repository.InsertAsync(existingMenuItem, true); var eto = new TryCreateMenuItemEto(null, false, "GoogleLink", "Google2", "https://google.com", null, null, - null, null, null, null); + null, null, null, null, null, false, null, null); // Act