form

update

resources/views/form/daterange.blade.php

@@ -6,17 +6,21 @@
 
         @include('admin::form.error')
 
-        <div class="row" style="width: 370px">
+        <div class="row" style="max-width: 603px">
             <div class="col-lg-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="feather icon-calendar"></i></span>
+                     <span class="input-group-prepend">
+                        <span class="input-group-text bg-white"><i class="feather icon-calendar"></i></span>
+                    </span>
                     <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ old($column['start'], $value['start']) }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
 
             <div class="col-lg-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="feather icon-calendar"></i></span>
+                     <span class="input-group-prepend">
+                        <span class="input-group-text bg-white"><i class="feather icon-calendar"></i></span>
+                    </span>
                     <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ old($column['end'], $value['end']) }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>

resources/views/form/datetimerange.blade.php

@@ -6,17 +6,21 @@
 
         @include('admin::form.error')
 
-        <div class="row" style="width: 433px">
-            <div class="col-lg-6">
+        <div class="row" style="max-width: 603px">
+            <div class="col-md-6" style="margin-right: 0">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="feather icon-calendar"></i></span>
+                    <span class="input-group-prepend">
+                        <span class="input-group-text bg-white"><i class="feather icon-calendar"></i></span>
+                    </span>
                     <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ old($column['start'], $value['start']) }}" class="form-control {{$class['start']}}" style="width:180px" {!! $attributes !!} />
                 </div>
             </div>
 
-            <div class="col-lg-6">
+            <div class="col-md-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="feather icon-calendar"></i></span>
+                    <span class="input-group-prepend">
+                        <span class="input-group-text bg-white"><i class="feather icon-calendar"></i></span>
+                    </span>
                     <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ old($column['end'], $value['end']) }}" class="form-control {{$class['end']}}" style="width: 180px" {!! $attributes !!} />
                 </div>
             </div>

resources/views/form/timerange.blade.php

@@ -6,17 +6,21 @@
 
         @include('admin::form.error')
 
-        <div class="row" style="width: 370px">
+        <div class="row" style="max-width: 603px">
             <div class="col-lg-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="feather icon-calendar"></i></span>
+                    <span class="input-group-prepend">
+                        <span class="input-group-text bg-white"><i class="fa fa-clock-o fa-fw"></i></span>
+                    </span>
                     <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ old($column['start'], $value['start']) }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
 
             <div class="col-lg-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="feather icon-calendar"></i></span>
+                    <span class="input-group-prepend">
+                        <span class="input-group-text bg-white"><i class="fa fa-clock-o fa-fw"></i></span>
+                    </span>
                     <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ old($column['end'], $value['end']) }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>

src/Form/Field/Date.php

@@ -31,7 +31,7 @@ class Date extends Text
         $this->options['locale'] = config('app.locale');
         $this->options['allowInputToggle'] = true;
 
-        $this->script = "$('{$this->getElementClassSelector()}').parent().datetimepicker(".json_encode($this->options).');';
+        $this->script = "$('{$this->getElementClassSelector()}').datetimepicker(".json_encode($this->options).');';
 
         $this->prepend('<i class="fa fa-calendar fa-fw"></i>')
             ->defaultAttribute('style', 'width: 200px');

src/Form/Field/Html.php

@@ -3,6 +3,7 @@
 namespace Dcat\Admin\Form\Field;
 
 use Dcat\Admin\Form\Field;
+use Dcat\Admin\Support\Helper;
 use Illuminate\Support\Arr;
 
 class Html extends Field
@@ -55,7 +56,9 @@ class Html extends Field
     public function render()
     {
         if ($this->html instanceof \Closure) {
-            $this->html = $this->html->call($this->values(), $this->form);
+            $this->html = Helper::render(
+                $this->html->call($this->values(), $this->form)
+            );
         }
 
         if ($this->plain) {