From 9fbf167a0bece5a21d9b70d4d8c3130dec091e2b Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Thu, 27 Apr 2023 16:04:57 +0800
Subject: [PATCH] dialog

---
 .gitignore                                    |  1 +
 .../Controllers/AdminNoticeController.php     | 55 ++++++++--------
 app/Admin/Controllers/ArticleController.php   | 63 +++++++++----------
 app/Admin/Controllers/BannerController.php    |  6 +-
 4 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0d10af..c6649d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ yarn-error.log
 /.fleet
 /.idea
 /.vscode
+project.md
\ No newline at end of file
diff --git a/app/Admin/Controllers/AdminNoticeController.php b/app/Admin/Controllers/AdminNoticeController.php
index 3b54b95..62336be 100644
--- a/app/Admin/Controllers/AdminNoticeController.php
+++ b/app/Admin/Controllers/AdminNoticeController.php
@@ -16,6 +16,10 @@ class AdminNoticeController extends AdminController
     {
         $crud = $this->baseCRUD()
             ->filterTogglable(false)
+            ->headerToolbar([
+                $this->createButton(true, 'lg'),
+                ...$this->baseHeaderToolBar(),
+            ])
             ->filter($this->baseFilter()->actions([])->body([
                 TextControl::make()->name('title')->label(__('admin-notice.title'))->size('md'),
                 Button::make()->label(__('admin.reset'))->actionType('clear-and-submit'),
@@ -29,7 +33,7 @@ class AdminNoticeController extends AdminController
                 TableColumn::make()->name('is_enable')->type('switch')->label(__('admin-notice.is_enable'))->quickEdit(SwitchControl::make()->saveImmediately(true)->mode('inline')),
                 TableColumn::make()->name('sort')->label(__('admin-notice.sort'))->align('center')->quickEdit(Components::make()->sortControl('sort', __('admin-notice.sort'))->saveImmediately(true)),
                 TableColumn::make()->name('published_at')->label(__('admin-notice.published_at')),
-                $this->rowActions(),
+                $this->rowActions(true, 'lg'),
             ]);
 
         return $this->baseList($crud);
@@ -37,37 +41,30 @@ class AdminNoticeController extends AdminController
 
     public function form(): Form
     {
-        return $this->baseForm()->title('')->body(
-            Tabs::make()->tabs([
-                Tab::make()->title('基本信息')->body([
-                    TextControl::make()->name('title')->label(__('admin-notice.title'))->required(true),
-                    SelectControl::make()->name('article_id')->label(__('admin-notice.article_id'))->source(admin_url('api/articles/options')),
-                    Components::make()->sortControl('sort', __('admin-notice.sort')),
-                    DateTimeControl::make()->name('published_at')->label(__('admin-notice.published_at'))->value(now())->format('YYYY-MM-DD HH:mm:ss')->description('*不填写则默认为创建时间'),
-                    SwitchControl::make()->name('is_enable')->label(__('admin-notice.is_enable'))->value(true),
-                ]),
-                Tab::make()->title(__('admin-notice.content'))->body(Components::make()->fuEditorControl('content', ''))
-            ]));
+        return $this->baseForm()->title('')->body([
+            TextControl::make()->name('title')->label(__('admin-notice.title'))->required(true),
+            SelectControl::make()->name('article_id')->label(__('admin-notice.article_id'))->source(admin_url('api/articles/options')),
+            Components::make()->sortControl('sort', __('admin-notice.sort')),
+            DateTimeControl::make()->name('published_at')->label(__('admin-notice.published_at'))->value(now())->format('YYYY-MM-DD HH:mm:ss')->description('*不填写则默认为创建时间'),
+            SwitchControl::make()->name('is_enable')->label(__('admin-notice.is_enable'))->value(true),
+            Components::make()->fuEditorControl('content', __('admin-notice.content'))
+        ]);
     }
 
     public function detail(): Form
     {
-        return $this->baseDetail()->title('')->body(
-            Tabs::make()->tabs([
-                Tab::make()->title('基本信息')->body([
-                    TextControl::make()->static(true)->name('id')->label(__('admin-notice.id')),
-                    TextControl::make()->static(true)->name('title')->label(__('admin-notice.title')),
-                    TextControl::make()->static(true)->name('article.title')->label(__('admin-notice.article_id')),
-                    TextControl::make()->static(true)->name('sort')->label(__('admin-notice.sort')),
-                    TextControl::make()->name('is_enable')->label(__('admin-notice.is_enable'))->static(true)->staticSchema(Status::make()->source([
-                        ['label' => '不显示', 'icon' => 'fa fa-close', 'color' => '#cc292e'],
-                        ['label' => '显示', 'icon' => 'fa fa-check', 'color' => '#30bf13'],
-                    ])),
-                    TextControl::make()->static(true)->name('published_at')->label(__('admin-notice.published_at')),
-                    TextControl::make()->static(true)->name('created_at')->label(__('admin-notice.created_at')),
-                ]),
-                Tab::make()->title(__('admin-notice.content'))->body(Html::make()->name('content'))
-            ])
-        );
+        return $this->baseDetail()->title('')->body([
+            TextControl::make()->static(true)->name('id')->label(__('admin-notice.id')),
+            TextControl::make()->static(true)->name('title')->label(__('admin-notice.title')),
+            TextControl::make()->static(true)->name('article.title')->label(__('admin-notice.article_id')),
+            TextControl::make()->static(true)->name('sort')->label(__('admin-notice.sort')),
+            TextControl::make()->name('is_enable')->label(__('admin-notice.is_enable'))->static(true)->staticSchema(Status::make()->source([
+                ['label' => '不显示', 'icon' => 'fa fa-close', 'color' => '#cc292e'],
+                ['label' => '显示', 'icon' => 'fa fa-check', 'color' => '#30bf13'],
+            ])),
+            TextControl::make()->static(true)->name('published_at')->label(__('admin-notice.published_at')),
+            TextControl::make()->static(true)->name('created_at')->label(__('admin-notice.created_at')),
+            TextControl::make()->name('content')->label(__('admin-notice.content'))->static(true)->staticSchema(Html::make()->name('content')),
+        ]);
     }
 }
diff --git a/app/Admin/Controllers/ArticleController.php b/app/Admin/Controllers/ArticleController.php
index 2271bc5..61632ac 100644
--- a/app/Admin/Controllers/ArticleController.php
+++ b/app/Admin/Controllers/ArticleController.php
@@ -16,6 +16,10 @@ class ArticleController extends AdminController
     {
         $crud = $this->baseCRUD()
             ->filterTogglable(false)
+            ->headerToolbar([
+                $this->createButton(true, 'lg'),
+                ...$this->baseHeaderToolBar(),
+            ])
             ->filter($this->baseFilter()->actions([])->body([
                 TextControl::make()->name('title')->label(__('article.title'))->size('md'),
                 Components::make()->parentControl(admin_url('api/article-categories/tree-list'), 'category_path', __('article.category_id'))->size('lg'),
@@ -32,7 +36,7 @@ class ArticleController extends AdminController
                 TableColumn::make()->name('sort')->label(__('article.sort'))->align('center')->quickEdit(Components::make()->sortControl('sort', __('article-category.sort'))->saveImmediately(true)),
                 TableColumn::make()->name('is_enable')->type('switch')->label(__('article.is_enable'))->quickEdit(SwitchControl::make()->saveImmediately(true)->mode('inline')),
                 TableColumn::make()->name('published_at')->label(__('article.published_at')),
-                $this->rowActions(),
+                $this->rowActions(true, 'lg'),
             ]);
 
         return $this->baseList($crud);
@@ -40,42 +44,35 @@ class ArticleController extends AdminController
 
     public function form(): Form
     {
-        return $this->baseForm()->title('')->body(
-            Tabs::make()->tabs([
-                Tab::make()->title('基本信息')->body([
-                    TextControl::make()->name('title')->label(__('article.title'))->required(true),
-                    Components::make()->parentControl(admin_url('api/article-categories/tree-list'), 'category_id', __('article.category_id'))->required(true),
-                    TextControl::make()->name('sub_title')->label(__('article.sub_title')),
-                    ImageControl::make()->name('cover')->label(__('article.cover'))->autoUpload(true),
-                    Components::make()->sortControl('sort', __('article.sort')),
-                    DateTimeControl::make()->name('published_at')->label(__('article.published_at'))->value(now())->format('YYYY-MM-DD HH:mm:ss')->description('*不填写则默认为创建时间'),
-                    SwitchControl::make()->name('is_enable')->label(__('article.is_enable'))->value(true),
-                ]),
-                Tab::make()->title('内容')->body(Components::make()->fuEditorControl('content', ''))
-            ]));
+        return $this->baseForm()->title('')->body([
+            TextControl::make()->name('title')->label(__('article.title'))->required(true),
+            Components::make()->parentControl(admin_url('api/article-categories/tree-list'), 'category_id', __('article.category_id'))->required(true),
+            TextControl::make()->name('sub_title')->label(__('article.sub_title')),
+            ImageControl::make()->name('cover')->label(__('article.cover'))->autoUpload(true),
+            Components::make()->sortControl('sort', __('article.sort')),
+            DateTimeControl::make()->name('published_at')->label(__('article.published_at'))->value(now())->format('YYYY-MM-DD HH:mm:ss')->description('*不填写则默认为创建时间'),
+            SwitchControl::make()->name('is_enable')->label(__('article.is_enable'))->value(true),
+            Components::make()->fuEditorControl('content', __('article.content')),
+        ]);
     }
 
     public function detail(): Form
     {
-        return $this->baseDetail()->title('')->body(
-            Tabs::make()->tabs([
-                Tab::make()->title('基本信息')->body([
-                    TextControl::make()->static(true)->name('id')->label(__('article.id')),
-                    TextControl::make()->static(true)->name('title')->label(__('article.title')),
-                    TextControl::make()->static(true)->name('category.name')->label(__('article.category_id')),
-                    TextControl::make()->static(true)->name('sub_title')->label(__('article.sub_title')),
-                    TextControl::make()->name('cover')->label(__('article.cover'))->static(true)->staticSchema(Image::make()),
-                    TextControl::make()->static(true)->name('sort')->label(__('article.sort')),
-                    TextControl::make()->name('is_enable')->label(__('article.is_enable'))->static(true)->staticSchema(Status::make()->source([
-                        ['label' => '不显示', 'icon' => 'fa fa-close', 'color' => '#cc292e'],
-                        ['label' => '显示', 'icon' => 'fa fa-check', 'color' => '#30bf13'],
-                    ])),
-                    TextControl::make()->static(true)->name('published_at')->label(__('article.published_at')),
-                    TextControl::make()->static(true)->name('created_at')->label(__('article.created_at')),
-                ]),
-                Tab::make()->title('内容')->body(Html::make()->name('content'))
-            ])
-        );
+        return $this->baseDetail()->title('')->body([
+            TextControl::make()->static(true)->name('id')->label(__('article.id')),
+            TextControl::make()->static(true)->name('title')->label(__('article.title')),
+            TextControl::make()->static(true)->name('category.name')->label(__('article.category_id')),
+            TextControl::make()->static(true)->name('sub_title')->label(__('article.sub_title')),
+            TextControl::make()->name('cover')->label(__('article.cover'))->static(true)->staticSchema(Image::make()),
+            TextControl::make()->static(true)->name('sort')->label(__('article.sort')),
+            TextControl::make()->name('is_enable')->label(__('article.is_enable'))->static(true)->staticSchema(Status::make()->source([
+                ['label' => '不显示', 'icon' => 'fa fa-close', 'color' => '#cc292e'],
+                ['label' => '显示', 'icon' => 'fa fa-check', 'color' => '#30bf13'],
+            ])),
+            TextControl::make()->static(true)->name('published_at')->label(__('article.published_at')),
+            TextControl::make()->static(true)->name('created_at')->label(__('article.created_at')),
+            TextControl::make()->name('content')->label(__('article.content'))->static(true)->staticSchema(Html::make()),
+        ]);
     }
 
     public function options()
diff --git a/app/Admin/Controllers/BannerController.php b/app/Admin/Controllers/BannerController.php
index 0550ac8..df3dc2a 100644
--- a/app/Admin/Controllers/BannerController.php
+++ b/app/Admin/Controllers/BannerController.php
@@ -16,6 +16,10 @@ class BannerController extends AdminController
     {
         $crud = $this->baseCRUD()
             ->filterTogglable(false)
+            ->headerToolbar([
+                $this->createButton(true, 'lg'),
+                ...$this->baseHeaderToolBar(),
+            ])
             ->quickSaveItemApi(admin_url('quick-edit/banners/$id'))
             ->filter($this->baseFilter()->actions([])->body([
                 SelectControl::make()->name('place_id')->label(__('banner.place_id'))->source(admin_url('api/banner-places/options'))->size('md'),
@@ -29,7 +33,7 @@ class BannerController extends AdminController
                 Image::make()->name('picture')->label(__('banner.picture'))->width(100),
                 TableColumn::make()->name('sort')->label(__('banner.sort'))->align('center')->quickEdit(Components::make()->sortControl('sort', __('article-category.sort'))->saveImmediately(true)),
                 TableColumn::make()->name('is_enable')->label(__('banner.is_enable'))->type('switch')->quickEdit(SwitchControl::make()->mode('inline')->saveImmediately(true)),
-                $this->rowActions(),
+                $this->rowActions(true, 'lg'),
             ]);
 
         return $this->baseList($crud);