From 9873a2156b7dae3790375bf6da4b5372e885a047 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Thu, 27 May 2021 08:55:09 +0800 Subject: [PATCH] update cms --- catch/cms/database/seeds/CmsMenusSeed.php | 282 ++++++++++++++++++++++ catch/cms/model/Banners.php | 2 +- catch/cms/model/events/BannersEvent.php | 6 +- catch/cms/tables/Banners.php | 1 + catch/cms/tables/forms/Banners.php | 6 +- 5 files changed, 292 insertions(+), 5 deletions(-) diff --git a/catch/cms/database/seeds/CmsMenusSeed.php b/catch/cms/database/seeds/CmsMenusSeed.php index 5374fa3..da9f8d4 100644 --- a/catch/cms/database/seeds/CmsMenusSeed.php +++ b/catch/cms/database/seeds/CmsMenusSeed.php @@ -612,6 +612,288 @@ class CmsMenusSeed extends Seeder ), ), ), + 6 => + array ( + 'id' => 211, + 'permission_name' => '用户管理', + 'parent_id' => 140, + 'level' => '', + 'route' => '/cms/users', + 'icon' => 'el-icon-user-solid', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'users', + 'component' => 'cmsUsers', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 1, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622020257, + 'updated_at' => 1622020418, + 'deleted_at' => 0, + 'children' => + array ( + 0 => + array ( + 'id' => 212, + 'permission_name' => '列表', + 'parent_id' => 211, + 'level' => '140-211', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'users@index', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622020257, + 'updated_at' => 1622020418, + 'deleted_at' => 0, + ), + 1 => + array ( + 'id' => 213, + 'permission_name' => '保存', + 'parent_id' => 211, + 'level' => '140-211', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'users@save', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622020257, + 'updated_at' => 1622020418, + 'deleted_at' => 0, + ), + 2 => + array ( + 'id' => 214, + 'permission_name' => '更新', + 'parent_id' => 211, + 'level' => '140-211', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'users@update', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622020257, + 'updated_at' => 1622020418, + 'deleted_at' => 0, + ), + 3 => + array ( + 'id' => 215, + 'permission_name' => '删除', + 'parent_id' => 211, + 'level' => '140-211', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'users@delete', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622020257, + 'updated_at' => 1622020418, + 'deleted_at' => 0, + ), + ), + ), + 7 => + array ( + 'id' => 216, + 'permission_name' => '评论管理', + 'parent_id' => 140, + 'level' => '', + 'route' => '/cms/comments', + 'icon' => 'el-icon-s-help', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'comments', + 'component' => 'cmsComments', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 1, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622022327, + 'updated_at' => 1622022327, + 'deleted_at' => 0, + 'children' => + array ( + 0 => + array ( + 'id' => 217, + 'permission_name' => '列表', + 'parent_id' => 216, + 'level' => '140-216', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'comments@index', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622022327, + 'updated_at' => 1622022327, + 'deleted_at' => 0, + ), + 1 => + array ( + 'id' => 220, + 'permission_name' => '删除', + 'parent_id' => 216, + 'level' => '140-216', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'comments@delete', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622022327, + 'updated_at' => 1622022327, + 'deleted_at' => 0, + ), + ), + ), + 8 => + array ( + 'id' => 221, + 'permission_name' => '轮播管理', + 'parent_id' => 140, + 'level' => '', + 'route' => '/cms/banners', + 'icon' => 'el-icon-picture-outline-round', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'banners', + 'component' => 'cmsBanners', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 1, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622073776, + 'updated_at' => 1622073776, + 'deleted_at' => 0, + 'children' => + array ( + 0 => + array ( + 'id' => 222, + 'permission_name' => '列表', + 'parent_id' => 221, + 'level' => '140-221', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'banners@index', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622073776, + 'updated_at' => 1622073776, + 'deleted_at' => 0, + ), + 1 => + array ( + 'id' => 223, + 'permission_name' => '保存', + 'parent_id' => 221, + 'level' => '140-221', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'banners@save', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622073776, + 'updated_at' => 1622073776, + 'deleted_at' => 0, + ), + 2 => + array ( + 'id' => 224, + 'permission_name' => '更新', + 'parent_id' => 221, + 'level' => '140-221', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'banners@update', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622073776, + 'updated_at' => 1622073776, + 'deleted_at' => 0, + ), + 3 => + array ( + 'id' => 225, + 'permission_name' => '删除', + 'parent_id' => 221, + 'level' => '140-221', + 'route' => '', + 'icon' => '', + 'module' => 'cms', + 'creator_id' => 1, + 'permission_mark' => 'banners@delete', + 'component' => '', + 'redirect' => '', + 'keepalive' => 1, + 'type' => 2, + 'hidden' => 1, + 'sort' => 1, + 'created_at' => 1622073776, + 'updated_at' => 1622073776, + 'deleted_at' => 0, + ), + ), + ), ), ), ); diff --git a/catch/cms/model/Banners.php b/catch/cms/model/Banners.php index 2ffd9e0..4c9cdbd 100644 --- a/catch/cms/model/Banners.php +++ b/catch/cms/model/Banners.php @@ -46,7 +46,7 @@ class Banners extends BaseModel { return $this->catchSearch() ->field($this->aliasField('*')) - ->catchJoin(Category::class, 'id', 'category_id', ['name as category']) + ->catchLeftJoin(Category::class, 'id', 'category_id', ['name as category']) ->catchOrder() ->creator() ->paginate(); diff --git a/catch/cms/model/events/BannersEvent.php b/catch/cms/model/events/BannersEvent.php index 61d5458..d4b076f 100644 --- a/catch/cms/model/events/BannersEvent.php +++ b/catch/cms/model/events/BannersEvent.php @@ -43,7 +43,11 @@ trait BannersEvent $data = $model->getData(); if (isset($data['category_id'])) { - $model->category_id = $model->category_id[count($model->category_id) - 1]; + $model->category_id = is_array($model->category_id) ? + + (count($model->category_id) ? $model->category_id[count($model->category_id) - 1] : 0) + + : $model->category_id; } } } \ No newline at end of file diff --git a/catch/cms/tables/Banners.php b/catch/cms/tables/Banners.php index 2ab6b36..d8df941 100644 --- a/catch/cms/tables/Banners.php +++ b/catch/cms/tables/Banners.php @@ -35,6 +35,7 @@ class Banners extends CatchTable ->withActions([ Actions::create() ]) + ->withDialogWidth('40%') ->withBind() ->withApiRoute('cms/banners') ->render(); diff --git a/catch/cms/tables/forms/Banners.php b/catch/cms/tables/forms/Banners.php index 8447806..9c8ecef 100644 --- a/catch/cms/tables/forms/Banners.php +++ b/catch/cms/tables/forms/Banners.php @@ -21,10 +21,10 @@ class Banners extends Form 'props' => [ 'value' => 'id', 'label' => 'name', - 'checkStrictly' => true + 'checkStrictly' => true, + 'multiple' => false, ], - ])->style(['width' => '100%']) - ->required(), + ])->style(['width' => '100%']), self::input('title', '标题')->placeholder('请输入标题')->required(),