1

config/admin.php

@@ -328,7 +328,8 @@ return [
 
         'sidebar_collapsed' => false,
 
-        'sidebar_dark' => false,
+        // light, primary, dark
+        'sidebar_style' => 'light',
 
         'dark_mode_switch' => false,
 

resources/assets/dcat/js/extensions/DarkMode.js

@@ -6,7 +6,7 @@ export default class DarkMode {
             dark_mode: Dcat.config.dark_mode,
             class: {
                 dark: 'dark-mode',
-                sidebarLight: 'sidebar-light-primary',
+                sidebarLight: Dcat.config.sidebar_light_style || 'sidebar-light-primary',
                 sidebarDark: 'sidebar-dark-white',
             }
         };

resources/assets/dcat/sass/components/_content-header.scss

@@ -8,7 +8,7 @@
 }
 
 .breadcrumbs-top {
-  margin-bottom: 1.2rem;
+  margin-bottom: 1rem;
 }
 
 // 页面标题

resources/assets/dcat/sass/components/_menu.scss

@@ -103,6 +103,10 @@ body.sidebar-collapse {
   box-shadow: 0 0;
 }
 
+.nav-treeview > .nav-item > .nav-link p i {
+  margin-top: -5px;
+}
+
 .sidebar-light-primary .nav-item > .nav-link.active {
   background: none;
   color: $primary-darker !important;
@@ -155,3 +159,47 @@ body.sidebar-separate.dark-mode [class*=sidebar-dark-] .navbar-header {
   background: unset!important;
 }
 
+//
+.main-sidebar.sidebar-primary {
+  background-color: $primary!important;
+
+  .navbar-header .logo-mini,
+  .navbar-header .logo-lg,
+  .nav-treeview > .nav-item > .nav-link,
+  .sidebar a {
+    color: $white;
+  }
+
+  .nav-pills .nav-link:not(.active):hover {
+    color: $white;
+  }
+
+  .nav.nav-pills .nav-item .nav-link.active,
+  .nav-treeview > .nav-item > .nav-link.active,
+  .nav-treeview>.nav-item>.nav-link:hover {
+    //background-color: #f7f7f9;
+    //color: #555;
+    font-weight: bold;
+    border-bottom: 1px solid $white;
+  }
+
+  .nav-item>.nav-link i {
+    margin-right: .71rem;
+    font-size: 1.2rem;
+  }
+  .nav-treeview>.nav-item>.nav-link i {
+    margin-right: .65rem;
+    margin-left: 3px;
+  }
+
+  //.navbar-header .navbar-brand {
+  //  margin-top: .5rem;
+  //}
+  //
+  //.navbar-header {
+  //  padding: 0 1rem 0;
+  //  height: 61px;
+  //  background: $primary-darker;
+  //}
+}
+

resources/views/partials/sidebar.blade.php

@@ -1,6 +1,6 @@
 <div class="main-menu">
     <div class="main-menu-content">
-        <aside class="main-sidebar {{ $configData['sidebar_dark'] ? 'sidebar-dark-white' : 'sidebar-light-primary' }} shadow">
+        <aside class="main-sidebar {{ $configData['sidebar_style'] }} shadow">
             <div class="navbar-header">
                 <ul class="nav navbar-nav flex-row">
                     <li class="nav-item mr-auto">

src/Admin.php

@@ -497,12 +497,15 @@ class Admin
      */
     public static function jsVariables()
     {
+        $sidebarStyle = config('admin.layout.sidebar_style') ?: 'light';
+
         static::$jsVariables['pjax_container_selector'] = '#'.static::$pjaxContainerId;
         static::$jsVariables['token'] = csrf_token();
         static::$jsVariables['lang'] = __('admin.client') ?: [];
         static::$jsVariables['colors'] = static::color()->all();
         static::$jsVariables['dark_mode'] = Str::contains(config('admin.layout.body_class'), 'dark-mode');
-        static::$jsVariables['sidebar_dark'] = config('admin.layout.sidebar_dark');
+        static::$jsVariables['sidebar_dark'] = config('admin.layout.sidebar_dark') || ($sidebarStyle === 'dark');
+        static::$jsVariables['sidebar_light_style'] = in_array($sidebarStyle, ['dark', 'light'], true) ? 'sidebar-light-primary' : 'sidebar-primary';
 
         return json_encode(static::$jsVariables);
     }

src/Console/stubs/config.stub

@@ -328,7 +328,8 @@ return [
 
         'sidebar_collapsed' => false,
 
-        'sidebar_dark' => false,
+        // light, primary, dark
+		'sidebar_style' => 'light',
 
         'dark_mode_switch' => false,
 

src/Layout/Content.php

@@ -418,7 +418,7 @@ class Content implements Renderable
         $defaultData = [
             'theme'             => '',
             'sidebar_collapsed' => false,
-            'sidebar_dark'      => false,
+            'sidebar_style'     => 'sidebar-light-primary',
             'navbar_color'      => '',
             'navbar_class'      => 'sticky',
             'footer_type'       => '',
@@ -430,13 +430,18 @@ class Content implements Renderable
             $this->config
         );
 
+        // 1.0 版本兼容 sidebar_dark 参数
+        if (empty($data['sidebar_style']) && ! empty($data['sidebar_dark'])) {
+            $data['sidebar_style'] = 'sidebar-dark-white';
+        }
+
         $allOptions = [
             'theme'             => '',
             'footer_type'       => '',
             'body_class'        => '',
-            'sidebar_dark'      => '',
-            'sidebar_collapsed' => [true, false],
-            'navbar_color'      => ['bg-primary', 'bg-info', 'bg-warning', 'bg-success', 'bg-danger', 'bg-dark'],
+            'sidebar_style'     => ['light' => 'sidebar-light-primary', 'primary' => 'sidebar-primary', 'dark' => 'sidebar-dark-white'],
+            'sidebar_collapsed' => [],
+            'navbar_color'      => [],
             'navbar_class'      => ['floating' => 'floating-nav', 'sticky' => 'fixed-top', 'hidden' => 'd-none'],
         ];
 
@@ -461,10 +466,14 @@ class Content implements Renderable
             ) {
                 $data[$key] = $defaultData[$key];
             }
+
+            if (! is_array($data[$key]) && isset($value[$data[$key]])) {
+                $data[$key] = $value[$data[$key]];
+            }
         }
 
         if ($data['body_class'] && Str::contains($data['body_class'], 'dark-mode')) {
-            $data['sidebar_dark'] = true;
+            $data['sidebar_style'] = 'sidebar-dark-white';
         }
 
         return [
@@ -474,7 +483,7 @@ class Content implements Renderable
             'navbar_class'      => $allOptions['navbar_class'][$data['navbar_class']],
             'sidebar_class'     => $data['sidebar_collapsed'] ? 'sidebar-collapse' : '',
             'body_class'        => $data['body_class'],
-            'sidebar_dark'      => $data['sidebar_dark'],
+            'sidebar_style'     => $data['sidebar_style'],
         ];
     }