Browse Source

菜单列表返回优化

master
wanghongjun 1 month ago
parent
commit
c49bf01f16
  1. 6
      app/Http/Middleware/CheckPermission.php
  2. 2
      app/Services/AdminMenuService.php
  3. 30
      database/seeders/AdminMenuSeeder.php

6
app/Http/Middleware/CheckPermission.php

@ -43,8 +43,8 @@ class CheckPermission
*/ */
protected function passedOrNot($action, $uriArr): bool protected function passedOrNot($action, $uriArr): bool
{ {
$characters = '/api/admin/'; $search = '/api/admin/';
$action = ltrim($action, $characters); $action = str_replace($search, '', $action);
if (in_array($action, $uriArr)) { if (in_array($action, $uriArr)) {
return false; return false;
@ -56,7 +56,7 @@ class CheckPermission
$newAction = $actionArr[0] ?? ''; $newAction = $actionArr[0] ?? '';
// 特殊 // 特殊
if (in_array($newAction, ['logout', 'me'])) { if (in_array($newAction, ['logout', 'me', 'menu'])) {
return false; return false;
} }

2
app/Services/AdminMenuService.php

@ -89,7 +89,7 @@ final class AdminMenuService
if (!$menus_id) { if (!$menus_id) {
return []; return [];
} }
return $this->getMenuTreeList($menus_id); return $this->getMenuTreeList($menus_id, 1);
} }
/** /**

30
database/seeders/AdminMenuSeeder.php

@ -103,9 +103,9 @@ class AdminMenuSeeder extends Seeder
], ],
[ [
'id' => 9, 'id' => 9,
'parent_id' => 0, 'parent_id' => 8,
'order' => 0, 'order' => 0,
'title' => '角色管理', 'title' => '用户列表',
'icon' => '', 'icon' => '',
'uri' => '', 'uri' => '',
'show' => 1, 'show' => 1,
@ -115,6 +115,16 @@ class AdminMenuSeeder extends Seeder
'id' => 10, 'id' => 10,
'parent_id' => 8, 'parent_id' => 8,
'order' => 0, 'order' => 0,
'title' => '角色管理',
'icon' => '',
'uri' => '',
'show' => 1,
'created_at' => $not_datetime
],
[
'id' => 11,
'parent_id' => 9,
'order' => 0,
'title' => '只读', 'title' => '只读',
'icon' => '', 'icon' => '',
'uri' => 'users.index', 'uri' => 'users.index',
@ -122,8 +132,8 @@ class AdminMenuSeeder extends Seeder
'created_at' => $not_datetime 'created_at' => $not_datetime
], ],
[ [
'id' => 11, 'id' => 12,
'parent_id' => 8, 'parent_id' => 9,
'order' => 0, 'order' => 0,
'title' => '查看', 'title' => '查看',
'icon' => '', 'icon' => '',
@ -132,8 +142,8 @@ class AdminMenuSeeder extends Seeder
'created_at' => $not_datetime 'created_at' => $not_datetime
], ],
[ [
'id' => 12, 'id' => 13,
'parent_id' => 8, 'parent_id' => 9,
'order' => 0, 'order' => 0,
'title' => '添加', 'title' => '添加',
'icon' => '', 'icon' => '',
@ -142,8 +152,8 @@ class AdminMenuSeeder extends Seeder
'created_at' => $not_datetime 'created_at' => $not_datetime
], ],
[ [
'id' => 13, 'id' => 14,
'parent_id' => 8, 'parent_id' => 9,
'order' => 0, 'order' => 0,
'title' => '编辑', 'title' => '编辑',
'icon' => '', 'icon' => '',
@ -152,8 +162,8 @@ class AdminMenuSeeder extends Seeder
'created_at' => $not_datetime 'created_at' => $not_datetime
], ],
[ [
'id' => 14, 'id' => 15,
'parent_id' => 8, 'parent_id' => 9,
'order' => 0, 'order' => 0,
'title' => '删除', 'title' => '删除',
'icon' => '', 'icon' => '',

Loading…
Cancel
Save