0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed#gitee#I3J1IL

Browse Source
This commit is contained in:
JaguarJack 2021-04-18 07:45:02 +08:00
parent 898ffbc822
commit be91cfbc4f
6 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catch/permissions/controller/Role.php
View File

@ -21,7 +21,7 @@ class Role extends CatchController
/** /**
* *
* @time 2019年12月09日 * @time 2019年12月09日
* @return string * @return string|Json
*/ */
public function index() public function index()
{ {

2
catch/permissions/model/Roles.php
View File

@ -41,7 +41,7 @@ class Roles extends CatchModel
->each(function (&$item){ ->each(function (&$item){
$permissions = $item->permissions->column('id'); $permissions = $item->permissions->column('id');
unset($item['permissions']); unset($item['permissions']);
$item['permissions'] = $permissions; $item['_permissions'] = $permissions;
$departments = $item->departments->column('id'); $departments = $item->departments->column('id');
unset($item['departments']); unset($item['departments']);

2
catch/permissions/tables/Department.php
View File

@ -19,7 +19,7 @@ class Department extends CatchTable
protected function table(): array protected function table(): array
{ {
// TODO: Implement table() method. // TODO: Implement table() method.
return $this->getTable('user')->header([ return $this->getTable('department')->header([
HeaderItem::label('部门名称')->prop('department_name'), HeaderItem::label('部门名称')->prop('department_name'),
HeaderItem::label('排序')->prop('sort')->withEditNumberComponent(), HeaderItem::label('排序')->prop('sort')->withEditNumberComponent(),
HeaderItem::label('状态')->prop('status')->withSwitchComponent(), HeaderItem::label('状态')->prop('status')->withSwitchComponent(),

127
catch/permissions/tables/forms/Permission.php
View File

@ -17,80 +17,85 @@ class Permission extends Form
->select()->toTree() ->select()->toTree()
)->col(12)->props(self::props('permission_name', 'id', [ )->col(12)->props(self::props('permission_name', 'id', [
'checkStrictly' => true 'checkStrictly' => true
]))->style(['width' => '100%']), ]))->filterable(true)->clearable(true)->style(['width' => '100%']),
self::radio('type', '菜单类型') self::radio('type', '菜单类型')
->button() ->button()
->value(1) ->value(1)
->options( ->options(
self::options()->add('菜单', 1)->add('按钮', 2)->render() self::options()->add('菜单', 1)->add('按钮', 2)->render()
)->appendControl(1, [ )->appendControl(
self::input('permission_name', '菜单名称')->required()->col(12), 1,
self::input('permission_mark', '权限标识')->required()->col(12), [
self::input('permission_name', '菜单名称')->required()->col(12),
self::input('permission_mark', '权限标识')->required()->col(12),
self::select('module', '模块') self::select('module', '模块')
->required() ->required()
->style(['width' => '100%']) ->style(['width' => '100%'])
->allowCreate(true) ->allowCreate(true)
->filterable(true) ->filterable(true)
->clearable(true) ->clearable(true)
->col(12) ->col(12)
->options($this->getModules()), ->options($this->getModules()),
self::input('icon', '菜单图标') self::input('icon', '菜单图标')
->col(12) ->col(12)
->style(['width' => '100%']) ->style(['width' => '100%'])
->clearable(true), ->clearable(true),
self::input('route', '菜单Path')->col(12), self::input('route', '菜单Path')->col(12),
self::cascader('component', '组件') self::cascader('component', '组件')
->col(12) ->col(12)
->options([]) ->options([])
->style(['width' => '100%']) ->style(['width' => '100%'])
->showAllLevels(false), ->showAllLevels(false),
self::input('redirect', 'Redirect')->col(12), self::input('redirect', 'Redirect')->col(12),
self::number('sort', '排序')->value(1)->col(12), self::number('sort', '排序')->value(1)->col(12),
self::radio('keepalive', 'Keepalive') self::radio('keepalive', 'Keepalive')
->value(1) ->value(1)
->col(12) ->col(12)
->options( ->options(
self::options()->add('启用', 1) self::options()->add('启用', 1)
->add('禁用', 2) ->add('禁用', 2)
->render() ->render()
), ),
self::radio('hidden', 'Hidden')->value(1)->options( self::radio('hidden', 'Hidden')->value(1)->options(
self::options()->add('显示', 1)->add('隐藏', 2)->render() self::options()->add('显示', 1)->add('隐藏', 2)->render()
)->col(12) )->col(12)
]) ]
->appendControl(2, [ )
self::select('permission_name', '菜单名称') ->appendControl( 2,
->allowCreate(true) [
->filterable(true) self::select('permission_name', '菜单名称')
->options( ->allowCreate(true)
self::options()->add('列表', '列表') ->filterable(true)
->add('创建', '创建') ->options(
->add('更新', '更新')->add('读取', '读取') self::options()->add('列表', '列表')
->add('删除', '删除')->add('禁用/启用', '禁用/启用') ->add('创建', '创建')
->add('导出', '导出')->add('导入', '导入')->render() ->add('更新', '更新')->add('读取', '读取')
) ->add('删除', '删除')->add('禁用/启用', '禁用/启用')
->required()->style(['width' => '100%'])->col(12), ->add('导出', '导出')->add('导入', '导入')->render()
self::select('permission_mark', '权限标识') )
->allowCreate(true) ->required()->style(['width' => '100%'])->col(12),
->filterable(true) self::select('permission_mark', '权限标识')
->options( ->allowCreate(true)
self::options()->add('index', 'index') ->filterable(true)
->add('save', 'save') ->options(
->add('update', 'update')->add('read', 'read') self::options()->add('index', 'index')
->add('delete', 'delete')->add('disable', 'disable') ->add('save', 'save')
->add('export', 'export')->add('import', 'import')->render() ->add('update', 'update')->add('read', 'read')
) ->add('delete', 'delete')->add('disable', 'disable')
->required()->col(12), ->add('export', 'export')->add('import', 'import')->render()
self::number('sort', '排序')->value(1)->col(12), )
])->col(12) ->required()->col(12),
self::number('sort', '排序')->value(1)->col(12),
]
)->col(12)
]; ];
} }

2
catch/permissions/tables/forms/Role.php
View File

@ -32,7 +32,7 @@ class Role extends Form
self::textarea('description', '角色描述') self::textarea('description', '角色描述')
->clearable(true)->placeholder('请填写角色描述'), ->clearable(true)->placeholder('请填写角色描述'),
self::tree('permissions', '角色权限', []) self::tree('_permissions', '角色权限', [])
->props(self::props('permission_name', 'id', [], ->props(self::props('permission_name', 'id', [],
Permissions::field(['id', 'parent_id', 'permission_name'])->select()->toTree() Permissions::field(['id', 'parent_id', 'permission_name'])->select()->toTree()
)) ))

2
catch/permissions/tables/forms/User.php
View File

@ -35,7 +35,7 @@ class User extends Form
self::tree('roles', '角色', []) self::tree('roles', '角色', [])
->props(self::props('role_name', 'id', [], Roles::field(['id', 'parent_id', 'role_name'])->select()->toTree())) ->props(self::props('role_name', 'id', [], Roles::field(['id', 'parent_id', 'role_name'])->select()->toTree()))
->required() ->required(),
]; ];
} }