3 Commits
1.0.4 ... 1.0.7

Author SHA1 Message Date
02a3e52b7d fix pagination 2024-09-24 15:42:55 +03:00
d747203d99 custom action 2024-09-02 22:34:25 +03:00
ad18d94489 table filter fix 2024-08-29 13:13:51 +03:00
2 changed files with 23 additions and 19 deletions

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

@ -104,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 {
@ -115,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;
} }
@ -148,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'];
} }
} }
@ -183,7 +183,6 @@ class ListJsonTable extends JasonTable
} }
private function getColumnKeys(): array private function getColumnKeys(): array
{ {
$columnKeys = []; $columnKeys = [];
@ -254,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;
@ -279,13 +282,11 @@ class ListJsonTable extends JasonTable
if ($filter) { if ($filter) {
$class = new $filter['class']($params); $class = new $filter['class']($params);
$this->html .= $class->fetch(); $this->html .= $class->fetch();
} } else {
else {
$class = new InputTextFilter($params); $class = new InputTextFilter($params);
$this->html .= $class->fetch(); $this->html .= $class->fetch();
} }
} } else {
else {
$this->html .= "<td></td>"; $this->html .= "<td></td>";
} }
} }
@ -325,7 +326,7 @@ class ListJsonTable extends JasonTable
$hookAfter = $this->afterPrintHook; $hookAfter = $this->afterPrintHook;
$this->html .= $hookAfter($this->data['meta']); $this->html .= $hookAfter($this->data['meta']);
if ($this->pagination) { if ($this->pagination && $this->data['data']) {
$options = [ $options = [
'countItem' => $this->data['meta']['total'], 'countItem' => $this->data['meta']['total'],
'perPage' => $this->data['meta']['perPage'] ?? 10, 'perPage' => $this->data['meta']['perPage'] ?? 10,