From 31869e4c22b53c1a0522df29938cc69cbea229a0 Mon Sep 17 00:00:00 2001 From: slowlyo Date: Thu, 31 Oct 2024 14:40:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Controllers/AdminMenuController.php | 8 ++-- src/Controllers/AdminPermissionController.php | 8 ++-- src/Controllers/AdminRoleController.php | 6 +-- src/Controllers/AdminUserController.php | 6 +-- .../DevTools/CodeGeneratorController.php | 2 +- src/Traits/ElementTrait.php | 47 ++++++++++++------- 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/src/Controllers/AdminMenuController.php b/src/Controllers/AdminMenuController.php index f01c53d8..fda58964 100644 --- a/src/Controllers/AdminMenuController.php +++ b/src/Controllers/AdminMenuController.php @@ -3,8 +3,6 @@ namespace Slowlyo\OwlAdmin\Controllers; use Slowlyo\OwlAdmin\Admin; -use Slowlyo\OwlAdmin\Renderers\Page; -use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Services\AdminMenuService; use Slowlyo\OwlAdmin\Traits\IconifyPickerTrait; use Slowlyo\OwlAdmin\Services\AdminPageService; @@ -18,7 +16,7 @@ class AdminMenuController extends AdminController protected string $serviceName = AdminMenuService::class; - public function list(): Page + public function list() { $crud = $this->baseCRUD() ->perPage(999) @@ -66,7 +64,7 @@ public function list(): Page return $this->baseList($crud); } - public function form(): Form + public function form() { return $this->baseForm()->body([ amis()->GroupControl()->body([ @@ -156,7 +154,7 @@ public function form(): Form ]); } - public function detail(): Form + public function detail() { return $this->baseDetail()->body([]); } diff --git a/src/Controllers/AdminPermissionController.php b/src/Controllers/AdminPermissionController.php index 56cc8c80..0452a4fd 100644 --- a/src/Controllers/AdminPermissionController.php +++ b/src/Controllers/AdminPermissionController.php @@ -6,8 +6,6 @@ use Slowlyo\OwlAdmin\Admin; use Illuminate\Support\Facades\DB; use Slowlyo\OwlAdmin\Renderers\Tag; -use Slowlyo\OwlAdmin\Renderers\Page; -use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Services\AdminMenuService; use Slowlyo\OwlAdmin\Services\AdminPermissionService; @@ -18,7 +16,7 @@ class AdminPermissionController extends AdminController { protected string $serviceName = AdminPermissionService::class; - public function list(): Page + public function list() { $autoBtn = ''; if (Admin::config('admin.show_auto_generate_permission_button')) { @@ -65,7 +63,7 @@ public function list(): Page return $this->baseList($crud); } - public function form(): Form + public function form() { return $this->baseForm()->body([ amis()->TextControl('name', admin_trans('admin.admin_permission.name'))->required(), @@ -101,7 +99,7 @@ public function form(): Form ]); } - public function detail(): Form + public function detail() { return $this->baseDetail()->body([]); } diff --git a/src/Controllers/AdminRoleController.php b/src/Controllers/AdminRoleController.php index 92c12a4d..b5bcad52 100644 --- a/src/Controllers/AdminRoleController.php +++ b/src/Controllers/AdminRoleController.php @@ -14,7 +14,7 @@ class AdminRoleController extends AdminController { protected string $serviceName = AdminRoleService::class; - public function list(): Page + public function list() { $crud = $this->baseCRUD() ->headerToolbar([ @@ -100,7 +100,7 @@ public function savePermissions() return $this->autoResponse($result, admin_trans('admin.save')); } - public function form(): Form + public function form() { return $this->baseForm()->body([ amis()->TextControl()->label(admin_trans('admin.admin_role.name'))->name('name')->required(), @@ -112,7 +112,7 @@ public function form(): Form ]); } - public function detail(): Form + public function detail() { return $this->baseDetail()->body([]); } diff --git a/src/Controllers/AdminUserController.php b/src/Controllers/AdminUserController.php index c58f7450..758db964 100644 --- a/src/Controllers/AdminUserController.php +++ b/src/Controllers/AdminUserController.php @@ -13,7 +13,7 @@ class AdminUserController extends AdminController { protected string $serviceName = AdminUserService::class; - public function list(): Page + public function list() { $crud = $this->baseCRUD() ->headerToolbar([ @@ -47,7 +47,7 @@ public function list(): Page return $this->baseList($crud); } - public function form(): Form + public function form() { return $this->baseForm()->body([ amis()->ImageControl('avatar', admin_trans('admin.admin_user.avatar'))->receiver($this->uploadImagePath()), @@ -72,7 +72,7 @@ public function form(): Form ]); } - public function detail(): Form + public function detail() { return $this->baseDetail()->body([]); } diff --git a/src/Controllers/DevTools/CodeGeneratorController.php b/src/Controllers/DevTools/CodeGeneratorController.php index f2e78de4..48d3a1e1 100644 --- a/src/Controllers/DevTools/CodeGeneratorController.php +++ b/src/Controllers/DevTools/CodeGeneratorController.php @@ -31,7 +31,7 @@ public function index() } return $this->response()->success( - amis()->Page()->css($this->css())->body($this->list()) + $this->basePage()->css($this->css())->body($this->list()) ); } diff --git a/src/Traits/ElementTrait.php b/src/Traits/ElementTrait.php index 436069ca..d8741b23 100644 --- a/src/Traits/ElementTrait.php +++ b/src/Traits/ElementTrait.php @@ -30,7 +30,8 @@ protected function backButton() $path = str_replace(Admin::config('admin.route.prefix'), '', request()->path()); $script = sprintf('window.$owl.hasOwnProperty(\'closeTabByPath\') && window.$owl.closeTabByPath(\'%s\')', $path); - $action = amis()->OtherAction() + $action = amis() + ->OtherAction() ->label(admin_trans('admin.back')) ->icon('fa-solid fa-chevron-left') ->level('primary') @@ -44,11 +45,13 @@ protected function backButton() */ protected function bulkDeleteButton() { - $action = amis()->DialogAction() + $action = amis() + ->DialogAction() ->label(admin_trans('admin.delete')) ->icon('fa-solid fa-trash-can') ->dialog( - amis()->Dialog() + amis() + ->Dialog() ->title(admin_trans('admin.delete')) ->className('py-2') ->actions([ @@ -113,7 +116,8 @@ protected function rowEditButton(bool|string $dialog = false, string $dialogSize $action = amis()->LinkAction()->link($this->getEditPath()); if ($dialog) { - $form = $this->form(true) + $form = $this + ->form(true) ->api($this->getUpdatePath()) ->initApi($this->getEditGetDataPath()) ->redirect('') @@ -152,7 +156,8 @@ protected function rowShowButton(bool|string $dialog = false, string $dialogSize if ($dialog) { if ($dialog === 'drawer') { $action = amis()->DrawerAction()->drawer( - amis()->Drawer() + amis() + ->Drawer() ->title($title) ->body($this->detail('$id')) ->size($dialogSize) @@ -162,7 +167,8 @@ protected function rowShowButton(bool|string $dialog = false, string $dialogSize ); } else { $action = amis()->DialogAction()->dialog( - amis()->Dialog() + amis() + ->Dialog() ->title($title) ->body($this->detail('$id')) ->size($dialogSize) @@ -187,12 +193,14 @@ protected function rowShowButton(bool|string $dialog = false, string $dialogSize */ protected function rowDeleteButton(string $title = '') { - $action = amis()->DialogAction() + $action = amis() + ->DialogAction() ->label($title ?: admin_trans('admin.delete')) ->level('link') ->className('text-danger') ->dialog( - amis()->Dialog() + amis() + ->Dialog() ->title() ->className('py-2') ->actions([ @@ -239,7 +247,8 @@ protected function rowActions(bool|array|string $dialog = false, string $dialogS */ protected function baseFilter() { - $schema = amis()->Form() + $schema = amis() + ->Form() ->panelClassName('base-filter') ->title('') ->actions([ @@ -267,7 +276,8 @@ protected function baseCRUD() { $crudId = str_replace('/', '.', request()->path()) . '.crud'; - $crud = amis()->CRUDTable() + $crud = amis() + ->CRUDTable() ->id($crudId) ->perPage(20) ->alwaysShowPagination() @@ -282,7 +292,8 @@ protected function baseCRUD() 'statistics', // 重写实现 CRUD 自带的页码切换组件, 解决下拉被遮挡的问题 amis()->Form()->wrapWithPanel(false)->body([ - amis()->SelectControl('perPage') + amis() + ->SelectControl('perPage') ->options(array_map( fn($i) => ['label' => $i . ' ' . admin_trans('admin.per_page_suffix'), 'value' => $i], [10, 20, 30, 50, 100, 200] @@ -365,7 +376,8 @@ protected function baseForm(bool $back = true) */ protected function baseDetail() { - $schema = amis()->Form() + $schema = amis() + ->Form() ->panelClassName('px-48 m:px-0') ->title(' ') ->mode('horizontal') @@ -384,10 +396,7 @@ protected function baseDetail() */ protected function baseList($crud) { - return AdminPipeline::handle( - AdminPipeline::PIPE_BASE_LIST, - amis()->Page()->className('m:overflow-auto')->body($crud) - ); + return AdminPipeline::handle(AdminPipeline::PIPE_BASE_LIST, $this->basePage()->body($crud)); } /** @@ -431,13 +440,15 @@ protected function exportAction($disableSelectedItem = false) ); } - $action = amis()->Service() + $action = amis() + ->Service() ->id('export-action') ->set('align', 'right') ->set('data', ['showExportLoading' => false]) ->body( amis()->Spinner()->set('showOn', '${showExportLoading}')->overlay()->body( - amis()->DropdownButton() + amis() + ->DropdownButton() ->label(admin_trans('admin.export.title')) ->set('icon', 'fa-solid fa-download') ->buttons($buttons)