Merge pull request #84 from djpa3k/data_as_object

src/Column.php

@@ -113,11 +113,12 @@ public function isOrderable(): bool
     }
 
     /**
+     * @param string $property data as object, fallback data as string  
      * @return string
      */
-    public function data(): string
+    public function data($property = '_'): string
     {
-        return $this->attr['data'] ?? '';
+        return $this->attr['data'][$property] ?? $this->attr['data']['_'] ?? $this->attr['data'] ?? '';
     }
 
     /**

src/QueryBuilder.php

@@ -89,9 +89,8 @@ public function setColumnAttributes(): void
     {
         $columns = $this->options->columns();
         if ($columns) {
-            $attributes = array_column($columns, null, 'data');
-
-            foreach ($attributes as $index => $attr) {
+            foreach ($columns as $attr) {
+                $index = $attr['data']['_'] ?? $attr['data'];
                 if ($this->columns->visible()->isExists($index)) {
                     $this->columns->visible()->get($index)->attr = $attr;
                 }
@@ -278,7 +277,7 @@ protected function limit(): string
     protected function orderBy(): string
     {
         $orders = $this->options->order();
-
+        
         $orders = array_filter($orders, function ($order) {
             return \in_array($order['dir'], ['asc', 'desc'],
                     true) && $this->columns->visible()->offsetGet($order['column'])->isOrderable();
@@ -287,7 +286,8 @@ protected function orderBy(): string
         $o = [];
 
         foreach ($orders as $order) {
-            $id = $this->options->columns()[$order['column']]['data'];
+            $data = $this->options->columns()[$order['column']]['data'];
+            $id = $data['sort'] ?? $data['_'] ?? $data;
 
             if ($this->columns->visible()->isExists($id)) {
                 $o[] = $this->columns->visible()->get($id)->name.' '.$order['dir'];