From 68d7a26cf67451263bada5fa4faf3420e0dafa37 Mon Sep 17 00:00:00 2001 From: xuanchen <122383162@qq.com> Date: Mon, 5 Sep 2022 14:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Advert/IndexController.php | 11 ++----- .../Controllers/Article/ArticleController.php | 21 +++++++------- .../Controllers/Article/PictureController.php | 29 ++++++++++--------- .../Controllers/Category/IndexController.php | 11 ++++--- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/Admin/Controllers/Advert/IndexController.php b/app/Admin/Controllers/Advert/IndexController.php index 6e6f79b..00a6b18 100644 --- a/app/Admin/Controllers/Advert/IndexController.php +++ b/app/Admin/Controllers/Advert/IndexController.php @@ -43,6 +43,7 @@ class IndexController extends AdminController /** * Make a form builder. + * * @return Form */ protected function form() @@ -59,14 +60,8 @@ class IndexController extends AdminController 'min' => '必须选择所属分类', ]); $form->image('cover', '封面图片') - ->rules(function ($form) { - if ($form->model()->cover != []) { - return 'nullable|image'; - } else { - return 'required'; - } - }) - ->move('images/' . date('Y/m/d')) + ->rules('image|mimes:jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) ->removable() ->uniqueName(); $form->text('url', '链接地址'); diff --git a/app/Admin/Controllers/Article/ArticleController.php b/app/Admin/Controllers/Article/ArticleController.php index 923622e..a7ca2e4 100644 --- a/app/Admin/Controllers/Article/ArticleController.php +++ b/app/Admin/Controllers/Article/ArticleController.php @@ -49,19 +49,20 @@ class ArticleController extends AdminController $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->text('keywords', '关键词')->rules('nullable'); $form->textarea('description', '内容简介')->rules('max:350'); $form->image('cover', '封面') - ->move('images/' . date('Y/m/d')) - ->removable() - ->uniqueName(); + ->rules('image|mimes:jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) + ->removable() + ->uniqueName(); $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']); $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先'); $states = [ diff --git a/app/Admin/Controllers/Article/PictureController.php b/app/Admin/Controllers/Article/PictureController.php index 46a22d9..9b07ca4 100644 --- a/app/Admin/Controllers/Article/PictureController.php +++ b/app/Admin/Controllers/Article/PictureController.php @@ -23,10 +23,10 @@ class PictureController extends AdminController }); $filter->column(1 / 2, function ($filter) { $filter->like('category.id', '所属分类') - ->select(Category::selectOptions(function ($model) { - return $model->where('status', 1) - ->whereIn('type', [Category::TYPE_PICTURE]); - }, '所有分类')); + ->select(Category::selectOptions(function ($model) { + return $model->where('status', 1) + ->whereIn('type', [Category::TYPE_PICTURE]); + }, '所有分类')); }); $filter->disableIdFilter(); @@ -50,17 +50,18 @@ class PictureController extends AdminController $form->text('title', '文章标题')->rules('min:2'); $form->select('category_id', '所属分类') - ->options(Category::selectOptions(function ($model) { - return $model->whereIn('type', [Category::TYPE_PICTURE]); - }, '选择分类')) - ->rules('required|min:1', [ - 'required' => '必须选择所属分类', - 'min' => '必须选择所属分类', - ]); + ->options(Category::selectOptions(function ($model) { + return $model->whereIn('type', [Category::TYPE_PICTURE]); + }, '选择分类')) + ->rules('required|min:1', [ + 'required' => '必须选择所属分类', + 'min' => '必须选择所属分类', + ]); $form->multipleImage('pictures', '封面') - ->move('images/' . date('Y/m/d')) - ->removable() - ->uniqueName(); + ->rules('image|mimes:jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) + ->removable() + ->uniqueName(); $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先'); diff --git a/app/Admin/Controllers/Category/IndexController.php b/app/Admin/Controllers/Category/IndexController.php index 0eb1159..ad71e79 100644 --- a/app/Admin/Controllers/Category/IndexController.php +++ b/app/Admin/Controllers/Category/IndexController.php @@ -20,6 +20,7 @@ class IndexController extends AdminController /** * Index interface. + * * @return \Closure */ public function grid() @@ -33,8 +34,7 @@ class IndexController extends AdminController $form->select('parent_id', '上级分类') ->options(Category::selectOptions(function ($model) { return $model->where('status', 1); - }, '一级分类')) - ; + }, '一级分类')); $form->text('title', '分类名称')->rules('required'); $form->select('type', '分类类型') ->options(Category::TYPES) @@ -52,7 +52,8 @@ class IndexController extends AdminController $form->text('keywords', '关键词')->rules('nullable'); $form->image('cover', 'Logo') - ->move('images/' . date('Y/m/d')) + ->rules('image|mimes:jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) ->removable() ->uniqueName(); $form->number('order', '排序')->default(0); @@ -91,6 +92,7 @@ class IndexController extends AdminController /** * Make a form builder. + * * @return Form */ protected function form() @@ -115,7 +117,8 @@ class IndexController extends AdminController $form->textarea('description', '分类简介')->rows(4)->rules('nullable'); $form->text('keywords', '关键词')->rules('nullable'); $form->image('cover', 'Logo') - ->move('images/' . date('Y/m/d')) + ->rules('image|mimes:jpeg,jpg,png') + ->move('images/'.date('Y/m/d')) ->removable() ->uniqueName(); $form->number('order', '排序')->default(0)->help('正序优先');