banner_ad

packages/article/src/Http/Controllers/ArticleController.php

@@ -101,7 +101,7 @@ class ArticleController extends AdminController
                 ->removable(false)
                 ->autoUpload()->autoSave(false);
 
-            $form->datetime('published_at');
+            $form->datetime('published_at')->default(now())->required();
             $form->switch('is_enable')->default(0);
             $form->switch('is_recommend')->default(0);
             $form->number('sort')->min(0)->default(0);

packages/banner/src/Http/Admin/BannerAdController.php

@@ -18,7 +18,11 @@ class BannerAdController extends AdminController
 
     public function list(Request $request)
     {
-        $query = BannerAd::filter($request->all());
+        $query = BannerAd::query();
+
+        if ($request->filled('q')) {
+            $query->where('name', 'like', '%'.$request->input('q').'%');
+        }
 
         $query->select(['id', 'name as text', 'width', 'height']);
 
@@ -70,7 +74,11 @@ class BannerAdController extends AdminController
     {
         return Form::make(new BannerAd(), function (Form $form) {
             $form->text('name')->required();
-            $form->text('key')->required()->rules([Rule::unique((new BannerAd())->getTable())]);
+            $unqiue = Rule::unique((new BannerAd())->getTable());
+            if ($form->isEditing()) {
+                $unqiue->ignore($form->model()->id);
+            }
+            $form->text('key')->required()->rules([$unqiue]);
             $form->number('width')->min(0);
             $form->number('height')->min(0);
             $form->switch('is_enable')->default(1);

packages/keywords/src/Http/Admin/KeywordsController.php

@@ -2,6 +2,7 @@
 
 namespace Peidikeji\Keywords\Http\Admin;
 
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
@@ -30,12 +31,16 @@ class KeywordsController extends AdminController
 
     protected function grid()
     {
-        return Grid::make(new Keywords(), function ($grid) {
+        return Grid::make(new Keywords(), function (Grid $grid) {
             $grid->column('name')->tree();
             $grid->column('key');
             $grid->column('value');
 
             $grid->enableDialogCreate();
+            $user = Admin::user();
+            $grid->showCreateButton($user->can('dcat.admin.keywords.create'));
+            $grid->showEditButton($user->can('dcat.admin.keywords.edit'));
+            $grid->showDeleteButton($user->can('dcat.admin.keywords.destroy'));
 
             $grid->quickSearch(['name', 'type_key', 'key']);
         });