From 1481bb3a8bbcaaf30374edebf964c54dd071dfdc Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 10 Aug 2022 15:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E7=AB=A0=E5=92=8C?= =?UTF-8?q?=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ArticleCategoryController.php | 12 ++++++- .../Http/Controllers/ArticleController.php | 14 ++++++-- .../article/updates/AddnumToArticleTable.php | 33 +++++++++++++++++++ .../Http/Controllers/BannerAdController.php | 8 +++++ .../src/Http/Controllers/BannerController.php | 7 ++++ 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 packages/article/updates/AddnumToArticleTable.php diff --git a/packages/article/src/Http/Controllers/ArticleCategoryController.php b/packages/article/src/Http/Controllers/ArticleCategoryController.php index 8c7df45..6148a37 100644 --- a/packages/article/src/Http/Controllers/ArticleCategoryController.php +++ b/packages/article/src/Http/Controllers/ArticleCategoryController.php @@ -51,8 +51,18 @@ class ArticleCategoryController extends AdminController $grid->actions(function (Grid\Displayers\Actions $actions) { $actions->disableView(); $actions->disableEdit(); - $actions->quickEdit(!config('admin.articles.enable') || Admin::user()->can('dcat.admin.article_categories.edit')); + $actions->quickEdit(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.article_categories.edit')); + $actions->delete(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.article_categories.destroy')); }); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(); + $filter->expand(); + $filter->like('name')->width(3); + $filter->like('key')->width(3); + $filter->equal('parent_id', '上级分类')->select(ArticleCategory::selectOptions())->width(3); + }); + }); } diff --git a/packages/article/src/Http/Controllers/ArticleController.php b/packages/article/src/Http/Controllers/ArticleController.php index 821ec57..8f28e6a 100644 --- a/packages/article/src/Http/Controllers/ArticleController.php +++ b/packages/article/src/Http/Controllers/ArticleController.php @@ -34,6 +34,7 @@ class ArticleController extends AdminController $grid->column('like_nums'); $grid->column('read_nums'); $grid->column('sort')->editable(['mask' => '{alias:\'numeric\',min:0,max:999}']); + $grid->column('published_at'); $grid->column('is_enable')->if(function(){ return !config('admin.permission.enable') || Admin::user()->can('dcat.admin.articles.edit'); })->then(function (GridColumn $column) { @@ -49,7 +50,7 @@ class ArticleController extends AdminController $column->bool(); }); - $grid->column('remarks'); + // $grid->column('remarks'); $grid->model()->orderBy('sort', 'desc'); $grid->model()->orderBy('created_at', 'desc'); @@ -62,7 +63,16 @@ class ArticleController extends AdminController $grid->actions(function (Grid\Displayers\Actions $actions) { $actions->disableView(); $actions->disableEdit(); - $actions->quickEdit(!config('admin.articles.enable') || Admin::user()->can('dcat.admin.articles.edit')); + $actions->quickEdit(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.articles.edit')); + $actions->delete(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.articles.destroy')); + }); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(); + $filter->expand(); + $filter->equal('category_id', '分类')->select(ArticleCategory::selectOptions())->width(3); + $filter->like('title')->width(3); + $filter->between('published_at')->datetime()->width(7); }); }); } diff --git a/packages/article/updates/AddnumToArticleTable.php b/packages/article/updates/AddnumToArticleTable.php new file mode 100644 index 0000000..cfbc49c --- /dev/null +++ b/packages/article/updates/AddnumToArticleTable.php @@ -0,0 +1,33 @@ +unsignedBigInteger('like_nums')->default(0)->comment('点赞数'); + $table->unsignedBigInteger('read_nums')->default(0)->comment('阅读数'); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropColumns(['like_nums', 'read_nums']); + } +}; diff --git a/packages/banner/src/Http/Controllers/BannerAdController.php b/packages/banner/src/Http/Controllers/BannerAdController.php index 67590d8..38c5b64 100644 --- a/packages/banner/src/Http/Controllers/BannerAdController.php +++ b/packages/banner/src/Http/Controllers/BannerAdController.php @@ -54,6 +54,14 @@ class BannerAdController extends AdminController $actions->disableView(); $actions->disableEdit(); $actions->quickEdit(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.banner_ads.edit')); + $actions->delete(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.banner_ads.destroy')); + }); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(); + $filter->expand(); + $filter->like('name')->width(3); + $filter->like('key')->width(3); }); }); } diff --git a/packages/banner/src/Http/Controllers/BannerController.php b/packages/banner/src/Http/Controllers/BannerController.php index 2ee00be..e236cfe 100644 --- a/packages/banner/src/Http/Controllers/BannerController.php +++ b/packages/banner/src/Http/Controllers/BannerController.php @@ -85,6 +85,13 @@ class BannerController extends AdminController $actions->disableView(); $actions->disableEdit(); $actions->quickEdit(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.banners.edit')); + $actions->delete(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.banners.destroy')); + }); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(); + $filter->expand(); + $filter->like('name')->width(3); }); }); }