jqh há 5 anos atrás
pai
commit
0ba9f2a880
2 ficheiros alterados com 15 adições e 0 exclusões
  1. 5 0
      src/Form/Field.php
  2. 10 0
      src/Form/Field/Table.php

+ 5 - 0
src/Form/Field.php

@@ -4,6 +4,7 @@ namespace Dcat\Admin\Form;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
+use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\Form as WidgetForm;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Renderable;
@@ -341,6 +342,8 @@ class Field implements Renderable
      */
     final public function fill($data)
     {
+        $data = Helper::array($data);
+
         $this->data($data);
 
         $this->value = $this->formatFieldData($data);
@@ -393,6 +396,8 @@ class Field implements Renderable
      */
     final public function setOriginal($data)
     {
+        $data = Helper::array($data);
+
         $this->original = $this->formatFieldData($data);
 
         $this->callCustomFormatter('original', new Fluent($data));

+ 10 - 0
src/Form/Field/Table.php

@@ -4,6 +4,7 @@ namespace Dcat\Admin\Form\Field;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form\NestedForm;
+use Dcat\Admin\Support\Helper;
 
 class Table extends HasMany
 {
@@ -78,6 +79,15 @@ class Table extends HasMany
         );
     }
 
+    public function value($value = null)
+    {
+        if ($value === null) {
+            return Helper::array(parent::value($value));
+        }
+
+        return parent::value($value);
+    }
+
     protected function getKeyName()
     {
         if (is_null($this->form)) {