Browse Source

修复当取消路由前缀时权限管理页面显示路由path异常问题

jqh 3 years ago
parent
commit
73dd33e1f6
1 changed files with 12 additions and 2 deletions
  1. 12 2
      src/Http/Controllers/PermissionController.php

+ 12 - 2
src/Http/Controllers/PermissionController.php

@@ -156,14 +156,24 @@ class PermissionController extends AdminController
             }
 
             if (! Str::contains($uri, '{')) {
-                $route = Str::replaceFirst($prefix, '', $uri.'*');
+                if ($prefix !== '/') {
+                    $route = Str::replaceFirst($prefix, '', $uri . '*');
+                } else {
+                    $route = $uri.'*';
+                }
 
                 if ($route !== '*') {
                     $container->push($route);
                 }
             }
 
-            return Str::replaceFirst($prefix, '', preg_replace('/{.*}+/', '*', $uri));
+            $path = preg_replace('/{.*}+/', '*', $uri);
+
+            if ($prefix !== '/') {
+                return Str::replaceFirst($prefix, '', $path);
+            }
+
+            return $path;
         });
 
         return $container->merge($routes)->filter()->all();