layout full page

update

resources/assets/dcat/sass/_variables.scss

@@ -47,7 +47,6 @@ $primary-90: #8379f2;
 // 渐变主色
 $primary-linear-gradient: linear-gradient(118deg, rgba($primary, 1), rgba($primary, 0.7));
 
-
 // 字体颜色
 $font-color: #414750;
 
@@ -55,6 +54,8 @@ $font-color: #414750;
 //$body-background: #f9fafc;
 $body-background: $dark30;
 
+// 灰背景色
+$gray-background: #f1f1f1;
 
 // 常用阴影颜色
 $shadow: 0 2px 4px 0 rgba(0,0,0,.08);

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

@@ -29,6 +29,7 @@
   }
 }
 
+// 过滤器滑动面板
 .right-side-filter-container .header {
   border-bottom: 1px solid $divider-color;
   width: 100%;
@@ -37,3 +38,13 @@
   top: 0;
   margin-left: -1rem;
 }
+
+// 快捷新增
+.quick-create {
+  td {
+    padding-left: 45px;
+    background-color: $gray-background;
+    vertical-align: middle;
+    border-radius: .5rem;
+  }
+}

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

@@ -4,10 +4,10 @@
 
 .layui-layer-title {
   padding: 0 80px 0 20px;
-  height: 50px!important;
-  line-height: 50px!important;
-  border-bottom: 0!important;
-  font-size: 1rem!important;
+  height: 55px!important;
+  line-height: 55px!important;
+  border-bottom: 1px solid $divider-color!important;
+  font-size: 1.1rem!important;
   text-transform: capitalize;
   overflow: hidden;
 }
@@ -19,7 +19,7 @@
 .layui-layer-setwin .layui-layer-min cite:before {
   font-family: "feather";
   content: "\e897";
-  font-size: 1.15rem;
+  font-size: 1.2rem;
   color: $font-color;
 }
 
