增加角色以及权限表单绑定菜单功能

config/admin.php

@@ -215,7 +215,6 @@ return [
             'auth/logout',
             'auth/setting',
         ],
-
     ],
 
     /*
@@ -234,6 +233,12 @@ return [
         // Whether enable menu bind to a permission.
         'bind_permission' => true,
 
+        // Whether enable role bind to menu.
+        'role_bind_menu' => true,
+
+        // Whether enable permission bind to menu.
+        'permission_bind_menu' => true,
+
         'default_icon' => 'feather icon-circle',
     ],
 

src/Console/stubs/config.stub

@@ -231,6 +231,12 @@ return [
         // Whether enable menu bind to a permission.
         'bind_permission' => true,
 
+        // Whether enable role bind to menu.
+        'role_bind_menu' => true,
+
+        // Whether enable permission bind to menu.
+        'permission_bind_menu' => true,
+
 		'default_icon' => 'feather icon-circle',
     ],
 

src/Http/Controllers/MenuController.php

@@ -46,6 +46,7 @@ class MenuController extends AdminController
                     if ($menuModel::withPermission()) {
                         $form->tree('permissions', trans('admin.permission'))
                             ->expand(false)
+                            ->treeState(false)
                             ->nodes((new $permissionModel())->allNodes());
                     }
 
@@ -136,6 +137,7 @@ class MenuController extends AdminController
             }
             if ($menuModel::withPermission()) {
                 $form->tree('permissions', trans('admin.permission'))
+                    ->treeState(false)
                     ->nodes(function () {
                         $permissionModel = config('admin.database.permissions_model');
 

src/Http/Controllers/PermissionController.php

@@ -79,7 +79,13 @@ class PermissionController extends AdminController
 
     public function form()
     {
-        return Form::make(new Permission(), function (Form $form) {
+        $with = [];
+
+        if ($bindMenu = config('admin.menu.permission_bind_menu', true)) {
+            $with[] = 'menus';
+        }
+
+        return Form::make(Permission::with($with), function (Form $form) use ($bindMenu) {
             $permissionTable = config('admin.database.permissions_table');
             $connection = config('admin.database.connection');
             $permissionModel = config('admin.database.permissions_model');
@@ -107,6 +113,25 @@ class PermissionController extends AdminController
             $form->tags('http_path', trans('admin.http.path'))
                 ->options($this->getRoutes());
 
+            if ($bindMenu) {
+                $form->tree('menus', trans('admin.menu'))
+                    ->treeState(false)
+                    ->setTitleColumn('title')
+                    ->nodes(function () {
+                        $model = config('admin.database.menu_model');
+                        $model = new $model();
+
+                        return $model->allNodes();
+                    })
+                    ->customFormat(function ($v) {
+                        if (! $v) {
+                            return [];
+                        }
+
+                        return array_column($v, 'id');
+                    });
+            }
+
             $form->display('created_at', trans('admin.created_at'));
             $form->display('updated_at', trans('admin.updated_at'));
 

src/Http/Controllers/RoleController.php

@@ -75,7 +75,13 @@ class RoleController extends AdminController
 
     public function form()
     {
-        return Form::make(Role::with(['permissions']), function (Form $form) {
+        $with = ['permissions'];
+
+        if ($bindMenu = config('admin.menu.role_bind_menu', true)) {
+            $with[] = 'menus';
+        }
+
+        return Form::make(Role::with($with), function (Form $form) use ($bindMenu) {
             $roleTable = config('admin.database.roles_table');
             $connection = config('admin.database.connection');
 
@@ -105,6 +111,25 @@ class RoleController extends AdminController
                     return array_column($v, 'id');
                 });
 
+            if ($bindMenu) {
+                $form->tree('menus', trans('admin.menu'))
+                    ->treeState(false)
+                    ->setTitleColumn('title')
+                    ->nodes(function () {
+                        $model = config('admin.database.menu_model');
+                        $model = new $model();
+
+                        return $model->allNodes();
+                    })
+                    ->customFormat(function ($v) {
+                        if (! $v) {
+                            return [];
+                        }
+
+                        return array_column($v, 'id');
+                    });
+            }
+
             $form->display('created_at', trans('admin.created_at'));
             $form->display('updated_at', trans('admin.updated_at'));
 

src/Models/Permission.php

@@ -65,6 +65,18 @@ class Permission extends Model implements Sortable
         return $this->belongsToMany($relatedModel, $pivotTable, 'permission_id', 'role_id');
     }
 
+    /**
+     * @return BelongsToMany
+     */
+    public function menus(): BelongsToMany
+    {
+        $pivotTable = config('admin.database.permission_menu_table');
+
+        $relatedModel = config('admin.database.menu_model');
+
+        return $this->belongsToMany($relatedModel, $pivotTable, 'permission_id', 'menu_id')->withTimestamps();
+    }
+
     /**
      * If request should pass through the current permission.
      *

src/Models/Role.php

@@ -64,6 +64,18 @@ class Role extends Model
         return $this->belongsToMany($relatedModel, $pivotTable, 'role_id', 'permission_id')->withTimestamps();
     }
 
+    /**
+     * @return BelongsToMany
+     */
+    public function menus(): BelongsToMany
+    {
+        $pivotTable = config('admin.database.role_menu_table');
+
+        $relatedModel = config('admin.database.menu_model');
+
+        return $this->belongsToMany($relatedModel, $pivotTable, 'role_id', 'menu_id')->withTimestamps();
+    }
+
     /**
      * Check user has permission.
      *