From 00e0b0b5e8497d2aa05d8d2b4aa77918f1650eb0 Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Fri, 10 Aug 2018 16:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9A?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=BE=E8=AE=A1=E7=BD=91=E7=AB=99=E7=9A=AE?=
 =?UTF-8?q?=E8=82=A4=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E8=AF=B7=E6=B1=82api/css=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AdminController.cs            |  2 +-
 .../Controllers/Api/CssController.cs          | 33 -------------------
 Bootstrap.Admin/Models/ModelBase.cs           |  5 +++
 Bootstrap.Admin/Models/ProfilesModel.cs       |  8 +----
 Bootstrap.Admin/Models/ThemeModel.cs          | 26 +++++++++++++++
 Bootstrap.Admin/Views/Admin/Profiles.cshtml   |  2 +-
 Bootstrap.Admin/Views/Admin/Settings.cshtml   | 16 +++++++--
 Bootstrap.Admin/Views/Shared/Footer.cshtml    |  2 +-
 Bootstrap.Admin/Views/Shared/Header.cshtml    |  2 +-
 Bootstrap.Admin/Views/Shared/_Layout.cshtml   |  7 +++-
 Bootstrap.Admin/wwwroot/js/Longbow.Common.js  | 16 ++-------
 Bootstrap.Admin/wwwroot/js/Settings.js        | 16 +--------
 Bootstrap.DataAccess/DictHelper.cs            |  7 ++--
 13 files changed, 63 insertions(+), 79 deletions(-)
 delete mode 100644 Bootstrap.Admin/Controllers/Api/CssController.cs
 create mode 100644 Bootstrap.Admin/Models/ThemeModel.cs

diff --git a/Bootstrap.Admin/Controllers/AdminController.cs b/Bootstrap.Admin/Controllers/AdminController.cs
index 9b7292ed..d12e60ea 100644
--- a/Bootstrap.Admin/Controllers/AdminController.cs
+++ b/Bootstrap.Admin/Controllers/AdminController.cs
@@ -89,7 +89,7 @@ namespace Bootstrap.Admin.Controllers
         /// <returns></returns>
         public ActionResult Settings()
         {
-            return View(new NavigatorBarModel(this));
+            return View(new ThemeModel(this));
         }
 
         /// <summary>
diff --git a/Bootstrap.Admin/Controllers/Api/CssController.cs b/Bootstrap.Admin/Controllers/Api/CssController.cs
deleted file mode 100644
index da85ecb2..00000000
--- a/Bootstrap.Admin/Controllers/Api/CssController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Bootstrap.DataAccess;
-using Bootstrap.Security;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Bootstrap.Admin.Controllers.Api
-{
-    [Route("api/[controller]")]
-    public class CssController : Controller
-    {
-        /// <summary>
-        /// 获得当前样式接口
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        [AllowAnonymous]
-        public JsonResult Get()
-        {
-            return new JsonResult(DictHelper.RetrieveActiveCss().FirstOrDefault().Code);
-        }
-        /// <summary>
-        /// 获得网站所有样式表
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public IEnumerable<BootstrapDict> Post()
-        {
-            return DictHelper.RetrieveWebCss();
-        }
-    }
-}
diff --git a/Bootstrap.Admin/Models/ModelBase.cs b/Bootstrap.Admin/Models/ModelBase.cs
index 0eddb7cb..03d35ee0 100644
--- a/Bootstrap.Admin/Models/ModelBase.cs
+++ b/Bootstrap.Admin/Models/ModelBase.cs
@@ -14,6 +14,7 @@ namespace Bootstrap.Admin.Models
         {
             Title = DictHelper.RetrieveWebTitle();
             Footer = DictHelper.RetrieveWebFooter();
+            Theme = DictHelper.RetrieveActiveTheme();
         }
         /// <summary>
         /// 
@@ -23,5 +24,9 @@ namespace Bootstrap.Admin.Models
         /// 
         /// </summary>
         public string Footer { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Theme { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Bootstrap.Admin/Models/ProfilesModel.cs b/Bootstrap.Admin/Models/ProfilesModel.cs
index 4f8f7d8c..b30cea60 100644
--- a/Bootstrap.Admin/Models/ProfilesModel.cs
+++ b/Bootstrap.Admin/Models/ProfilesModel.cs
@@ -10,17 +10,13 @@ namespace Bootstrap.Admin.Models
     /// <summary>
     /// 
     /// </summary>
-    public class ProfilesModel : NavigatorBarModel
+    public class ProfilesModel : ThemeModel
     {
         /// <summary>
         /// 获得/设置 头像文件大小
         /// </summary>
         public long Size { get; }
         /// <summary>
-        /// 获得 系统配置的所有样式表
-        /// </summary>
-        public IEnumerable<BootstrapDict> Csss { get; }
-        /// <summary>
         /// 
         /// </summary>
         /// <param name="controller"></param>
@@ -32,8 +28,6 @@ namespace Bootstrap.Admin.Models
             {
                 Size = new FileInfo(fileName).Length;
             }
-
-            Csss = DictHelper.RetrieveWebCss();
         }
     }
 }
