From e20253c2bfc104a92b25249fdda1457f5eac36ff Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Mon, 20 Mar 2023 10:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=86=E6=9E=B6=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/AdminRoleController.php | 79 ------------------- app/Admin/routes.php | 2 +- composer.json | 10 ++- composer.lock | 8 +- database/seeders/AdminMenuSeeder.php | 2 +- 5 files changed, 13 insertions(+), 88 deletions(-) delete mode 100644 app/Admin/Controllers/AdminRoleController.php diff --git a/app/Admin/Controllers/AdminRoleController.php b/app/Admin/Controllers/AdminRoleController.php deleted file mode 100644 index 1fbfdfe..0000000 --- a/app/Admin/Controllers/AdminRoleController.php +++ /dev/null @@ -1,79 +0,0 @@ -baseCRUD() - ->headerToolbar([ - $this->createButton(true, 'lg'), - 'bulkActions', - amis('reload')->align('right'), - amis('filter-toggler')->align('right'), - ]) - ->filterTogglable(false) - ->columns([ - TableColumn::make()->label('ID')->name('id')->sortable(true), - TableColumn::make()->label(__('admin.admin_role.name'))->name('name'), - TableColumn::make()->label(__('admin.admin_role.slug'))->name('slug')->type('tag'), - TableColumn::make()->label(__('admin.created_at'))->name('created_at')->type('datetime')->sortable(true), - TableColumn::make()->label(__('admin.updated_at'))->name('updated_at')->type('datetime')->sortable(true), - Operation::make()->label(__('admin.actions'))->buttons([ - $this->rowEditButton(true, 'lg'), - $this->rowDeleteButton()->visibleOn('${slug != "administrator"}'), - ]), - ]); - - return $this->baseList($crud); - } - - public function form(): Form - { - return $this->baseForm()->body([ - TextControl::make()->label(__('admin.admin_role.name'))->name('name')->required(true)->size('lg'), - TextControl::make() - ->label(__('admin.admin_role.slug')) - ->name('slug') - ->description(__('admin.admin_role.slug_description')) - ->required(true)->size('lg'), - CheckboxesControl::make() - ->name('permissions') - ->label(__('admin.admin_role.permissions')) - ->options(AdminPermissionService::make()->getTree()) - // ->checkAll(true) - ->labelField('name') - ->valueField('id') - ->joinValues(false) - ->extractValue(true) - // TreeSelectControl::make() - // ->name('permissions') - // ->label(__('admin.admin_role.permissions')) - // ->multiple(true) - // ->options(AdminPermissionService::make()->getTree()) - // ->searchable(true) - // ->labelField('name') - // ->valueField('id') - // ->autoCheckChildren(false) - // ->joinValues(false) - // ->extractValue(true), - ]); - } - - public function detail(): Form - { - return $this->baseDetail()->body([]); - } -} diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 399c3e0..d491d79 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -18,7 +18,7 @@ Route::group([ $router->resource('keywords', \App\Admin\Controllers\KeywordController::class); - $router->resource('system/re-roles', \App\Admin\Controllers\AdminRoleController::class); + // $router->resource('system/re-roles', \App\Admin\Controllers\AdminRoleController::class); $router->resource('system/settings', \App\Admin\Controllers\SettingController::class); }); diff --git a/composer.json b/composer.json index 30761a5..bb2e3da 100644 --- a/composer.json +++ b/composer.json @@ -64,10 +64,14 @@ }, "minimum-stability": "dev", "prefer-stable": true, - "repositories": { - "packagist": { + "repositories": [ + { "type": "composer", "url": "https://mirrors.aliyun.com/composer/" + }, + { + "type": "composer", + "url": "https://repo.packagist.org" } - } + ] } diff --git a/composer.lock b/composer.lock index 2e968db..09ba599 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0955c00d24fb997149c86a6cf19f653a", + "content-hash": "919683e37fe05de4a5eed11ce6fdccd9", "packages": [ { "name": "brick/math", @@ -2317,11 +2317,11 @@ }, { "name": "slowlyo/owl-admin", - "version": "v2.1.0", + "version": "v2.1.4", "source": { "type": "git", "url": "https://gitee.com/slowlyo/owl-admin", - "reference": "33b9ebe4e3372e2b93c17df105d776d47268238f" + "reference": "c85a1f9fee4414a9ee69099b14aced0a0cb5ed18" }, "require": { "illuminate/support": "~9|~10", @@ -2364,7 +2364,7 @@ "admin", "laravel" ], - "time": "2023-03-15T06:01:19+00:00" + "time": "2023-03-18T14:39:35+00:00" }, { "name": "symfony/console", diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index fa37c58..6516b40 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -54,7 +54,7 @@ class AdminMenuSeeder extends Seeder ['title' => '系统管理', 'icon' => 'icon-park:setting', 'url' => '/system', 'children' => [ ['title' => '用户管理', 'icon' => 'icon-park:people-plus', 'url' => '/system/admin_users'], - ['title' => '角色管理', 'icon' => 'icon-park:people-plus-one', 'url' => '/system/re-roles'], + ['title' => '角色管理', 'icon' => 'icon-park:people-plus-one', 'url' => '/system/admin_roles'], ['title' => '权限管理', 'icon' => 'icon-park:key-one', 'url' => '/system/admin_permissions'], ['title' => '菜单管理', 'icon' => 'icon-park:menu-fold-one', 'url' => '/system/admin_menus'], ['title' => '字典管理', 'icon' => 'icon-park:arrow-keys', 'url' => '/keywords'],