Add a makeVisible() to the row object.

yajra · Dec 16, 2019 · ad69720 · ad69720
1 parent 787eb04
commit ad69720
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/DataTableAbstract.php b/src/DataTableAbstract.php
@@ -57,6 +57,7 @@ abstract class DataTableAbstract implements DataTable, Arrayable, Jsonable
         'order'       => [],
         'only'        => null,
         'hidden'      => [],
+        'visible'     => [],
     ];
 
     /**
@@ -261,6 +262,19 @@ public function makeHidden(array $attributes = [])
         return $this;
     }
 
+    /**
+     * Add a makeVisible() to the row object.
+     *
+     * @param array          $attributes
+     * @return $this
+     */
+    public function makeVisible(array $attributes = [])
+    {
+        $this->columnDef['visible'] = array_merge_recursive(Arr::get($this->columnDef, 'visible', []), $attributes);
+
+        return $this;
+    }
+
     /**
      * Set columns that should not be escaped.
      * Optionally merge the defaults from config.

diff --git a/src/Processors/DataProcessor.php b/src/Processors/DataProcessor.php
@@ -83,6 +83,7 @@ public function __construct($results, array $columnDef, array $templates, $start
         $this->includeIndex  = $columnDef['index'];
         $this->rawColumns    = $columnDef['raw'];
         $this->makeHidden    = $columnDef['hidden'];
+        $this->makeVisible   = $columnDef['visible'];
         $this->templates     = $templates;
         $this->start         = $start;
     }
@@ -99,7 +100,7 @@ public function process($object = false)
         $indexColumn  = config('datatables.index_column', 'DT_RowIndex');
 
         foreach ($this->results as $row) {
-            $data  = Helper::convertToArray($row, ['hidden' => $this->makeHidden]);
+            $data  = Helper::convertToArray($row, ['hidden' => $this->makeHidden, 'visible' => $this->makeVisible]);
             $value = $this->addColumns($data, $row);
             $value = $this->editColumns($value, $row);
             $value = $this->setupRowVariables($value, $row);

diff --git a/src/Utilities/Helper.php b/src/Utilities/Helper.php
@@ -158,6 +158,7 @@ public static function getOrMethod($method)
     public static function convertToArray($row, $filters = [])
     {
         $row  = method_exists($row, 'makeHidden') ? $row->makeHidden(Arr::get($filters, 'hidden', [])) : $row;
+        $row  = method_exists($row, 'makeVisible') ? $row->makeVisible(Arr::get($filters, 'visible', [])) : $row;
         $data = $row instanceof Arrayable ? $row->toArray() : (array) $row;
 
         foreach ($data as &$value) {