Merge branch 'master' into 2.0

resources/views/form/button.blade.php

@@ -3,6 +3,6 @@
     <label class="{{$viewClass['label']}} control-label"></label>
 
     <div class="{{$viewClass['field']}}">
-        <input type='button' value='{!! $label !!}' class="btn {{ $class }} {{ $buttonClass }}" {!! $attributes !!} />
+        <span class="btn {{ $class }} {{ $buttonClass }}" {!! $attributes !!}>{!! $label !!}</span>
     </div>
 </div>

src/Form.php

@@ -84,6 +84,7 @@ use Symfony\Component\HttpFoundation\Response;
  * @method Field\ArrayField             array($column, $labelOrCallback, $callback = null)
  * @method Field\SelectTable            selectTable($column, $label = '')
  * @method Field\MultipleSelectTable    multipleSelectTable($column, $label = '')
+ * @method Field\Button                 button(string $html = null)
  */
 class Form implements Renderable
 {

src/Form/Builder.php

@@ -807,7 +807,7 @@ class Builder
         ];
 
         $reject = function (Field $field) use (&$reservedColumns) {
-            return in_array($field->column(), $reservedColumns)
+            return in_array($field->column(), $reservedColumns, true)
                 && $field instanceof Form\Field\Display;
         };
 

src/Form/Field/Button.php

@@ -3,11 +3,17 @@
 namespace Dcat\Admin\Form\Field;
 
 use Dcat\Admin\Form\Field;
+use Illuminate\Support\Str;
 
 class Button extends Field
 {
     protected $class = 'btn-primary';
 
+    public function __construct($label)
+    {
+        parent::__construct(Str::random(), [$label]);
+    }
+
     public function class(string $class)
     {
         $this->class = $class;

src/Widgets/Form.php

@@ -82,6 +82,7 @@ use Illuminate\Validation\Validator;
  * @method Field\ArrayField          array($column, $labelOrCallback, $callback = null)
  * @method Field\SelectTable         selectTable($column, $label = '')
  * @method Field\MultipleSelectTable multipleSelectTable($column, $label = '')
+ * @method Field\Button              button(string $html = null)
  */
 class Form implements Renderable
 {