From ef3cee84d5598e8bac38957e9075f9e55e6470d7 Mon Sep 17 00:00:00 2001 From: xuanchen <122383162@qq.com> Date: Fri, 2 Sep 2022 15:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Advert/IndexController.php | 31 ++--- .../Controllers/Article/IndexController.php | 31 +++-- .../Controllers/Category/IndexController.php | 108 +++++++++--------- .../Controllers/File/IndexController.php | 8 +- app/Models/Log.php | 10 ++ 5 files changed, 110 insertions(+), 78 deletions(-) create mode 100644 app/Models/Log.php diff --git a/app/Admin/Controllers/Advert/IndexController.php b/app/Admin/Controllers/Advert/IndexController.php index 42be2a0..b43d4a2 100644 --- a/app/Admin/Controllers/Advert/IndexController.php +++ b/app/Admin/Controllers/Advert/IndexController.php @@ -16,6 +16,7 @@ class IndexController extends AdminController /** * Make a grid builder. + * * @return Grid */ protected function grid() @@ -44,7 +45,8 @@ class IndexController extends AdminController /** * Make a show builder. - * @param mixed $id + * + * @param mixed $id * @return Show */ protected function detail($id) @@ -58,6 +60,7 @@ class IndexController extends AdminController /** * Make a form builder. + * * @return Form */ protected function form() @@ -65,16 +68,18 @@ class IndexController extends AdminController return Form::make(new Advert(), function (Form $form) { $form->text('title', '图片名称')->required(); $form->select('category_id', '所属分类') - ->options(Category::selectOptions(function ($model) { - return $model->where('status', 1)->where('type', Category::TYPE_ADVERT); - }, '选择分类')) - ->rules('required|min:1', [ - 'required' => '必须选择所属分类', - 'min' => '必须选择所属分类', - ]); + ->options(Category::selectOptions(function ($model) { + return $model->where('status', 1)->where('type', Category::TYPE_ADVERT); + }, '选择分类')) + ->rules('required|min:1', [ + 'required' => '必须选择所属分类', + 'min' => '必须选择所属分类', + ]); $form->image('cover', '封面图片') - ->move('images/' . date('Y/m/d')) - ->uniqueName(); + ->accept('jpeg,jpg,png') + ->rules('image|mimes:jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) + ->uniqueName(); // $form->image('cover', '封面图片') // ->rules(function ($form) { // if ($form->model()->cover != []) { @@ -88,9 +93,9 @@ class IndexController extends AdminController // ->uniqueName(); $form->text('url', '链接地址'); $form->number('sort', '排序') - ->default(1) - ->required() - ->help('数字越大越靠前'); + ->default(1) + ->required() + ->help('数字越大越靠前'); }); } diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php index a9e515e..3d58815 100644 --- a/app/Admin/Controllers/Article/IndexController.php +++ b/app/Admin/Controllers/Article/IndexController.php @@ -16,6 +16,7 @@ class IndexController extends AdminController /** * Make a grid builder. + * * @return Grid */ protected function grid() @@ -43,6 +44,7 @@ class IndexController extends AdminController /** * Make a show builder. + * * @param mixed $id * @return Show */ @@ -64,6 +66,7 @@ class IndexController extends AdminController /** * Make a form builder. + * * @return Form */ protected function form() @@ -71,21 +74,27 @@ class IndexController extends AdminController return Form::make(new Article(), function (Form $form) { $form->text('title', '文章标题')->rules('min:2'); $form->select('category_id', '所属分类') - ->options(Category::selectOptions(function ($model) { - return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]); - }, '选择分类')) - ->rules('required|min:1', [ - 'required' => '必须选择所属分类', - 'min' => '必须选择所属分类', - ]); + ->options(Category::selectOptions(function ($model) { + return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]); + }, '选择分类')) + ->rules('required|min:1', [ + 'required' => '必须选择所属分类', + 'min' => '必须选择所属分类', + ]); $form->textarea('description', '内容简介')->rules('max:350'); $form->image('cover', '封面') - ->move('images/' . date('Y/m/d')) - ->uniqueName(); + ->rules('image|mimes:jpeg,jpg,png') + ->accept('jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) + ->uniqueName(); - $form->editor('content', '文章内容')->rules('required', ['required' => '详情不能为空']); - $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先'); + $form->editor('content', '文章内容') + ->rules('required', ['required' => '详情不能为空']); + $form->number('sort', '序号') + ->default(0) + ->rules('required', ['required' => '序号必须填写']) + ->help('倒序优先'); $form->switch('status', '状态')->default(1); $form->datetime('created_at', '发布时间')->default(now()); }); diff --git a/app/Admin/Controllers/Category/IndexController.php b/app/Admin/Controllers/Category/IndexController.php index ceba1ab..1ef91c9 100644 --- a/app/Admin/Controllers/Category/IndexController.php +++ b/app/Admin/Controllers/Category/IndexController.php @@ -21,51 +21,53 @@ class IndexController extends AdminController public function index(Content $content) { return $content->header('树状模型') - ->body(function (Row $row) { - $row->column(6, $this->treeView()->render()); - $row->column(6, function (Column $column) { - $form = new WidgetForm(); + ->body(function (Row $row) { + $row->column(6, $this->treeView()->render()); + $row->column(6, function (Column $column) { + $form = new WidgetForm(); - $form->select('parent_id', '上级分类') - ->options(Category::selectOptions(function ($model) { - return $model->where('status', 1); - }, '一级分类')) - ->required(); - $form->text('title', '分类名称')->rules('required'); + $form->select('parent_id', '上级分类') + ->options(Category::selectOptions(function ($model) { + return $model->where('status', 1); + }, '一级分类')) + ->required(); + $form->text('title', '分类名称')->rules('required'); - $form->select('type', '分类类型') - ->options(Category::TYPES) - ->when('show', function (WidgetForm $form) { - $form->select('article_id', '关联文章') - ->options(function ($option, $info) { - return Article::whereHas('category', function ($q) { - $q->where('type', 'show'); - })->pluck('title', 'id'); - })->help('当分类类型是文章详情的时候需要选择关联文章'); - }) - ->when('web', function (WidgetForm $form) { - $form->text('url', '跳转链接'); - }) - ->required(); + $form->select('type', '分类类型') + ->options(Category::TYPES) + ->when('show', function (WidgetForm $form) { + $form->select('article_id', '关联文章') + ->options(function ($option, $info) { + return Article::whereHas('category', function ($q) { + $q->where('type', 'show'); + })->pluck('title', 'id'); + })->help('当分类类型是文章详情的时候需要选择关联文章'); + }) + ->when('web', function (WidgetForm $form) { + $form->text('url', '跳转链接'); + }) + ->required(); - $form->textarea('description', '分类简介') - ->rules('nullable'); + $form->textarea('description', '分类简介') + ->rules('nullable'); - $form->text('keywords', '关键词')->rules('nullable'); + $form->text('keywords', '关键词')->rules('nullable'); - $form->image('cover', '封面图片') - ->move('images/' . date('Y/m/d')) - ->uniqueName(); + $form->image('cover', '封面图片') + ->rules('image|mimes:jpeg,jpg,png') + ->accept('jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) + ->uniqueName(); - $form->number('order', '排序')->default(0); - $form->switch('top_show', '顶部导航显示'); - $form->switch('status', '显示')->default(1); + $form->number('order', '排序')->default(0); + $form->switch('top_show', '顶部导航显示'); + $form->switch('status', '显示')->default(1); - $form->action(admin_url('categories')); + $form->action(admin_url('categories')); - $column->append((new Box('新增分类', $form))->style('success')); - }); - }); + $column->append((new Box('新增分类', $form))->style('success')); + }); + }); } protected function treeView() @@ -101,25 +103,27 @@ class IndexController extends AdminController }, '一级分类')); $form->text('title', '分类名称')->rules('required'); $form->select('type', '分类类型') - ->options(Category::TYPES) - ->when('show', function (Form $form) { - $form->select('article_id', '关联文章') - ->options(function ($option, $info) { - return Article::whereHas('category', function ($q) { - $q->where('type', 'show'); - })->pluck('title', 'id'); - })->help('当分类类型是文章详情的时候需要选择关联文章'); - }) - ->when('web', function (Form $form) { - $form->text('url', '跳转链接'); - }) - ->required(); + ->options(Category::TYPES) + ->when('show', function (Form $form) { + $form->select('article_id', '关联文章') + ->options(function ($option, $info) { + return Article::whereHas('category', function ($q) { + $q->where('type', 'show'); + })->pluck('title', 'id'); + })->help('当分类类型是文章详情的时候需要选择关联文章'); + }) + ->when('web', function (Form $form) { + $form->text('url', '跳转链接'); + }) + ->required(); $form->textarea('description', '分类简介')->rows(4)->rules('nullable'); $form->text('keywords', '关键词')->rules('nullable'); $form->image('cover', 'Logo') - ->move('images/' . date('Y/m/d')) - ->uniqueName(); + ->rules('image|mimes:jpeg,jpg,png') + ->accept('jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) + ->uniqueName(); $form->number('order', '排序')->default(0)->help('正序优先'); diff --git a/app/Admin/Controllers/File/IndexController.php b/app/Admin/Controllers/File/IndexController.php index 158fc65..0dbfdcf 100644 --- a/app/Admin/Controllers/File/IndexController.php +++ b/app/Admin/Controllers/File/IndexController.php @@ -14,6 +14,7 @@ class IndexController extends AdminController /** * Make a grid builder. + * * @return Grid */ protected function grid() @@ -29,6 +30,7 @@ class IndexController extends AdminController /** * Make a form builder. + * * @return Form */ protected function form() @@ -36,8 +38,10 @@ class IndexController extends AdminController return Form::make(new File(), function (Form $form) { $form->text('title', '文件名称'); $form->file('cover', '文件') - ->move('file/' . date('Y/m/d')) - ->required(); + ->accept('doc,docx,xlsx') + ->rules('file|mimes:doc,docx,xlsx') + ->move('file/'.date('Y/m/d')) + ->required(); }); } diff --git a/app/Models/Log.php b/app/Models/Log.php new file mode 100644 index 0000000..3667819 --- /dev/null +++ b/app/Models/Log.php @@ -0,0 +1,10 @@ +