diff --git a/src/admin/Bootstrap.Admin/App.razor b/src/admin/Bootstrap.Admin/Pages/App.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/App.razor
rename to src/admin/Bootstrap.Admin/Pages/App.razor
diff --git a/src/admin/Bootstrap.Admin/Components/AdminLayoutComponentBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/AdminLayoutComponentBase.cs
similarity index 85%
rename from src/admin/Bootstrap.Admin/Components/AdminLayoutComponentBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/AdminLayoutComponentBase.cs
index ee1096560a4ccd7af3284c0e7407b6cd010f4e56..1494b59c0b2384f75ea57f1b79b77fd1ac12f909 100644
--- a/src/admin/Bootstrap.Admin/Components/AdminLayoutComponentBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/AdminLayoutComponentBase.cs
@@ -1,7 +1,7 @@
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// AdminLayout 布局类
diff --git a/src/admin/Bootstrap.Admin/Components/AlertBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/AlertBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/AlertBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/AlertBase.cs
index 19ad6a384bfcb08998772e8c28a056b636b1ab0c..3fb08db48b084ee5ab46206f1249c2e1a06da547 100644
--- a/src/admin/Bootstrap.Admin/Components/AlertBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/AlertBase.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 弹窗组件基类
diff --git a/src/admin/Bootstrap.Admin/Components/AuthorizateComponent.cs b/src/admin/Bootstrap.Admin/Pages/Components/AuthorizateComponent.cs
similarity index 95%
rename from src/admin/Bootstrap.Admin/Components/AuthorizateComponent.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/AuthorizateComponent.cs
index 35056c08f12be65faac45124c089a3cad63030ff..b8e26cc343488dd43fbebd69a6e9c6d7bc26d5ef 100644
--- a/src/admin/Bootstrap.Admin/Components/AuthorizateComponent.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/AuthorizateComponent.cs
@@ -1,4 +1,4 @@
-using Bootstrap.Admin.Extensions;
+using Bootstrap.Admin.Pages.Extensions;
 using Bootstrap.Security.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 using System;
 using System.Threading.Tasks;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 授权组件
diff --git a/src/admin/Bootstrap.Admin/Components/BootstrapAdminDataAnnotationsValidator.cs b/src/admin/Bootstrap.Admin/Pages/Components/BootstrapAdminDataAnnotationsValidator.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/BootstrapAdminDataAnnotationsValidator.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/BootstrapAdminDataAnnotationsValidator.cs
index 7aafc043cc56d525d6c56d4bde1548ffff0c1f3b..c8cb0457912804f168a575f28c75403f969cc2b7 100644
--- a/src/admin/Bootstrap.Admin/Components/BootstrapAdminDataAnnotationsValidator.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/BootstrapAdminDataAnnotationsValidator.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Components.Forms;
 using System;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// BootstrapAdminDataAnnotationsValidator 验证组件
diff --git a/src/admin/Bootstrap.Admin/Components/BootstrapAdminEditContextDataAnnotationsExtensions.cs b/src/admin/Bootstrap.Admin/Pages/Components/BootstrapAdminEditContextDataAnnotationsExtensions.cs
similarity index 99%
rename from src/admin/Bootstrap.Admin/Components/BootstrapAdminEditContextDataAnnotationsExtensions.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/BootstrapAdminEditContextDataAnnotationsExtensions.cs
index 57683d8f7314a4271e83c26010b4a40bef569c33..726f37fbd306aef425e09a9f0abaaa22445bc2e1 100644
--- a/src/admin/Bootstrap.Admin/Components/BootstrapAdminEditContextDataAnnotationsExtensions.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/BootstrapAdminEditContextDataAnnotationsExtensions.cs
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Reflection;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/CheckBoxState.cs b/src/admin/Bootstrap.Admin/Pages/Components/CheckBoxState.cs
similarity index 95%
rename from src/admin/Bootstrap.Admin/Components/CheckBoxState.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/CheckBoxState.cs
index 91d416bdf0489aa332f9daa425197cb87cf82798..bce115e06cdeec95f01d548a9f9477d572f6d085 100644
--- a/src/admin/Bootstrap.Admin/Components/CheckBoxState.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/CheckBoxState.cs
@@ -1,4 +1,4 @@
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// CheckBox 组件状态枚举值
diff --git a/src/admin/Bootstrap.Admin/Components/CheckboxBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/CheckboxBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/CheckboxBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/CheckboxBase.cs
index 4390bf8be034b4d87659ae99b094f8a81a624cf6..5cc91f9c9418d5f4e3226ebed342f10fde301942 100644
--- a/src/admin/Bootstrap.Admin/Components/CheckboxBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/CheckboxBase.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using System;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Checkbox 组件基类
diff --git a/src/admin/Bootstrap.Admin/Components/Color.cs b/src/admin/Bootstrap.Admin/Pages/Components/Color.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/Color.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/Color.cs
index b9bcbbd0e7b87db7e2856fc849893bf95db5cd80..a0d10c45b9c27b62617f0756b19d39dc24f061e5 100644
--- a/src/admin/Bootstrap.Admin/Components/Color.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/Color.cs
@@ -1,4 +1,4 @@
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/ConditionComponent.cs b/src/admin/Bootstrap.Admin/Pages/Components/ConditionComponent.cs
similarity index 95%
rename from src/admin/Bootstrap.Admin/Components/ConditionComponent.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ConditionComponent.cs
index 8f1e4bbfe2aeb8593bd90b60889d749057c086ad..63de57654afac2385485cec054a2d7756729b51d 100644
--- a/src/admin/Bootstrap.Admin/Components/ConditionComponent.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ConditionComponent.cs
@@ -1,11 +1,11 @@
 using System;
