From 27155f744d5227ad87f54652f5b016641957bda5 Mon Sep 17 00:00:00 2001 From: liaodeity Date: Thu, 6 May 2021 10:58:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BE=BD=E7=AB=A0=E9=A2=9C=E8=89=B2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Enums/BaseEnum.php | 28 +++++++++++++++---- app/Enums/ColorEnum.php | 25 +++++++++++++++++ app/Enums/MenuStatusEnum.php | 4 +++ app/Enums/MenuTypeEnum.php | 4 +++ app/Enums/StatusEnum.php | 6 +++- app/Http/Controllers/Admin/MenuController.php | 4 ++- resources/views/admin/menu/index.blade.php | 13 +-------- 7 files changed, 65 insertions(+), 19 deletions(-) create mode 100644 app/Enums/ColorEnum.php diff --git a/app/Enums/BaseEnum.php b/app/Enums/BaseEnum.php index 90162c3..60297dc 100644 --- a/app/Enums/BaseEnum.php +++ b/app/Enums/BaseEnum.php @@ -20,6 +20,8 @@ abstract class BaseEnum protected static $ATTRS = []; /*名称*/ protected static $VALUES = []; + /*颜色*/ + protected static $COLORS = []; public static function toName ($value) { @@ -51,11 +53,6 @@ abstract class BaseEnum return static::$ATTRS; } - public static function toLabel ($value) - { - return isset(static::$ATTRS[ $value ]) ? static::$ATTRS[ $value ] : null; - } - public static function exists ($value) { foreach (static::values () as $item) { @@ -80,4 +77,25 @@ abstract class BaseEnum return $data; } + + /** + * 获取带颜色标签 + * @param $value + * @return string + */ + public static function toHtml ($value) + { + $defaultColor = ColorEnum::INFO; + $label = self::toLabel ($value); + $color = array_key_exists ($value, static::$COLORS) ? static::$COLORS[ $value ] : $defaultColor; + if(!$color) + $color = $defaultColor; + + return '' . $label . ''; + } + + public static function toLabel ($value) + { + return isset(static::$ATTRS[ $value ]) ? static::$ATTRS[ $value ] : null; + } } diff --git a/app/Enums/ColorEnum.php b/app/Enums/ColorEnum.php new file mode 100644 index 0000000..5b48685 --- /dev/null +++ b/app/Enums/ColorEnum.php @@ -0,0 +1,25 @@ + +|----------------------------------------------------------------------------------------------------------- +*/ + +namespace App\Enums; + + +class ColorEnum extends BaseEnum +{ + const PRIMARY = '#1E9FFF';//主要 + const SECONDARY = '#009688';//次要 + const SUCCESS = '#5FB878';//成功 + const DANGER = '#FFB800';//危险 + const WARNING = '#FF5722';//警告 + const INFO = '#C2C2C2';//基本 +} diff --git a/app/Enums/MenuStatusEnum.php b/app/Enums/MenuStatusEnum.php index 985d640..4b150fc 100644 --- a/app/Enums/MenuStatusEnum.php +++ b/app/Enums/MenuStatusEnum.php @@ -22,4 +22,8 @@ class MenuStatusEnum extends BaseEnum self::SHOW => '显示', self::HIDE => '隐藏' ]; + protected static $COLORS = [ + self::SHOW => ColorEnum::SUCCESS, + self::HIDE => ColorEnum::INFO + ]; } diff --git a/app/Enums/MenuTypeEnum.php b/app/Enums/MenuTypeEnum.php index 1f70b50..ff2a8a2 100644 --- a/app/Enums/MenuTypeEnum.php +++ b/app/Enums/MenuTypeEnum.php @@ -22,4 +22,8 @@ class MenuTypeEnum extends BaseEnum self::MENU => '菜单', self::BTN => '按钮' ]; + protected static $COLORS = [ + self::MENU => ColorEnum::PRIMARY, + self::BTN => ColorEnum::SECONDARY + ]; } diff --git a/app/Enums/StatusEnum.php b/app/Enums/StatusEnum.php index b2ac564..505b985 100644 --- a/app/Enums/StatusEnum.php +++ b/app/Enums/StatusEnum.php @@ -19,8 +19,12 @@ class StatusEnum extends BaseEnum const NORMAL = 1;//正常 const HIDE = 0;//隐藏 - protected static $ATTRS = [ + protected static $ATTRS = [ self::NORMAL => '正常', self::HIDE => '隐藏', ]; + protected static $COLORS = [ + self::NORMAL => ColorEnum::SUCCESS, + self::HIDE => ColorEnum::INFO + ]; } diff --git a/app/Http/Controllers/Admin/MenuController.php b/app/Http/Controllers/Admin/MenuController.php index 5fce4e9..24b89ce 100644 --- a/app/Http/Controllers/Admin/MenuController.php +++ b/app/Http/Controllers/Admin/MenuController.php @@ -14,6 +14,7 @@ namespace App\Http\Controllers\Admin; use App\Enums\MenuStatusEnum; +use App\Enums\MenuTypeEnum; use App\Http\Controllers\Controller; use App\Libs\QueryWhere; use App\Models\Log; @@ -64,7 +65,8 @@ class MenuController extends Controller //进行了搜索，不进行上下级显示 $list[ $key ]['pid'] = 0; } - $list[$key]['status'] = MenuStatusEnum::toLabel ($item->status); + $list[$key]['status'] = MenuStatusEnum::toHtml ($item->status); + $list[$key]['type'] = MenuTypeEnum::toHtml ($item->type); $list[ $key ]['_view_auth'] = true; $list[ $key ]['_edit_url'] = url ('admin/menu/' . $item->id . '/edit'); } diff --git a/resources/views/admin/menu/index.blade.php b/resources/views/admin/menu/index.blade.php index b05b4b2..5421561 100644 --- a/resources/views/admin/menu/index.blade.php +++ b/resources/views/admin/menu/index.blade.php @@ -134,18 +134,7 @@ {field: 'auth_name', title: '权限标识'}, {field: 'route_url', title: '菜单url'}, {field: 'sort', width: 80, align: 'center', title: '排序号'}, - { - field: 'isMenu', width: 80, align: 'center', templet: function (d) { - if (d.type == 2) { - return '按钮'; - } - if (d.pid == 0) { - return '目录'; - } else { - return '菜单'; - } - }, title: '类型' - }, + {field: 'type', width: 80, align: 'center', title: '类型'}, {field: 'status', width: 80, align: 'center', title: '状态'}, {templet: '#operateTableBar', width: 120, align: 'center', title: '操作'} ]], -- Gitee From db502567aad6da8ad1c5ae7b5bea82a73371b1a9 Mon Sep 17 00:00:00 2001 From: liaodeity Date: Thu, 6 May 2021 11:01:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/admin/menu/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/menu/index.blade.php b/resources/views/admin/menu/index.blade.php index 5421561..3a839d8 100644 --- a/resources/views/admin/menu/index.blade.php +++ b/resources/views/admin/menu/index.blade.php @@ -132,7 +132,7 @@ {type: 'numbers'}, {field: 'title', minWidth: 200, title: '菜单名称'}, {field: 'auth_name', title: '权限标识'}, - {field: 'route_url', title: '菜单url'}, + {field: 'href', title: '路由地址'}, {field: 'sort', width: 80, align: 'center', title: '排序号'}, {field: 'type', width: 80, align: 'center', title: '类型'}, {field: 'status', width: 80, align: 'center', title: '状态'}, -- Gitee