Fix #5038

z-song · z-song · commit ee897f7e5a0f · 2020-10-21T18:21:27.000+08:00
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -14,7 +14,7 @@
     @endif
 
     <script src="{{ admin_asset('vendor/laravel-admin/require.js') }}"></script>
-    <script src="{{ admin_asset('_require_config') }}"></script>
+    <script src="{{ admin_route('require-config') }}"></script>
 </head>
 
 <body class="hold-transition {{join(' ', config('admin.theme.layout'))}} {{ config('admin.theme.accent') ? 'accent-'.config('admin.theme.accent') : '' }}">
diff --git a/src/Form/Field/BelongsToRelation.php b/src/Form/Field/BelongsToRelation.php
@@ -54,7 +54,7 @@ protected function getLoadUrl()
         $selectable = str_replace('\\', '_', $this->selectable);
         $args = [intval($this instanceof BelongsToMany)];
 
-        return route(config('admin.route.as') . 'handle_selectable', compact('selectable', 'args'));
+        return admin_route('handle_selectable', compact('selectable', 'args'));
     }
 
     /**
diff --git a/src/Form/Field/ValuePicker.php b/src/Form/Field/ValuePicker.php
@@ -65,7 +65,7 @@ protected function getLoadUrl()
 
         $args = [$this->multiple, $this->column];
 
-        return route(config('admin.route.as') . 'handle_selectable', compact('selectable', 'args'));
+        return admin_route('handle_selectable', compact('selectable', 'args'));
     }
 
     /**
diff --git a/src/Table/Displayers/BelongsTo.php b/src/Table/Displayers/BelongsTo.php
@@ -17,7 +17,7 @@ protected function getLoadUrl($selectable, $multiple = 0)
         $selectable = str_replace('\\', '_', $selectable);
         $args = [$multiple];
 
-        return route(config('admin.route.as') . 'handle_selectable', compact('selectable', 'args'));
+        return admin_route('handle_selectable', compact('selectable', 'args'));
     }
 
     /**
diff --git a/src/Table/Displayers/Expand.php b/src/Table/Displayers/Expand.php
@@ -46,6 +46,6 @@ protected function getLoadUrl()
     {
         $renderable = str_replace('\\', '_', $this->renderable);
 
-        return route(config('admin.route.as') . 'handle_renderable', compact('renderable'));
+        return admin_route('handle_renderable', compact('renderable'));
     }
 }
diff --git a/src/helpers.php b/src/helpers.php
@@ -408,3 +408,18 @@ function admin_user()
         return \Encore\Admin\Facades\Admin::user();
     }
 }
+
+if (!function_exists('admin_route')) {
+    /**
+     * @param $name
+     * @param array $parameters
+     * @param bool $absolute
+     * @return mixed
+     */
+    function admin_route($name, $parameters = [], $absolute = true)
+    {
+        $name = config('admin.route.as', '').$name;
+
+        return app('url')->route($name, $parameters, $absolute);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected function getLoadUrl()`
`54`	`54`	`$selectable = str_replace('\\', '_', $this->selectable);`
`55`	`55`	`$args = [intval($this instanceof BelongsToMany)];`
`56`	`56`
`57`		`- return route(config('admin.route.as') . 'handle_selectable', compact('selectable', 'args'));`
	`57`	`+ return admin_route('handle_selectable', compact('selectable', 'args'));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function getLoadUrl()`
`65`	`65`
`66`	`66`	`$args = [$this->multiple, $this->column];`
`67`	`67`
`68`		`- return route(config('admin.route.as') . 'handle_selectable', compact('selectable', 'args'));`
	`68`	`+ return admin_route('handle_selectable', compact('selectable', 'args'));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected function getLoadUrl($selectable, $multiple = 0)`
`17`	`17`	`$selectable = str_replace('\\', '_', $selectable);`
`18`	`18`	`$args = [$multiple];`
`19`	`19`
`20`		`- return route(config('admin.route.as') . 'handle_selectable', compact('selectable', 'args'));`
	`20`	`+ return admin_route('handle_selectable', compact('selectable', 'args'));`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ protected function getLoadUrl()`
`46`	`46`	`{`
`47`	`47`	`$renderable = str_replace('\\', '_', $this->renderable);`
`48`	`48`
`49`		`- return route(config('admin.route.as') . 'handle_renderable', compact('renderable'));`
	`49`	`+ return admin_route('handle_renderable', compact('renderable'));`
`50`	`50`	`}`
`51`	`51`	`}`