fix: 模板更新

resources/views/admin/form/wang-editor.blade.php

@@ -0,0 +1,32 @@
+<div class="{{$viewClass['form-group']}}">
+
+    <label class="{{$viewClass['label']}} control-label">{{$label}}</label>
+
+    <div class="{{$viewClass['field']}}">
+
+        @include('admin::form.error')
+
+        <div {!! $attributes !!} style="width: 100%; height: 100%;">
+            <p>{!! $value !!}</p>
+        </div>
+
+        <input type="hidden" name="{{$name}}" value="{{ old($column, $value) }}" />
+
+        @include('admin::form.help-block')
+
+    </div>
+</div>
+
+<!-- script标签加上 "init" 属性后会自动使用 Dcat.init() 方法动态监听元素生成 -->
+<script require="@wang-editor" init="{!! $selector !!}">
+    var E = window.wangEditor;
+    // id 变量是 Dcat.init() 自动生成的，是一个唯一的随机字符串
+    var editor = new E('#' + id);
+    editor.config.zIndex = 0
+    editor.config.uploadImgShowBase64 = true
+    editor.config.onchange = function (html) {
+        $this.parents('.form-field').find('input[type="hidden"]').val(html);
+    }
+    editor.create()
+
+</script>

resources/views/admin/grid/table-toolbar.blade.php

@@ -20,6 +20,7 @@
                     {!! $grid->renderTools() !!}  {!! $grid->renderQuickSearch() !!}
 
                     <div class="pull-right" data-responsive-table-toolbar="{{$tableId}}">
+                        {!! $grid->renderRightTools() !!}
                         {!! $grid->renderColumnSelector() !!}
                         {!! $grid->renderCreateButton() !!}
                         {!! $grid->renderExportButton() !!}

resources/views/admin/grid/table.blade.php

@@ -56,7 +56,7 @@
             @endforeach
 
             @foreach($grid->rows() as $row)
-                <tr {!! $row->rowAttributes() !!}>
+                <tr {!! $row->rowAttributes() !!} @if($grid->allowColumnLink()) onclick="window.location.href = '{{$grid->resource()}}/{{$row->id}}'" @endif>
 
                     @foreach($grid->getVisibleColumnNames() as $name)
                         @if(!empty($mergerow_arr[$row->column($name)]))

resources/views/admin/layouts/container.blade.php

@@ -93,4 +93,4 @@
 
 </body>
 
-</html>
+</html>

resources/views/admin/partials/navbar.blade.php

