使用别名

update

resources/assets/dcat/js/bootstrappers/DataActions.js

@@ -70,19 +70,6 @@ let actions = {
         });
     },
 
-    // 进度条初始化
-    progressBar: function () {
-        $('.progress-bar').each(function (k, v) {
-            v = $(v);
-            var w = v.data('width');
-            if (w) {
-                setTimeout(function () {
-                    v.css({width: w});
-                }, 80);
-            }
-        });
-    },
-
     // 图片预览
     imagePreview: function (Dcat) {
         $('[data-action="preview"]').off('click').click(function () {

resources/dist/dcat/js/dcat-app.js

@@ -392,21 +392,6 @@ var actions = {
       });
     });
   },
-  // 进度条初始化
-  progressBar: function progressBar() {
-    $('.progress-bar').each(function (k, v) {
-      v = $(v);
-      var w = v.data('width');
-
-      if (w) {
-        setTimeout(function () {
-          v.css({
-            width: w
-          });
-        }, 80);
-      }
-    });
-  },
   // 图片预览
   imagePreview: function imagePreview(Dcat) {
     $('[data-action="preview"]').off('click').click(function () {

src/Controllers/PermissionController.php

@@ -106,7 +106,7 @@ class PermissionController extends AdminController
                     $method = array_merge($method, explode(',', $me));
                 }
                 if ($path !== '...' && ! empty(config('admin.route.prefix'))) {
-                    $path = admin_base_path($path);
+                    $path = trim(admin_base_path($path), '/');
                 }
 
                 return "<code>$path</code>";

src/Form/Field/Currency.php

@@ -4,8 +4,8 @@ namespace Dcat\Admin\Form\Field;
 
 class Currency extends Text
 {
-    public static $js = 'jquery.inputmask';
-    public static $css = 'jquery.inputmask';
+    public static $js = '@jquery.inputmask';
+    public static $css = '@jquery.inputmask';
 
     /**
      * @var string

src/Form/Field/Date.php

@@ -4,8 +4,8 @@ namespace Dcat\Admin\Form\Field;
 
 class Date extends Text
 {
-    public static $js = 'bootstrap-datetimepicker';
-    public static $css = 'bootstrap-datetimepicker';
+    public static $js = '@bootstrap-datetimepicker';
+    public static $css = '@bootstrap-datetimepicker';
 
     protected $format = 'yyyy-mm-dd';
 

src/Form/Field/DateRange.php

@@ -7,8 +7,8 @@ use Dcat\Admin\Form\Field;
 
 class DateRange extends Field
 {
-    public static $js = 'bootstrap-datetimepicker';
-    public static $css = 'bootstrap-datetimepicker';
+    public static $js = '@bootstrap-datetimepicker';
+    public static $css = '@bootstrap-datetimepicker';
 
     protected $format = 'yyyy-mm-dd';
 

src/Form/Field/Decimal.php

@@ -4,8 +4,8 @@ namespace Dcat\Admin\Form\Field;
 
 class Decimal extends Text
 {
-    public static $js = 'jquery.inputmask';
-    public static $css = 'jquery.inputmask';
+    public static $js = '@jquery.inputmask';
+    public static $css = '@jquery.inputmask';
 
     /**
      * @see https://github.com/RobinHerbots/Inputmask#options

src/Form/Field/File.php

@@ -19,7 +19,7 @@ class File extends Field implements UploadFieldInterface
      * @var array
      */
     protected static $css = [
-        'vendor/dcat-admin/webuploader/webuploader.min.css',
+        '@webuploader',
     ];
 
     /**
@@ -28,8 +28,7 @@ class File extends Field implements UploadFieldInterface
      * @var array
      */
     protected static $js = [
-        'vendor/dcat-admin/webuploader/webuploader.min.js',
-        'vendor/dcat-admin/dcat-admin/upload.min.js',
+        '@webuploader',
     ];
 
     /**

src/Form/Field/Icon.php

@@ -4,8 +4,8 @@ namespace Dcat\Admin\Form\Field;
 
 class Icon extends Text
 {
-    public static $js = 'fontawesome-iconpicker';
-    public static $css = 'fontawesome-iconpicker';
+    public static $js = '@fontawesome-iconpicker';
+    public static $css = '@fontawesome-iconpicker';
 
     public function render()
     {

src/Form/Field/Ip.php

@@ -4,8 +4,8 @@ namespace Dcat\Admin\Form\Field;
 
 class Ip extends Text
 {
-    public static $js = 'jquery.inputmask';
-    public static $css = 'jquery.inputmask';
+    public static $js = '@jquery.inputmask';
+    public static $css = '@jquery.inputmask';
 
     protected $rules = ['nullable', 'ip'];
 

src/Form/Field/Listbox.php

@@ -9,8 +9,8 @@ namespace Dcat\Admin\Form\Field;
  */
 class Listbox extends MultipleSelect
 {
-    public static $js = 'jquery.bootstrap-duallistbox';
-    public static $css = 'jquery.bootstrap-duallistbox';
+    public static $js = '@jquery.bootstrap-duallistbox';
+    public static $css = '@jquery.bootstrap-duallistbox';
 
     protected $settings = [];
 

src/Form/Field/Mobile.php

@@ -4,8 +4,8 @@ namespace Dcat\Admin\Form\Field;
 
 class Mobile extends Text
 {
-    public static $js = 'jquery.inputmask';
-    public static $css = 'jquery.inputmask';
+    public static $js = '@jquery.inputmask';
+    public static $css = '@jquery.inputmask';
 
     /**
      * @see https://github.com/RobinHerbots/Inputmask#options

src/Form/Field/Number.php

@@ -5,7 +5,7 @@ namespace Dcat\Admin\Form\Field;
 class Number extends Text
 {
     protected static $js = [
-        '/vendor/dcat-admin/number-input/bootstrap-number-input.js',
+        '@number-input',
     ];
 
     public function render()

src/Form/Field/Select.php

@@ -11,8 +11,8 @@ use Illuminate\Support\Str;
 
 class Select extends Field
 {
-    public static $js = 'select2';
-    public static $css = 'select2';
+    public static $js = '@select2';
+    public static $css = '@select2';
 
 
     /**

src/Form/Field/SelectResource.php

@@ -12,7 +12,7 @@ class SelectResource extends Field
     use PlainInput;
 
     protected static $js = [
-        'dcat-admin/dcat/extra/resource-selector.js',
+        '@resource-selector',
     ];
 
     protected $area = ['51%', '65%'];

src/Form/Field/Slider.php

@@ -7,12 +7,11 @@ use Dcat\Admin\Form\Field;
 class Slider extends Field
 {
     protected static $css = [
-        '/vendor/dcat-admin/AdminLTE/plugins/ionslider/ion.rangeSlider.css',
-        '/vendor/dcat-admin/AdminLTE/plugins/ionslider/ion.rangeSlider.skinNice.css',
+        '@ionslider',
     ];
 
     protected static $js = [
-        '/vendor/dcat-admin/AdminLTE/plugins/ionslider/ion.rangeSlider.min.js',
+        '@ionslider',
     ];
 
     protected $options = [

src/Form/Field/SwitchField.php

@@ -7,8 +7,8 @@ use Dcat\Admin\Form\Field;
 
 class SwitchField extends Field
 {
-    public static $js = 'switchery';
-    public static $css = 'switchery';
+    public static $js = '@switchery';
+    public static $css = '@switchery';
 
     public function primary()
     {

src/Form/Field/Tags.php

@@ -11,8 +11,8 @@ use Illuminate\Support\Collection;
 
 class Tags extends Field
 {
-    public static $js = 'select2';
-    public static $css = 'select2';
+    public static $js = '@select2';
+    public static $css = '@select2';
 
     /**
      * @var array

src/Form/Field/Tree.php

@@ -11,8 +11,8 @@ use Illuminate\Support\Arr;
 
 class Tree extends Field
 {
-    public static $js = 'jstree';
-    public static $css = 'jstree';
+    public static $js = '@jstree';
+    public static $css = '@jstree';
 
     protected $options = [
         'plugins' => ['checkbox', 'types'],

src/Grid/Displayers/DialogTree.php

@@ -8,8 +8,8 @@ use Illuminate\Contracts\Support\Arrayable;
 
 class DialogTree extends AbstractDisplayer
 {
-    public static $js = 'jstree';
-    public static $css = 'jstree';
+    public static $js = '@jstree';
+    public static $css = '@jstree';
 
     protected $url;
 

src/Grid/Displayers/Select.php

@@ -6,8 +6,8 @@ use Dcat\Admin\Admin;
 
 class Select extends AbstractDisplayer
 {
-    public static $js = 'select2';
-    public static $css = 'select2';
+    public static $js = '@select2';
+    public static $css = '@select2';
 
     public function display($options = [])
     {

src/Grid/Displayers/SwitchDisplay.php

@@ -6,8 +6,8 @@ use Dcat\Admin\Admin;
 
 class SwitchDisplay extends AbstractDisplayer
 {
-    public static $js = 'switchery';
-    public static $css = 'switchery';
+    public static $js = '@switchery';
+    public static $css = '@switchery';
 
     /**
      * @var string

src/Grid/Filter/Presenter/DateTime.php

@@ -8,11 +8,11 @@ use Illuminate\Support\Arr;
 class DateTime extends Presenter
 {
     public static $js = [
-        'bootstrap-datetimepicker',
+        '@bootstrap-datetimepicker',
     ];
 
     public static $css = [
-        'bootstrap-datetimepicker',
+        '@bootstrap-datetimepicker',
     ];
 
     /**

src/Grid/Filter/Presenter/Select.php

@@ -10,10 +10,10 @@ use Illuminate\Support\Arr;
 class Select extends Presenter
 {
     public static $js = [
-        'select2',
+        '@select2',
     ];
     public static $css = [
-        'select2',
+        '@select2',
     ];
 
     /**

src/Grid/Filter/Presenter/SelectResource.php

@@ -8,7 +8,7 @@ use Dcat\Admin\Support\Helper;
 class SelectResource extends Presenter
 {
     public static $js = [
-        'dcat-admin/dcat/extra/resource-selector.js',
+        '@resource-selector',
     ];
 
     /**

src/Layout/Assets.php

@@ -10,47 +10,117 @@ class Assets
      * @var array
      */
     protected $alias = [
-        'nunito' => [
+        '@nunito' => [
             'css' => ['https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,800,800i,900,900i'],
         ],
-        'montserrat' => [
+        '@montserrat' => [
             'css' => ['https://fonts.googleapis.com/css?family=Montserrat:300,400,500,600'],
         ],
-
-        'custom' => [
+        '@dcat' => [
+            'js'  => 'dcat-admin/dcat/js/dcat-app.js',
+            'css' => 'dcat-admin/dcat/css/dcat-app.css',
+        ],
+        '@vendors' => [
+            'js'  => 'dcat-admin/vendors/js/vendors.min.js',
+            'css' => 'dcat-admin/vendors/css/vendors.min.css',
+        ],
+        '@bootstrap' => [
+            'css' => 'dcat-admin/css/bootstrap.css',
+        ],
+        '@bootstrap-extended' => [
+            'css' => 'dcat-admin/css/bootstrap-extended.css',
+        ],
+        '@default-colors' => [
+            'css' => 'dcat-admin/css/colors.css',
+        ],
+        '@menu' => [
+            'js' => 'dcat-admin/js/core/app-menu.js',
+        ],
+        '@app' => [
+            'js' => 'dcat-admin/js/core/app.js',
+        ],
+        '@components' => [
+            'css' => 'dcat-admin/css/components.css',
+        ],
+        '@palette-gradient' => [
+            'css' => 'dcat-admin/css/core/colors/palette-gradient.css',
+        ],
+        '@datatables' => [
+            'css' => 'dcat-admin/vendors/css/tables/datatable/datatables.min.css',
+        ],
+        '@data-list-view' => [
+            'css' => 'dcat-admin/css/pages/data-list-view.css',
+        ],
+        '@custom' => [
             'css' => 'dcat-admin/css/custom-laravel.css',
         ],
-
-        'grid-extension' => [
+        '@grid-extension' => [
             'js' => 'dcat-admin/dcat/extra/grid-extend.js',
         ],
-
-        'jquery.nestable' => [
+        '@resource-selector' => [
+            'js' => 'dcat-admin/dcat/extra/resource-selector.js',
+        ],
+        '@layer' => [
+            'js' => 'dcat-admin/dcat/plugins/layer/layer.js',
+        ],
+        '@pjax' => [
+            'js' => 'dcat-admin/dcat/plugins/jquery-pjax/jquery.pjax.min.js',
+        ],
+        '@toastr' => [
+            'js'  => 'dcat-admin/vendors/js/extensions/toastr.min.js',
+            'css' => 'dcat-admin/vendors/css/extensions/toastr.css',
+        ],
+        '@jquery.nestable' => [
             'js'  => 'dcat-admin/dcat/plugins/nestable/jquery.nestable.min.js',
             'css' => 'dcat-admin/dcat/plugins/nestable/nestable.css',
         ],
-        'select2' => [
+        '@select2' => [
             'js'  => 'dcat-admin/vendors/js/forms/select/select2.full.min.js',
             'css' => 'dcat-admin/vendors/css/forms/select/select2.min.css',
         ],
-        'bootstrap-datetimepicker' => [
+        '@bootstrap-datetimepicker' => [
             'js'  => 'dcat-admin/dcat/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js',
             'css' => 'dcat-admin/dcat/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css',
         ],
-        'rwd-table' => [
+        '@rwd-table' => [
             'js'  => 'dcat-admin/dcat/plugins/RWD-Table-Patterns/dist/js/rwd-table.min.js',
             'css' => 'dcat-admin/dcat/plugins/RWD-Table-Patterns/dist/css/rwd-table.min.css',
         ],
-        'jstree' => [
+        '@jstree' => [
             'js'  => 'dcat-admin/dcat/plugins/jstree-theme/jstree.min.js',
             'css' => 'dcat-admin/dcat/plugins/jstree-theme/themes/proton/style.min.css',
         ],
-        'switchery' => [
+        '@switchery' => [
             'js'  => 'dcat-admin/dcat/plugins/switchery/switchery.min.js',
             'css' => 'dcat-admin/dcat/plugins/switchery/switchery.min.css',
         ],
-        'grid-extension' => [
-            'js' => 'dcat-admin/dcat/extra/grid-extend.js',
+        '@webuploader' => [
+            'js' => [
+                'vendor/dcat-admin/webuploader/webuploader.min.js',
+                'vendor/dcat-admin/dcat-admin/upload.min.js',
+            ],
+            'css' => 'vendor/dcat-admin/webuploader/webuploader.min.css',
+        ],
+        '@chartjs' => [
+
+        ],
+        '@jquery.sparkline' => [
+
+        ],
+        '@jquery.bootstrap-duallistbox' => [
+
+        ],
+        '@number-input' => [
+
+        ],
+        '@ionslider' => [
+            'js' => [
+                '/vendor/dcat-admin/AdminLTE/plugins/ionslider/ion.rangeSlider.min.js',
+            ],
+            'css' => [
+                '/vendor/dcat-admin/AdminLTE/plugins/ionslider/ion.rangeSlider.css',
+                '/vendor/dcat-admin/AdminLTE/plugins/ionslider/ion.rangeSlider.skinNice.css',
+            ],
         ],
     ];
 
@@ -88,8 +158,8 @@ class Assets
      * @var array
      */
     protected $headerJs = [
-        'vendors' => 'dcat-admin/vendors/js/vendors.min.js',
-        'dcat'    => 'dcat-admin/dcat/js/dcat-app.js',
+        'vendors' => '@vendors',
+        'dcat'    => '@dcat',
     ];
 
     /**
@@ -98,19 +168,18 @@ class Assets
      * @var array
      */
     protected $baseCss = [
-        'vendors'            => 'dcat-admin/vendors/css/vendors.min.css',
-        'bootstrap'          => 'dcat-admin/css/bootstrap.css',
-        'bootstrap-extended' => 'dcat-admin/css/bootstrap-extended.css',
-        'toastr'             => 'dcat-admin/vendors/css/extensions/toastr.css',
-        'components'         => 'dcat-admin/css/components.css',
-        'palette-gradient'   => 'dcat-admin/css/core/colors/palette-gradient.css',
-        'colors'             => 'dcat-admin/css/colors.css',
-        //'custom'             => 'dcat-admin/css/custom-laravel.css',
-
-        'datatables' => 'dcat-admin/vendors/css/tables/datatable/datatables.min.css',
-        'data-list-view' => 'dcat-admin/css/pages/data-list-view.css',
-
-        'dcat'               => 'dcat-admin/dcat/css/dcat-app.css',
+        'vendors'            => '@vendors',
+        'bootstrap'          => '@bootstrap',
+        'bootstrap-extended' => '@bootstrap-extended',
+        'toastr'             => '@toastr',
+        'components'         => '@components',
+        'palette-gradient'   => '@palette-gradient',
+        'colors'             => '@default-colors',
+        //'custom'             => 'custom',
+
+        'datatables'     => '@datatables',
+        'data-list-view' => '@data-list-view',
+        'dcat'           => '@dcat',
     ];
 
     /**
@@ -119,19 +188,19 @@ class Assets
      * @var array
      */
     protected $baseJs = [
-        'menu'   => 'dcat-admin/js/core/app-menu.js',
-        'app'    => 'dcat-admin/js/core/app.js',
-        'toastr' => 'dcat-admin/vendors/js/extensions/toastr.min.js',
-        'pjax'   => 'dcat-admin/dcat/plugins/jquery-pjax/jquery.pjax.min.js',
-        'layer'  => 'dcat-admin/dcat/plugins/layer/layer.js',
+        'menu'   => '@menu',
+        'app'    => '@app',
+        'toastr' => '@toastr',
+        'pjax'   => '@pjax',
+        'layer'  => '@layer',
     ];
 
     /**
      * @var array
      */
     public $fonts = [
-        'nunito',
-        'montserrat',
+        '@nunito',
+        '@montserrat',
     ];
 
     /**
@@ -172,7 +241,9 @@ class Assets
     public function alias($name, $js = null, $css = null)
     {
         if (is_array($name)) {
-            $this->alias = array_merge($this->alias, $name);
+            foreach ($name as $key => $value) {
+                $this->alias($key, $value['js'] ?? [], $value['css'] ?? []);
+            }
 
             return;
         }
@@ -181,6 +252,10 @@ class Assets
             return $this->alias[$name] ?? [];
         }
 
+        if (strpos($name, '@') !== 0) {
+            $name = '@'.$name;
+        }
+
         $this->alias[$name] = [
             'js'  => $js,
             'css' => $css,
@@ -209,6 +284,10 @@ class Assets
      */
     public function collect(string $alias, string $type = '')
     {
+        if (strpos($alias, '@') !== 0) {
+            $alias = '@'.$alias;
+        }
+
         if ($type === 'js') {
             $this->js($this->alias[$alias]['js'] ?? null);
 

src/Widgets/Chart/Chart.php

@@ -20,8 +20,8 @@ abstract class Chart extends Widget
 {
     use HasAjaxRequest;
 
-    public static $js = 'chartjs';
-    public static $css = 'chartjs';
+    public static $js = '@chartjs';
+    public static $css = '@chartjs';
 
     public static $globalSettings = [
         'defaultFontColor'  => '#555',

src/Widgets/DataCard/Card.php

@@ -14,12 +14,12 @@ class Card extends Widget
     use HasAjaxRequest;
 
     public static $js = [
-        'waypoints',
-        'jquery.counterup',
+        '@waypoints',
+        '@jquery.counterup',
     ];
     public static $css = [
-        'waypoints',
-        'jquery.counterup',
+        '@waypoints',
+        '@jquery.counterup',
     ];
 
     protected $view = 'admin::widgets.data-card';

src/Widgets/Sparkline/Sparkline.php

@@ -24,8 +24,8 @@ class Sparkline extends Widget
 {
     use HasAjaxRequest;
 
-    public static $js = 'jquery.sparkline';
-    public static $css = 'jquery.sparkline';
+    public static $js = '@jquery.sparkline';
+    public static $css = '@jquery.sparkline';
 
     protected static $optionMethods = [
         'highlightSpotColor',

src/Widgets/Tree.php

@@ -9,10 +9,10 @@ use Illuminate\Support\Str;
 class Tree extends Widget
 {
     public static $js = [
-        'jstree',
+        '@jstree',
     ];
     public static $css = [
-        'jstree',
+        '@jstree',
     ];
 
     /**