-using Bootstrap.Admin.Extensions;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Extensions;
+using Bootstrap.Admin.Pages.Shared;
 using Bootstrap.Security.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 条件输出组件
diff --git a/src/admin/Bootstrap.Admin/Components/DefaultLayoutComponentBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/DefaultLayoutComponentBase.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/DefaultLayoutComponentBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/DefaultLayoutComponentBase.cs
index f524b593e175d893227ba934447252b132e6d575..a98af7ebccefed0fc51a8ecfac0e6de33c6e9bc5 100644
--- a/src/admin/Bootstrap.Admin/Components/DefaultLayoutComponentBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/DefaultLayoutComponentBase.cs
@@ -1,6 +1,6 @@
-using Bootstrap.Admin.Extensions;
+using Bootstrap.Admin.Pages.Extensions;
 using Bootstrap.Admin.Models;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Shared;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Server;
@@ -9,7 +9,7 @@ using System;
 using System.Net;
 using System.Threading.Tasks;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     ///
diff --git a/src/admin/Bootstrap.Admin/Components/DropdownBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/DropdownBase.cs
similarity index 94%
rename from src/admin/Bootstrap.Admin/Components/DropdownBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/DropdownBase.cs
index a71e23c8809149a5b8de023e7c6e8a4e1e3db6d0..a6d3c47c575d2546ef29e1e22a94daad3fe63677 100644
--- a/src/admin/Bootstrap.Admin/Components/DropdownBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/DropdownBase.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Dropdown 组件
diff --git a/src/admin/Bootstrap.Admin/Components/EditPageBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/EditPageBase.cs
similarity index 98%
rename from src/admin/Bootstrap.Admin/Components/EditPageBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/EditPageBase.cs
index c2c38b9049727db8a4b7e4c64adbf961ee1c3935..c8205e88c62ff6d3dc2b4f51b63439c289dbf2c4 100644
--- a/src/admin/Bootstrap.Admin/Components/EditPageBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/EditPageBase.cs
@@ -1,9 +1,9 @@
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Shared;
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 可编辑页面组件包含查询与数据表格
diff --git a/src/admin/Bootstrap.Admin/Components/EqualToValidator.cs b/src/admin/Bootstrap.Admin/Pages/Components/EqualToValidator.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/EqualToValidator.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/EqualToValidator.cs
index 38611d67b9ec8f8e745e994f804f1d0d5cb3a1ed..1b5e0647eb91d78e876cbddbdbe7b1981822e9f0 100644
--- a/src/admin/Bootstrap.Admin/Components/EqualToValidator.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/EqualToValidator.cs
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System;
 using System.Linq.Expressions;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/HeaderBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/HeaderBase.cs
similarity index 94%
rename from src/admin/Bootstrap.Admin/Components/HeaderBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/HeaderBase.cs
index 93323879d80bf7b4854d6784c386d479bde6025a..3be253a5178dc5ee0b22cba69d8475e67cc8c057 100644
--- a/src/admin/Bootstrap.Admin/Components/HeaderBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/HeaderBase.cs
@@ -1,8 +1,8 @@
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Shared;
 using Bootstrap.DataAccess;
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     ///
diff --git a/src/admin/Bootstrap.Admin/Components/IRules.cs b/src/admin/Bootstrap.Admin/Pages/Components/IRules.cs
similarity index 86%
rename from src/admin/Bootstrap.Admin/Components/IRules.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/IRules.cs
index 3a1e672dd207ee81ebc23f8a9953fadf7a5acd45..a2b379ce82ba4feff4ca5e023e039e5e98f83026 100644
--- a/src/admin/Bootstrap.Admin/Components/IRules.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/IRules.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// IRules 接口
diff --git a/src/admin/Bootstrap.Admin/Components/ITableHeader.cs b/src/admin/Bootstrap.Admin/Pages/Components/ITableHeader.cs
similarity index 92%
rename from src/admin/Bootstrap.Admin/Components/ITableHeader.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ITableHeader.cs
index 0c08920d1ca41137179d8a393f050ec9e298eef4..9f0344a51ae6b193f10686c627d32f99c28cad0e 100644
--- a/src/admin/Bootstrap.Admin/Components/ITableHeader.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ITableHeader.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// ITableHeader 接口
diff --git a/src/admin/Bootstrap.Admin/Components/IValidateComponent.cs b/src/admin/Bootstrap.Admin/Pages/Components/IValidateComponent.cs
similarity index 94%
rename from src/admin/Bootstrap.Admin/Components/IValidateComponent.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/IValidateComponent.cs
index 5f8e0e39ff59b1a2b043869fae303208c1f033c9..5cd85f2723fcb54d31be6d0df8309782bdcc9e89 100644
--- a/src/admin/Bootstrap.Admin/Components/IValidateComponent.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/IValidateComponent.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// IValidComponent 接口
diff --git a/src/admin/Bootstrap.Admin/Components/LgbEditFormBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/LgbEditFormBase.cs
similarity index 99%
rename from src/admin/Bootstrap.Admin/Components/LgbEditFormBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/LgbEditFormBase.cs
index 557d1b8cc7123e5db8f52f292b96d59d67bffde0..36eb1d14615228317c2867f4b62a437bf40a0b2c 100644
--- a/src/admin/Bootstrap.Admin/Components/LgbEditFormBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/LgbEditFormBase.cs
@@ -5,7 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// LgbEditForm 组件
diff --git a/src/admin/Bootstrap.Admin/Components/LgbInputBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/LgbInputBase.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/LgbInputBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/LgbInputBase.cs
index f706352e49c698b22e071845ab1ed5c37afae34b..126aaca9d04c8664b1fba22f8ea8510115f2348e 100644
--- a/src/admin/Bootstrap.Admin/Components/LgbInputBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/LgbInputBase.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Linq;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// LgbInputText 组件
diff --git a/src/admin/Bootstrap.Admin/Components/LgbInputText.cs b/src/admin/Bootstrap.Admin/Pages/Components/LgbInputText.cs
similarity index 62%
rename from src/admin/Bootstrap.Admin/Components/LgbInputText.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/LgbInputText.cs
index 1e9890a0949b0c09ab151f916c492b9fb5a9e8e4..e07e3daf8785b644a48af7371806abb5c40688b2 100644
--- a/src/admin/Bootstrap.Admin/Components/LgbInputText.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/LgbInputText.cs
@@ -1,6 +1,6 @@
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Shared;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// LgbInputText 组件
diff --git a/src/admin/Bootstrap.Admin/Components/LgbTableHeader.cs b/src/admin/Bootstrap.Admin/Pages/Components/LgbTableHeader.cs
similarity index 95%
rename from src/admin/Bootstrap.Admin/Components/LgbTableHeader.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/LgbTableHeader.cs
index a0050a0e733a1917a78082ca9268aa400966c7a1..46bc039ca81c9775eece4f05a3cbb9dd6e9129a0 100644
--- a/src/admin/Bootstrap.Admin/Components/LgbTableHeader.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/LgbTableHeader.cs
@@ -1,10 +1,10 @@
-using Bootstrap.Admin.Extensions;
+using Bootstrap.Admin.Pages.Extensions;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using System;
 using System.Linq.Expressions;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 表头组件
