Browse Source

简化collectAssets方法

jqh 5 years ago
parent
commit
347b218dd2
3 changed files with 4 additions and 16 deletions
  1. 1 1
      src/Grid/Filter/Presenter/SelectResource.php
  2. 1 12
      src/Layout/Asset.php
  3. 2 3
      src/Traits/HasAssets.php

+ 1 - 1
src/Grid/Filter/Presenter/SelectResource.php

@@ -186,7 +186,7 @@ class SelectResource extends Presenter
 
         if (! $this->maxItem || $this->maxItem > 2) {
             // 选项大于两个时使用select2样式布局
-            Admin::collectAssets('select2', 'css');
+            Admin::css('@select2');
 
             $containerClass = 'select2 select2-container select2-container--default select2-container--below ';
         }

+ 1 - 12
src/Layout/Asset.php

@@ -338,24 +338,13 @@ class Asset
      * 根据别名设置需要载入的js和css脚本.
      *
      * @param string $alias
-     * @param string $type
      */
-    public function collect(string $alias, string $type = '')
+    public function collect(string $alias)
     {
         if (strpos($alias, '@') !== 0) {
             $alias = '@'.$alias;
         }
 
-        if ($type === 'js') {
-            $this->js($this->alias[$alias]['js'] ?? null);
-
-            return;
-        } elseif ($type === 'css') {
-            $this->css($this->alias[$alias]['css'] ?? null);
-
-            return;
-        }
-
         $this->js($this->alias[$alias]['js'] ?? null);
         $this->css($this->alias[$alias]['css'] ?? null);
     }

+ 2 - 3
src/Traits/HasAssets.php

@@ -35,13 +35,12 @@ trait HasAssets
 
     /**
      * @param string $name
-     * @param string|null $type
      *
      * @return void
      */
-    public static function collectAssets(string $name, string $type = '')
+    public static function collectAssets(string $name)
     {
-        static::asset()->collect($name, $type);
+        static::asset()->collect($name);
     }
 
     /**