From 607384c91264d5fead547fc6df4b5a715559b7b7 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Mon, 16 Sep 2024 17:21:49 +0800
Subject: [PATCH] update owl-admin permission

---
 .env.example                                |  5 ++++-
 app/Admin/Controllers/KeywordController.php |  6 ++---
 app/Admin/Controllers/SettingController.php | 25 ++++++++-------------
 tests/Feature/ExampleTest.php               |  8 ++++++-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.env.example b/.env.example
index 8ec9442..03128e8 100644
--- a/.env.example
+++ b/.env.example
@@ -7,7 +7,7 @@ APP_URL=http://localhost
 
 APP_LOCALE=zh_CN
 APP_FALLBACK_LOCALE=en
-APP_FAKER_LOCALE=en_US
+APP_FAKER_LOCALE=zh_CN
 
 APP_MAINTENANCE_DRIVER=file
 APP_MAINTENANCE_STORE=database
@@ -62,3 +62,6 @@ AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
 VITE_APP_NAME="${APP_NAME}"
+
+ADMIN_SHOW_DEVELOPMENT_TOOLS=false
+ADMIN_SHOW_AUTO_GENERATE_PERMISSION_BUTTON=false
diff --git a/app/Admin/Controllers/KeywordController.php b/app/Admin/Controllers/KeywordController.php
index 59e662d..354f82f 100644
--- a/app/Admin/Controllers/KeywordController.php
+++ b/app/Admin/Controllers/KeywordController.php
@@ -20,7 +20,7 @@ class KeywordController extends AdminController
 
 	public function list()
     {
-		$user = Admin::user();
+        $user = Admin::user();
         $crud = $this->baseCRUD()
             ->filterTogglable(false)
             ->columnsTogglable(false)
@@ -43,9 +43,7 @@ class KeywordController extends AdminController
                 amis()->TableColumn()->name('id')->label(__('keywords.id')),
                 amis()->TableColumn()->name('name')->label(__('keywords.name')),
                 amis()->TableColumn()->name('key')->label(__('keywords.key')),
-                amis()->TableColumn()->name('value')->label(__('keywords.value'))->quickEdit([
-                    'saveImmediately' => true,
-                ]),
+                amis()->TableColumn()->name('value')->label(__('keywords.value'))->quickEdit(['saveImmediately' => true])->quickEditEnabled($user->can('admin.keywords.edit')),
                 $this->rowActions([
 					$this->rowShowButton()->permission('admin.keywords.show'),
 					$this->rowEditButton()->permission('admin.keywords.edit'),
diff --git a/app/Admin/Controllers/SettingController.php b/app/Admin/Controllers/SettingController.php
index a574357..9a3f082 100644
--- a/app/Admin/Controllers/SettingController.php
+++ b/app/Admin/Controllers/SettingController.php
@@ -25,31 +25,24 @@ class SettingController extends AdminController
     public function form()
     {
         return $this->baseForm(false)
+            ->mode('horizontal')
+            ->labelWidth('auto')
             ->redirect('')
             ->api($this->getStorePath())
             ->data(settings()->all())
             ->body(
-                Tabs::make()->tabs([
-                    Tab::make()->title('基本设置')->body([
-                        TextControl::make()->label('网站名称')->name('site_name'),
-                        InputKV::make()->label('附加配置')->name('addition_config'),
-                    ]),
-                    Tab::make()->title('上传设置')->body([
-                        TextControl::make()->label('上传域名')->name('upload_domain'),
-                        TextControl::make()->label('上传路径')->name('upload_path'),
-                    ]),
-                ])
+                amis()->Tabs()->tabs([
+                    amis()->Tab()->title('基本设置')->body([
+                        amis()->TextControl()->label('网站名称')->name('site_name'),
+                        amis()->InputKV()->label('附加配置')->name('addition_config'),
+                    ])
+                ]),
             );
     }
 
     public function store(Request $request)
     {
-        $data = $request->only([
-            'site_name',
-            'addition_config',
-            'upload_domain',
-            'upload_path',
-        ]);
+        $data = $request->except(['system_theme_setting']);
 
         return settings()->adminSetMany($data);
     }
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index 032ab91..8deefd5 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -3,6 +3,10 @@
 namespace Tests\Feature;
 
 // use Illuminate\Foundation\Testing\RefreshDatabase;
+
+use Faker\Generator;
+use Illuminate\Container\Container;
+use Illuminate\Support\Testing\Fakes\Fake;
 use Tests\TestCase;
 
 class ExampleTest extends TestCase
@@ -12,6 +16,8 @@ class ExampleTest extends TestCase
      */
     public function test_the_application_returns_a_successful_response(): void
     {
-        dump(__('admin.username'), admin_trans('admin.username'));
+        $faker = Container::getInstance()->make(Generator::class);
+
+        dump($faker->name);
     }
 }