@@ -1,6 +1,6 @@
 
 {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_BEFORE']) !!}
-
+@if(!$configData['horizontal_menu'])
 <nav class="header-navbar navbar-expand-lg navbar
     navbar-with-menu {{ $configData['navbar_class'] }}
     {{ $configData['navbar_color'] }}
@@ -57,5 +57,5 @@
         </div>
     </div>
 </nav>
-
+@endif
 {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_AFTER']) !!}

resources/views/admin/partials/sidebar.blade.php

@@ -1,31 +1,101 @@
+<style>
+    .main-horizontal-sidebar .user-nav {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        float: left;
+        margin-right: .8rem;
+    }
+
+    .main-horizontal-sidebar .dropdown-item {
+        padding: 10px !important;
+    }
+    .main-horizontal-sidebar ul.nav li .badge{
+        padding: .42em .6em .25rem;
+    }
+    .main-horizontal-sidebar li.dropdown .dropdown-menu{
+        top:48px
+    }
+    .main-horizontal-sidebar ul.nav li .badge.badge-up{
+        position: absolute;
+        top: 12px;
+        right: -2px;
+    }
+    .dropdown-menu-media{
+        width: 26rem;
+    }
+</style>
 <div class="{{ $configData['horizontal_menu'] ? 'header-navbar navbar-expand-sm navbar navbar-horizontal' : 'main-menu' }}">
     <div class="main-menu-content">
         <aside class="{{ $configData['horizontal_menu'] ? 'main-horizontal-sidebar' : 'main-sidebar shadow' }} {{ $configData['sidebar_style'] }}">
 
             @if(! $configData['horizontal_menu'])
-            <div class="navbar-header">
-                <ul class="nav navbar-nav flex-row">
-                    <li class="nav-item mr-auto">
-                        <a href="{{ admin_url('/') }}" class="navbar-brand waves-effect waves-light">
-                            <span class="logo-mini">{!! config('admin.logo-mini') !!}</span>
-                            <span class="logo-lg">{!! config('admin.logo') !!}</span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
+                <div class="navbar-header">
+                    <ul class="nav navbar-nav flex-row">
+                        <li class="nav-item mr-auto">
+                            <a href="{{ admin_url('/') }}" class="navbar-brand waves-effect waves-light">
+                                <span class="logo-mini">{!! config('admin.logo-mini') !!}</span>
+                                <span class="logo-lg">{!! config('admin.logo') !!}</span>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
             @endif
 
-            <div class="p-0 {{ $configData['horizontal_menu'] ? 'pl-1 pr-1' : 'sidebar pb-3' }}">
-                <ul class="nav nav-pills nav-sidebar {{ $configData['horizontal_menu'] ? '' : 'flex-column' }}"
-                    {!! $configData['horizontal_menu'] ? '' : 'data-widget="treeview"' !!}
-                     style="padding-top: 10px">
-                    {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_TOP']) !!}
+            <div class="p-0 {{ $configData['horizontal_menu'] ? 'pl-2 pr-2' : 'sidebar pb-3' }}">
+                @if(!empty($configData['horizontal_menu']))
+                    <div class="navbar-wrapper">
+                        <div class=" content">
+                            <div class="navbar-collapse d-flex justify-content-between">
+                                <div class="navbar-left d-flex align-items-center">
+                                    <ul class="nav  nav-pills nav-sidebar {{ $configData['horizontal_menu'] ? '' : 'flex-column' }}"
+                                        {!! $configData['horizontal_menu'] ? '' : 'data-widget="treeview"' !!}
+                                        style="padding-top: 10px">
+                                        @if($configData['horizontal_menu'])
+                                            <li class="nav-item" style="margin-right: 50px">
+                                                <a href="{{ admin_url('/') }}" class="waves-effect waves-light">
+                                                    <span class="logo-lg">{!! config('admin.logo') !!}</span>
+                                                </a>
+                                            </li>
+                                        @endif
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_TOP']) !!}
+
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU']) !!}
+
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_BOTTOM']) !!}
+                                    </ul>
+                                </div>
+                                <div class="navbar-right d-flex align-items-center">
+                                    {!! Dcat\Admin\Admin::navbar()->render() !!}
+                                    @if(!empty($configData['home_url']))
+                                        <a href="{{$configData['home_url']}}" target="_blank" class="nav-link"><i class="fa fa-home f18"></i></a>
+                                    @endif
+
+                                    @if(isset($configData['full_screen']) && $configData['full_screen'])
+                                        <a href="javascript:;"  data-check-screen="full" class="nav-link"><i class="feather icon-maximize f16"></i></a>
+                                    @endif
+                                    <ul class="nav navbar-nav">
+                                        {{--User Account Menu--}}
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_USER_PANEL']) !!}
+
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_AFTER_USER_PANEL']) !!}
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @else
+                    <ul class="nav nav-pills nav-sidebar {{ $configData['horizontal_menu'] ? '' : 'flex-column' }}"
+                        {!! $configData['horizontal_menu'] ? '' : 'data-widget="treeview"' !!}
+                        style="padding-top: 10px">
+                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_TOP']) !!}
 
-                    {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU']) !!}
+                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU']) !!}
 
-                    {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_BOTTOM']) !!}
-                </ul>
+                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_BOTTOM']) !!}
+                    </ul>
+                @endif
             </div>
         </aside>
     </div>
-</div>
+</div>

resources/views/admin/widgets/card.blade.php

@@ -1,12 +1,29 @@
+<style>
+    .card-tools .btn{box-shadow:none !important;}
+</style>
 <div {!! $attributes !!}>
     @if ($title || $tools)
-        <div class="card-header {{ $divider ? 'with-border' : '' }}">
+        <div class="card-header {{!empty($outline) ? 'card-outline '.$outline :''}} {{ $divider ? 'with-border' : '' }}">
             <span class="card-box-title">{!! $title !!}</span>
-            <div class="box-tools pull-right">
-                @foreach($tools as $tool)
-                    {!! $tool !!}
-                @endforeach
+            @if($collapse)
+            <div class="card-tools">
+                <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fa fa-minus"></i>
+                </button>
             </div>
+            @endif
+            @if($remove)
+            <div class="card-tools">
+                <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fa fa-times"></i>
+                </button>
+            </div>
+            @endif
+            @if(!empty($tools))
+                <div class="box-tools pull-right">
+                    @foreach($tools as $tool)
+                        {!! $tool !!}
+                    @endforeach
+                </div>
+            @endif
         </div>
     @endif
     <div class="card-body" style="{!! $padding !!}">

resources/views/distributor/form/wang-editor.blade.php

@@ -0,0 +1,32 @@
+<div class="{{$viewClass['form-group']}}">
+
+    <label class="{{$viewClass['label']}} control-label">{{$label}}</label>
+
+    <div class="{{$viewClass['field']}}">
+
+        @include('admin::form.error')
+
+        <div {!! $attributes !!} style="width: 100%; height: 100%;">
+            <p>{!! $value !!}</p>
+        </div>
+
+        <input type="hidden" name="{{$name}}" value="{{ old($column, $value) }}" />
+
+        @include('admin::form.help-block')
+
+    </div>
+</div>
+
+<!-- script标签加上 "init" 属性后会自动使用 Dcat.init() 方法动态监听元素生成 -->
+<script require="@wang-editor" init="{!! $selector !!}">
+    var E = window.wangEditor;
+    // id 变量是 Dcat.init() 自动生成的，是一个唯一的随机字符串
+    var editor = new E('#' + id);
+    editor.config.zIndex = 0
+    editor.config.uploadImgShowBase64 = true
+    editor.config.onchange = function (html) {
+        $this.parents('.form-field').find('input[type="hidden"]').val(html);
+    }
+    editor.create()
+
+</script>

resources/views/distributor/grid/table-toolbar.blade.php

@@ -20,6 +20,7 @@
                     {!! $grid->renderTools() !!}  {!! $grid->renderQuickSearch() !!}
 
                     <div class="pull-right" data-responsive-table-toolbar="{{$tableId}}">
+                        {!! $grid->renderRightTools() !!}
                         {!! $grid->renderColumnSelector() !!}
                         {!! $grid->renderCreateButton() !!}
                         {!! $grid->renderExportButton() !!}

resources/views/distributor/grid/table.blade.php

@@ -56,7 +56,7 @@
             @endforeach
 
             @foreach($grid->rows() as $row)
-                <tr {!! $row->rowAttributes() !!}>
+                <tr {!! $row->rowAttributes() !!} @if($grid->allowColumnLink()) onclick="window.location.href = '{{$grid->resource()}}/{{$row->id}}'" @endif>
 
                     @foreach($grid->getVisibleColumnNames() as $name)
                         @if(!empty($mergerow_arr[$row->column($name)]))

resources/views/distributor/layouts/container.blade.php

@@ -26,7 +26,7 @@
                 Powered by
                 <a target="_blank" href="https://github.com/ycookies/dcat-plus-admin">Dcat-plus Admin (速码邦)</a>
                 <span>&nbsp;·&nbsp;</span>
-                v{{ Dcat\Admin\Admin::VERSION }}
+                {{ \Dcat\Admin\Support\Helper::getPackageVersion('dcat-plus/laravel-admin') }}
             </span>
 
         <button class="btn btn-primary btn-icon scroll-top pull-right" style="position: fixed;bottom: 2%; right: 10px;display: none">

resources/views/distributor/pages/login.blade.php

@@ -24,7 +24,7 @@
 <div class="login-page bg-40">
     <div class="login-box">
         <div class="login-logo mb-2">
-            Distributor Management
+            {{ config('admin.name') }}
         </div>
         <div class="card">
             <div class="card-body login-card-body shadow-100">

resources/views/distributor/partials/navbar.blade.php

@@ -1,6 +1,6 @@
 
 {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_BEFORE']) !!}
-
+@if(!$configData['horizontal_menu'])
 <nav class="header-navbar navbar-expand-lg navbar
     navbar-with-menu {{ $configData['navbar_class'] }}
     {{ $configData['navbar_color'] }}
@@ -57,5 +57,5 @@
         </div>
     </div>
 </nav>
-
+@endif
 {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_AFTER']) !!}

resources/views/distributor/partials/sidebar.blade.php

@@ -1,31 +1,101 @@
+<style>
+    .main-horizontal-sidebar .user-nav {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        float: left;
+        margin-right: .8rem;
+    }
+
+    .main-horizontal-sidebar .dropdown-item {
+        padding: 10px !important;
+    }
+    .main-horizontal-sidebar ul.nav li .badge{
+        padding: .42em .6em .25rem;
+    }
+    .main-horizontal-sidebar li.dropdown .dropdown-menu{
+        top:48px
+    }
+    .main-horizontal-sidebar ul.nav li .badge.badge-up{
+        position: absolute;
+        top: 12px;
+        right: -2px;
+    }
+    .dropdown-menu-media{
+        width: 26rem;
+    }
+</style>
 <div class="{{ $configData['horizontal_menu'] ? 'header-navbar navbar-expand-sm navbar navbar-horizontal' : 'main-menu' }}">
     <div class="main-menu-content">
         <aside class="{{ $configData['horizontal_menu'] ? 'main-horizontal-sidebar' : 'main-sidebar shadow' }} {{ $configData['sidebar_style'] }}">
 
             @if(! $configData['horizontal_menu'])
-            <div class="navbar-header">
-                <ul class="nav navbar-nav flex-row">
-                    <li class="nav-item mr-auto">
-                        <a href="{{ admin_url('/') }}" class="navbar-brand waves-effect waves-light">
-                            <span class="logo-mini">{!! config('admin.logo-mini') !!}</span>
-                            <span class="logo-lg">{!! config('admin.logo') !!}</span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
+                <div class="navbar-header">
+                    <ul class="nav navbar-nav flex-row">
+                        <li class="nav-item mr-auto">
+                            <a href="{{ admin_url('/') }}" class="navbar-brand waves-effect waves-light">
+                                <span class="logo-mini">{!! config('admin.logo-mini') !!}</span>
+                                <span class="logo-lg">{!! config('admin.logo') !!}</span>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
             @endif
 
-            <div class="p-0 {{ $configData['horizontal_menu'] ? 'pl-1 pr-1' : 'sidebar pb-3' }}">
-                <ul class="nav nav-pills nav-sidebar {{ $configData['horizontal_menu'] ? '' : 'flex-column' }}"
-                    {!! $configData['horizontal_menu'] ? '' : 'data-widget="treeview"' !!}
-                     style="padding-top: 10px">
-                    {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_TOP']) !!}
+            <div class="p-0 {{ $configData['horizontal_menu'] ? 'pl-2 pr-2' : 'sidebar pb-3' }}">
+                @if(!empty($configData['horizontal_menu']))
+                    <div class="navbar-wrapper">
+                        <div class=" content">
+                            <div class="navbar-collapse d-flex justify-content-between">
+                                <div class="navbar-left d-flex align-items-center">
+                                    <ul class="nav  nav-pills nav-sidebar {{ $configData['horizontal_menu'] ? '' : 'flex-column' }}"
+                                        {!! $configData['horizontal_menu'] ? '' : 'data-widget="treeview"' !!}
+                                        style="padding-top: 10px">
+                                        @if($configData['horizontal_menu'])
+                                            <li class="nav-item" style="margin-right: 50px">
+                                                <a href="{{ admin_url('/') }}" class="waves-effect waves-light">
+                                                    <span class="logo-lg">{!! config('admin.logo') !!}</span>
+                                                </a>
+                                            </li>
+                                        @endif
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_TOP']) !!}
+
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU']) !!}
+
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_BOTTOM']) !!}
+                                    </ul>
+                                </div>
+                                <div class="navbar-right d-flex align-items-center">
+                                    {!! Dcat\Admin\Admin::navbar()->render() !!}
+                                    @if(!empty($configData['home_url']))
+                                        <a href="{{$configData['home_url']}}" target="_blank" class="nav-link"><i class="fa fa-home f18"></i></a>
+                                    @endif
+
+                                    @if(isset($configData['full_screen']) && $configData['full_screen'])
+                                        <a href="javascript:;"  data-check-screen="full" class="nav-link"><i class="feather icon-maximize f16"></i></a>
+                                    @endif
+                                    <ul class="nav navbar-nav">
+                                        {{--User Account Menu--}}
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_USER_PANEL']) !!}
+
+                                        {!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_AFTER_USER_PANEL']) !!}
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @else
+                    <ul class="nav nav-pills nav-sidebar {{ $configData['horizontal_menu'] ? '' : 'flex-column' }}"
+                        {!! $configData['horizontal_menu'] ? '' : 'data-widget="treeview"' !!}
+                        style="padding-top: 10px">
+                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_TOP']) !!}
 
-                    {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU']) !!}
+                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU']) !!}
 
-                    {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_BOTTOM']) !!}
-                </ul>
+                        {!! admin_section(Dcat\Admin\Admin::SECTION['LEFT_SIDEBAR_MENU_BOTTOM']) !!}
+                    </ul>
+                @endif
             </div>
         </aside>
     </div>
-</div>
+</div>

resources/views/distributor/widgets/card.blade.php

@@ -1,12 +1,29 @@
+<style>
+    .card-tools .btn{box-shadow:none !important;}
+</style>
 <div {!! $attributes !!}>
     @if ($title || $tools)
-        <div class="card-header {{ $divider ? 'with-border' : '' }}">
+        <div class="card-header {{!empty($outline) ? 'card-outline '.$outline :''}} {{ $divider ? 'with-border' : '' }}">
             <span class="card-box-title">{!! $title !!}</span>
-            <div class="box-tools pull-right">
-                @foreach($tools as $tool)
-                    {!! $tool !!}
-                @endforeach
+            @if($collapse)
+            <div class="card-tools">
+                <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fa fa-minus"></i>
+                </button>
             </div>
+            @endif
+            @if($remove)
+            <div class="card-tools">
+                <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fa fa-times"></i>
+                </button>
+            </div>
+            @endif
+            @if(!empty($tools))
+                <div class="box-tools pull-right">
+                    @foreach($tools as $tool)
+                        {!! $tool !!}
+                    @endforeach
+                </div>
+            @endif
         </div>
     @endif
     <div class="card-body" style="{!! $padding !!}">