Merge pull request z-song#5306 from rust17/master

当 form 参数形式为'驼峰.字段名'时，获取不到字段的值

Author: jxlwqq

src/Form.php

@@ -192,6 +192,8 @@ public function edit($id): self
         $this->builder->setMode(Builder::MODE_EDIT);
         $this->builder->setResourceId($id);
 
+        $this->setRelationFieldSnakeAttributes();
+
         $this->setFieldValue($id);
 
         return $this;
@@ -1009,6 +1011,34 @@ protected function setFieldOriginalValue()
         });
     }
 
+    /**
+     * Determine relational column needs to be snaked.
+     *
+     * @return void
+     */
+    protected function setRelationFieldSnakeAttributes()
+    {
+        $relations = $this->getRelations();
+
+        $this->fields()->each(function (Field $field) use ($relations) {
+            if ($field->getSnakeAttributes()) {
+                return;
+            }
+
+            $column = $field->column();
+
+            $column = is_array($column) ? head($column) : $column;
+
+            list($relation) = explode('.', $column);
+
+            if (!in_array($relation, $relations)) {
+                return;
+            }
+
+            $field->setSnakeAttributes($this->model::$snakeAttributes);
+        });
+    }
+
     /**
      * Set all fields value in form.
      *

src/Form/Field.php

@@ -246,6 +246,13 @@ class Field implements Renderable
      */
     protected $callback;
 
+    /**
+     * column is snake-casing attributes.
+     *
+     * @var bool
+     */
+    protected $snakeAttributes = false;
+
     /**
      * @var bool
      */
@@ -379,6 +386,42 @@ public function setElementName($name): self
         return $this;
     }
 
+    /**
+     * Set snake attributes to the field.
+     *
+     * @param bool $snakeAttributes
+     *
+     * @return $this
+     */
+    public function setSnakeAttributes($snakeAttributes)
+    {
+        $this->snakeAttributes = $snakeAttributes;
+
+        return $this;
+    }
+
+    /**
+     * Get snake attributes of the field.
+     *
+     * @return bool
+     */
+    public function getSnakeAttributes()
+    {
+        return $this->snakeAttributes;
+    }
+
+    /**
+     * Determine if a column needs to be snaked.
+     *
+     * @param string|array $column
+     *
+     * @return string|array
+     */
+    protected function columnShouldSnaked($column)
+    {
+        return $this->getSnakeAttributes() ? Str::snake($column) : $column;
+    }
+
     /**
      * Fill data to the field.
      *
@@ -392,13 +435,13 @@ public function fill($data)
 
         if (is_array($this->column)) {
             foreach ($this->column as $key => $column) {
-                $this->value[$key] = Arr::get($data, $column);
+                $this->value[$key] = Arr::get($data, $this->columnShouldSnaked($column));
             }
 
             return;
         }
 
-        $this->value = Arr::get($data, $this->column);
+        $this->value = Arr::get($data, $this->columnShouldSnaked($this->column));
 
         $this->formatValue();
     }