完善表单事件回调

Author: SmallRuralDog

public/app.js

@@ -1826,7 +1826,8 @@ __webpack_require__.r(__webpack_exports__);
     onHandle: function onHandle() {
       var _this = this;
 
-      this.$http["delete"](this.$route.path + "/" + this.key).then(function (_ref) {
+      this.loading = true;
+      this.$http["delete"](this.action.resource + "/" + this.key).then(function (_ref) {
         var code = _ref.code;
         if (code === 200) _this.$bus.emit("tableReload");
       })["finally"](function () {

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=3519231aa2ed59351d3b",
+    "/app.js": "/app.js?id=16f687ed6c6f1fb127ff",
     "/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
     "/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
 }

resources/js/components/widgets/Actions/DeleteAction.vue

@@ -28,8 +28,9 @@ export default {
   },
   methods: {
     onHandle() {
+      this.loading = true;
       this.$http
-        .delete(this.$route.path + "/" + this.key)
+        .delete(this.action.resource + "/" + this.key)
         .then(({ code }) => {
           if (code === 200) this.$bus.emit("tableReload");
         })

src/Actions/BaseAction.php

@@ -12,8 +12,19 @@ class BaseAction implements JsonSerializable
     protected $className;
     protected $style;
 
+    protected $resource;
+
     public $hideAttrs = [];
 
+    /**
+     * BaseAction constructor.
+     */
+    public function __construct()
+    {
+        $this->resource = url(request()->getPathInfo());
+    }
+
+
     public function jsonSerialize()
     {
         $data = [];

src/Controllers/PermissionController.php

@@ -28,7 +28,7 @@ protected function grid()
 
         $grid = new Grid(new $permissionModel());
 
-        $grid->defaultSort('id', 'asc')->hideViewAction();
+        $grid->defaultSort('id', 'asc');
 
         $grid->columns([
             $grid->column('id', 'ID')->sortable()->width('80px'),
@@ -40,9 +40,12 @@ protected function grid()
             })->displayComponent(function () {
                 return Tag::make();
             }),
-            //$grid->column('created_at', trans('admin::admin.created_at')),
-            //$grid->column('updated_at', trans('admin::admin.updated_at'))
         ]);
+
+        $grid->actions(function (Grid\Actions $actions) {
+            $actions->hideViewAction();
+        });
+
         return $grid;
     }
 

src/Form.php

@@ -325,12 +325,22 @@ public function getRelations(): array
 
     public function store()
     {
+
+        if (($result = $this->callSubmitted()) instanceof Response) {
+            return $result;
+        }
+
+
         $data = request()->all();
 
         if ($validationMessages = $this->validatorData($data)) {
             return Admin::responseError($validationMessages);
         }
 
+        if (($result = $this->callSaving()) instanceof Response) {
+            return $result;
+        }
+
         if (($response = $this->prepare($data)) instanceof Response) {
             return $response;
         }
@@ -417,6 +427,9 @@ public function destroy($id)
      */
     public function update($id, $data = null)
     {
+        if (($result = $this->callSubmitted()) instanceof Response) {
+            return $result;
+        }
         $data = ($data) ?: request()->all();
 
         $builder = $this->model();
@@ -425,6 +438,9 @@ public function update($id, $data = null)
         if ($validationMessages = $this->validatorData($data)) {
             return Admin::responseError($validationMessages);
         }
+        if (($result = $this->callSaving()) instanceof Response) {
+            return $result;
+        }
 
         if (($response = $this->prepare($data)) instanceof Response) {
             return $response;
@@ -589,6 +605,10 @@ private function updateRelation($relationsData)
      */
     public function editData($id)
     {
+        if (($result = $this->callEditing($id)) instanceof Response) {
+            return $result;
+        }
+
         $this->setMode(self::MODE_EDIT);
         $this->setResourceId($id);
         $e_data = $this->model->with($this->getRelations())->findOrFail($this->getResourceId());
@@ -600,7 +620,7 @@ public function editData($id)
             $field = $formItem->getField();
             $prop = $formItem->getProp();
             $component = $formItem->getDisplayComponent();
-            Arr::set($data, $prop, $formItem->getData(Arr::get($e_data, $prop), $this->model,$component));
+            Arr::set($data, $prop, $formItem->getData(Arr::get($e_data, $prop), $this->model, $component));
             //$data[$prop] = $formItem->getData($e_data->{$prop}, $this->model);
         }
         foreach ($this->formItems as $formItem) {

src/Form/HasHooks.php

@@ -126,11 +126,12 @@ public function deleted(Closure $callback)
     /**
      * Call editing callbacks.
      *
+     * @param $id
      * @return mixed
      */
-    protected function callEditing()
+    protected function callEditing($id)
     {
-        return $this->callHooks('editing');
+        return $this->callHooks('editing',$id);
     }
 
     /**