fix filter row

examples/simple.json

@@ -15,11 +15,11 @@
     "currentPage": "1",
     "showActionColumn": true,
     "showFiltersRow": true,
-    "filter": true,
     "total": 10,
     "paginationPrefix": "/page",
     "params": {"class":  "table table-bordered", "border": "1"}
   },
+  "filters": ["email", "status"],
   "data": [
     {"id": 1,"email":"fas1@mail.ru","description":"sdgsdfg","description2":"ffdghdas", "created_at": "17.06.2024", "status":  "1"},
     {"id": 2,"email":"fas2@mail.ru","description":"fafdgdfgsdfdfs","description2":"ffdghdas", "created_at": "18.06.2024", "status":  "1"},

examples/simple.php

@@ -68,6 +68,9 @@ $table->addColumn("Колонка 33", "k33", function ($id) {
 $table->addColumn("Колонка 34", "k34", function ($id) {
     return "some34";
 });
+$table->addAction(function($row, $url){
+    return "<a href='mailto:". $row['email'] ."'>Написать</a>";
+});
 $table->create();
 $table->render();
 

src/ListJsonTable.php

@@ -6,6 +6,7 @@ use Exception;
 use Itguild\Tables\ActionColumn\DeleteActionColumn;
 use Itguild\Tables\ActionColumn\EditActionColumn;
 use Itguild\Tables\ActionColumn\ViewActionColumn;
+use Itguild\Tables\Filter\InputTextFilter;
 use Itguild\Tables\traits\CreateParams;
 use JetBrains\PhpStorm\NoReturn;
 
@@ -64,13 +65,13 @@ class ListJsonTable extends JasonTable
             $this->html .= "<th>" . "ID" . "</th>";
             $columnKeys[] = "id";
         }
-        $columnKeys = $this->getColumnKeys();
+        $columnKeys = array_merge($columnKeys, $this->getColumnKeys());
         $columnKeys = array_merge($columnKeys, $this->getCustomColumnKeys());
         $this->getCustomHeadColumn();
         if ($this->showActionColumn) {
             $this->html .= "<th>Действия</th></th></tr>";
         }
-        if($this->showFiltersRow){
+        if ($this->showFiltersRow) {
             $this->getFilters($columnKeys);
             $this->html .= "</thead>";
         }
@@ -91,7 +92,10 @@ class ListJsonTable extends JasonTable
                 }
                 foreach ($row as $key => $cell) {
                     if ($this->issetColumn($key) and $this->is_fillable($key)) {
-                        if($this->beforePrintCell) {
+                        if ($this->beforePrintCell) {
+                            if ($key === "id" and $cell === 0) {
+                                $cell = $this->count;
+                            }
                             $cell = $this->getCustomCell($key, $cell);
                         }
                         $this->html .= "<td style='" . $this->getStyleFromCustomColumn($key) . "'>" . $cell . "</td>";
@@ -100,7 +104,7 @@ class ListJsonTable extends JasonTable
                 $this->getCustomColumns($row["id"] ?? null);
                 if ($this->showActionColumn) {
                     if (isset($row["id"])) {
-                        $actions = $this->getActions($row["id"]);
+                        $actions = $this->getActions($row);
 
                         $this->html .= "<td>$actions</td></tr>";
                     } else {
@@ -111,7 +115,7 @@ class ListJsonTable extends JasonTable
         }
     }
 
-    public function addAction(string $actionColumn): void
+    public function addAction(string|\Closure $actionColumn): void
     {
         $this->customActionsArray[] = $actionColumn;
     }
@@ -144,9 +148,9 @@ class ListJsonTable extends JasonTable
 
     private function getCurrentFilter(string $column)
     {
-        if (is_array($this->beforePrintCell[$column])) {
+        if (isset($this->beforePrintCell[$column]) and is_array($this->beforePrintCell[$column])) {
             if (isset($this->beforePrintCell[$column]['filter'])) {
-                if (is_array($this->beforePrintCell[$column]['filter'])) {
+                if (isset($this->beforePrintCell[$column]['filter']) and is_array($this->beforePrintCell[$column]['filter'])) {
                     return $this->beforePrintCell[$column]['filter'];
                 }
             }
@@ -179,7 +183,6 @@ class ListJsonTable extends JasonTable
     }
 
 
-
     private function getColumnKeys(): array
     {
         $columnKeys = [];
@@ -250,12 +253,16 @@ class ListJsonTable extends JasonTable
         return false;
     }
 
-    private function getActions(int $id): string
+    private function getActions(array $row): string
     {
         $actions = "";
         foreach ($this->actionsArray as $item) {
-            $objItem = new $item($this->baseUrl, $id);
+            if (is_string($item)) {
+                $objItem = new $item($this->baseUrl, $row['id']);
                 $actions .= $objItem->fetch();
+            } else {
+                $actions .= $item($row, $this->baseUrl);
+            }
         }
 
         return $actions;
@@ -264,20 +271,28 @@ class ListJsonTable extends JasonTable
     private function getFilters(array $columnKeys): void
     {
         $this->html .= "<tr><form action='$this->baseUrl/search'>";
-        foreach ($columnKeys as $key){
-            if ($this->issetFilter($key)){
+        foreach ($columnKeys as $key) {
+            if ($this->issetFilter($key)) {
                 $filter = $this->getCurrentFilter($key);
-                $class = new $filter['class']([
+                $params = [
                     'param' => $filter['param'] ?? '',
                     'name' => $key,
                     'value' => $filter['value'] ?? '',
-                ]);
+                ];
+                if ($filter) {
+                    $class = new $filter['class']($params);
+                    $this->html .= $class->fetch();
+                } else {
+                    $class = new InputTextFilter($params);
                     $this->html .= $class->fetch();
                 }
-            else {
+            } else {
                 $this->html .= "<td></td>";
             }
         }
+        if ($this->showActionColumn) {
+            $this->html .= "<td></td>";
+        }
         $this->html .= "</form></tr>";
     }
 
@@ -314,7 +329,7 @@ class ListJsonTable extends JasonTable
         $hookAfter = $this->afterPrintHook;
         $this->html .= $hookAfter($this->data['meta']);
 
-        if ($this->pagination) {
+        if ($this->pagination && $this->data['data']) {
             $options = [
                 'countItem' => $this->data['meta']['total'],
                 'perPage' => $this->data['meta']['perPage'] ?? 10,