diff --git a/src/blazor/admin/BootStarpAdmin.DataAccess.FreeSql/Extensions/FreeSqlExtensions.cs b/src/blazor/admin/BootStarpAdmin.DataAccess.FreeSql/Extensions/FreeSqlExtensions.cs
index cf6db7f97f5287934d82afc9039400901bc7068c..5ef93317742d6eb5a989b8789045c3b3251cc5de 100644
--- a/src/blazor/admin/BootStarpAdmin.DataAccess.FreeSql/Extensions/FreeSqlExtensions.cs
+++ b/src/blazor/admin/BootStarpAdmin.DataAccess.FreeSql/Extensions/FreeSqlExtensions.cs
@@ -24,6 +24,10 @@ static class FreeSqlExtensions
             i.Property(n => n.Period).IsIgnore(true);
             i.Property(n => n.IsReset).IsIgnore(true);
         });
+        freeSql.CodeFirst.ConfigEntity<Trace>(i =>
+        {
+            i.Name("Traces");
+        });
         freeSql.CodeFirst.ConfigEntity<Group>(i =>
         {
             i.Name("Groups");
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor
index 3413080bc735f203152a69f00a1db8bfa91662e2..277e070767b24c3237024fd301775348809ca037 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor
@@ -2,7 +2,7 @@
 
 <Table TItem="TItem" IsBordered="true" IsStriped="true" IsMultipleSelect="IsMultipleSelect" @ref="Instance"
        IsPagination="IsPagination" PageItemsSource="PageItemsSource" IsFixedHeader="IsFixedHeader"
-       IsTree="IsTree" OnTreeExpand="OnTreeExpand!" TreeIcon="fa-chevron-circle-right"
+       IsTree="IsTree" OnTreeExpand="OnTreeExpand!" TreeNodeConverter="TreeNodeConverter!" TreeIcon="fa-chevron-circle-right"
        ShowDefaultButtons="ShowDefaultButtons" ShowAdvancedSearch="ShowAdvancedSearch"
        ShowEmpty="ShowEmpty" EmptyText="暂无数据" EmptyImage="images/empty.svg" SortString="@SortString"
        OnQueryAsync="OnQueryAsync!" OnDeleteAsync="OnDeleteAsync!" OnSaveAsync="OnSaveAsync!"
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor.cs
index 76d34fd079c46c2ad71dd9fc4b3f474aaa73344d..bd11ff9c3ee2adc20d58f22068f9d180146ce6fc 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/AdminTable.razor.cs
@@ -145,8 +145,10 @@ namespace BootstrapAdmin.Web.Components
         /// 
         /// </summary>
         [Parameter]
-        public Func<TItem, Task<IEnumerable<TItem>>>? OnTreeExpand { get; set; }
+        public Func<TItem, Task<IEnumerable<TableTreeNode<TItem>>>>? OnTreeExpand { get; set; }
 
+        [Parameter]
+        public Func<IEnumerable<TItem>, Task<IEnumerable<TableTreeNode<TItem>>>>? TreeNodeConverter { get; set; }
         /// <summary>
         /// 
         /// </summary>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor
index 77fe74d5bad4a9baffc9904443fdb527bd4bc7d0..78f998a4b6dcc99320618c315a319bdf9c9d1f96 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor
@@ -1,7 +1,7 @@
 @page "/Admin/Menus"
 
 <AdminTable TItem="DataAccess.Models.Navigation"
-            IsTree="true" OnTreeExpand="OnTreeExpand" ExtendButtonColumnWidth="200"
+            IsTree="true" OnTreeExpand="OnTreeExpand" TreeNodeConverter="TreeNodeConverter" ExtendButtonColumnWidth="200"
             CustomerSearchModel="SearchModel" OnQueryAsync="OnQueryAsync">
     <TableToolbarTemplate>
         <TableToolbarButton TItem="DataAccess.Models.Navigation" Color="Color.Info" Icon="fa fa-sitemap" Text="分配角色" 
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor.cs
index ea8e0fc92f2a1110b29545de58695196e7880c83..bea97b06ded39fd6b72c5750be3835392755fd17 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Menus.razor.cs
@@ -123,9 +123,32 @@ public partial class Menus
         });
     }
 
