From 0e3656c7cc15df9828584796cd39c75b3131dd5c Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Wed, 2 Sep 2020 11:20:10 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=92=8C=E6=A8=A1=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/20200830031139_update_permissions.php | 10 +++------- catch/permissions/model/Permissions.php | 2 -- catch/permissions/model/Roles.php | 1 + 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/catch/permissions/database/migrations/20200830031139_update_permissions.php b/catch/permissions/database/migrations/20200830031139_update_permissions.php index 8998d63..23db89d 100644 --- a/catch/permissions/database/migrations/20200830031139_update_permissions.php +++ b/catch/permissions/database/migrations/20200830031139_update_permissions.php @@ -31,13 +31,9 @@ class UpdatePermissions extends Migrator if ($this->hasTable('permissions')) { $table = $this->table('permissions'); - $table->renameColumn('method', 'hidden_children_in_menu', 'status') - ->addColumn('hidden', 'integer', [ - 'limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, - 'default' => 1, - 'comment' => '是否在侧边栏隐藏 1 显示 2 隐藏', - 'after' => 'redirect']) - ->update(); + $table->removeColumn('method') + ->removeColumn('hide_children_in_menu') + ->update(); } } } diff --git a/catch/permissions/model/Permissions.php b/catch/permissions/model/Permissions.php index e038200..edd7834 100644 --- a/catch/permissions/model/Permissions.php +++ b/catch/permissions/model/Permissions.php @@ -19,12 +19,10 @@ class Permissions extends CatchModel 'component', // 组件 'redirect', 'keepalive', - 'hide_children_in_menu', 'creator_id', 'status', 'module', // 模块 'route', // 路由 - 'method', // 请求方法 'permission_mark', // 权限标识 'type', // 1 菜单 2 按钮 'sort', // 排序字段 diff --git a/catch/permissions/model/Roles.php b/catch/permissions/model/Roles.php index 8c59b10..85350d3 100644 --- a/catch/permissions/model/Roles.php +++ b/catch/permissions/model/Roles.php @@ -21,6 +21,7 @@ class Roles extends CatchModel protected $field = [ 'id', // 'role_name', // 角色名 + 'identify', // 身份标识 'parent_id', // 父级ID 'creator_id', // 创建者 'data_range', // 数据范围