From 99b6da65af14de792bcdf89d844ee110fe31a22f Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sat, 25 Dec 2021 15:47:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=B8=BB=E9=A2=98=20?=
 =?UTF-8?q?UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BootstrapAdmin.DataAccess.Models/User.cs  |  2 +-
 .../Pages/Admin/Profiles.razor                | 36 +++++++++----------
 .../Pages/Admin/Profiles.razor.cs             | 10 +++++-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
index 27707928..8f3d3556 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
@@ -31,7 +31,7 @@ namespace BootstrapAdmin.DataAccess.Models
         /// 获得/设置 用户设置样式表名称
         /// </summary>
         [Display(Name = "主题")]
-        public string? Css { get; set; }
+        public string? Theme { get; set; }
 
         /// <summary>
         /// 获得/设置 用户默认登陆 App 标识
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor
index fc4f0887..cad2c81b 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor
@@ -49,30 +49,26 @@
             </div>
         </div>
     </AdminCard>
+
+    <AdminCard HeaderText="网站样式" AuthorizeKey="SaveApp">
+        <AdminAlert Color="Color.Info">
+            <span>注意：本设置将覆盖 <b><a class="badge-pill" href="./Settings">网站设置</a></b> 中设置的网站样式</span>
+        </AdminAlert>
+        <div class="row g-3 form-inline">
+            <div class="col-12 col-sm-6">
+                <Dropdown Items="Themes" @bind-Value="CurrentUser.Theme" />
+            </div>
+            <div class="col-12 col-sm-6 text-end">
+                <Button Icon="fa fa-save" Text="保存" OnClickWithoutRender="OnSaveTheme" />
+            </div>
+        </div>
+    </AdminCard>
 </div>
 
 @*
-    <div class="card" asp-auth="saveApp">
-    <div class="card-header">默认应用</div>
-    <div class="card-body">
-    <div class="form-group">
-    <div class="btn-group" role="group">
-    <button id="app" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" value="@Model.AppId">@Model.AppName</button>
-    <div class="dropdown-menu">
-    @foreach (var app in Model.Applications)
-    {
-    <a href="#" data-val="@app.Key">@app.Value</a>
-    }
-    </div>
-    </div>
-    </div>
-    <div class="modal-footer">
-    <button id="btnSaveApp" data-method="app" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
-    </div>
-    </div>
-    </div>
+    
     <div class="card" asp-auth="saveTheme">
-    <div class="card-header">网站样式</div>
+    <div class="card-header"></div>
     <div class="card-body">
     <div class="alert alert-info" role="alert">
     <span>注意：本设置将覆盖<b><a class="badge-pill" href="./Settings">网站设置</a></b>中设置的网站样式</span>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor.cs
index 65df8808..78dc21ed 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Profiles.razor.cs
@@ -2,7 +2,6 @@
 using BootstrapAdmin.Web.Core;
 using BootstrapAdmin.Web.Extensions;
 using BootstrapAdmin.Web.Services;
-using BootstrapAdmin.Web.Utils;
 using Microsoft.AspNetCore.Components.Forms;
 
 namespace BootstrapAdmin.Web.Pages.Admin;
@@ -23,6 +22,9 @@ public partial class Profiles
     [NotNull]
     private List<SelectedItem>? Apps { get; set; }
 
+    [NotNull]
+    private List<SelectedItem>? Themes { get; set; }
+
     [Inject]
     [NotNull]
     private IDict? DictService { get; set; }
@@ -41,6 +43,7 @@ public partial class Profiles
             DisplayName = AppContext.DisplayName
         };
         Apps = DictService.GetApps().ToSelectedItemList();
+        Themes = DictService.GetThemes().ToSelectedItemList();
     }
 
     private Task OnSaveDisplayName(EditContext context)
@@ -57,4 +60,9 @@ public partial class Profiles
     {
         return Task.CompletedTask;
     }
+
+    private Task OnSaveTheme()
+    {
+        return Task.CompletedTask;
+    }
 }