From eaf36fec5e4b178f9ee2532689949cd88cd8c761 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Wed, 15 Dec 2021 14:59:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=85=8D=E6=8E=88=E6=9D=83=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BootstrapAdmin.DataAccess.Models/User.cs  | 15 +++--
 .../Components/BlazorTable.razor              |  9 ++-
 .../Components/BlazorTable.razor.cs           | 19 ++-----
 .../Components/UserGroup.razor                |  5 ++
 .../Components/UserGroup.razor.cs             | 16 ++++++
 .../Components/UserRole.razor                 |  5 ++
 .../Components/UserRole.razor.cs              | 16 ++++++
 .../Pages/Admin/Users.razor                   | 22 ++++---
 .../Pages/Admin/Users.razor.cs                | 57 +++++++------------
 9 files changed, 95 insertions(+), 69 deletions(-)
 create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor
 create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor.cs
 create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor
 create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor.cs

diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
index 102c94f1..8f44b001 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
@@ -1,4 +1,6 @@
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Xml.Linq;
 
 namespace BootstrapAdmin.DataAccess.Models
 {
@@ -10,6 +12,7 @@ namespace BootstrapAdmin.DataAccess.Models
         /// <summary>
         /// 获得/设置 系统登录用户名
         /// </summary>
+        [Display(Name = "登录名称")]
         public string UserName { get; set; } = "";
 
         /// <summary>
@@ -40,7 +43,7 @@ namespace BootstrapAdmin.DataAccess.Models
         /// <summary>
         /// 获取/设置 密码
         /// </summary>
-        [DisplayName("登录密码")]
+        [Display(Name = "登录密码")]
         public string Password { get; set; } = "";
 
         /// <summary>
@@ -56,25 +59,25 @@ namespace BootstrapAdmin.DataAccess.Models
         /// <summary>
         /// 获得/设置 用户注册时间
         /// </summary>
-        [DisplayName("注册时间")]
+        [Display(Name = "注册时间")]
         public DateTime RegisterTime { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 获得/设置 用户被批复时间
         /// </summary>
-        [DisplayName("授权时间")]
+        [Display(Name = "授权时间")]
         public DateTime? ApprovedTime { get; set; }
 
         /// <summary>
         /// 获得/设置 用户批复人
         /// </summary>
-        [DisplayName("授权人")]
+        [Display(Name = "授权人")]
         public string? ApprovedBy { get; set; }
 
         /// <summary>
         /// 获得/设置 用户的申请理由
         /// </summary>
-        [DisplayName("说明")]
+        [Display(Name = "说明")]
         public string Description { get; set; } = "";
 
         /// <summary>
@@ -90,7 +93,7 @@ namespace BootstrapAdmin.DataAccess.Models
         /// <summary>
         /// 获得/设置 新密码
         /// </summary>
-        [DisplayName("确认密码")]
+        [Display(Name = "确认密码")]
         public string NewPassword { get; set; } = "";
 
         /// <summary>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor
index 344efa84..8b887e43 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor
@@ -4,15 +4,18 @@
        IsPagination="IsPagination" PageItemsSource="PageItemsSource"
        UseInjectDataService="true" DataService="DataService" OnQueryAsync="OnQueryAsync!"
        ShowToolbar="true" ShowExtendButtons="true" ShowSearch="true"
-       ShowCardView="true" ShowColumnList="true" @bind-SelectedRows="SelectedRows"
+       ShowCardView="true" ShowColumnList="true"
        CustomerSearchModel="@TableSearchModel">
     <TableToolbarTemplate>
         @TableToolbarTemplate
     </TableToolbarTemplate>
     <TableColumns>
-        @ColumnsTemplete(context)
+        @ColumnsTemplete?.Invoke(context)
     </TableColumns>
     <CustomerSearchTemplate>
-        @CustomerSearchTemplate(context)
+        @CustomerSearchTemplate?.Invoke(context)
     </CustomerSearchTemplate>
+    <RowButtonTemplate>
+        @RowButtonTemplate?.Invoke(context)
+    </RowButtonTemplate>
 </Table>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor.cs
index fd711a5c..531eb41c 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor.cs
@@ -22,7 +22,12 @@
         /// <summary>
         /// 
         /// </summary>
-        [NotNull]
+        [Parameter]
+        public RenderFragment<TItem>? RowButtonTemplate { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
         [Parameter]
         public RenderFragment<ITableSearchModel>? CustomerSearchTemplate { get; set; }
 
@@ -56,17 +61,5 @@
         /// </summary>
         [Parameter]
         public Func<QueryPageOptions, Task<QueryData<TItem>>>? OnQueryAsync { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        [Parameter]
-        public List<TItem> SelectedRows { get; set; } = new List<TItem>();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        [Parameter]
-        public EventCallback<List<TItem>> SelectedRowsChanged { get; set; }
     }
 }
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor
new file mode 100644
index 00000000..a421f10d
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor
@@ -0,0 +1,5 @@
+<h3>UserGroup</h3>
+
+@code {
+
+}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor.cs
new file mode 100644
index 00000000..8d45f8fc
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/UserGroup.razor.cs
@@ -0,0 +1,16 @@
+namespace BootstrapAdmin.Web.Components
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class UserGroup
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Parameter]
+        [NotNull]
+        [EditorRequired]
+        public string? UserName { get; set; }
+    }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor
new file mode 100644
index 00000000..d758a089
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor
@@ -0,0 +1,5 @@
+<h3>UserRole</h3>
+
+@code {
+
+}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor.cs
new file mode 100644
index 00000000..bc162953
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/UserRole.razor.cs
@@ -0,0 +1,16 @@
+namespace BootstrapAdmin.Web.Components
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class UserRole
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Parameter]
+        [NotNull]
+        [EditorRequired]
+        public string? UserName { get; set; }
+    }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor
index d315631d..c9bfbb27 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor
@@ -1,16 +1,20 @@
 @page "/Admin/Users"
 
