update

update

resources/assets/dcat/js/bootstrappers/Footer.js

@@ -1,10 +1,10 @@
 
 export default class Footer {
     constructor(Dcat) {
-        Dcat.booting(this.bootScrollTop)
+        this.boot(Dcat)
     }
 
-    bootScrollTop() {
+    boot(Dcat) {
         $(window).scroll(function(){
             if ($(this).scrollTop() > 400) {
                 $('.scroll-top').fadeIn();

resources/assets/dcat/js/bootstrappers/Pjax.js

@@ -3,11 +3,7 @@ let $d = $(document);
 
 export default class Pjax {
     constructor(Dcat) {
-        let _this = this;
-
-        Dcat.booting(function () {
-            _this.boot(Dcat)
-        })
+        this.boot(Dcat)
     }
 
     boot(Dcat) {

resources/assets/dcat/js/dcat-app.js

@@ -13,9 +13,9 @@ import Dcat from './Dcat'
 import NProgress from './nprogress/NProgress.min'
 import AjaxExtension from './extensions/Ajax'
 import DialogExtension from './extensions/Dialog'
-import RowSelector from './extensions/RowSelector'
-import Grid from './extensions/Grid'
-import Debounce from './extensions/Debounce'
+import RowSelectorExtension from './extensions/RowSelector'
+import GridExtension from './extensions/Grid'
+import DebounceExtension from './extensions/Debounce'
 
 import Footer from './bootstrappers/Footer'
 import Pjax from './bootstrappers/Pjax'
@@ -29,21 +29,21 @@ win.NProgress = NProgress;
 function extend (Dcat) {
     new AjaxExtension(Dcat);
     new DialogExtension(Dcat);
-    new Grid(Dcat);
+    new GridExtension(Dcat);
 
     Dcat.NP = NProgress;
     Dcat.RowSelector = function (options) {
-        return new RowSelector(options)
+        return new RowSelectorExtension(options)
     };
-    Dcat.debounce = Debounce;
+    Dcat.debounce = DebounceExtension;
 }
 
 // 初始化事件监听
-function on(Dcat) {
-    new Footer(Dcat);
-    new Pjax(Dcat);
-
+function listen(Dcat) {
     Dcat.booting(function () {
+        new Footer(Dcat);
+        new Pjax(Dcat);
+
         Dcat.NP.configure({parent: '.app-content'});
     });
 }
@@ -51,7 +51,7 @@ function on(Dcat) {
 // 初始化
 function boot(Dcat) {
     extend(Dcat);
-    on(Dcat);
+    listen(Dcat);
 
     $(Dcat.boot);
 

resources/assets/dcat/sass/_variables.scss

@@ -1,4 +1,4 @@
 
 $primary-linear-gradient: linear-gradient(118deg, rgba($primary, 1), rgba($primary, 0.7));
 
-$body-background: ecf0f5;
+$body-background: #ecf0f5;

resources/assets/dcat/sass/dcat-app.scss

@@ -15,3 +15,30 @@
 html body {
   background-color: $body-background;
 }
+
+body, .header-navbar, .navigation, .breadcrumb, h1, h2, h3, h4, h5 {
+  font-family: Nunito,system-ui,BlinkMacSystemFont,-apple-system,sans-serif;
+}
+
+body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
+   font-size: 1.3rem;
+}
+
+// 导航栏
+.breadcrumb {
+  border-left: 0;
+}
+
+// 页面标题
+.content-header h1 {
+  font-weight: 400;
+  font-size: 24px;
+  display: inline-block;
+
+  small {
+    font-size: 15px;
+    display: inline-block;
+    padding-left: 5px;
+    font-weight: 300;
+  }
+}

resources/dist/dcat/css/app.css

@@ -78,6 +78,39 @@
 /*nprogress*/
 
 html body {
-  background-color: ecf0f5;
+  background-color: #ecf0f5;
+}
+
+body,
+.header-navbar,
+.navigation,
+.breadcrumb,
+h1,
+h2,
+h3,
+h4,
+h5 {
+  font-family: Nunito, system-ui, BlinkMacSystemFont, -apple-system, sans-serif;
+}
+
+body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
+  font-size: 1.3rem;
+}
+
+.breadcrumb {
+  border-left: 0;
+}
+
+.content-header h1 {
+  font-weight: 400;
+  font-size: 24px;
+  display: inline-block;
+}
+
+.content-header h1 small {
+  font-size: 15px;
+  display: inline-block;
+  padding-left: 5px;
+  font-weight: 300;
 }
 

resources/dist/dcat/js/app.js

@@ -236,12 +236,12 @@ var Footer = /*#__PURE__*/function () {
   function Footer(Dcat) {
     _classCallCheck(this, Footer);
 
-    Dcat.booting(this.bootScrollTop);
+    this.boot(Dcat);
   }
 
   _createClass(Footer, [{
-    key: "bootScrollTop",
-    value: function bootScrollTop() {
+    key: "boot",
+    value: function boot(Dcat) {
       $(window).scroll(function () {
         if ($(this).scrollTop() > 400) {
           $('.scroll-top').fadeIn();
@@ -287,11 +287,7 @@ var Pjax = /*#__PURE__*/function () {
   function Pjax(Dcat) {
     _classCallCheck(this, Pjax);
 
-    var _this = this;
-
-    Dcat.booting(function () {
-      _this.boot(Dcat);
-    });
+    this.boot(Dcat);
   }
 
   _createClass(Pjax, [{
@@ -404,10 +400,10 @@ function extend(Dcat) {
 } // 初始化事件监听
 
 
-function on(Dcat) {
-  new _bootstrappers_Footer__WEBPACK_IMPORTED_MODULE_7__["default"](Dcat);
-  new _bootstrappers_Pjax__WEBPACK_IMPORTED_MODULE_8__["default"](Dcat);
+function listen(Dcat) {
   Dcat.booting(function () {
+    new _bootstrappers_Footer__WEBPACK_IMPORTED_MODULE_7__["default"](Dcat);
+    new _bootstrappers_Pjax__WEBPACK_IMPORTED_MODULE_8__["default"](Dcat);
     Dcat.NP.configure({
       parent: '.app-content'
     });
@@ -417,7 +413,7 @@ function on(Dcat) {
 
 function boot(Dcat) {
   extend(Dcat);
-  on(Dcat);
+  listen(Dcat);
   $(Dcat.boot);
   return Dcat;
 }

resources/views/layouts/content.blade.php

@@ -1,7 +1,7 @@
-@section('content')
-    <section class="content-header">
+@section('content-header')
+    <section class="content-header breadcrumbs-top mb-1">
         @if($header || $description)
-            <h1 style="display:inline">
+            <h1 class=" float-left">
                 {!! $header !!}
                 <small>{!! $description !!}</small>
             </h1>
@@ -12,31 +12,24 @@
         @include('admin::partials.breadcrumb')
 
     </section>
+@endsection
 
-    <section class="content">
-
-        @include('admin::partials.alerts')
-        @include('admin::partials.exception')
-
-        {!! $content !!}
+@section('content')
+    @include('admin::partials.alerts')
+    @include('admin::partials.exception')
 
-    </section>
+    {!! $content !!}
 
-    @if(Session::has('____'))
-        @php
-            $bag     = Session::get('layer-msg');
-            $type    = $bag->get('type')[0] ?? 'success';
-            $message = $bag->get('message')[0] ?? '';
-            $offset  = $bag->get('offset')[0] ?? '';
-        @endphp
-        <script>$(function () { Dcat.{{$type}}('{!!  $message  !!}', '{{ $offset }}'); })</script>
-    @endif
+    @include('admin::partials.toastr')
 @endsection
 
 @section('app')
     {!! Dcat\Admin\Admin::assets()->renderStyle() !!}
 
     {!! admin_section(AdminSection::APP_INNER_BEFORE) !!}
+    <div class="content-header">
+        @yield('content-header')
+    </div>
 
     <div class="content-body" id="app">
         @yield('content')

resources/views/layouts/vertical.blade.php

@@ -8,10 +8,6 @@
         var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});
 
         console.log(123, Dcat)
-        $(function () {
-
-        });
-
     </script>
 
     @include('admin::partials.sidebar')

resources/views/partials/breadcrumb.blade.php

@@ -1,16 +1,17 @@
 @if ($breadcrumb)
-    <ol class="breadcrumb" style="margin-right:30px;">
-        <li><a href="{{ admin_url('/') }}"><i class="fa fa-dashboard"></i> {{ucfirst(admin_trans('admin.home'))}}</a></li>
+    <div class="breadcrumb-wrapper col-12">
+    <ol class="breadcrumb float-right">
+        <li class="breadcrumb-item"><a href="{{ admin_url('/') }}"><i class="fa fa-dashboard"></i> {{ucfirst(admin_trans('admin.home'))}}</a></li>
         @foreach($breadcrumb as $item)
             @if($loop->last)
-                <li class="active">
+                <li class="active breadcrumb-item">
                     @if (\Illuminate\Support\Arr::has($item, 'icon'))
                         <i class="fa {{ $item['icon'] }}"></i>
                     @endif
                     {{ $item['text'] }}
                 </li>
             @else
-                <li>
+                <li class="breadcrumb-item">
                     <a href="{{ admin_url(\Illuminate\Support\Arr::get($item, 'url')) }}">
                         @if (\Illuminate\Support\Arr::has($item, 'icon'))
                             <i class="fa {{ $item['icon'] }}"></i>
@@ -21,15 +22,20 @@
             @endif
         @endforeach
     </ol>
+    </div>
 @elseif(config('admin.enable_default_breadcrumb'))
-    <ol class="breadcrumb" style="margin-right:30px;">
-        <li><a href="{{ admin_url('/') }}"><i class="fa fa-dashboard"></i> {{ucfirst(admin_trans('admin.home'))}}</a></li>
+    <div class="breadcrumb-wrapper col-12">
+    <ol class="breadcrumb float-right">
+        <li class="breadcrumb-item"><a href="{{ admin_url('/') }}"><i class="fa fa-dashboard"></i> {{ucfirst(admin_trans('admin.home'))}}</a></li>
         @for($i = 2; $i <= ($len = count(Request::segments())); $i++)
-            <li>
+            <li class="breadcrumb-item">
                 @if($i == $len) <a href=""> @endif
                 {{ucfirst(admin_trans_label(Request::segment($i)))}}
                 @if($i == $len) </a> @endif
             </li>
         @endfor
     </ol>
+    </div>
 @endif
+
+<div class="clearfix"></div>

resources/views/partials/toastr.blade.php

@@ -0,0 +1,9 @@
+@if(Session::has('dcat-admin-toastr'))
+    @php
+        $toastr  = Session::get('dcat-admin-toastr');
+        $type    = \Illuminate\Support\Arr::get($toastr->get('type'), 0, 'success');
+        $message = \Illuminate\Support\Arr::get($toastr->get('message'), 0, '');
+        $options = json_encode($toastr->get('options', []));
+    @endphp
+    <script>$(function () { toastr.{{$type}}('{!!  $message  !!}', null, {!! $options !!}); })</script>
+@endif

src/Controllers/AuthController.php

@@ -243,7 +243,7 @@ class AuthController extends Controller
      */
     protected function sendLoginResponse(Request $request)
     {
-        admin_alert(trans('admin.login_successful'));
+        admin_toastr(trans('admin.login_successful'));
 
         $request->session()->regenerate();
 

src/Support/helpers.php

@@ -294,19 +294,19 @@ if (! function_exists('admin_base_path')) {
     }
 }
 
-if (! function_exists('admin_alert')) {
+if (! function_exists('admin_toastr')) {
     /**
-     * Flash a layer message bag to session.
+     * Flash a toastr message bag to session.
      *
      * @param string $message
      * @param string $type
      * @param string $offset
      */
-    function admin_alert($message = '', $type = 'success', $offset = '')
+    function admin_toastr($message = '', $type = 'success', $offset = '')
     {
         $toastr = new MessageBag(get_defined_vars());
 
-        session()->flash('layer-msg', $toastr);
+        session()->flash('dcat-admin-toastr', $toastr);
     }
 }
 

src/Traits/HasFormResponse.php

@@ -130,7 +130,7 @@ trait HasFormResponse
         $status = (int) ($options['status_code'] ?? 302);
 
         if ($message) {
-            admin_alert($message);
+            admin_toastr($message);
         }
 
         return redirect(admin_url($url), $status);