feat: add OnMenuItemClicked,SelectedKeys,SelectedKeysChanged (#93)

ant-design-blazor · Mar 27, 2024 · ae5337d · ae5337d
1 parent aa95cb1
commit ae5337d
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 12 deletions.
diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor
@@ -6,7 +6,8 @@
     Theme="MenuTheme.Light"
     MenuAccordion
     @bind-OpenKeys="openKeys"
-    @bind-Collapsed="collapsed">
+    @bind-Collapsed="collapsed"
+    @bind-SelectedKeys=selectedKeys>
     <HeaderContentRender>
         <Menu Mode="MenuMode.Horizontal" Theme="MenuTheme.Dark">
             <MenuItem OnClick="ResetMenu">Refresh Menu</MenuItem>
@@ -49,6 +50,7 @@
 
     private bool collapsed;
     private string[] openKeys = [];
+    private string[] selectedKeys = ["welcome"];
 
     protected override async Task OnInitializedAsync()
     {
@@ -57,7 +59,7 @@
         data[0].IconFont = "icon-tuichu";
         data.Insert(0, new MenuDataItem
             {
-                TitleTemplate =@<span><Icon Type="user"></Icon> Custom Menu </span>,
+                TitleTemplate =@<span><Icon Type="user"></Icon><span> Custom Menu </span</span>,
             });
         MenuData = data.ToArray();
     }

diff --git a/src/layout/src/BasicLayout.razor b/src/layout/src/BasicLayout.razor
@@ -22,7 +22,12 @@
                             SiderWidth="SiderWidth"
                             Accordion="MenuAccordion"
                             OnCollapse="HandleCollapse"
-                            OpenKeysChanged="OpenKeysChanged">
+                            OpenKeysChanged="OpenKeysChanged"
+                            OnMenuHeaderClick="@OnMenuHeaderClick"
+                            OnMenuItemClicked="OnMenuItemClicked"
+                            SelectedKeys="SelectedKeys"
+                            SelectedKeysChanged="SelectedKeysChanged"
+                            >
                         </SiderMenu>
                     </CascadingValue>
                 </CascadingValue>

diff --git a/src/layout/src/BasicLayout.razor.cs b/src/layout/src/BasicLayout.razor.cs
@@ -57,11 +57,12 @@ public partial class BasicLayout : IBasicLayout
         [Parameter] public string ColSize { get; set; } = "lg";
         [Parameter] public RenderFragment RightContentRender { get; set; }
         [Parameter] public RenderFragment HeaderContentRender { get; set; }
-        [Inject] public ILogger<BasicLayout> Logger { get; set; }
+        [Parameter] public string[] SelectedKeys { get; set; }
+        [Parameter] public EventCallback<string[]> SelectedKeysChanged { get; set; }
+        [Parameter] public EventCallback<MenuItem> OnMenuItemClicked { get; set; }
 
         protected override void OnInitialized()
         {
-            Logger.LogInformation("BasicLayout initialized.");
             base.OnInitialized();
             SetStyle();
             SetClassMap();
@@ -80,7 +81,7 @@ protected void SetStyle()
         {
             var hasLeftPadding = FixSiderbar && Layout != Layout.Top && !IsMobile;
             var paddingLeft = hasLeftPadding ? Collapsed ? 48 : SiderWidth : 0;
-            Logger.LogInformation($"HasLeftPadding: {hasLeftPadding}, Collapsed: {Collapsed}, Padding: {paddingLeft}");
+
             _genLayoutStyle = MenuRender ? $"padding-left: {paddingLeft}px; position: relative;" : "";
             _weakModeStyle = ColorWeak ? "filter: invert(80%);" : "";
         }

diff --git a/src/layout/src/SiderMenu/BaseMenu.razor b/src/layout/src/SiderMenu/BaseMenu.razor
@@ -8,7 +8,10 @@
       Style="@Style"
       Accordion="@Accordion"
       Class="@ClassMapper.Class"
-      OpenKeysChanged="OpenKeysChanged">
+      OpenKeysChanged="OpenKeysChanged"
+      OnMenuItemClicked="OnMenuItemClicked"
+      SelectedKeys="SelectedKeys"
+      SelectedKeysChanged="SelectedKeysChanged">
     @menuItemTemplate(MenuData, false)
 </Menu>
 

diff --git a/src/layout/src/SiderMenu/BaseMenu.razor.cs b/src/layout/src/SiderMenu/BaseMenu.razor.cs
@@ -14,6 +14,11 @@ internal interface IBaseMenu : IPureSettings
         EventCallback<bool> OnCollapse { get; }
         string[] OpenKeys { get; }
         EventCallback<string[]> OpenKeysChanged { get; set; }
+
+        string[] SelectedKeys { get; }
+        EventCallback<string[]> SelectedKeysChanged { get; set; }
+
+        EventCallback<MenuItem> OnMenuItemClicked { get; set; }
     }
 
     public partial class BaseMenu : IBaseMenu
@@ -28,11 +33,12 @@ public partial class BaseMenu : IBaseMenu
 
         [Parameter] public bool Accordion { get; set; }
 
-        [Inject] public ILogger<BaseMenu> Logger { get; set; }
+        [Parameter] public EventCallback<MenuItem> OnMenuItemClicked { get; set; }
+
+        [Parameter]
+        public string[] SelectedKeys { get; set; } = [];
 
-        protected override void OnInitialized()
-        {
-            Logger.LogInformation("BaseMenu initialized.");
-        }
+        [Parameter]
+        public EventCallback<string[]> SelectedKeysChanged { get; set; }
     }
 }
diff --git a/src/layout/src/SiderMenu/SiderMenu.razor b/src/layout/src/SiderMenu/SiderMenu.razor
@@ -36,6 +36,9 @@
             OpenKeys="OpenKeys"
             Accordion="@Accordion"
             OpenKeysChanged="OpenKeysChanged"
+            OnMenuItemClicked="OnMenuItemClicked"
+            SelectedKeys="SelectedKeys"
+            SelectedKeysChanged="SelectedKeysChanged"
             Style="@("width: '100%'")" />
     </div>
 

diff --git a/src/layout/src/SiderMenu/SiderMenu.razor.cs b/src/layout/src/SiderMenu/SiderMenu.razor.cs
@@ -64,6 +64,15 @@ public SiderTheme SiderTheme
             set => NavTheme = value == SiderTheme.Light ? MenuTheme.Light : MenuTheme.Dark;
         }
 
+        [Parameter]
+        public string[] SelectedKeys { get; set; }
+
+        [Parameter]
+        public EventCallback<string[]> SelectedKeysChanged { get; set; }
+
+        [Parameter]
+        public EventCallback<MenuItem> OnMenuItemClicked { get; set; }
+
         private async Task HandleOnCollapse(bool collapsed)
         {
             if (!IsMobile && OnCollapse.HasDelegate)

diff --git a/src/layout/src/TopNavHeader/TopNavHeader.razor.cs b/src/layout/src/TopNavHeader/TopNavHeader.razor.cs
@@ -30,6 +30,9 @@ public partial class TopNavHeader : ITopNavHeader
         [Parameter] public bool Hide { get; set; }
         [Parameter] public List<RenderFragment> Links { get; set; }
         [Parameter] public EventCallback<string[]> OpenKeysChanged { get; set; }
+        [Parameter] public string[] SelectedKeys { get; set; }
+        [Parameter] public EventCallback<string[]> SelectedKeysChanged { get; set; }
+        [Parameter] public EventCallback<MenuItem> OnMenuItemClicked { get; set; }
 
         protected override void OnInitialized()
         {