Merge pull request #10122 from abpframework/auto-merge/rel-4-4/556

Merge branch dev with rel-4.4

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs

@@ -60,7 +60,8 @@ namespace Volo.CmsKit.Admin.Menus
                     input.Order,
                     input.Target,
                     input.ElementId,
-                    input.CssClass
+                    input.CssClass,
+                    CurrentTenant.Id
                 );
 
             await MenuItemRepository.InsertAsync(menuItem);

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuItem.cs

@@ -23,7 +23,7 @@ namespace Volo.CmsKit.Menus
         public string DisplayName { get; protected set; }
 
         public bool IsActive { get; set; }
-        
+
         [NotNull]
         public string Url { get; protected set; }
 
@@ -39,7 +39,7 @@ namespace Volo.CmsKit.Menus
 
         public Guid? PageId { get; protected set; }
 
-        public Guid? TenantId { get;  protected set; }
+        public Guid? TenantId { get; protected set; }
 
         public MenuItem(Guid id,
                         [NotNull] string displayName,
@@ -50,8 +50,9 @@ namespace Volo.CmsKit.Menus
                         int order = 0,
                         [CanBeNull] string target = null,
                         [CanBeNull] string elementId = null,
-                        [CanBeNull] string cssClass = null) 
-            :base(id)
+                        [CanBeNull] string cssClass = null,
+                        [CanBeNull] Guid? tenantId = null)
+            : base(id)
         {
             SetDisplayName(displayName);
             IsActive = isActive;
@@ -62,6 +63,7 @@ namespace Volo.CmsKit.Menus
             Target = target;
             ElementId = elementId;
             CssClass = cssClass;
+            TenantId = tenantId;
         }
 
         public void SetDisplayName([NotNull] string displayName)
@@ -69,7 +71,7 @@ namespace Volo.CmsKit.Menus
             DisplayName = Check.NotNullOrEmpty(displayName, nameof(displayName), MenuItemConsts.MaxDisplayNameLength);
         }
 
-        public void SetUrl([NotNull]string url)
+        public void SetUrl([NotNull] string url)
         {
             Url = Check.NotNullOrEmpty(url, nameof(url), MenuItemConsts.MaxUrlLength);
         }