diff --git a/src/admin/Bootstrap.Admin/Components/ModalBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/ModalBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/ModalBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ModalBase.cs
index a887d8bd6a15f19bbbe548ac496f83ec2e2d603a..4fbef3b40ba68ad3d4163aa86d3553171ab55c5d 100644
--- a/src/admin/Bootstrap.Admin/Components/ModalBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ModalBase.cs
@@ -1,9 +1,9 @@
-using Bootstrap.Admin.Extensions;
+using Bootstrap.Admin.Pages.Extensions;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using System;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 模态框组件类
diff --git a/src/admin/Bootstrap.Admin/Components/NavItemBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/NavItemBase.cs
similarity index 88%
rename from src/admin/Bootstrap.Admin/Components/NavItemBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/NavItemBase.cs
index 93e193485093da1b0223a74236b99aa77679f05a..f3866033ab89c08215ec66f7536ce372cd5c8908 100644
--- a/src/admin/Bootstrap.Admin/Components/NavItemBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/NavItemBase.cs
@@ -1,7 +1,7 @@
 using Bootstrap.Security;
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/PageContent.cs b/src/admin/Bootstrap.Admin/Pages/Components/PageContent.cs
similarity index 92%
rename from src/admin/Bootstrap.Admin/Components/PageContent.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/PageContent.cs
index 314448567b3fb4d5ab3f54ff6a556a1cf58a742b..58bdafd11ecf32d4522084dd9b0991aab5fbf533 100644
--- a/src/admin/Bootstrap.Admin/Components/PageContent.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/PageContent.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Http;
 using System;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// PageContent 网页组件
