Browse Source

修复表单事件拦截相关bug

jqh 4 years ago
parent
commit
7f97cb3478

+ 2 - 2
src/Form.php

@@ -536,13 +536,13 @@ class Form implements Renderable
             $this->build();
 
             if ($response = $this->callDeleting()) {
-                return $response;
+                return $this->sendResponse($response);
             }
 
             $result = $this->repository->delete($this, $data);
 
             if ($response = $this->callDeleted($result)) {
-                return $response;
+                return $this->sendResponse($response);
             }
 
             $status = $result ? true : false;

+ 4 - 4
src/Form/Concerns/HasFiles.php

@@ -44,14 +44,14 @@ trait HasFiles
         }
 
         if ($field && $field instanceof UploadFieldInterface) {
-            if (($results = $this->callUploading($field, $file)) && $results instanceof Response) {
-                return $results;
+            if ($results = $this->callUploading($field, $file)) {
+                return $this->sendResponse($results);
             }
 
             $response = $field->upload($file);
 
-            if (($results = $this->callUploaded($field, $file, $response)) && $results instanceof Response) {
-                return $results;
+            if ($results = $this->callUploaded($field, $file, $response)) {
+                return $this->sendResponse($results);
             }
 
             return $response;

+ 1 - 1
src/Http/Controllers/UserController.php

@@ -2,9 +2,9 @@
 
 namespace Dcat\Admin\Http\Controllers;
 
-use Dcat\Admin\Http\Auth\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
+use Dcat\Admin\Http\Auth\Permission;
 use Dcat\Admin\Http\Repositories\Administrator;
 use Dcat\Admin\Models\Administrator as AdministratorModel;
 use Dcat\Admin\Show;

+ 1 - 1
src/Http/Middleware/Permission.php

@@ -3,8 +3,8 @@
 namespace Dcat\Admin\Http\Middleware;
 
 use Dcat\Admin\Admin;
-use Dcat\Admin\Http\Auth\Permission as Checker;
 use Dcat\Admin\Exception\RuntimeException;
+use Dcat\Admin\Http\Auth\Permission as Checker;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;