wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed plugin pagination and sidebar

This commit is contained in:
Edward Yang 2023-03-10 14:27:54 +08:00
parent e907a1adae
commit d84393b237
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beike/Admin/Http/Controllers/MarketingController.php
View File

@ -26,7 +26,7 @@ class MarketingController
$filters = [
'type' => $request->get('type'),
'keyword' => $request->get('keyword'),
'page' => $request->get('page'),
'page' => $request->get('page'),
];
$plugins = MarketingService::getInstance()->getList($filters);
$data = [

33
beike/Admin/View/Components/Header.php
View File

@ -32,18 +32,31 @@ class Header extends Component
$preparedMenus = $this->prepareMenus();
foreach ($preparedMenus as $menu) {
if ($menu['code']) {
$routes = [];
$sideMenuRoutes = $sidebar->{"get{$menu['code']}SubRoutes"}();
foreach ($sideMenuRoutes as $route) {
$route_first = explode('.', $route['route'])[0] ?? '';
$routes[] = 'admin.' . $route['route'];
$routes[] = 'admin.' . $route_first . '.edit';
$routes[] = 'admin.' . $route_first . '.show';
$menuCode = $menu['code'] ?? '';
if ($menuCode) {
$routes = [];
$subRoutesMethod = "get{$menu['code']}SubRoutes";
if (method_exists($sidebar, $subRoutesMethod)) {
$sideMenuRoutes = $sidebar->{"get{$menu['code']}SubRoutes"}();
foreach ($sideMenuRoutes as $route) {
$routeFirst = explode('.', $route['route'])[0] ?? '';
$routes[] = 'admin.' . $route['route'];
$routes[] = 'admin.' . $routeFirst . '.edit';
$routes[] = 'admin.' . $routeFirst . '.show';
}
}
$is_route = equal_route($routes);
$data = [
'menu_code' => $menuCode,
'routes' => $routes,
];
$filterRoutes = hook_filter('admin.components.header.routes', $data);
$routes = $filterRoutes['routes'] ?? [];
if (empty($routes)) {
$is_route = equal_route('admin.' . $menu['route']);
} else {
$is_route = equal_route($routes);
}
} else {
$is_route = equal_route('admin.' . $menu['route']);
}