3 Commits
1.0.3 ... 1.0.6

Author SHA1 Message Date
d747203d99 custom action 2024-09-02 22:34:25 +03:00
ad18d94489 table filter fix 2024-08-29 13:13:51 +03:00
453917ea1a table filter fix 2024-08-29 13:08:43 +03:00
3 changed files with 31 additions and 19 deletions

View File

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

View File

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

View File

@ -6,6 +6,7 @@ use Exception;
use Itguild\Tables\ActionColumn\DeleteActionColumn; use Itguild\Tables\ActionColumn\DeleteActionColumn;
use Itguild\Tables\ActionColumn\EditActionColumn; use Itguild\Tables\ActionColumn\EditActionColumn;
use Itguild\Tables\ActionColumn\ViewActionColumn; use Itguild\Tables\ActionColumn\ViewActionColumn;
use Itguild\Tables\Filter\InputTextFilter;
use Itguild\Tables\traits\CreateParams; use Itguild\Tables\traits\CreateParams;
use JetBrains\PhpStorm\NoReturn; use JetBrains\PhpStorm\NoReturn;
@ -103,7 +104,7 @@ class ListJsonTable extends JasonTable
$this->getCustomColumns($row["id"] ?? null); $this->getCustomColumns($row["id"] ?? null);
if ($this->showActionColumn) { if ($this->showActionColumn) {
if (isset($row["id"])) { if (isset($row["id"])) {
$actions = $this->getActions($row["id"]); $actions = $this->getActions($row);
$this->html .= "<td>$actions</td></tr>"; $this->html .= "<td>$actions</td></tr>";
} else { } else {
@ -114,7 +115,7 @@ class ListJsonTable extends JasonTable
} }
} }
public function addAction(string $actionColumn): void public function addAction(string|\Closure $actionColumn): void
{ {
$this->customActionsArray[] = $actionColumn; $this->customActionsArray[] = $actionColumn;
} }
@ -147,9 +148,9 @@ class ListJsonTable extends JasonTable
private function getCurrentFilter(string $column) 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 (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']; return $this->beforePrintCell[$column]['filter'];
} }
} }
@ -182,7 +183,6 @@ class ListJsonTable extends JasonTable
} }
private function getColumnKeys(): array private function getColumnKeys(): array
{ {
$columnKeys = []; $columnKeys = [];
@ -253,12 +253,16 @@ class ListJsonTable extends JasonTable
return false; return false;
} }
private function getActions(int $id): string private function getActions(array $row): string
{ {
$actions = ""; $actions = "";
foreach ($this->actionsArray as $item) { 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(); $actions .= $objItem->fetch();
} else {
$actions .= $item($row, $this->baseUrl);
}
} }
return $actions; return $actions;
@ -270,14 +274,19 @@ class ListJsonTable extends JasonTable
foreach ($columnKeys as $key) { foreach ($columnKeys as $key) {
if ($this->issetFilter($key)) { if ($this->issetFilter($key)) {
$filter = $this->getCurrentFilter($key); $filter = $this->getCurrentFilter($key);
$class = new $filter['class']([ $params = [
'param' => $filter['param'] ?? '', 'param' => $filter['param'] ?? '',
'name' => $key, 'name' => $key,
'value' => $filter['value'] ?? '', 'value' => $filter['value'] ?? '',
]); ];
if ($filter) {
$class = new $filter['class']($params);
$this->html .= $class->fetch();
} else {
$class = new InputTextFilter($params);
$this->html .= $class->fetch(); $this->html .= $class->fetch();
} }
else { } else {
$this->html .= "<td></td>"; $this->html .= "<td></td>";
} }
} }