From ce0fcb99bfce11f4b64a7a457779e23084b27a36 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 11 Jan 2020 15:16:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(#I184LO):=20=E7=BD=91=E7=AB=99=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=A2=9E=E5=8A=A0=20Blazor=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #Issue close https://gitee.com/LongbowEnterprise/dashboard/issues?id=I184LO --- .../Controllers/Api/SettingsController.cs | 2 +- .../Bootstrap.Admin/Models/SettingsModel.cs | 9 +++++++- .../Views/Admin/Settings.cshtml | 22 +++++++++++++++++++ .../Bootstrap.Admin/wwwroot/js/settings.js | 10 +++++++-- src/admin/Bootstrap.DataAccess/Dict.cs | 6 +++++ .../Bootstrap.DataAccess/Helper/DictHelper.cs | 8 ++++++- 6 files changed, 52 insertions(+), 5 deletions(-) diff --git a/src/admin/Bootstrap.Admin/Controllers/Api/SettingsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/SettingsController.cs index 02f5b8bc..917bfa6b 100644 --- a/src/admin/Bootstrap.Admin/Controllers/Api/SettingsController.cs +++ b/src/admin/Bootstrap.Admin/Controllers/Api/SettingsController.cs @@ -22,7 +22,7 @@ namespace Bootstrap.Admin.Controllers.Api /// /// [HttpPost] - [ButtonAuthorize(Url = "~/Admin/Settings", Auth = "saveTitle,saveFooter,saveTheme,saveUISettings,clearCache,clearAllCache,loginSettings,lockScreen,defaultApp")] + [ButtonAuthorize(Url = "~/Admin/Settings", Auth = "saveTitle,saveFooter,saveTheme,saveUISettings,clearCache,clearAllCache,loginSettings,lockScreen,defaultApp,blazor")] public bool Post([FromBody]BootstrapDict value) => DictHelper.SaveSettings(value); /// diff --git a/src/admin/Bootstrap.Admin/Models/SettingsModel.cs b/src/admin/Bootstrap.Admin/Models/SettingsModel.cs index d6602ef3..8a8fb903 100644 --- a/src/admin/Bootstrap.Admin/Models/SettingsModel.cs +++ b/src/admin/Bootstrap.Admin/Models/SettingsModel.cs @@ -11,7 +11,7 @@ namespace Bootstrap.Admin.Models public class SettingsModel : NavigatorBarModel { /// - /// + /// 构造函数 /// /// public SettingsModel(ControllerBase controller) : base(controller) @@ -19,6 +19,7 @@ namespace Bootstrap.Admin.Models Themes = DictHelper.RetrieveThemes(); AutoLockScreen = EnableAutoLockScreen ? "" : "lockScreen"; DefaultApp = DictHelper.RetrieveDefaultApp() ? "" : "defaultApp"; + EnableBlazor = DictHelper.RetrieveEnableBlazor() ? "" : "blazor"; } /// @@ -29,6 +30,7 @@ namespace Bootstrap.Admin.Models Themes = DictHelper.RetrieveThemes(); AutoLockScreen = EnableAutoLockScreen ? "" : "lockScreen"; DefaultApp = DictHelper.RetrieveDefaultApp() ? "" : "defaultApp"; + EnableBlazor = DictHelper.RetrieveEnableBlazor() ? "" : "blazor"; } /// @@ -45,5 +47,10 @@ namespace Bootstrap.Admin.Models /// 获得 是否开启自动锁屏 /// public string DefaultApp { get; } + + /// + /// 获得 是否开启 Blazor + /// + public string EnableBlazor { get; } } } diff --git a/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml index fb64e909..15f9203e 100644 --- a/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml +++ b/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml @@ -146,6 +146,9 @@
默认应用设置
+
@@ -159,6 +162,25 @@
+
+
网站设置
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/settings.js b/src/admin/Bootstrap.Admin/wwwroot/js/settings.js index 33bd25dd..071f3202 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/settings.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/settings.js @@ -79,9 +79,15 @@ $(function () { case 'saveDefaultApp': var defaultApp = $('#defaultApp').prop('checked') ? "1" : "0"; $.bc({ - url: Settings.url, data: { name: '默认应用程序', code: defaultApp, category: '系统设置' }, title: '保存默认应用程序设置', method: "post" + url: Settings.url, data: { name: '默认应用程序', code: defaultApp, category: '网站设置' }, title: '保存默认应用程序设置', method: "post" }); - break; + break; + case 'saveBlazor': + var blazor = $('#blazor').prop('checked') ? "1" : "0"; + $.bc({ + url: Settings.url, data: { name: 'Blazor', code: blazor, category: '网站设置' }, title: 'Blazor 设置', method: "post" + }); + break; } }); diff --git a/src/admin/Bootstrap.DataAccess/Dict.cs b/src/admin/Bootstrap.DataAccess/Dict.cs index d46c68d3..24ff8038 100644 --- a/src/admin/Bootstrap.DataAccess/Dict.cs +++ b/src/admin/Bootstrap.DataAccess/Dict.cs @@ -284,5 +284,11 @@ namespace Bootstrap.DataAccess ///
/// public bool RetrieveDefaultApp() => (DictHelper.RetrieveDicts().FirstOrDefault(d => d.Category == "系统设置" && d.Name == "默认应用程序" && d.Define == 0)?.Code ?? "0") == "1"; + + /// + /// 获得是否开启 Blazor 功能 默认关闭 + /// + /// + public bool RetrieveEnableBlazor() => (DictHelper.RetrieveDicts().FirstOrDefault(d => d.Category == "网站设置" && d.Name == "Blazor" && d.Define == 0)?.Code ?? "0") == "1"; } } diff --git a/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs index 10b29c3a..7c1b99f3 100644 --- a/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs +++ b/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs @@ -265,9 +265,15 @@ namespace Bootstrap.DataAccess public static bool RetrieveAutoLockScreen() => DbContextManager.Create()?.RetrieveAutoLockScreen() ?? false; /// - /// 获得自动锁屏 默认关闭 + /// 获得是否开启默认应用功能 默认关闭 /// /// public static bool RetrieveDefaultApp() => DbContextManager.Create()?.RetrieveDefaultApp() ?? false; + + /// + /// 获得是否开启 Blazor 功能 默认关闭 + /// + /// + public static bool RetrieveEnableBlazor() => DbContextManager.Create()?.RetrieveEnableBlazor() ?? false; } }