opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' of https://github.com/filamentphp/filament into 3.x

Browse Source
This commit is contained in:
Dan Harrin
2023-08-01 13:31:24 +01:00
parent fd6ca0129f 5f2a5bbe83
commit 366535ae90
2 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/panels/dist/theme.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/tables/resources/views/index.blade.php
+70 -56
View File
@@ -587,6 +587,18 @@
$recordHasActions = count($actions) && (! $isReordering);
$recordContentHorizontalPaddingClasses = \Illuminate\Support\Arr::toCssClasses([
'ps-3' => (! $contentGrid) && $hasItemBeforeRecordContent,
'ps-4 sm:ps-6' => (! $contentGrid) && (! $hasItemBeforeRecordContent),
'pe-3' => (! $contentGrid) && $hasItemAfterRecordContent,
'pe-4 sm:pe-6 md:pe-3' => (! $contentGrid) && (! $hasItemAfterRecordContent),
'ps-2' => $contentGrid && $hasItemBeforeRecordContent,
'ps-4' => $contentGrid && (! $hasItemBeforeRecordContent),
'pe-2' => $contentGrid && $hasItemAfterRecordContent,
'pe-4' => $contentGrid && (! $hasItemAfterRecordContent),
]);
$recordActionsClasses = \Illuminate\Support\Arr::toCssClasses([
'md:ps-3' => (! $contentGrid),
'ps-3' => (! $contentGrid) && $hasItemBeforeRecordContent,
'ps-4 sm:ps-6' => (! $contentGrid) && (! $hasItemBeforeRecordContent),
'pe-3' => (! $contentGrid) && $hasItemAfterRecordContent,
@@ -623,71 +635,73 @@
@php
$recordContentClasses = \Illuminate\Support\Arr::toCssClasses([
$recordContentHorizontalPaddingClasses,
'flex-1 block',
'block',
]);
@endphp
<div
@class([
'flex w-full flex-col gap-3 py-4',
'flex w-full flex-col gap-y-3 py-4',
'md:flex-row md:items-center' => ! $contentGrid,
])
>
@if ($recordUrl)
<a
href="{{ $recordUrl }}"
class="{{ $recordContentClasses }}"
>
<x-filament-tables::columns.layout
:components="$getColumnsLayout()"
:record="$record"
:record-key="$recordKey"
:row-loop="$loop"
/>
</a>
@elseif ($recordAction)
@php
$recordWireClickAction = $getAction($recordAction)
? "mountTableAction('{$recordAction}', '{$recordKey}')"
: $recordWireClickAction = "{$recordAction}('{$recordKey}')";
@endphp
<div class="flex-1">
@if ($recordUrl)
<a
href="{{ $recordUrl }}"
class="{{ $recordContentClasses }}"
>
<x-filament-tables::columns.layout
:components="$getColumnsLayout()"
:record="$record"
:record-key="$recordKey"
:row-loop="$loop"
/>
</a>
@elseif ($recordAction)
@php
$recordWireClickAction = $getAction($recordAction)
? "mountTableAction('{$recordAction}', '{$recordKey}')"
: $recordWireClickAction = "{$recordAction}('{$recordKey}')";
@endphp
<button
type="button"
wire:click="{{ $recordWireClickAction }}"
wire:loading.attr="disabled"
wire:target="{{ $recordWireClickAction }}"
class="{{ $recordContentClasses }}"
>
<x-filament-tables::columns.layout
:components="$getColumnsLayout()"
:record="$record"
:record-key="$recordKey"
:row-loop="$loop"
/>
</button>
@else
<div
class="{{ $recordContentClasses }}"
>
<x-filament-tables::columns.layout
:components="$getColumnsLayout()"
:record="$record"
:record-key="$recordKey"
:row-loop="$loop"
/>
</div>
@endif
<button
type="button"
wire:click="{{ $recordWireClickAction }}"
wire:loading.attr="disabled"
wire:target="{{ $recordWireClickAction }}"
class="{{ $recordContentClasses }}"
>
<x-filament-tables::columns.layout
:components="$getColumnsLayout()"
:record="$record"
:record-key="$recordKey"
:row-loop="$loop"
/>
</button>
@else
<div
class="{{ $recordContentClasses }}"
>
<x-filament-tables::columns.layout
:components="$getColumnsLayout()"
:record="$record"
:record-key="$recordKey"
:row-loop="$loop"
/>
</div>
@endif
@if ($hasCollapsibleColumnsLayout && (! $isReordering))
<div
x-collapse
x-show="! isCollapsed"
class="{{ $recordContentHorizontalPaddingClasses }}"
>
{{ $collapsibleColumnsLayout->viewData(['recordKey' => $recordKey]) }}
</div>
@endif
@if ($hasCollapsibleColumnsLayout && (! $isReordering))
<div
x-collapse
x-show="! isCollapsed"
class="{{ $recordContentHorizontalPaddingClasses }}"
>
{{ $collapsibleColumnsLayout->viewData(['recordKey' => $recordKey]) }}
</div>
@endif
</div>
@if ($recordHasActions)
<x-filament-tables::actions
@@ -695,7 +709,7 @@
:alignment="(! $contentGrid) ? 'start md:end' : Alignment::Start"
:record="$record"
wrap="-sm"
:class="$recordContentHorizontalPaddingClasses"
:class="$recordActionsClasses"
/>
@endif
</div>