工具表单增加格式化表单提交数据功能

src/Controllers/HandleFormController.php

@@ -20,6 +20,8 @@ class HandleFormController
             return $form->failedAuthorization();
         }
 
+        $form->form();
+
         if ($errors = $form->validate($request)) {
             return $form->validationErrorsResponse($errors);
         }

src/Support/Helper.php

@@ -9,6 +9,7 @@ use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
@@ -710,4 +711,40 @@ class Helper
 
         return base_path(str_replace([$namespace, '\\'], [$path, '/'], $class)).'.php';
     }
+
+    /**
+     * Is input data is has-one relation.
+     *
+     * @param Collection $fields
+     * @param array      $input
+     */
+    public static function prepareHasOneRelation(Collection $fields, array &$input)
+    {
+        $relations = [];
+        $fields->each(function ($field) use (&$relations) {
+            $column = $field->column();
+
+            if (is_array($column)) {
+                foreach ($column as $v) {
+                    if (Str::contains($v, '.')) {
+                        $first = explode('.', $v)[0];
+                        $relations[$first] = null;
+                    }
+                }
+
+                return;
+            }
+
+            if (Str::contains($column, '.')) {
+                $first = explode('.', $column)[0];
+                $relations[$first] = null;
+            }
+        });
+
+        foreach ($relations as $first => $v) {
+            if (isset($input[$first])) {
+                $input = array_merge($input, Arr::dot([$first => $input[$first]]));
+            }
+        }
+    }
 }

src/Widgets/Form.php

@@ -330,6 +330,10 @@ class Form implements Renderable
     public function field($name)
     {
         foreach ($this->fields as $field) {
+            if (is_array($field->column())) {
+                return in_array($name, $field->column(), true);
+            }
+
             if ($field === $name || $field->column() === $name) {
                 return $field;
             }
@@ -376,10 +380,6 @@ class Form implements Renderable
      */
     public function validate(Request $request)
     {
-        if (method_exists($this, 'form')) {
-            $this->form();
-        }
-
         $failedValidators = [];
 
         /** @var \Dcat\Admin\Form\Field $field */
@@ -745,7 +745,30 @@ JS
     {
         Arr::forget($input, [static::REQUEST_NAME, '_token', '_current_']);
 
-        return $input;
+        return $this->prepareInput($input);
+    }
+
+    public function prepareInput(array $input)
+    {
+        Helper::prepareHasOneRelation($this->fields, $input);
+
+        foreach ($input as $column => $value) {
+            if (is_null($field = $this->field($column))) {
+                unset($input[$column]);
+
+                continue;
+            }
+
+            $input[$column] = $field->prepare($value);
+        }
+
+        $prepared = [];
+
+        foreach ($input as $key => $value) {
+            Arr::set($prepared, $key, $value);
+        }
+
+        return $prepared;
     }
 
     protected function prepareForm()