\ No newline at end of file
diff --git a/Bootstrap.Admin/Models/ThemeModel.cs b/Bootstrap.Admin/Models/ThemeModel.cs
new file mode 100644
index 00000000..1171fc58
--- /dev/null
+++ b/Bootstrap.Admin/Models/ThemeModel.cs
@@ -0,0 +1,26 @@
+using Bootstrap.DataAccess;
+using Bootstrap.Security;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+
+namespace Bootstrap.Admin.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class ThemeModel : NavigatorBarModel
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="controller"></param>
+        public ThemeModel(ControllerBase controller) : base(controller)
+        {
+            Themes = DictHelper.RetrieveThemes();
+        }
+        /// <summary>
+        /// 获得 系统配置的所有样式表
+        /// </summary>
+        public IEnumerable<BootstrapDict> Themes { get; }
+    }
+}
diff --git a/Bootstrap.Admin/Views/Admin/Profiles.cshtml b/Bootstrap.Admin/Views/Admin/Profiles.cshtml
index 17125df6..043691c0 100644
--- a/Bootstrap.Admin/Views/Admin/Profiles.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Profiles.cshtml
@@ -84,7 +84,7 @@
                     <label class="control-label" for="userName">样式</label>
                     <select id="css" class="select form-control">
                         <option value="">默认样式</option>
-                        @foreach (var css in Model.Csss)
+                        @foreach (var css in Model.Themes)
                         {
                             if (css.Code == Model.Css)
                             {
diff --git a/Bootstrap.Admin/Views/Admin/Settings.cshtml b/Bootstrap.Admin/Views/Admin/Settings.cshtml
index 0b3f822b..dcb7cff9 100644
--- a/Bootstrap.Admin/Views/Admin/Settings.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Settings.cshtml
@@ -1,4 +1,4 @@
-@model Bootstrap.Admin.Models.NavigatorBarModel
+@model Bootstrap.Admin.Models.ThemeModel
 @{
     ViewBag.Title = "网站设置";
     Layout = "~/Views/Shared/_Admin.cshtml";
@@ -48,9 +48,21 @@
         <form id="CssDataForm" class="form-inline">
             <div class="form-group">
                 <div class="dropdown">
-                    <button id="dictCssDefine" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="">默认样式</button>
+                    <button id="dictCssDefine" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="" value="@Model.Theme">默认样式</button>
                     <ul class="dropdown-menu" role="menu" id="cssContainer">
                         <li><a href="#" data-val="">默认样式</a></li>
+                        @foreach (var css in Model.Themes)
+                        {
+                            if (css.Code == Model.Css)
+                            {
+                                <li><a href="#" data-val="@css.Code">@css.Name</a></li>
+                            }
+                            else
+                            {
+                                <li><a href="#" data-val="@css.Code">@css.Name</a></li>
+                            }
+                        }
+
                     </ul>
                 </div>
                 <button class="btn btn-secondary" type="button" data-method="css">保存</button>
diff --git a/Bootstrap.Admin/Views/Shared/Footer.cshtml b/Bootstrap.Admin/Views/Shared/Footer.cshtml
index 824d1fd8..4879d956 100644
--- a/Bootstrap.Admin/Views/Shared/Footer.cshtml
+++ b/Bootstrap.Admin/Views/Shared/Footer.cshtml
@@ -1,4 +1,4 @@
-@model Bootstrap.Admin.Models.HeaderBarModel
+@model ModelBase
 <footer class="site-footer">
     <div class="text-center">
         <span id="websiteFooter">@Model.Footer</span>
diff --git a/Bootstrap.Admin/Views/Shared/Header.cshtml b/Bootstrap.Admin/Views/Shared/Header.cshtml
index e49e0ff9..8a16ee6d 100644
--- a/Bootstrap.Admin/Views/Shared/Header.cshtml
+++ b/Bootstrap.Admin/Views/Shared/Header.cshtml
@@ -1,4 +1,4 @@
-@model Bootstrap.Admin.Models.HeaderBarModel
+@model HeaderBarModel
 <header class="header">
     <div class="bg"></div>
     <div class="d-flex align-items-center">
diff --git a/Bootstrap.Admin/Views/Shared/_Layout.cshtml b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
index 4792ed6e..31f33d5f 100644
--- a/Bootstrap.Admin/Views/Shared/_Layout.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
@@ -1,4 +1,5 @@
-@{
+@model ModelBase
+@{
     Layout = "~/Views/Shared/_Root.cshtml";
 }
 @section css {
@@ -16,6 +17,10 @@
     <link href="~/css/theme-responsive.css" rel="stylesheet" />
     <link href="~/css/site.css" rel="stylesheet" />
     <link href="~/css/site-responsive.css" rel="stylesheet" />
+    @if (!string.IsNullOrEmpty(Model.Theme))
+    {
+        <link href="~/css/@Model.Theme" rel="stylesheet" />
+    }
 }
 @section javascript {
     <environment include="Development">
diff --git a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
index 1ac1a687..701efa05 100644
--- a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
+++ b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
@@ -257,8 +257,7 @@
 
     // Dicts
     Dicts = {
-        url: 'api/Dicts/',
-        css: 'api/Css/',
+        url: 'api/Dicts/'
     };
 
     // Profiles
@@ -372,15 +371,4 @@
             });
         }
     });
