调整文章和广告

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);
+            });
+
         });
     }
 

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);
             });
         });
     }

packages/article/updates/AddnumToArticleTable.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateArticleTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('articles')) {
+            Schema::table('articles', function (Blueprint $table) {
+                $table->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']);
+    }
+};

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);
             });
         });
     }

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);
             });
         });
     }