-    private Task<IEnumerable<Navigation>> OnTreeExpand(Navigation menu)
+    private Task<IEnumerable<TableTreeNode<Navigation>>> OnTreeExpand(Navigation menu)
     {
         var navs = NavigationService.GetAllMenus(AppContext.UserName);
-        return Task.FromResult(navs.Where(m => m.ParentId == menu.Id).OrderBy(m => m.Order).AsEnumerable());
+        return Task.FromResult(navs.Where(m => m.ParentId == menu.Id).OrderBy(m => m.Order).AsEnumerable().Select(i => new TableTreeNode<Navigation>(i)));
+    }
+
+    public Task<IEnumerable<TableTreeNode<Navigation>>> TreeNodeConverter(IEnumerable<Navigation> items)
+    {
+        var ret = BuildTreeNodes(items, "0");
+        return Task.FromResult(ret);
+
+        IEnumerable<TableTreeNode<Navigation>> BuildTreeNodes(IEnumerable<Navigation> items, string parentId)
+        {
+            var navs = NavigationService.GetAllMenus(AppContext.UserName);
+            
+            var ret = new List<TableTreeNode<Navigation>>();
+            ret.AddRange(items.Where(i => i.ParentId == parentId).Select((nav, index) => new TableTreeNode<Navigation>(nav)
+            {
+               
+                HasChildren = navs.Any(i => i.ParentId == nav.Id),
+               
+                IsExpand = !navs.Any(i => i.ParentId == nav.Id),
+                // 获得子项集合
+                Items = BuildTreeNodes(items.Where(i => i.ParentId == nav.Id), nav.Id)
+            }));
+            return ret;
+        }
     }
 }
diff --git a/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor b/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor
index 3413080bc735f203152a69f00a1db8bfa91662e2..277e070767b24c3237024fd301775348809ca037 100644
--- a/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor
+++ b/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor
@@ -2,7 +2,7 @@
 
 <Table TItem="TItem" IsBordered="true" IsStriped="true" IsMultipleSelect="IsMultipleSelect" @ref="Instance"
        IsPagination="IsPagination" PageItemsSource="PageItemsSource" IsFixedHeader="IsFixedHeader"
-       IsTree="IsTree" OnTreeExpand="OnTreeExpand!" TreeIcon="fa-chevron-circle-right"
+       IsTree="IsTree" OnTreeExpand="OnTreeExpand!" TreeNodeConverter="TreeNodeConverter!" TreeIcon="fa-chevron-circle-right"
        ShowDefaultButtons="ShowDefaultButtons" ShowAdvancedSearch="ShowAdvancedSearch"
        ShowEmpty="ShowEmpty" EmptyText="暂无数据" EmptyImage="images/empty.svg" SortString="@SortString"
        OnQueryAsync="OnQueryAsync!" OnDeleteAsync="OnDeleteAsync!" OnSaveAsync="OnSaveAsync!"
diff --git a/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor.cs b/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor.cs
index a5e44eb13502f8ba8b60d4f76709ddb58878f73a..fdbc94767fdff45c862f9869e490b7153698fb51 100644
--- a/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor.cs
+++ b/src/blazor/client/BootstrapClient.Shared/Components/AdminTable.razor.cs
@@ -145,7 +145,10 @@ namespace BootstrapClient.Web.Shared.Components
         /// 
         /// </summary>
         [Parameter]
-        public Func<TItem, Task<IEnumerable<TItem>>>? OnTreeExpand { get; set; }
+        public Func<TItem, Task<IEnumerable<TableTreeNode<TItem>>>>? OnTreeExpand { get; set; }
+
+        [Parameter]
+        public Func<IEnumerable<TItem>, Task<IEnumerable<TableTreeNode<TItem>>>>? TreeNodeConverter { get; set; }
 
         /// <summary>
         ///