-<BlazorTable TItem="DataAccess.Models.User" @bind-SelectedRows="SelectedRows">
+<BlazorTable TItem="DataAccess.Models.User">
     <TableToolbarTemplate>
-        <TableToolbarButton TItem="DataAccess.Models.User" IsDisabled="SelectedRows.Count() != 1" Color="Color.Info" Icon="fa fa-bank" Text="分配部门" OnClickCallback="OnAssignmentDept" />
-        <TableToolbarButton TItem="DataAccess.Models.User" IsDisabled="SelectedRows.Count() != 1" Color="Color.Warning" Icon="fa fa-sitemap" Text="分配角色" OnClickCallback="OnAssignmentRoles" />
+        <TableToolbarButton TItem="DataAccess.Models.User" IsEnableWhenSelectedOneRow="true" Color="Color.Warning" Icon="fa fa-bank" Text="分配部门" OnClickCallback="users => OnAssignmentDept(users.First())" />
+        <TableToolbarButton TItem="DataAccess.Models.User" IsEnableWhenSelectedOneRow="true" Color="Color.Info" Icon="fa fa-sitemap" Text="分配角色" OnClickCallback="users => OnAssignmentRoles(users.First())" />
     </TableToolbarTemplate>
     <ColumnsTemplete>
-        <TableColumn @bind-Field="@context.UserName" Text="登录名称" Sortable="true" Filterable="true" Searchable="true"></TableColumn>
-        <TableColumn @bind-Field="@context.DisplayName" Text="显示名称" Sortable="true" Filterable="true" Searchable="true"></TableColumn>
-        <TableColumn @bind-Field="@context.RegisterTime" Text="注册时间" Sortable="true" Filterable="true"></TableColumn>
-        <TableColumn @bind-Field="@context.ApprovedTime" Text="授权时间" Sortable="true" Filterable="true"></TableColumn>
-        <TableColumn @bind-Field="@context.ApprovedBy" Text="授权人" Sortable="true" Filterable="true"></TableColumn>
-        <TableColumn @bind-Field="@context.Description" Text="说明" Sortable="true" Filterable="true"></TableColumn>
+        <TableColumn @bind-Field="@context.UserName" Sortable="true" Filterable="true" Searchable="true"></TableColumn>
+        <TableColumn @bind-Field="@context.DisplayName" Sortable="true" Filterable="true" Searchable="true"></TableColumn>
+        <TableColumn @bind-Field="@context.RegisterTime" Sortable="true" Filterable="true"></TableColumn>
+        <TableColumn @bind-Field="@context.ApprovedTime" Sortable="true" Filterable="true"></TableColumn>
+        <TableColumn @bind-Field="@context.ApprovedBy" Sortable="true" Filterable="true"></TableColumn>
+        <TableColumn @bind-Field="@context.Description" Sortable="true" Filterable="true"></TableColumn>
     </ColumnsTemplete>
