Merge pull request #14 from anjestar/patch-1

fix:修复Upload组件无法上传普通文件 close #13

Author: SmallRuralDog

src/Controllers/HandleController.php

@@ -12,15 +12,7 @@ class HandleController extends Controller
 
     public function uploadFile(Request $request)
     {
-        try {
-            \Admin::validatorData($request->all(), [
-                'file' => 'mimes:'.config('admin.upload.mimes','jpg')
-            ]);
             return $this->upload($request);
-        } catch (\Exception $exception) {
-            return \Admin::responseError($exception->getMessage());
-        }
-
     }
 
     public function uploadImage(Request $request)
@@ -46,11 +38,12 @@ protected function upload(Request $request)
             $path = $request->input('path', 'images');
             $uniqueName = $request->input('uniqueName', false);
 
+            //如果配置了 mimes 则只可以上传 mimes 配置内的文件类型，否则默认只能传 image 类型的文件
+            $mimes = config('admin.upload.mimes');
             \Admin::validatorData($request->all(), [
-                'file' => 'image'
+                'file' => $mimes ? 'mimes:' . $mimes : 'image',
             ]);
 
-
             $disk = config('admin.upload.disk');
             $name = $file->getClientOriginalName();
             if ($uniqueName == "true" || $uniqueName == true) {