webUploader工具类使用容器加载

src/AdminServiceProvider.php

@@ -7,6 +7,7 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Menu;
 use Dcat\Admin\Layout\Navbar;
 use Dcat\Admin\Layout\SectionManager;
+use Dcat\Admin\Support\WebUploader;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Fluent;
@@ -215,6 +216,7 @@ class AdminServiceProvider extends ServiceProvider
         $this->app->singleton('admin.navbar', Navbar::class);
         $this->app->singleton('admin.menu', Menu::class);
         $this->app->singleton('admin.context', Fluent::class);
+        $this->app->singleton('admin.web-uploader', WebUploader::class);
     }
 
     /**

src/Form/Concerns/HasFiles.php

@@ -22,7 +22,7 @@ trait HasFiles
     protected function handleUploadFile($data)
     {
         $column = $data['upload_column'] ?? null;
-        $file = Admin::context()->webUploader->getCompleteUploadedFile() ?: ($data['file'] ?? null);
+        $file = app('admin.web-uploader')->getCompleteUploadedFile() ?: ($data['file'] ?? null);
 
         if (! $column || ! $file instanceof UploadedFile) {
             return;

src/Middleware/WebUploader.php

@@ -2,7 +2,6 @@
 
 namespace Dcat\Admin\Middleware;
 
-use Dcat\Admin\Admin;
 use Dcat\Admin\Support\WebUploader as Uploader;
 use Illuminate\Http\Request;
 
@@ -15,7 +14,8 @@ class WebUploader
 {
     public function handle(Request $request, \Closure $next)
     {
-        Admin::context()->webUploader = $webUploader = new Uploader();
+        /* @var Uploader $webUploader */
+        $webUploader = app('admin.web-uploader');
 
         if (! $webUploader->isUploading()) {
             return $next($request);

src/Traits/HasUploadedFile.php

@@ -22,7 +22,7 @@ trait HasUploadedFile
      */
     public function uploader()
     {
-        return Admin::context()->webUploader;
+        return app('admin.web-uploader');
     }
 
     /**