From df8d7ce4ac6575eba3970f895165bfeedd1419e6 Mon Sep 17 00:00:00 2001 From: "allen.yan" Date: Sun, 3 Aug 2025 18:31:42 +0800 Subject: [PATCH] =?UTF-8?q?202508031828=20=E8=AA=BF=E6=95=B4=E6=AC=8A?= =?UTF-8?q?=E9=99=90=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Livewire/Tables/ArtistTable.php | 4 +-- app/Livewire/Tables/BranchTable.php | 4 +-- app/Livewire/Tables/RoleTable.php | 4 +-- app/Livewire/Tables/SongTable.php | 4 +-- app/Livewire/Tables/TextAdsTable.php | 4 +-- app/Livewire/Tables/UserTable.php | 4 +-- .../views/livewire/headers/artist.blade.php | 29 ++++++++++--------- .../views/livewire/headers/branch.blade.php | 29 ++++++++++--------- .../livewire/headers/broadcast.blade.php | 10 +++++++ .../views/livewire/headers/role.blade.php | 14 +++++---- .../views/livewire/headers/song.blade.php | 29 ++++++++++--------- .../views/livewire/headers/text-ad.blade.php | 14 +++++---- .../views/livewire/headers/user.blade.php | 14 +++++---- 13 files changed, 88 insertions(+), 75 deletions(-) create mode 100644 resources/views/livewire/headers/broadcast.blade.php diff --git a/app/Livewire/Tables/ArtistTable.php b/app/Livewire/Tables/ArtistTable.php index 486fdcd..707fad5 100644 --- a/app/Livewire/Tables/ArtistTable.php +++ b/app/Livewire/Tables/ArtistTable.php @@ -62,9 +62,7 @@ final class ArtistTable extends PowerGridComponent ->showToggleColumns(); //->showSoftDeletes() //->showSearchInput() - if($this->canCreate){ - $header->includeViewOnTop('livewire.headers.artist') ; - } + $header->includeViewOnTop('livewire.headers.artist') ; $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); return $actions; diff --git a/app/Livewire/Tables/BranchTable.php b/app/Livewire/Tables/BranchTable.php index 08de251..0340480 100644 --- a/app/Livewire/Tables/BranchTable.php +++ b/app/Livewire/Tables/BranchTable.php @@ -60,9 +60,7 @@ final class BranchTable extends PowerGridComponent ->showToggleColumns(); //->showSoftDeletes() //->showSearchInput() - if($this->canCreate){ - $header->includeViewOnTop('livewire.headers.branch') ; - } + $header->includeViewOnTop('livewire.headers.branch') ; $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); return $actions; diff --git a/app/Livewire/Tables/RoleTable.php b/app/Livewire/Tables/RoleTable.php index 5c66b93..d1204f9 100644 --- a/app/Livewire/Tables/RoleTable.php +++ b/app/Livewire/Tables/RoleTable.php @@ -41,9 +41,7 @@ final class RoleTable extends PowerGridComponent } $actions = []; $header =PowerGrid::header(); - if($this->canCreate){ - $header->includeViewOnTop('livewire.headers.role'); - } + $header->includeViewOnTop('livewire.headers.role'); $actions[]=$header; $actions[]=PowerGrid::footer() ->showPerPage() diff --git a/app/Livewire/Tables/SongTable.php b/app/Livewire/Tables/SongTable.php index 801665f..2028f0f 100644 --- a/app/Livewire/Tables/SongTable.php +++ b/app/Livewire/Tables/SongTable.php @@ -58,9 +58,7 @@ final class SongTable extends PowerGridComponent ->type(Exportable::TYPE_XLS, Exportable::TYPE_CSV); } $header = PowerGrid::header()->showSoftDeletes()->showToggleColumns(); - if($this->canCreate){ - $header->includeViewOnTop('livewire.headers.song'); - } + $header->includeViewOnTop('livewire.headers.song'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/TextAdsTable.php b/app/Livewire/Tables/TextAdsTable.php index e0a07d3..8280a29 100644 --- a/app/Livewire/Tables/TextAdsTable.php +++ b/app/Livewire/Tables/TextAdsTable.php @@ -52,9 +52,7 @@ final class TextAdsTable extends PowerGridComponent ->type(Exportable::TYPE_XLS, Exportable::TYPE_CSV); } $header = PowerGrid::header()->showSoftDeletes()->showToggleColumns(); - if($this->canCreate){ - $header->includeViewOnTop('livewire.headers.text-ad'); - } + $header->includeViewOnTop('livewire.headers.text-ad'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/UserTable.php b/app/Livewire/Tables/UserTable.php index e57fc23..b3f814c 100644 --- a/app/Livewire/Tables/UserTable.php +++ b/app/Livewire/Tables/UserTable.php @@ -54,9 +54,7 @@ final class UserTable extends PowerGridComponent ->type(Exportable::TYPE_XLS, Exportable::TYPE_CSV); $header = PowerGrid::header() ->showToggleColumns(); - if($this->canCreate){ - $header->includeViewOnTop('livewire.headers.user'); - } + $header->includeViewOnTop('livewire.headers.user'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); return $actions; diff --git a/resources/views/livewire/headers/artist.blade.php b/resources/views/livewire/headers/artist.blade.php index 60f2b99..6699c00 100644 --- a/resources/views/livewire/headers/artist.blade.php +++ b/resources/views/livewire/headers/artist.blade.php @@ -1,15 +1,18 @@ - - - + @if ($canCreate) + + @endif + @if ($canDownload) + + @endif \ No newline at end of file diff --git a/resources/views/livewire/headers/branch.blade.php b/resources/views/livewire/headers/branch.blade.php index 7e2e38f..e213f3c 100644 --- a/resources/views/livewire/headers/branch.blade.php +++ b/resources/views/livewire/headers/branch.blade.php @@ -1,15 +1,18 @@ - - - + @if ($canCreate) + + @endif + @if ($canDownload) + + @endif \ No newline at end of file diff --git a/resources/views/livewire/headers/broadcast.blade.php b/resources/views/livewire/headers/broadcast.blade.php new file mode 100644 index 0000000..974a4d1 --- /dev/null +++ b/resources/views/livewire/headers/broadcast.blade.php @@ -0,0 +1,10 @@ + + @if ($canCreate) + + @endif + \ No newline at end of file diff --git a/resources/views/livewire/headers/role.blade.php b/resources/views/livewire/headers/role.blade.php index 3324883..132c63f 100644 --- a/resources/views/livewire/headers/role.blade.php +++ b/resources/views/livewire/headers/role.blade.php @@ -1,8 +1,10 @@ - + @if ($canCreate) + + @endif \ No newline at end of file diff --git a/resources/views/livewire/headers/song.blade.php b/resources/views/livewire/headers/song.blade.php index e81671b..8d1327d 100644 --- a/resources/views/livewire/headers/song.blade.php +++ b/resources/views/livewire/headers/song.blade.php @@ -1,15 +1,18 @@ - - - + @if ($canCreate) + + @endif + @if ($canDownload) + + @endif \ No newline at end of file diff --git a/resources/views/livewire/headers/text-ad.blade.php b/resources/views/livewire/headers/text-ad.blade.php index 0d02b72..e9fd206 100644 --- a/resources/views/livewire/headers/text-ad.blade.php +++ b/resources/views/livewire/headers/text-ad.blade.php @@ -1,8 +1,10 @@ - + @if ($canCreate) + + @endif \ No newline at end of file diff --git a/resources/views/livewire/headers/user.blade.php b/resources/views/livewire/headers/user.blade.php index 128185d..84c66d9 100644 --- a/resources/views/livewire/headers/user.blade.php +++ b/resources/views/livewire/headers/user.blade.php @@ -1,8 +1,10 @@ - + @if ($canCreate) + + @endif \ No newline at end of file