Fix z-song#4262

Author: z-song

src/Form.php

@@ -10,6 +10,7 @@
 use Encore\Admin\Form\Layout\Layout;
 use Encore\Admin\Form\Row;
 use Encore\Admin\Form\Tab;
+use Encore\Admin\Traits\ShouldSnakeAttributes;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations;
@@ -74,7 +75,7 @@
  */
 class Form implements Renderable
 {
-    use HasHooks;
+    use HasHooks, ShouldSnakeAttributes;
 
     /**
      * Remove flag in `has many` form.
@@ -1121,8 +1122,6 @@ function (Field $field) use ($column) {
      */
     protected function setFieldOriginalValue()
     {
-//        static::doNotSnakeAttributes($this->model);
-
         $values = $this->model->toArray();
 
         $this->builder->fields()->each(function (Field $field) use ($values) {
@@ -1151,8 +1150,6 @@ protected function setFieldValue($id)
 
         $this->callEditing();
 
-//        static::doNotSnakeAttributes($this->model);
-
         $data = $this->model->toArray();
 
         $this->builder->fields()->each(function (Field $field) use ($data) {
@@ -1183,20 +1180,6 @@ public function fieldset(string $title, Closure $setCallback)
         return $fieldset;
     }
 
-    /**
-     * Don't snake case attributes.
-     *
-     * @param Model $model
-     *
-     * @return void
-     */
-    protected static function doNotSnakeAttributes(Model $model)
-    {
-        $class = get_class($model);
-
-        $class::$snakeAttributes = false;
-    }
-
     /**
      * Get validation messages.
      *

src/Form/Field/MultipleSelect.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 class MultipleSelect extends Select
 {
@@ -45,7 +46,7 @@ protected function getOtherKey()
      */
     public function fill($data)
     {
-        $relations = Arr::get($data, \Illuminate\Support\Str::snake($this->column));
+        $relations = Arr::get($data, $this->form->shouldSnakeAttributes() ? Str::snake($this->column) : $this->column);
 
         if (is_string($relations)) {
             $this->value = explode(',', $relations);

src/Grid.php

@@ -12,6 +12,7 @@
 use Encore\Admin\Grid\Model;
 use Encore\Admin\Grid\Row;
 use Encore\Admin\Grid\Tools;
+use Encore\Admin\Traits\ShouldSnakeAttributes;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Database\Eloquent\Relations;
 use Illuminate\Support\Collection;
@@ -33,6 +34,7 @@ class Grid
         Concerns\HasSelector,
         Concerns\CanHidesColumns,
         Concerns\CanFixColumns,
+        ShouldSnakeAttributes,
         Macroable {
             __call as macroCall;
         }
@@ -385,7 +387,7 @@ protected function addRelationColumn($name, $label = '')
             return $this;
         }
 
-        $name = Str::snake($relation).'.'.$column;
+        $name = ($this->shouldSnakeAttributes() ? Str::snake($relation) : $relation) .'.'.$column;
 
         $this->model()->with($relation);
 
@@ -842,7 +844,9 @@ protected function handleRelationColumn($method, $label)
         ) {
             $this->model()->with($method);
 
-            return $this->addColumn($method, $label)->setRelation(Str::snake($method));
+            return $this->addColumn($method, $label)->setRelation(
+                $this->shouldSnakeAttributes() ? Str::snake($method) : $method
+            );
         }
 
         if ($relation instanceof Relations\HasMany
@@ -852,7 +856,7 @@ protected function handleRelationColumn($method, $label)
         ) {
             $this->model()->with($method);
 
-            return $this->addColumn(Str::snake($method), $label);
+            return $this->addColumn($this->shouldSnakeAttributes() ? Str::snake($method) : $method, $label);
         }
 
         return false;

src/Grid/Model.php

@@ -113,22 +113,6 @@ public function __construct(EloquentModel $model, Grid $grid = null)
         $this->grid = $grid;
 
         $this->queries = collect();
-
-//        static::doNotSnakeAttributes($this->model);
-    }
-
-    /**
-     * Don't snake case attributes.
-     *
-     * @param EloquentModel $model
-     *
-     * @return void
-     */
-    protected static function doNotSnakeAttributes(EloquentModel $model)
-    {
-        $class = get_class($model);
-
-        $class::$snakeAttributes = false;
     }
 
     /**

src/Show.php

@@ -6,6 +6,7 @@
 use Encore\Admin\Show\Field;
 use Encore\Admin\Show\Panel;
 use Encore\Admin\Show\Relation;
+use Encore\Admin\Traits\ShouldSnakeAttributes;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -22,6 +23,8 @@
 
 class Show implements Renderable
 {
+    use ShouldSnakeAttributes;
+
     /**
      * The Eloquent model to show.
      *
@@ -444,7 +447,9 @@ protected function handleRelationField($method, $arguments)
                 return $this->addRelation($method, $arguments[1], $arguments[0]);
             }
 
-            return $this->addField($method, Arr::get($arguments, 0))->setRelation(Str::snake($method));
+            return $this->addField($method, Arr::get($arguments, 0))->setRelation(
+                $this->shouldSnakeAttributes() ? Str::snake($method) : $method
+            );
         }
 
         if ($relation    instanceof HasMany

src/Traits/ShouldSnakeAttributes.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Encore\Admin\Traits;
+
+trait ShouldSnakeAttributes
+{
+    /**
+     * Indicates if model should snake attribute name.
+     *
+     * @return bool
+     */
+    public function shouldSnakeAttributes()
+    {
+        $class = get_class($this->model);
+
+        return $class::$snakeAttributes;
+    }
+}