Sort update

deniskoronets · May 25, 2020 · 8e6ba32 · 8e6ba32
1 parent 8408eef
commit 8e6ba32
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/resources/views/renderers/default.blade.php b/resources/views/renderers/default.blade.php
@@ -20,7 +20,7 @@
                     <tr>
                         @foreach ($grid->columns as $column)
                             <th {!! $column->compileHeaderHtmlOptions() !!}>
-                                <a href="#" @if ($column->sortable && is_scalar($column->value)) v-on:click="sort('{{ $column->value }}')" @endif>{{ $column->title }}</a>
+                                <a href="#" @if ($column->getSortableName() !== false) v-on:click="sort('{{ $column->getSortableName() }}')" @endif>{{ $column->title }}</a>
 
                                 @if ($column->sortable)
                                     @if ($grid->getRequest()->sortColumn == $column->value)

diff --git a/src/Columns/BaseColumn.php b/src/Columns/BaseColumn.php
@@ -29,7 +29,7 @@ abstract class BaseColumn
     public $filter;
 
     /**
-     * @var boolean
+     * @var boolean|string
      */
     public $sortable = true;
 
@@ -66,6 +66,26 @@ public function __construct(array $config)
         $this->buildFilter();
     }
 
+    /**
+     * Allows to get sortable column's name
+     */
+    public function getSortableName()
+    {
+        if ($this->sortable === false) {
+            return false;
+        }
+
+        if (is_scalar($this->sortable)) {
+            return $this->sortable;
+        }
+
+        if (is_scalar($this->value)) {
+            return $this->value;
+        }
+
+        return false;
+    }
+
     protected function buildFilter()
     {
         if (is_null($this->filter) || is_object($this->filter)) {
@@ -103,7 +123,7 @@ protected function configTests(): array
             'contentHtmlOptions' => 'array',
             'formatters' => 'array',
             'emptyValue' => 'string',
-            'sortable' => 'bool',
+            'sortable' => 'any',
             'filter' => BaseFilter::class . '|null',
         ];
     }
@@ -151,4 +171,4 @@ public function renderValue($row)
         return $value;
     }
 
-}
+}
diff --git a/src/DataProviders/EloquentDataProvider.php b/src/DataProviders/EloquentDataProvider.php
@@ -18,6 +18,7 @@ public function __construct(Builder $query)
         $this->query = clone $query;
     }
 
+
     /**
      * @param GridViewRequest $request
      * @return Builder
@@ -60,4 +61,4 @@ public function getData(GridViewRequest $request)
             ->limit($request->perPage)
             ->get();
     }
-}
+}