-})(jQuery);
-
-$(function () {
-    // loading customer css
-    $.bc({
-        url: Dicts.css, swal: false, method: 'get',
-        callback: function (result) {
-            if (result.length > 0)
-                $('head').append($.format('<link href="{0}css/{1}" rel="stylesheet" type="text/css" />', $('#pathBase').attr('href'), result));
-        }
-    });
-});
\ No newline at end of file
+})(jQuery);
\ No newline at end of file
diff --git a/Bootstrap.Admin/wwwroot/js/Settings.js b/Bootstrap.Admin/wwwroot/js/Settings.js
index 420c7a2f..c918235b 100644
--- a/Bootstrap.Admin/wwwroot/js/Settings.js
+++ b/Bootstrap.Admin/wwwroot/js/Settings.js
@@ -117,19 +117,5 @@
         listCacheUrl();
     });
 
-    var $css = $('#dictCssDefine');
-    $.bc({
-        url: Dicts.css, swal: false,
-        callback: function (result) {
-            var html = result.map(function (ele, index) { return $.format('<li><a href="#" data-val="{1}">{0}</a></li>', ele.Name, ele.Code); }).join('');
-            $('#cssContainer').append(html);
-            $.bc({
-                url: Dicts.css, swal: false, method: 'get',
-                callback: function (result) {
-                    if (result.length > 0)
-                        $css.val(result).dropdown('val');
-                }
-            });
-        }
-    });
+    var $css = $('#dictCssDefine').dropdown('val');
 })
\ No newline at end of file
diff --git a/Bootstrap.DataAccess/DictHelper.cs b/Bootstrap.DataAccess/DictHelper.cs
index 34e06283..2a8ac49d 100644
--- a/Bootstrap.DataAccess/DictHelper.cs
+++ b/Bootstrap.DataAccess/DictHelper.cs
@@ -163,7 +163,7 @@ namespace Bootstrap.DataAccess
         /// 获得系统中配置的可以使用的网站样式
         /// </summary>
         /// <returns></returns>
-        public static IEnumerable<BootstrapDict> RetrieveWebCss()
+        public static IEnumerable<BootstrapDict> RetrieveThemes()
         {
             var data = RetrieveDicts();
             return data.Where(d => d.Category == "网站样式");
@@ -172,10 +172,11 @@ namespace Bootstrap.DataAccess
         /// 获得网站设置中的当前样式
         /// </summary>
         /// <returns></returns>
-        public static IEnumerable<BootstrapDict> RetrieveActiveCss()
+        public static string RetrieveActiveTheme()
         {
             var data = RetrieveDicts();
-            return data.Where(d => d.Name == "使用样式" && d.Category == "当前样式" && d.Define == 0 && !d.Code.Equals("site.css", StringComparison.OrdinalIgnoreCase));
+            var theme = data.Where(d => d.Name == "使用样式" && d.Category == "当前样式" && d.Define == 0).FirstOrDefault();
+            return theme == null ? string.Empty : (theme.Code.Equals("site.css", StringComparison.OrdinalIgnoreCase) ? string.Empty : theme.Code);
         }
         /// <summary>
         /// 获取头像路径