@@ -31,7 +31,7 @@ namespace Bootstrap.Admin.Components
             var name = Name.Replace("/", ".");
             if (!string.IsNullOrEmpty(name))
             {
-                var t = Type.GetType($"Bootstrap.Admin{name}");
+                var t = Type.GetType($"Bootstrap.Admin.Pages.Views.{name}");
                 if (t != null)
                 {
                     // 访问日志
diff --git a/src/admin/Bootstrap.Admin/Components/PageContentAttributes.cs b/src/admin/Bootstrap.Admin/Pages/Components/PageContentAttributes.cs
similarity index 91%
rename from src/admin/Bootstrap.Admin/Components/PageContentAttributes.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/PageContentAttributes.cs
index 868653146bf1f25fd4cc726e533b17f196fb64e7..95263d1a6ef8d617aefd80c2fe63093cf64985c4 100644
--- a/src/admin/Bootstrap.Admin/Components/PageContentAttributes.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/PageContentAttributes.cs
@@ -1,4 +1,4 @@
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// PageContentAttributes 实体类
diff --git a/src/admin/Bootstrap.Admin/Components/PaginationBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/PaginationBase.cs
similarity index 98%
rename from src/admin/Bootstrap.Admin/Components/PaginationBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/PaginationBase.cs
index dcf1e03c4f5ea07bcbd8ee245dfc7facb462e32e..d329a8583bd62039009a72cacd4643429fe782a6 100644
--- a/src/admin/Bootstrap.Admin/Components/PaginationBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/PaginationBase.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 分页组件基类
diff --git a/src/admin/Bootstrap.Admin/Components/Placement.cs b/src/admin/Bootstrap.Admin/Pages/Components/Placement.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/Placement.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/Placement.cs
index 70f1b93c127dcca4290a277400266c0d51e2fbda..b3d3280bdd7be1fa12fa4d9c347fd6f637f7b51b 100644
--- a/src/admin/Bootstrap.Admin/Components/Placement.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/Placement.cs
@@ -1,4 +1,4 @@
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 组件位置枚举类型
diff --git a/src/admin/Bootstrap.Admin/Components/QueryBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/QueryBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/QueryBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/QueryBase.cs
index d85dc914380bfcad5ba79a88e986950b0c68fe4e..c35d50afbee84a19b44f53da6055b1d24da7ddbd 100644
--- a/src/admin/Bootstrap.Admin/Components/QueryBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/QueryBase.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using System;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 查询组件
diff --git a/src/admin/Bootstrap.Admin/Components/QueryData.cs b/src/admin/Bootstrap.Admin/Pages/Components/QueryData.cs
similarity index 93%
rename from src/admin/Bootstrap.Admin/Components/QueryData.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/QueryData.cs
index f1a321c18a09f85ee81a86c697242a626bc41bfe..acc1235fe52264004857a38cecb5a1aa21dee020 100644
--- a/src/admin/Bootstrap.Admin/Components/QueryData.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/QueryData.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/QueryPageOptions.cs b/src/admin/Bootstrap.Admin/Pages/Components/QueryPageOptions.cs
similarity index 95%
rename from src/admin/Bootstrap.Admin/Components/QueryPageOptions.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/QueryPageOptions.cs
index f5c54215d47cb624455af44b0ac0e00304cfd63d..9c59eeedcb168dec2bfa6db184e267133a170d62 100644
--- a/src/admin/Bootstrap.Admin/Components/QueryPageOptions.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/QueryPageOptions.cs
@@ -1,4 +1,4 @@
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 查询条件实体类
diff --git a/src/admin/Bootstrap.Admin/Components/RequiredValidator.cs b/src/admin/Bootstrap.Admin/Pages/Components/RequiredValidator.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/RequiredValidator.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/RequiredValidator.cs
index 6b7308b4df8d4ed027ecd2ba843596cedec2b6ed..e66f2c01b07c6ff2de52837e7bebfa00bafc1fb5 100644
--- a/src/admin/Bootstrap.Admin/Components/RequiredValidator.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/RequiredValidator.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/SectionBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/SectionBase.cs
similarity index 94%
rename from src/admin/Bootstrap.Admin/Components/SectionBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/SectionBase.cs
index e97a86446362432b717902c69d7f6e60d5e3f68c..1390198abc4fdc080c0969b210f389aa66e9f9a8 100644
--- a/src/admin/Bootstrap.Admin/Components/SectionBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/SectionBase.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/SelectBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/SelectBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/SelectBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/SelectBase.cs
index bb5fa7c3ca9b5cc5bd4678f912e52301708546b3..7385188b60fa5a03efe203e4d500ca7d327dfe30 100644
--- a/src/admin/Bootstrap.Admin/Components/SelectBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/SelectBase.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Select 组件基类
diff --git a/src/admin/Bootstrap.Admin/Components/SelectItemBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/SelectItemBase.cs
similarity index 92%
rename from src/admin/Bootstrap.Admin/Components/SelectItemBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/SelectItemBase.cs
index b9835e9acb138ab53d5d3453162b12c6d22075d9..5605d9297f641a8340e25431652af401196c4f58 100644
--- a/src/admin/Bootstrap.Admin/Components/SelectItemBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/SelectItemBase.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using System;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/SelectedItem.cs b/src/admin/Bootstrap.Admin/Pages/Components/SelectedItem.cs
similarity index 91%
rename from src/admin/Bootstrap.Admin/Components/SelectedItem.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/SelectedItem.cs
index f1c81ab90a23d7b183703624e50271ab854eca15..e21e092d84c09db14e6b74854c73cbc89b85d521 100644
--- a/src/admin/Bootstrap.Admin/Components/SelectedItem.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/SelectedItem.cs
@@ -1,4 +1,4 @@
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 选项类
diff --git a/src/admin/Bootstrap.Admin/Components/SideBarBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/SideBarBase.cs
similarity index 92%
rename from src/admin/Bootstrap.Admin/Components/SideBarBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/SideBarBase.cs
index c66e28189d860b70227ed9561005dbdb92f6109b..01ebdbc7dae2f8b5d4a98ffb2b1f6a959b147044 100644
--- a/src/admin/Bootstrap.Admin/Components/SideBarBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/SideBarBase.cs
@@ -1,8 +1,8 @@
 using Bootstrap.Admin.Models;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Shared;
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 侧边栏组件
diff --git a/src/admin/Bootstrap.Admin/Components/StringLengthValidator.cs b/src/admin/Bootstrap.Admin/Pages/Components/StringLengthValidator.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/StringLengthValidator.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/StringLengthValidator.cs
index 14adc8ee2b1ba523a3e267981eac0e4e12a4d918..c7f7790e90517d634a534b0e70e637eb0ecd775e 100644
--- a/src/admin/Bootstrap.Admin/Components/StringLengthValidator.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/StringLengthValidator.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Components/SubmitModalBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/SubmitModalBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/SubmitModalBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/SubmitModalBase.cs
index f8bb919a38b54a8364f45ff2381ae19c54237a7c..1192bf524a5ce936dbf6ed467b6002f9d0a6d42d 100644
--- a/src/admin/Bootstrap.Admin/Components/SubmitModalBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/SubmitModalBase.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 数据绑定提交弹窗组件
diff --git a/src/admin/Bootstrap.Admin/Components/TabBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/TabBase.cs
similarity index 94%
rename from src/admin/Bootstrap.Admin/Components/TabBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TabBase.cs
index e7a87a2f3029128dc2afc9eb3603b3a291b7772e..fe28749bce617a98a12787a0a60b9825fb1ab2ac 100644
--- a/src/admin/Bootstrap.Admin/Components/TabBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TabBase.cs
@@ -1,10 +1,10 @@
-using Bootstrap.Admin.Extensions;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Extensions;
+using Bootstrap.Admin.Pages.Shared;
 using Bootstrap.Security;
 using Microsoft.AspNetCore.Components;
 using System.Threading.Tasks;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     ///
diff --git a/src/admin/Bootstrap.Admin/Components/TabSetBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/TabSetBase.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/TabSetBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TabSetBase.cs
index a1a89c95c2f311e78920edff853828342cc58184..a4303adaa6ebbe092bb581128f34b69ea57f2c72 100644
--- a/src/admin/Bootstrap.Admin/Components/TabSetBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TabSetBase.cs
@@ -1,5 +1,5 @@
-using Bootstrap.Admin.Extensions;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Extensions;
+using Bootstrap.Admin.Pages.Shared;
 using Bootstrap.Security;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// TabSet 组件类
@@ -84,7 +84,7 @@ namespace Bootstrap.Admin.Components
                 Tabs.ForEach(t => t.SetActive(false));
                 Tabs.Add(tab);
                 Pages.ForEach(p => p.Active = false);
-                Pages.Add(new PageContentAttributes() { Id = menu.Id, Name = menu.Url.ToBlazorMenuUrl(), Active = true });
+                Pages.Add(new PageContentAttributes() { Id = menu.Id, Name = menu.Url.Replace("~/", ""), Active = true });
             }
             else
             {
diff --git a/src/admin/Bootstrap.Admin/Components/TableBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
similarity index 98%
rename from src/admin/Bootstrap.Admin/Components/TableBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
index cc71f394e4a1b52d4d527ddf46286e5dc50a9e95..2764a8c4e431d4208a2ff2265f8f78f05cf634a8 100644
--- a/src/admin/Bootstrap.Admin/Components/TableBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
@@ -1,5 +1,5 @@
-using Bootstrap.Admin.Extensions;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Extensions;
+using Bootstrap.Admin.Pages.Shared;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.JSInterop;
@@ -7,7 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 表格组件类
@@ -393,7 +393,9 @@ namespace Bootstrap.Admin.Components
         {
             if (SelectedItems.Count == 1)
             {
+#nullable disable
                 EditModel = SelectedItems[0].Clone();
+#nullable restore
                 EditModal?.Toggle();
             }
             else
diff --git a/src/admin/Bootstrap.Admin/Components/TableHeaderBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/TableHeaderBase.cs
similarity index 95%
rename from src/admin/Bootstrap.Admin/Components/TableHeaderBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TableHeaderBase.cs
index 07abb7aefe49cc11c03e429d1b61d1d4f1fe8127..7dc96eaac66d073a093edcd73d4d45a114e09ea2 100644
--- a/src/admin/Bootstrap.Admin/Components/TableHeaderBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TableHeaderBase.cs
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Table Header 组件
diff --git a/src/admin/Bootstrap.Admin/Components/TableHeaderContent.cs b/src/admin/Bootstrap.Admin/Pages/Components/TableHeaderContent.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/TableHeaderContent.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TableHeaderContent.cs
index b15e0939010c8b4a1741ad8cf69d99cfb0d913eb..051ae9de2829800cc23ae1aab6b46aecce36a9f3 100644
--- a/src/admin/Bootstrap.Admin/Components/TableHeaderContent.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TableHeaderContent.cs
@@ -1,9 +1,9 @@
 using System;
-using Bootstrap.Admin.Extensions;
+using Bootstrap.Admin.Pages.Extensions;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Table Header 表头组件
diff --git a/src/admin/Bootstrap.Admin/Components/TableToolbarBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/TableToolbarBase.cs
similarity index 94%
rename from src/admin/Bootstrap.Admin/Components/TableToolbarBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TableToolbarBase.cs
index ddaafc73084e9e416f13f8201e383a779beea9fb..9df5c12488c295484c4c8bd0700bbc2529cf9ecb 100644
--- a/src/admin/Bootstrap.Admin/Components/TableToolbarBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TableToolbarBase.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Table Toolbar 组件
diff --git a/src/admin/Bootstrap.Admin/Components/TableToolbarButton.cs b/src/admin/Bootstrap.Admin/Pages/Components/TableToolbarButton.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/TableToolbarButton.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TableToolbarButton.cs
index d843318945bb2d69692c3e65bef74b245d5c3c03..504976795126d2e903318dae0986b620eb9d0cf5 100644
--- a/src/admin/Bootstrap.Admin/Components/TableToolbarButton.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TableToolbarButton.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 表格 Toolbar 按钮组件
diff --git a/src/admin/Bootstrap.Admin/Components/TableToolbarContent.cs b/src/admin/Bootstrap.Admin/Pages/Components/TableToolbarContent.cs
similarity index 99%
rename from src/admin/Bootstrap.Admin/Components/TableToolbarContent.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/TableToolbarContent.cs
index 56a5b67d41cb5bcc7461dddb92f43bc9061e8781..92a3c7595e71223a969b37d2def6e8adf4bcce8e 100644
--- a/src/admin/Bootstrap.Admin/Components/TableToolbarContent.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TableToolbarContent.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Table Toolbar 按钮呈现组件
diff --git a/src/admin/Bootstrap.Admin/Components/ToastBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/ToastBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/ToastBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ToastBase.cs
index bb6dffeffc6a542de3bfc4da2f726cffbae84b88..cbd80f5100faab6f5b60f8526beabfb3caeaeeac 100644
--- a/src/admin/Bootstrap.Admin/Components/ToastBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ToastBase.cs
@@ -1,9 +1,9 @@
-using Bootstrap.Admin.Extensions;
+using Bootstrap.Admin.Pages.Extensions;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using System;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Toast 组件基类
diff --git a/src/admin/Bootstrap.Admin/Components/ToastCategory.cs b/src/admin/Bootstrap.Admin/Pages/Components/ToastCategory.cs
similarity index 88%
rename from src/admin/Bootstrap.Admin/Components/ToastCategory.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ToastCategory.cs
index 2e2ba1d6e933243ce4273592948d0c304ffb09cc..85543d91f3561003b4c5d6345e6354662282db65 100644
--- a/src/admin/Bootstrap.Admin/Components/ToastCategory.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ToastCategory.cs
@@ -1,4 +1,4 @@
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Toast 组件类型
diff --git a/src/admin/Bootstrap.Admin/Components/ToggleBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/ToggleBase.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Components/ToggleBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ToggleBase.cs
index cd4f037fac86fc2829b8f4c1d776334f50d07edd..735e4bb4dde82e9d186ba29cd9e46a1dc311dc95 100644
--- a/src/admin/Bootstrap.Admin/Components/ToggleBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ToggleBase.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// Toggle 开关组件
diff --git a/src/admin/Bootstrap.Admin/Components/ValidateInputBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/ValidateInputBase.cs
similarity index 98%
rename from src/admin/Bootstrap.Admin/Components/ValidateInputBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ValidateInputBase.cs
index b956506dce46a28c418112857c0ad5288f947df8..c79164f514866ba39152be3fad596a30fa0f72ad 100644
--- a/src/admin/Bootstrap.Admin/Components/ValidateInputBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ValidateInputBase.cs
@@ -1,4 +1,4 @@
-using Bootstrap.Admin.Extensions;
+using Bootstrap.Admin.Pages.Extensions;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.JSInterop;
@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Linq;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 内置验证组件基类
diff --git a/src/admin/Bootstrap.Admin/Components/ValidatorComponentBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/ValidatorComponentBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Components/ValidatorComponentBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Components/ValidatorComponentBase.cs
index f4eace287a529e0060ddad6bd4cb113836927412..bef55a23e4acd8b0c3c6ca165d3a8c3110acab3c 100644
--- a/src/admin/Bootstrap.Admin/Components/ValidatorComponentBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/ValidatorComponentBase.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bootstrap.Admin.Components
+namespace Bootstrap.Admin.Pages.Components
 {
     /// <summary>
     /// 验证组件基类
diff --git a/src/admin/Bootstrap.Admin/Extensions/DisplayNamesExtensions.cs b/src/admin/Bootstrap.Admin/Pages/Extensions/DisplayNamesExtensions.cs
similarity index 100%
rename from src/admin/Bootstrap.Admin/Extensions/DisplayNamesExtensions.cs
rename to src/admin/Bootstrap.Admin/Pages/Extensions/DisplayNamesExtensions.cs
diff --git a/src/admin/Bootstrap.Admin/Extensions/FieldIdentifierExtensions.cs b/src/admin/Bootstrap.Admin/Pages/Extensions/FieldIdentifierExtensions.cs
similarity index 91%
rename from src/admin/Bootstrap.Admin/Extensions/FieldIdentifierExtensions.cs
rename to src/admin/Bootstrap.Admin/Pages/Extensions/FieldIdentifierExtensions.cs
index b671381828e94bb53c467bc4a3893df490efe6c1..2dfe35c9652ebdf2ccbc70b7f4c23951775e3b3c 100644
--- a/src/admin/Bootstrap.Admin/Extensions/FieldIdentifierExtensions.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Extensions/FieldIdentifierExtensions.cs
@@ -1,9 +1,8 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Components.Forms;
 using System.ComponentModel;
 
-namespace Bootstrap.Admin.Extensions
+namespace Microsoft.AspNetCore.Components.Forms
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Extensions/HttpContextExtensions.cs b/src/admin/Bootstrap.Admin/Pages/Extensions/HttpContextExtensions.cs
similarity index 100%
rename from src/admin/Bootstrap.Admin/Extensions/HttpContextExtensions.cs
rename to src/admin/Bootstrap.Admin/Pages/Extensions/HttpContextExtensions.cs
diff --git a/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs b/src/admin/Bootstrap.Admin/Pages/Extensions/JSRuntimeExtensions.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
rename to src/admin/Bootstrap.Admin/Pages/Extensions/JSRuntimeExtensions.cs
index 938ad6b09258e48e87e2042a213a6c8658ac0e6e..a03475ef63534097203bca0539359cfe064f5488 100644
--- a/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Extensions/JSRuntimeExtensions.cs
@@ -1,7 +1,6 @@
-using Microsoft.JSInterop;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
-namespace Bootstrap.Admin.Extensions
+namespace Microsoft.JSInterop
 {
     /// <summary>
     /// JSRuntime 扩展操作类
diff --git a/src/admin/Bootstrap.Admin/Extensions/ObjectExtensions.cs b/src/admin/Bootstrap.Admin/Pages/Extensions/ObjectExtensions.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Extensions/ObjectExtensions.cs
rename to src/admin/Bootstrap.Admin/Pages/Extensions/ObjectExtensions.cs
index ca07f34219a1e8782f312c3a551b958cd0679bdc..23f9eb0e77740a45ef3a56b6becc477825b65eb1 100644
--- a/src/admin/Bootstrap.Admin/Extensions/ObjectExtensions.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Extensions/ObjectExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace Bootstrap.Admin.Extensions
+namespace Bootstrap.Admin.Pages.Extensions
 {
     /// <summary>
     /// 
diff --git a/src/admin/Bootstrap.Admin/Extensions/UrlHelperExtensions.cs b/src/admin/Bootstrap.Admin/Pages/Extensions/UrlHelperExtensions.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Extensions/UrlHelperExtensions.cs
rename to src/admin/Bootstrap.Admin/Pages/Extensions/UrlHelperExtensions.cs
index c973dc627e28de695e7a039df61c4af9b3a0fea0..26ab35d184c3e6f1fc0b94f8f8760a8325cb6998 100644
--- a/src/admin/Bootstrap.Admin/Extensions/UrlHelperExtensions.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Extensions/UrlHelperExtensions.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Admin.Extensions
+namespace Bootstrap.Admin.Pages.Extensions
 {
     /// <summary>
     /// Url 地址辅助操作类
diff --git a/src/admin/Bootstrap.Admin/Shared/AdminLayout.razor b/src/admin/Bootstrap.Admin/Pages/Shared/AdminLayout.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/AdminLayout.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/AdminLayout.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Alert.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Alert.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Alert.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Alert.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Checkbox.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Checkbox.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Checkbox.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Checkbox.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/DefaultLayout.razor b/src/admin/Bootstrap.Admin/Pages/Shared/DefaultLayout.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/DefaultLayout.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/DefaultLayout.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Dropdown.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Dropdown.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Dropdown.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Dropdown.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/EditPage.razor b/src/admin/Bootstrap.Admin/Pages/Shared/EditPage.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/EditPage.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/EditPage.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Footer.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Footer.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Footer.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Footer.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Header.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Header.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Header.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Header.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/LgbEditForm.razor b/src/admin/Bootstrap.Admin/Pages/Shared/LgbEditForm.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/LgbEditForm.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/LgbEditForm.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/LgbInput.razor b/src/admin/Bootstrap.Admin/Pages/Shared/LgbInput.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/LgbInput.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/LgbInput.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/MainLayout.razor b/src/admin/Bootstrap.Admin/Pages/Shared/MainLayout.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/MainLayout.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/MainLayout.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Modal.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Modal.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Modal.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Modal.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/NavItem.razor b/src/admin/Bootstrap.Admin/Pages/Shared/NavItem.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/NavItem.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/NavItem.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/NavItems.razor b/src/admin/Bootstrap.Admin/Pages/Shared/NavItems.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/NavItems.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/NavItems.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/NotFoundLayout.razor b/src/admin/Bootstrap.Admin/Pages/Shared/NotFoundLayout.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/NotFoundLayout.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/NotFoundLayout.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Pagination.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Pagination.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Pagination.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Pagination.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/PaginationItem.razor b/src/admin/Bootstrap.Admin/Pages/Shared/PaginationItem.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/PaginationItem.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/PaginationItem.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Query.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Query.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Query.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Query.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Section.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Section.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Section.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Section.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Select.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Select.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Select.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Select.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/SelectItem.razor b/src/admin/Bootstrap.Admin/Pages/Shared/SelectItem.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/SelectItem.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/SelectItem.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/SideBar.razor b/src/admin/Bootstrap.Admin/Pages/Shared/SideBar.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/SideBar.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/SideBar.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/SubmitModal.razor b/src/admin/Bootstrap.Admin/Pages/Shared/SubmitModal.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/SubmitModal.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/SubmitModal.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Tab.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Tab.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Tab.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Tab.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/TabSet.razor b/src/admin/Bootstrap.Admin/Pages/Shared/TabSet.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/TabSet.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/TabSet.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Table.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Table.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Table.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Table.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/TableHeader.razor b/src/admin/Bootstrap.Admin/Pages/Shared/TableHeader.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/TableHeader.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/TableHeader.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/TableToolbar.razor b/src/admin/Bootstrap.Admin/Pages/Shared/TableToolbar.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/TableToolbar.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/TableToolbar.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Toast.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Toast.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Toast.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Toast.razor
diff --git a/src/admin/Bootstrap.Admin/Shared/Toggle.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Toggle.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Shared/Toggle.razor
rename to src/admin/Bootstrap.Admin/Pages/Shared/Toggle.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Dicts.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Dicts.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Dicts.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Dicts.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Groups.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Groups.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Groups.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Groups.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Home.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Home.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Home.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Home.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Menus.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Menus.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Profiles.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Profiles.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Profiles.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Profiles.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Roles.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Roles.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Roles.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Roles.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Settings.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Settings.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Settings.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Settings.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Users.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Users.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/Users.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/Users.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/_Imports.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/_Imports.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Admin/_Imports.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Admin/_Imports.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/DictsBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/DictsBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Pages/Components/DictsBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/DictsBase.cs
index 141fa2daa1feb1df206134d88e5def72305c48b0..cf36b6e745ea77f14238235ce4c0941dc92de535 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/DictsBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/DictsBase.cs
@@ -1,10 +1,10 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Bootstrap.Security;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 字典表维护组件
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/GroupsBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/GroupsBase.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Pages/Components/GroupsBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/GroupsBase.cs
index 56d3d1b26edec7677ce8d174d3ee5d9df5c3fe4a..e92d7ccb371c760bd390bba479f993d777676438 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/GroupsBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/GroupsBase.cs
@@ -1,10 +1,10 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Bootstrap.DataAccess;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 部门维护组件
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/MenusBase.cs
similarity index 98%
rename from src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/MenusBase.cs
index a6db0fc0862a33d254bcc5f7b9277d04e2cf6743..0807d4594810bb808c74dcf21c60a09f6ed5aeb5 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/MenusBase.cs
@@ -1,4 +1,4 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Bootstrap.DataAccess;
 using Bootstrap.Security;
 using Microsoft.AspNetCore.Components;
@@ -7,7 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 菜单维护组件
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/PageBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/PageBase.cs
similarity index 76%
rename from src/admin/Bootstrap.Admin/Pages/Components/PageBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/PageBase.cs
index 55f0c788556ff2210d5f5ba338f4f1c439870c54..e6ebe4060bddf418c052da0ee43b9ef4d6473848 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/PageBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/PageBase.cs
@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 页面组件基类
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/ProfilesBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/ProfilesBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Pages/Components/ProfilesBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/ProfilesBase.cs
index 79117cd3d96f80b459944997054b37e7a2e11441..737fc50d3d5afce3b1a63ccbb5f7baab857111d7 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/ProfilesBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/ProfilesBase.cs
@@ -1,6 +1,6 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Bootstrap.Admin.Models;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Shared;
 using Bootstrap.DataAccess;
 using Bootstrap.Security;
 using Microsoft.AspNetCore.Components;
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 个人中心组件类
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/QueryPageBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/QueryPageBase.cs
similarity index 93%
rename from src/admin/Bootstrap.Admin/Pages/Components/QueryPageBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/QueryPageBase.cs
index 6b8bd9c55d6c5ce5db8fc4113ef2d02c183ecaeb..cedba6047bda27dcc675bf01e194f23ba169b6cc 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/QueryPageBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/QueryPageBase.cs
@@ -1,9 +1,9 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Bootstrap.DataAccess;
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 页面组件基类
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/RolesBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/RolesBase.cs
similarity index 96%
rename from src/admin/Bootstrap.Admin/Pages/Components/RolesBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/RolesBase.cs
index f59a0af506fae29af81628fd0e60b4aa88f6c9b1..6d6d687e8326edab356144b2abaf9a0ea5d918f0 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/RolesBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/RolesBase.cs
@@ -1,10 +1,10 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Bootstrap.DataAccess;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 部门维护组件
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/SettingsBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/SettingsBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Pages/Components/SettingsBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/SettingsBase.cs
index c556e04727b99f6c022e03c1c3607bd55a8dd0ed..504abcabc18ccc829039a5b0680a3f15ec01c0d8 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/SettingsBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/SettingsBase.cs
@@ -1,14 +1,15 @@
-using Bootstrap.Admin.Components;
-using Bootstrap.Admin.Extensions;
-using Bootstrap.Admin.Shared;
+using Bootstrap.Admin.Pages.Components;
+using Bootstrap.Admin.Pages.Extensions;
+using Bootstrap.Admin.Pages.Shared;
 using Bootstrap.DataAccess;
 using Bootstrap.Security;
 using Longbow.Cache;
 using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
 using System;
 using System.Collections.Generic;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 网站设置组件
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/UsersBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/UsersBase.cs
similarity index 97%
rename from src/admin/Bootstrap.Admin/Pages/Components/UsersBase.cs
rename to src/admin/Bootstrap.Admin/Pages/Views/Components/UsersBase.cs
index 6ac4d352bdef5cceccec5a0653cb7801c425d6ef..814a30887e542e8331513f20c21ffc3862afe8e5 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/UsersBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/UsersBase.cs
@@ -1,10 +1,10 @@
-using Bootstrap.Admin.Components;
+using Bootstrap.Admin.Pages.Components;
 using Bootstrap.DataAccess;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Bootstrap.Pages.Admin.Components
+namespace Bootstrap.Admin.Pages.Views.Admin.Components
 {
     /// <summary>
     /// 用户表维护组件
diff --git a/src/admin/Bootstrap.Admin/Pages/Home.razor b/src/admin/Bootstrap.Admin/Pages/Views/Home.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Home.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Home.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/Index.razor b/src/admin/Bootstrap.Admin/Pages/Views/Index.razor
similarity index 100%
rename from src/admin/Bootstrap.Admin/Pages/Index.razor
rename to src/admin/Bootstrap.Admin/Pages/Views/Index.razor
diff --git a/src/admin/Bootstrap.Admin/Pages/_Host.cshtml b/src/admin/Bootstrap.Admin/Pages/_Host.cshtml
index 521f62245bf4a4ee061ef28b9ad838671e58b717..3513b669d12ffd6e2a6c1baa2671b7e6b0f347a9 100644
--- a/src/admin/Bootstrap.Admin/Pages/_Host.cshtml
+++ b/src/admin/Bootstrap.Admin/Pages/_Host.cshtml
@@ -1,5 +1,5 @@
 @page "/Pages"
-@namespace Bootstrap.Admin.Pages
+@using Bootstrap.Admin.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <!DOCTYPE html>
diff --git a/src/admin/Bootstrap.Admin/_Imports.razor b/src/admin/Bootstrap.Admin/Pages/_Imports.razor
similarity index 74%
rename from src/admin/Bootstrap.Admin/_Imports.razor
rename to src/admin/Bootstrap.Admin/Pages/_Imports.razor
index d083dab6c2bd2bda7ba6d1683ba18a70d1c8deed..f6e6765e7ae19566ec8637df03ff4c971ef51695 100644
--- a/src/admin/Bootstrap.Admin/_Imports.razor
+++ b/src/admin/Bootstrap.Admin/Pages/_Imports.razor
@@ -1,10 +1,11 @@
 @using Bootstrap.Admin
-@using Bootstrap.Admin.Components
-@using Bootstrap.Admin.Extensions
-@using Bootstrap.Admin.Models
 @using Bootstrap.Admin.Pages
-@using Bootstrap.Admin.Shared
-@using Bootstrap.Pages.Admin.Components
+@using Bootstrap.Admin.Pages.Components
+@using Bootstrap.Admin.Pages.Extensions
+@using Bootstrap.Admin.Pages.Views
+@using Bootstrap.Admin.Pages.Views.Admin.Components
+@using Bootstrap.Admin.Pages.Shared
+@using Bootstrap.Admin.Models
 @using Bootstrap.Security
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization