diff --git a/app/Filament/Resources/System/SettingResource/Pages/EditSetting.php b/app/Filament/Resources/System/SettingResource/Pages/EditSetting.php
index 9d3e3a31..d3c731de 100644
--- a/app/Filament/Resources/System/SettingResource/Pages/EditSetting.php
+++ b/app/Filament/Resources/System/SettingResource/Pages/EditSetting.php
@@ -2,6 +2,7 @@
namespace App\Filament\Resources\System\SettingResource\Pages;
+use Filament\Actions\Action;
use Filament\Forms\Contracts\HasForms;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Schemas\Schema;
@@ -41,8 +42,6 @@ class EditSetting extends Page implements HasForms
protected static string $resource = SettingResource::class;
- protected string $view = 'filament.resources.system.setting-resource.pages.edit-hit-and-run';
-
public ?array $data = [];
public function getTitle(): string
@@ -56,7 +55,7 @@ class EditSetting extends Page implements HasForms
$this->fillForm();
}
- public function form(Schema $schema): Schema
+ public function content(Schema $schema): Schema
{
return $schema
->components($this->getFormSchema())
@@ -76,7 +75,7 @@ class EditSetting extends Page implements HasForms
}
Arr::set($settings, 'captcha.attendance.enabled', $normalized);
- $this->form->fill($settings);
+ $this->content->fill($settings);
}
@@ -85,7 +84,10 @@ class EditSetting extends Page implements HasForms
{
return [
Tabs::make('Heading')
- ->tabs($this->getTabs())
+ ->tabs($this->getTabs()),
+ Action::make('submit')
+ ->label(__('label.save'))
+ ->action(fn() => $this->submit()),
];
}
@@ -93,7 +95,7 @@ class EditSetting extends Page implements HasForms
{
static::authorizeResourceAccess();
- $formData = $this->form->getState();
+ $formData = $this->content->getState();
$notAutoloadNames = ['donation_custom'];
$data = [];
foreach ($formData as $prefix => $parts) {
diff --git a/app/Filament/Resources/User/ExamUserResource.php b/app/Filament/Resources/User/ExamUserResource.php
index 58a7126f..e8ca14e4 100644
--- a/app/Filament/Resources/User/ExamUserResource.php
+++ b/app/Filament/Resources/User/ExamUserResource.php
@@ -2,6 +2,8 @@
namespace App\Filament\Resources\User;
+use Filament\Infolists\Components\RepeatableEntry;
+use Filament\Infolists\Components\RepeatableEntry\TableColumn;
use Filament\Schemas\Schema;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Columns\BooleanColumn;
@@ -193,10 +195,21 @@ class ExamUserResource extends Resource
->columns(2)
,
Group::make([
- ViewEntry::make('progressFormatted')
- ->label('进度')
- ->view('filament.resources.user.exam-user-resource.pages.detail-v3')
- ])->columnSpan(1),
+ RepeatableEntry::make('progressFormatted')
+ ->hiddenLabel()
+ ->table([
+ TableColumn::make(__('label.exam.index_required_label')),
+ TableColumn::make(__('label.exam.index_required_value')),
+ TableColumn::make(__('label.exam.index_current_value')),
+ TableColumn::make(__('label.exam.index_result')),
+ ])
+ ->schema([
+ TextEntry::make('index_formatted'),
+ TextEntry::make('require_value_formatted'),
+ TextEntry::make('current_value_formatted'),
+ TextEntry::make('index_result')->html(),
+ ])
+ ])->columnSpan(1),
]),
]);
diff --git a/resources/views/filament/resources/system/category-icon-resource/pages/create-record.blade.php b/resources/views/filament/resources/system/category-icon-resource/pages/create-record.blade.php
deleted file mode 100644
index 9d625d86..00000000
--- a/resources/views/filament/resources/system/category-icon-resource/pages/create-record.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
- {{ $this->form }}
-
-
- {{ $this->form }}
-
-
| - {{ __('label.exam.index_required_label') }} - | -- {{ __('label.exam.index_required_value') }} - | -- {{ __('label.exam.index_current_value') }} - - | -- {{ __('label.exam.index_result') }} - | -
|---|---|---|---|
|
-
-
- {{ $index['index_formatted'] }}
- |
-
-
-
- {{ $index['require_value_formatted'] }}
- |
-
-
-
- {{ $index['current_value_formatted'] }}
- |
-
-
-
- {!! $index['index_result'] !!}
- |
-
| {{ $value['label'] }} | -{!! $value['value'] !!} | -
|---|
| {{ __('label.exam.index_required_label') }} | -{{ __('label.exam.index_required_value') }} | -{{ __('label.exam.index_current_value') }} | -{{ __('label.exam.index_result') }} | -
|---|---|---|---|
| {{ $index['index_formatted'] }} | -{{ $index['require_value_formatted'] }} | -{{ $index['current_value_formatted'] }} | -{!! $index['passed'] ? __($result_pass_trans_key) : __($result_not_pass_trans_key) !!} | -
| UID | -{{$record->id}} | -- |
|---|---|---|
| {{__('label.user.username')}} | -{!! get_username($record->id, false, true, true, true) !!} | -- |
| {{__('label.email')}} | -{{$record->email}} | -- |
| Passkey | -{{$record->passkey}} | -- |
| {{__('label.status')}} | -{{$record->status}} | -- |
| {{__('label.enabled')}} | -{{$record->enabled}} | -- |
| {{__('label.added')}} | -{{$record->added}} | -- |
| {{__('label.last_access')}} | -{{$record->last_access}} | -- |
| {{__('label.user.class')}} | -{{$record->classText}} | -- |
| {{__('user.labels.props')}} | -{!! implode(' | ', $props) !!} |
- - |
| {{__('label.user.invite_by')}} | -{{$record->inviter->username ?? ''}} | -- |
| {{__('label.user.two_step_authentication')}} | -{{$record->two_step_secret ? 'Enabled' : 'Disabled'}} | -- |
| {{__('label.user.downloadpos')}} | -{{$record->downloadpos}} | -- |
| {{__('label.user.parked')}} | -{{$record->parked}} | -- |
| {{__('label.user.offer_allowed_count')}} | -{{$record->offer_allowed_count}} | -- |
| {{__('label.user.seed_points')}} | -{{$record->seed_points}} | -- |
| {{ __('label.user.attendance_card') }} | -{{$record->attendance_card}} | -- |
| {{ __('label.user.invites') }} | -{{sprintf('%s(%s)', $record->invites, $temporary_invite_count)}} | -- |
| {{ __('label.uploaded') }} | -{{$record->uploadedText}} | -- |
| {{ __('label.downloaded') }} | -{{$record->downloadedText}} | -- |
| {{ __('label.user.seedbonus') }} | -{{$record->seedbonus}} | -- |