数据仓库 store/update/delete 方法允许返回 JsonResponse 对象

jqhph · Mar 5, 2021 · 8188788 · 8188788
1 parent 993a84d
commit 8188788
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/Contracts/Repository.php b/src/Contracts/Repository.php
@@ -77,7 +77,7 @@ public function detail(Show $show);
      *
      * @param Form $form
      *
-     * @return mixed
+     * @return int|bool|\Dcat\Admin\Http\JsonResponse
      */
     public function store(Form $form);
 
@@ -95,7 +95,7 @@ public function updating(Form $form);
      *
      * @param Form $form
      *
-     * @return bool
+     * @return bool|\Dcat\Admin\Http\JsonResponse
      */
     public function update(Form $form);
 
@@ -105,7 +105,7 @@ public function update(Form $form);
      * @param Form  $form
      * @param array $deletingData
      *
-     * @return mixed
+     * @return mixed|\Dcat\Admin\Http\JsonResponse
      */
     public function delete(Form $form, array $deletingData);
 

diff --git a/src/Form.php b/src/Form.php
@@ -11,6 +11,7 @@
 use Dcat\Admin\Form\Condition;
 use Dcat\Admin\Form\Field;
 use Dcat\Admin\Form\NestedForm;
+use Dcat\Admin\Http\JsonResponse;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Traits\HasBuilderEvents;
 use Dcat\Admin\Traits\HasFormResponse;
@@ -568,6 +569,11 @@ public function destroy($id)
 
             $result = $this->repository->delete($this, $data);
 
+            // 返回 JsonResponse 对象，直接中断后续逻辑
+            if ($result instanceof JsonResponse) {
+                return $this->sendResponse($result);
+            }
+
             if ($response = $this->callDeleted($result)) {
                 return $this->sendResponse($response);
             }
@@ -628,6 +634,11 @@ public function store(?array $data = null, $redirectTo = null)
 
             $id = $this->repository->store($this);
 
+            // 返回 JsonResponse 对象，直接中断后续逻辑
+            if ($id instanceof JsonResponse) {
+                return $this->sendResponse($id);
+            }
+
             $this->builder->setResourceId($id);
 
             if (($response = $this->callSaved($id))) {
@@ -804,6 +815,11 @@ public function update(
 
             $updated = $this->repository->update($this);
 
+            // 返回 JsonResponse 对象，直接中断后续逻辑
+            if ($updated instanceof JsonResponse) {
+                return $this->sendResponse($updated);
+            }
+
             if ($response = $this->callSaved($updated)) {
                 return $this->sendResponse($response);
             }

diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php
@@ -124,7 +124,7 @@ public function detail(Show $show)
      *
      * @param Form $form
      *
-     * @return mixed
+     * @return int|bool|\Dcat\Admin\Http\JsonResponse
      */
     public function store(Form $form)
     {
@@ -136,7 +136,7 @@ public function store(Form $form)
      *
      * @param Form $form
      *
-     * @return array
+     * @return array|\Illuminate\Contracts\Support\Arrayable
      */
     public function updating(Form $form)
     {
@@ -148,7 +148,7 @@ public function updating(Form $form)
      *
      * @param Form $form
      *
-     * @return bool
+     * @return bool|\Dcat\Admin\Http\JsonResponse
      */
     public function update(Form $form)
     {
@@ -161,7 +161,7 @@ public function update(Form $form)
      * @param Form  $form
      * @param array $deletingData
      *
-     * @return mixed
+     * @return bool|int|\Dcat\Admin\Http\JsonResponse
      */
     public function delete(Form $form, array $deletingData)
     {