jqh 5 éve
szülő
commit
db247c26f5

+ 4 - 4
resources/views/layouts/content.blade.php

@@ -24,7 +24,7 @@
 @endsection
 
 @section('app')
-    {!! Dcat\Admin\Admin::asset()->renderStyle() !!}
+    {!! Dcat\Admin\Admin::asset()->styleToHtml() !!}
 
     <div class="content-header">
         @yield('content-header')
@@ -40,7 +40,7 @@
         {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
     </div>
 
-    {!! Dcat\Admin\Admin::asset()->renderScript() !!}
+    {!! Dcat\Admin\Admin::asset()->scriptToHtml() !!}
     {!! Dcat\Admin\Admin::html() !!}
 @endsection
 
@@ -51,8 +51,8 @@
 
     <script>Dcat.pjaxResponded()</script>
 
-    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
-    {!! Dcat\Admin\Admin::asset()->renderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
+    {!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
 
     @yield('app')
 @endif

+ 4 - 4
resources/views/layouts/form-content.blade.php

@@ -12,14 +12,14 @@
     <section class="form-content">{!! $content !!}</section>
 @endsection
 
-{!! Dcat\Admin\Admin::asset()->renderCss() !!}
-{!! Dcat\Admin\Admin::asset()->renderJs() !!}
+{!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
+{!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
 
-{!! Dcat\Admin\Admin::asset()->renderStyle() !!}
+{!! Dcat\Admin\Admin::asset()->styleToHtml() !!}
 
 @yield('content')
 
-{!! Dcat\Admin\Admin::asset()->renderScript() !!}
+{!! Dcat\Admin\Admin::asset()->scriptToHtml() !!}
 {!! Dcat\Admin\Admin::html() !!}
 
 {{--select2下拉选框z-index必须大于弹窗的值--}}

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

@@ -10,7 +10,7 @@
 @endsection
 
 @section('app')
-    {!! Dcat\Admin\Admin::asset()->renderStyle() !!}
+    {!! Dcat\Admin\Admin::asset()->styleToHtml() !!}
 
     <div class="content-body" id="app">
         {{-- 页面埋点--}}
@@ -22,7 +22,7 @@
         {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
     </div>
 
-    {!! Dcat\Admin\Admin::asset()->renderScript() !!}
+    {!! Dcat\Admin\Admin::asset()->scriptToHtml() !!}
     {!! Dcat\Admin\Admin::html() !!}
 @endsection
 
@@ -34,8 +34,8 @@
 
     <script>Dcat.pjaxResponded();</script>
 
-    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
-    {!! Dcat\Admin\Admin::asset()->renderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
+    {!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
 
     @yield('app')
 @endif

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

@@ -19,9 +19,9 @@
 
     {!! admin_section(\AdminSection::HEAD) !!}
 
-    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
+    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
 
-    {!! Dcat\Admin\Admin::asset()->renderHeaderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->headerJsToHtml() !!}
 
     @yield('head')
 </head>
@@ -45,7 +45,7 @@
 
 {!! admin_section(\AdminSection::BODY_INNER_AFTER) !!}
 
-{!! Dcat\Admin\Admin::asset()->renderJs() !!}
+{!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
 
 <script>Dcat.boot();</script>
 

+ 2 - 2
resources/views/layouts/page.blade.php

@@ -19,9 +19,9 @@
 
     {!! admin_section(\AdminSection::HEAD) !!}
 
-    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
+    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
 
-    {!! Dcat\Admin\Admin::asset()->renderHeaderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->headerJsToHtml() !!}
 
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>

+ 1 - 1
resources/views/layouts/vertical.blade.php

@@ -62,7 +62,7 @@
 
     {!! admin_section(\AdminSection::BODY_INNER_AFTER) !!}
 
-    {!! Dcat\Admin\Admin::asset()->renderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
 
     <script>Dcat.boot();</script>
 

+ 3 - 1
src/Form/Field/Date.php

@@ -8,7 +8,9 @@ class Date extends Text
         '@moment',
         '@bootstrap-datetimepicker',
     ];
-    public static $css = '@bootstrap-datetimepicker';
+    public static $css = [
+        '@bootstrap-datetimepicker',
+    ];
 
     protected $format = 'YYYY-MM-DD';
 

+ 5 - 5
src/Layout/Asset.php

@@ -608,7 +608,7 @@ class Asset
     /**
      * @return string
      */
-    public function renderCss()
+    public function cssToHtml()
     {
         $this->mergeBaseCss();
 
@@ -646,7 +646,7 @@ class Asset
     /**
      * @return string
      */
-    public function renderJs()
+    public function jsToHtml()
     {
         $this->mergeBaseJs();
 
@@ -668,7 +668,7 @@ class Asset
     /**
      * @return string
      */
-    public function renderHeaderJs()
+    public function headerJsToHtml()
     {
         $html = '';
 
@@ -688,7 +688,7 @@ class Asset
     /**
      * @return string
      */
-    public function renderScript()
+    public function scriptToHtml()
     {
         $script = implode(';', array_unique($this->script));
 
@@ -708,7 +708,7 @@ HTML;
     /**
      * @return string
      */
-    public function renderStyle()
+    public function styleToHtml()
     {
         $style = implode('', array_unique($this->style));