@@ -31,7 +31,7 @@
 .layui-layer-setwin .layui-layer-max:before {
   font-family: "feather";
   content: "\e908";
-  font-size: 1.1rem;
+  font-size: 1rem;
 }
 .layui-layer-setwin .layui-layer-maxmin:before {
   content: "\e88d";
@@ -40,8 +40,12 @@
 .layui-layer-setwin .layui-layer-close1:before {
   font-family: "feather";
   content: "\e8f6";
-  font-size: 1.15rem;
+  font-size: 1.2rem;
 }
 .layui-layer-setwin .layui-layer-close1 {
-  margin-left: 8px!important;
+  margin-left: 7px!important;
+}
+
+.layui-layer-setwin a {
+  top: 3px;
 }

resources/dist/dcat/css/dcat-app.css

@@ -1974,6 +1974,13 @@ table.data-thumb-view.dataTable tbody tr:hover {
   margin-left: -1rem;
 }
 
+.quick-create td {
+  padding-left: 45px;
+  background-color: #f1f1f1;
+  vertical-align: middle;
+  border-radius: 0.5rem;
+}
+
 .dropdown .dropdown-menu {
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
   border: 1px solid rgba(0, 0, 0, 0.03);
@@ -2060,10 +2067,10 @@ table.data-thumb-view.dataTable tbody tr:hover {
 
 .layui-layer-title {
   padding: 0 80px 0 20px;
-  height: 50px !important;
-  line-height: 50px !important;
-  border-bottom: 0 !important;
-  font-size: 1rem !important;
+  height: 55px !important;
+  line-height: 55px !important;
+  border-bottom: 1px solid #f4f4f4 !important;
+  font-size: 1.1rem !important;
   text-transform: capitalize;
   overflow: hidden;
 }
@@ -2076,7 +2083,7 @@ table.data-thumb-view.dataTable tbody tr:hover {
 .layui-layer-setwin .layui-layer-min cite:before {
   font-family: "feather";
   content: "\E897";
-  font-size: 1.15rem;
+  font-size: 1.2rem;
   color: #414750;
 }
 
@@ -2088,7 +2095,7 @@ table.data-thumb-view.dataTable tbody tr:hover {
 .layui-layer-setwin .layui-layer-max:before {
   font-family: "feather";
   content: "\E908";
-  font-size: 1.1rem;
+  font-size: 1rem;
 }
 
 .layui-layer-setwin .layui-layer-maxmin:before {
@@ -2098,11 +2105,15 @@ table.data-thumb-view.dataTable tbody tr:hover {
 .layui-layer-setwin .layui-layer-close1:before {
   font-family: "feather";
   content: "\E8F6";
-  font-size: 1.15rem;
+  font-size: 1.2rem;
 }
 
 .layui-layer-setwin .layui-layer-close1 {
-  margin-left: 8px !important;
+  margin-left: 7px !important;
+}
+
+.layui-layer-setwin a {
+  top: 3px;
 }
 
 body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {

resources/views/filter/button.blade.php

@@ -1,7 +1,7 @@
 <div class="btn-group filter-button-group btn-no-shadow" style="margin-right:3px">
-    <label class="btn btn-outline-primary {{ $scopes->isNotEmpty() ? 'dropdown-toggle' : '' }} {{ $btn_class }}" @if($only_scopes)data-toggle="dropdown"@endif>
+    <button class="btn btn-outline-primary {{ $scopes->isNotEmpty() ? 'dropdown-toggle' : '' }} {{ $btn_class }}" @if($only_scopes)data-toggle="dropdown"@endif>
         <i class="feather icon-filter"></i>@if($show_filter_text)<span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.filter') }}</span>@endif
-    </label>
+    </button>
     @if($scopes->isNotEmpty())
         <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown">
 

resources/views/grid/quick-create/form.blade.php

@@ -1,9 +1,8 @@
 <thead>
 <tr class="{{ $elementClass }} quick-create">
-    <td colspan="{{ $columnCount }}" style="height: 43px;padding-left: 57px;background-color: #f9f9f9; vertical-align: middle;">
-
-        <span class="create" style="color: #bdbdbd;cursor: pointer;display: block;">
-             <i class="ti-plus"></i>&nbsp;{{ __('admin.quick_create') }}
+    <td colspan="{{ $columnCount }}">
+        <span class="create cursor-pointer" style="display: block;">
+             <i class="feather icon-plus"></i>&nbsp;{{ __('admin.quick_create') }}
         </span>
 
         <form class="form-inline create-form" style="display: none;" method="post">
@@ -11,7 +10,9 @@
                 &nbsp;{!! $field->render() !!}
             @endforeach
                 &nbsp;
-            <button type="submit" class="btn btn-primary btn-sm">{{ __('admin.submit') }}</button>&nbsp;
+            &nbsp;
+            <button type="submit" class="btn btn-primary btn-sm">{{ strtoupper(__('admin.submit')) }}</button>&nbsp;
+            &nbsp;
             <a href="javascript:void(0);" class="cancel">{{ __('admin.cancel') }}</a>
             {{ csrf_field() }}
         </form>

resources/views/layouts/content.blade.php

@@ -26,18 +26,19 @@
 @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">
+        {{-- 页面埋点--}}
+        {!! admin_section(AdminSection::APP_INNER_BEFORE) !!}
+
         @yield('content')
-    </div>
 
-    {{-- 页面埋点--}}
-    {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
+        {{-- 页面埋点--}}
+        {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
+    </div>
 
     {!! Dcat\Admin\Admin::assets()->renderScript() !!}
     {!! Dcat\Admin\Admin::html() !!}

resources/views/layouts/full-content.blade.php

@@ -12,15 +12,15 @@
 @section('app')
     {!! Dcat\Admin\Admin::assets()->renderStyle() !!}
 
-    {{-- 页面埋点--}}
-    {!! admin_section(AdminSection::APP_INNER_BEFORE) !!}
-
     <div class="content-body" id="app">
+        {{-- 页面埋点--}}
+        {!! admin_section(AdminSection::APP_INNER_BEFORE) !!}
+
         @yield('content')
-    </div>
 
-    {{-- 页面埋点--}}
-    {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
+        {{-- 页面埋点--}}
+        {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
+    </div>
 
     {!! Dcat\Admin\Admin::assets()->renderScript() !!}
     {!! Dcat\Admin\Admin::html() !!}

resources/views/layouts/full-page.blade.php

@@ -35,12 +35,12 @@
     var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});
 </script>
 
+{{-- 页面埋点 --}}
+{!! admin_section(\AdminSection::BODY_INNER_BEFORE) !!}
 
 <div class="app-content content">
-    <div class="content-wrapper">
-        <div class="content-body">
-            @yield('content')
-        </div>
+    <div class="content-wrapper" id="{{ $pjaxContainerId }}">
+        @yield('app')
     </div>
 </div>
 

resources/views/layouts/vertical.blade.php

@@ -2,8 +2,6 @@
         class="dcat-admin-body vertical-layout vertical-menu-modern 2-columns {{ $configData['blank_page_class'] }} {{ $configData['body_class']}} {{($configData['theme'] === 'light') ? '' : $configData['layout_theme'] }}  {{ $configData['vertical_menu_navbar_type'] }} {{ $configData['sidebar_class'] }} {{ $configData['footer_type'] }}"
         data-menu="vertical-menu-modern" data-col="2-columns" data-layout="{{ $configData['theme'] }}">
 
-    {!! admin_section(\AdminSection::BODY_INNER_BEFORE) !!}
-
     <script>
         var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});
 
@@ -15,6 +13,8 @@
         })
     </script>
 
+    {!! admin_section(\AdminSection::BODY_INNER_BEFORE) !!}
+
     @include('admin::partials.sidebar')
 
     <div class="app-content content">
@@ -31,13 +31,13 @@
                     </div>
                 </div>
                 <div class="{{ $configData['content_sidebar_class'] }}">
-                    <div class="content-wrapper" id="pjax-container">
+                    <div class="content-wrapper" id="{{ $pjaxContainerId }}">
                         @yield('app')
                     </div>
                 </div>
             </div>
         @else
-            <div class="content-wrapper" id="pjax-container">
+            <div class="content-wrapper" id="{{ $pjaxContainerId }}">
                 @yield('app')
             </div>
         @endif

src/Admin.php

@@ -61,6 +61,11 @@ class Admin
      */
     public static $jsVariables = [];
 
+    /**
+     * @var string
+     */
+    public static $pjaxContainerId = 'pjax-container';
+
     /**
      * Returns the long version of dcat-admin.
      *
@@ -415,6 +420,7 @@ class Admin
      */
     public static function jsVariables()
     {
+        static::$jsVariables['pjax_container_selector'] = '#'.static::$pjaxContainerId;
         static::$jsVariables['token'] = csrf_token();
         static::$jsVariables['lang'] = __('admin.client') ?: [];
 

src/Grid/Displayers/DialogTree.php

@@ -178,7 +178,7 @@ EOF;
         Admin::script(
             <<<JS
 $('.{$this->getSelectorPrefix()}-open-tree').off('click').click(function () {
-    var tpl = '<div class="jstree-wrapper" style="border:0"><div class="da-tree" style="margin-top:10px"></div></div>', 
+    var tpl = '<div class="jstree-wrapper p-1" style="border:0"><div class="da-tree" style="margin-top:10px"></div></div>', 
         opts = $opts,
         url = '{$this->url}',
         t = $(this),

src/Layout/Content.php

@@ -394,11 +394,12 @@ class Content implements Renderable
     protected function variables()
     {
         return array_merge([
-            'header'      => $this->title,
-            'description' => $this->description,
-            'breadcrumb'  => $this->breadcrumb,
-            'configData'  => $this->applClasses(),
-            'content'     => $this->build(),
+            'header'          => $this->title,
+            'description'     => $this->description,
+            'breadcrumb'      => $this->breadcrumb,
+            'configData'      => $this->applClasses(),
+            'content'         => $this->build(),
+            'pjaxContainerId' => Admin::$pjaxContainerId,
         ], $this->variables);
     }
 

src/SimpleGrid.php

@@ -22,7 +22,9 @@ class SimpleGrid extends Grid
         $this->rowSelector()->click();
 
         Content::composing(function (Content $content) {
-            $content->simple();
+            Admin::style('#app{padding: 1rem}');
+
+            $content->full();
         }, true);
     }