diff --git a/resources/views/livewire/datatables/complex-query.blade.php b/resources/views/livewire/datatables/complex-query.blade.php index 57542edf..c02f8698 100644 --- a/resources/views/livewire/datatables/complex-query.blade.php +++ b/resources/views/livewire/datatables/complex-query.blade.php @@ -2,8 +2,8 @@ rules: @if($persistKey) $persist('').as('{{ $persistKey }}') @else '' @endif, init() { Livewire.on('complexQuery', rules => this.rules = rules) - if (this.rules && this.rules !== '') { - $wire.set('rules', this.rules) + if (this.rules && this.rules !== '' && this.rules.rules !== null) { + $wire.set('rules', this.rules.rules) $wire.runQuery() } } diff --git a/src/Column.php b/src/Column.php index fdddfde9..e8a0687b 100644 --- a/src/Column.php +++ b/src/Column.php @@ -24,7 +24,7 @@ class Column implements \ArrayAccess public bool $sortable = false; public string|array|null $filterOn = null; public bool|array $filterable = false; - public bool $hideable; + public string|bool|null $hideable = null; public ?string $sort = null; public bool|string $defaultSort = false; public string|array|Closure|null $callback = null; diff --git a/src/Livewire/ComplexQuery.php b/src/Livewire/ComplexQuery.php index 49ca5793..036c86c5 100644 --- a/src/Livewire/ComplexQuery.php +++ b/src/Livewire/ComplexQuery.php @@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; use Illuminate\Support\Collection; +use Livewire\Attributes\On; use Livewire\Component; class ComplexQuery extends Component @@ -88,6 +89,7 @@ public function deleteRules($id): void public function resetQuery(): void { $this->reset('rules'); + $this->dispatch('refreshLivewireDatatable'); $this->runQuery(); } diff --git a/src/Livewire/LivewireDatatable.php b/src/Livewire/LivewireDatatable.php index f729a56f..14526369 100644 --- a/src/Livewire/LivewireDatatable.php +++ b/src/Livewire/LivewireDatatable.php @@ -22,6 +22,7 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use Illuminate\View\View; +use Livewire\Attributes\On; use Livewire\Component; use Livewire\WithPagination; use RuntimeException; @@ -1274,8 +1275,6 @@ public function addComplexQuery(): static $this->processNested($this->complexQuery, $query); }); - $this->setPage(1); - return $this; }