+    <RowButtonTemplate>
+        <TableCellButton Size="Size.ExtraSmall" Color="Color.Warning" Icon="fa fa-bank" Text="分配部门" OnClickCallback="() => OnAssignmentDept(context)" />
+        <TableCellButton Size="Size.ExtraSmall" Color="Color.Info" Icon="fa fa-sitemap" Text="分配角色" OnClickCallback="() => OnAssignmentRoles(context)" />
+    </RowButtonTemplate>
 </BlazorTable>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor.cs
index e8210100..00b8fdad 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor.cs
@@ -1,4 +1,5 @@
 using BootstrapAdmin.DataAccess.Models;
+using BootstrapAdmin.Web.Components;
 
 namespace BootstrapAdmin.Web.Pages.Admin
 {
@@ -11,52 +12,32 @@ namespace BootstrapAdmin.Web.Pages.Admin
         [NotNull]
         private DialogService? DialogService { get; set; }
 
-        [Inject]
-        [NotNull]
-        private ToastService? ToastService { get; set; }
-
-        private List<User> SelectedRows { get; set; } = new List<User>();
-
-        private async Task OnAssignmentDept(IEnumerable<User> users)
+        private async Task OnAssignmentDept(User user)
         {
-            if (users.Count() == 1)
+            var option = new DialogOption()
             {
-                //var option = new DialogOption()
-                //{
-                //    Title = "部门授权",
-                //    BodyTemplate = BootstrapDynamicComponent.CreateComponent<CheckboxList<string>>(new Dictionary<string, object>
-                //    {
-                //        [nameof(CheckboxList<string>.Items)] = GroupHelper.Retrieves().Select(s => new SelectedItem(s.GroupCode, s.GroupName))
-                //    }).Render()
-                //};
+                Title = $"分配部门 - {user.ToString()}",
+                Component = BootstrapDynamicComponent.CreateComponent<UserGroup>(new Dictionary<string, object>
+                {
+                    [nameof(UserGroup.UserName)] = user.UserName
+                })
+            };
 
-                //await DialogService.Show(option);
-            }
-            else
-            {
-                await ToastService.Warning("部门授权", "请选择一个用户");
-            }
+            await DialogService.Show(option);
         }
 
-        private async Task OnAssignmentRoles(IEnumerable<User> users)
+        private async Task OnAssignmentRoles(User user)
         {
-            if (users.Count() != 0)
+            var option = new DialogOption()
             {
-                //var option = new DialogOption()
-                //{
-                //    Title = "分配角色",
-                //    BodyTemplate = BootstrapDynamicComponent.CreateComponent<CheckboxList<string>>(new Dictionary<string, object>
-                //    {
-                //        [nameof(CheckboxList<string>.Items)] = RoleHelper.Retrieves().Select(s => new SelectedItem(s.Id!, s.RoleName) { Active = s.Checked == "" ? false : true })
-                //    }).Render()
-                //};
+                Title = $"分配角色 - {user.ToString()}",
+                Component = BootstrapDynamicComponent.CreateComponent<UserRole>(new Dictionary<string, object>
+                {
+                    [nameof(UserGroup.UserName)] = user.UserName
+                })
+            };
 
-                //await DialogService.Show(option);
-            }
-            else
-            {
-                await ToastService.Warning("分配角色", "请选择一个用户");
-            }
+            await DialogService.Show(option);
         }
     }
 }