wip

resources/views/form/file.blade.php

@@ -1,21 +1,15 @@
 <style>
-    @php($primary = admin_color()->primary())
-
     .webuploader-pick {
-        background-color: {!! $primary !!}
-    }
-
-    .web-uploader .placeholder .webuploader-pick {
-        background: {!! admin_color()->lighten('primary', 12) !!};
+        background-color: @primary;
     }
 
     .web-uploader .placeholder .flashTip a {
-        color: {!! admin_color()->lighten('primary', 12) !!};
+        color: @primary(-10);
     }
 
     .web-uploader .statusBar .upload-progress span.percentage,
     .web-uploader .filelist li p.upload-progress span {
-        background: {!! admin_color()->lighten('primary', 10) !!};
+        background: @primary(-8);
     }
 </style>
 

resources/views/form/steps.blade.php

@@ -1,25 +1,23 @@
 <style>
-    @php($primary = admin_color()->primary())
-
     .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-icons,
     .done > .dcat-step-item-container > .dcat-step-line:after,
     .done .dcat-step-icons,
     .active .dcat-step-icons {
-        border-color: {!! $primary !!}
+        border-color: @primary
     }
 
     .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-icons .dcat-step-icon,
     .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-desc .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-title,
     .done .dcat-step-icons > .dcat-step-icon,
     .active .dcat-step-icons > .dcat-step-icon {
-        color: {!! $primary !!}
+        color: @primary
     }
 
     .done > .dcat-step-item-container > .dcat-step-content > .dcat-step-title:after,
     .done .dcat-step-icons > .dcat-step-icon .dcat-step-icon-dot,
     .active .dcat-step-icons,
     .active .dcat-step-icons > .dcat-step-icon .dcat-step-icon-dot {
-        background-color: {!! $primary !!}
+        background-color: @primary
     }
 </style>
 

resources/views/grid/displayer/dialogtree.blade.php

@@ -38,13 +38,13 @@
                     return Dcat.error(resp.message || '系统繁忙，请稍后再试');
                 }
 
-                build(resp.value);
+                open(resp.value);
             });
         } else {
-            build(val);
+            open(val);
         }
 
-        function build(val) {
+        function open(val) {
             options.config.core.data = formatNodes(val, options.nodes);
 
             idx = layer.open({

src/AdminServiceProvider.php

@@ -74,17 +74,6 @@ class AdminServiceProvider extends ServiceProvider
         ],
     ];
 
-    public function boot()
-    {
-        $this->registerDefaultSections();
-        $this->registerViews();
-        $this->ensureHttps();
-        $this->bootApplication();
-        $this->registerPublishing();
-        $this->compatibleBlade();
-        $this->bootExtensions();
-    }
-
     public function register()
     {
         require_once __DIR__.'/Support/AdminSection.php';
@@ -102,6 +91,18 @@ class AdminServiceProvider extends ServiceProvider
         }
     }
 
+    public function boot()
+    {
+        $this->registerDefaultSections();
+        $this->registerViews();
+        $this->ensureHttps();
+        $this->bootApplication();
+        $this->registerPublishing();
+        $this->compatibleBlade();
+        $this->bootExtensions();
+        $this->registerBladeDirective();
+    }
+
     protected function aliasAdmin()
     {
         if (! class_exists(\Admin::class)) {
@@ -228,6 +229,25 @@ class AdminServiceProvider extends ServiceProvider
         Admin::extensions()->boot();
     }
 
+    protected function registerBladeDirective()
+    {
+        Blade::directive('color', function ($color = 'primary', $amt = 0) {
+            $color = $amt ? admin_color()->darken($color, $amt) : admin_color($color);
+
+            return <<<PHP
+<?php echo "{$color}";?>
+PHP;
+        });
+
+        Blade::directive('primary', function ($amt = 0) {
+            $color = $amt ? admin_color()->darken('primary', $amt) : admin_color('primary');
+
+            return <<<PHP
+<?php echo "{$color}";?>
+PHP;
+        });
+    }
+
     /**
      * 路由中间件注册.
      *

src/Widgets/Table.php

@@ -2,6 +2,7 @@
 
 namespace Dcat\Admin\Widgets;
 
+use Dcat\Admin\Support\Helper;
 use Illuminate\Support\Arr;
 
 class Table extends Widget
@@ -82,7 +83,7 @@ class Table extends Widget
      */
     public function setRows($rows = [])
     {
-        if (! Arr::isAssoc($rows)) {
+        if ($rows && ! Arr::isAssoc(Helper::array($rows))) {
             $this->rows = $rows;
 
             return $this;