fixed#gitee#I3J1IL

catch/permissions/controller/Role.php

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

catch/permissions/model/Roles.php

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

catch/permissions/tables/Department.php

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

catch/permissions/tables/forms/Permission.php

@@ -17,14 +17,16 @@ class Permission extends Form
                     ->select()->toTree()
             )->col(12)->props(self::props('permission_name', 'id', [
                 'checkStrictly' => true
-            ]))->style(['width' => '100%']),
+            ]))->filterable(true)->clearable(true)->style(['width' => '100%']),
 
             self::radio('type', '菜单类型')
                 ->button()
                 ->value(1)
                 ->options(
                     self::options()->add('菜单', 1)->add('按钮', 2)->render()
-                )->appendControl(1, [
+                )->appendControl(
+                   1,
+                       [
                             self::input('permission_name', '菜单名称')->required()->col(12),
                             self::input('permission_mark', '权限标识')->required()->col(12),
 
@@ -65,8 +67,10 @@ class Permission extends Form
                             self::radio('hidden', 'Hidden')->value(1)->options(
                                 self::options()->add('显示', 1)->add('隐藏', 2)->render()
                             )->col(12)
-                ])
-                 ->appendControl(2, [
+                       ]
+                )
+                 ->appendControl( 2,
+                        [
                              self::select('permission_name', '菜单名称')
                                  ->allowCreate(true)
                                  ->filterable(true)
@@ -90,7 +94,8 @@ class Permission extends Form
                                  )
                                  ->required()->col(12),
                              self::number('sort', '排序')->value(1)->col(12),
-                 ])->col(12)
+                        ]
+                 )->col(12)
         ];
     }
 

catch/permissions/tables/forms/Role.php

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

catch/permissions/tables/forms/User.php

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