更新bug以及添加自定义抽屉操作

.env.example

@@ -17,7 +17,7 @@ DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-FILESYSTEM_DISK=local
+FILESYSTEM_DISK=public
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120

README.md

@@ -1,66 +1,5 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
-
-<p align="center">
-<a href="https://github.com/laravel/framework/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
-</p>
-
-## About Laravel
-
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
-
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
-
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
-
-## Learning Laravel
-
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
-
-You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch.
-
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 2000 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
-
-## Laravel Sponsors
-
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the [Laravel Partners program](https://partners.laravel.com).
-
-### Premium Partners
-
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[WebReinvent](https://webreinvent.com/)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[DevSquad](https://devsquad.com/hire-laravel-developers)**
-- **[Jump24](https://jump24.co.uk)**
-- **[Redberry](https://redberry.international/laravel/)**
-- **[Active Logic](https://activelogic.com)**
-- **[byte5](https://byte5.de)**
-- **[OP.GG](https://op.gg)**
-
-## Contributing
-
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
-
-## Code of Conduct
-
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
-
-## Security Vulnerabilities
-
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
-
-## License
-
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+composer install
+php artisan g:k
+php artisan storage:link
+php artisan admin:install
+php artisan db:seed

app/Admin/Controllers/ArticleController.php

@@ -10,16 +10,18 @@ use Slowlyo\OwlAdmin\Controllers\AdminController;
 use App\Services\Admin\ArticleService;
 use App\Admin\Components;
 use App\Models\Keyword;
+use App\Traits\CustomActionTrait;
 
 class ArticleController extends AdminController
 {
+    use CustomActionTrait;
     protected string $serviceName = ArticleService::class;
 
     public function list():Page 
     {
         $crud = $this->baseCRUD()->tableLayout('fixed')
             ->headerToolbar([
-                $this->createButton(),
+                $this->createTypeButton('drawer', 'xl'),
                 ...$this->baseHeaderToolBar(),
             ])
             ->filter($this->baseFilter()->body([
@@ -69,7 +71,7 @@ class ArticleController extends AdminController
                 amis()->TableColumn('is_recommend', __('admin.articles.is_recommend'))->type('switch'),
                 amis()->TableColumn('created_at', __('admin.created_at'))->type('datetime')->sortable(true),
                 amis()->Operation()->label(__('admin.actions'))->buttons([
-                    $this->rowEditButton(),
+                    $this->rowEditTypeButton('drawer', 'xl'),
                     $this->rowDeleteButton(),
                 ])
             ]);

app/Models/Keyword.php

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use EloquentFilter\Filterable;
 use App\Admin\Components;
+use Illuminate\Support\Facades\Str;
 
 class Keyword extends Model
 {
@@ -30,12 +31,19 @@ class Keyword extends Model
                 $keyword->lv = 1;
                 // 将 path 设为 -
                 $keyword->path = '-';
+                if(empty($keyword->key)){
+                    $keyword->key = Str::quickRandom($length = 16); 
+                }
             } else {
                 // 将层级设为父类目的层级 + 1
                 $keyword->lv = $keyword->parent->lv + 1;
                 $keyword->parent_key = $keyword->parent->key;
                 // 将 path 值设为父类目的 path 追加父类目 ID 以及最后跟上一个 - 分隔符
                 $keyword->path = $keyword->parent->path.$keyword->parent_id.'-';
+                 //当前key是否为空
+                if(empty($keyword->key)){
+                    $keyword->key = $keyword->parent_key . '_' . (self::where('parent_key', $keyword->parent_key)->count() + 1); 
+                }
             }
         });
     }