Merge pull request #12 from osindex/develop

fixComponentsBug

Author: SmallRuralDog

src/Grid/Concerns/HasDialog.php

@@ -1,10 +1,8 @@
 <?php
 
-
 namespace SmallRuralDog\Admin\Grid\Concerns;
 
-
-use SmallRuralDog\Admin\Components\Dialog;
+use SmallRuralDog\Admin\Components\Widgets\Dialog;
 
 trait HasDialog
 {

src/Grid/Filter/AbstractFilter.php

@@ -2,10 +2,9 @@
 
 namespace SmallRuralDog\Admin\Grid\Filter;
 
-
 use Illuminate\Support\Arr;
 use SmallRuralDog\Admin\Components\Component;
-use SmallRuralDog\Admin\Components\Input;
+use SmallRuralDog\Admin\Components\Form\Input;
 use SmallRuralDog\Admin\Traits\AdminJsonBuilder;
 
 abstract class AbstractFilter extends AdminJsonBuilder
@@ -22,7 +21,6 @@ abstract class AbstractFilter extends AdminJsonBuilder
 
     public $hideAttrs = ['value', 'query', 'ignore'];
 
-
     public function __construct($column, $label = '')
     {
         $this->column = $column;
@@ -50,7 +48,6 @@ public function defaultValue($defaultValue)
         return $this;
     }
 
-
     /**
      * @param Component $component
      * @return $this
@@ -82,7 +79,6 @@ public function getColumn()
         return $this->column;
     }
 
-
     public function condition($inputs)
     {
         if ($this->ignore) {
@@ -104,7 +100,6 @@ protected function buildCondition()
     {
         $column = explode('.', $this->column);
 
-
         if (count($column) == 1) {
             return [$this->query => func_get_args()];
         }

src/Grid/Filter/Where.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Arr;
 use ReflectionFunction;
-use SmallRuralDog\Admin\Components\Input;
+use SmallRuralDog\Admin\Components\Form\Input;
 
 class Where extends AbstractFilter
 {
@@ -22,7 +22,6 @@ class Where extends AbstractFilter
      */
     public $input;
 
-
     public function __construct(\Closure $query, $label, $column = null)
     {
         $this->where = $query;
@@ -56,10 +55,8 @@ public static function getQueryHash(\Closure $closure, $label = '')
     public function condition($inputs)
     {
 
-
         $value = Arr::get($inputs, $this->column ?: static::getQueryHash($this->where, $this->label));
 
-
         if (is_null($value)) {
             return;
         }