wip

config/admin.php

@@ -296,7 +296,7 @@ return [
     |--------------------------------------------------------------------------
     |
     */
-    'exception_handler' => \Dcat\Admin\Exception\Handler::class,
+    'exception_handler' => Dcat\Admin\Http\Exception\Handler::class,
 
     /*
     |--------------------------------------------------------------------------

resources/views/form/bootstrapfile.blade.php

@@ -1,14 +0,0 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
-
-    <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
-
-    <div class="{{$viewClass['field']}}">
-
-        @include('admin::form.error')
-
-        <input type="file" class="{{$class}}" name="{{$name}}" {!! $attributes !!} />
-
-        @include('admin::form.help-block')
-
-    </div>
-</div>

resources/views/form/bootstrapmultiplefile.blade.php

@@ -1,14 +0,0 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
-
-    <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
-
-    <div class="{{$viewClass['field']}}">
-
-        @include('admin::form.error')
-
-        <input type="file" class="{{$class}}" name="{{$name}}[]" {!! $attributes !!} />
-
-        @include('admin::form.help-block')
-
-    </div>
-</div>

resources/views/form/captcha.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 

resources/views/form/checkbox.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($column) ?: 'has-error' !!}" >
+<div class="{{$viewClass['form-group']}}" >
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label pt-0">{!! $label !!}</label>
 

resources/views/form/color.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <div for="{{ $id }}" class="{{$viewClass['label']}} control-label">
         <span>{!! $label !!}</span>

resources/views/form/daterange.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! ($errors->has($errorKey['start'].'start') || $errors->has($errorKey['end'].'end')) ? 'has-error' : ''  !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id['start']}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -12,7 +12,7 @@
                      <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'] ?? null) }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ $value['start'] ?? null }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
 
@@ -21,7 +21,7 @@
                      <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'] ?? null) }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ $value['end'] ?? null }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
         </div>

resources/views/form/datetimerange.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! ($errors->has($errorKey['start'].'start') || $errors->has($errorKey['end'].'end')) ? 'has-error' : ''  !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id['start']}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -12,7 +12,7 @@
                     <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'] ?? null) }}" class="form-control {{$class['start']}}" style="width:180px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ $value['start'] ?? null }}" class="form-control {{$class['start']}}" style="width:180px" {!! $attributes !!} />
                 </div>
             </div>
 
@@ -21,7 +21,7 @@
                     <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'] ?? null) }}" class="form-control {{$class['end']}}" style="width: 180px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ $value['end'] ?? null }}" class="form-control {{$class['end']}}" style="width: 180px" {!! $attributes !!} />
                 </div>
             </div>
         </div>

resources/views/form/editor.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -6,7 +6,7 @@
 
         @include('admin::form.error')
 
-        <textarea class="form-control {{$class}}" id="{{$id}}" name="{{$name}}" placeholder="{{ $placeholder }}" {!! $attributes !!} >{{ old($column, $value) }}</textarea>
+        <textarea class="form-control {{$class}}" id="{{$id}}" name="{{$name}}" placeholder="{{ $placeholder }}" {!! $attributes !!} >{{ $value }}</textarea>
 
         @include('admin::form.help-block')
 

resources/views/form/error.blade.php

@@ -1,17 +1 @@
-<div class="help-block with-errors"></div>
-
-@if(is_array($errorKey))
-    @foreach($errorKey as $key => $col)
-        @if($errors->has($col.$key))
-            @foreach($errors->get($col.$key) as $message)
-                <label class="control-label" for="inputError"><i class="feather icon-x-circle"></i> {{$message}}</label><br/>
-            @endforeach
-        @endif
-    @endforeach
-@else
-    @if($errors->has($errorKey))
-        @foreach($errors->get($errorKey) as $message)
-            <label class="control-label" for="inputError"><i class="feather icon-x-circle"></i> {{$message}}</label><br/>
-        @endforeach
-    @endif
-@endif
+<div class="help-block with-errors"></div>

resources/views/form/file.blade.php

@@ -1,4 +1,4 @@
-<div id="{{ $containerId }}" class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div id="{{ $containerId }}" class="{{$viewClass['form-group']}}">
 
     <label for="{{$column}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 

resources/views/form/input.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <div for="{{ $id }}" class="{{$viewClass['label']}} control-label">
         <span>{!! $label !!}</span>

resources/views/form/keyvalue.blade.php

@@ -18,36 +18,23 @@
             </thead>
             <tbody class="kv-{{ $class }}-table">
 
-            @foreach(old("{$column}.keys", ($value ?: [])) as $k => $v)
-
-                @php($keysErrorKey = "{$column}.keys.{$loop->index}")
-                @php($valsErrorKey = "{$column}.values.{$loop->index}")
-
+            @foreach(($value ?: []) as $k => $v)
                 <tr>
                     <td>
-                        <div class="form-group {{ $errors->has($keysErrorKey) ? 'has-error' : '' }}">
+                        <div class="form-group">
                             <div class="col-sm-12">
                                 <div class="help-block with-errors"></div>
-                                @if($errors->has($keysErrorKey))
-                                    @foreach($errors->get($keysErrorKey) as $message)
-                                        <label class="control-label" for="inputError"><i class="feather icon-x-circle"></i> {{$message}}</label><br/>
-                                    @endforeach
-                                @endif
-                                <input name="{{ $name }}[keys][{{ $loop->index }}]" value="{{ old("{$column}.keys.{$k}", $k) }}" class="form-control" required/>
+
+                                <input name="{{ $name }}[keys][{{ $loop->index }}]" value="{{ $k }}" class="form-control" required/>
 
                             </div>
                         </div>
                     </td>
                     <td>
-                        <div class="form-group {{ $errors->has($valsErrorKey) ? 'has-error' : '' }}">
+                        <div class="form-group">
                             <div class="col-sm-12">
                                 <div class="help-block with-errors"></div>
-                                @if($errors->has($valsErrorKey))
-                                    @foreach($errors->get($valsErrorKey) as $message)
-                                        <label class="control-label" for="inputError"><i class="feather icon-x-circle"></i> {{$message}}</label><br/>
-                                    @endforeach
-                                @endif
-                                <input name="{{ $name }}[values][{{ $loop->index }}]" value="{{ old("{$column}.values.{$k}", $v) }}" class="form-control" />
+                                <input name="{{ $name }}[values][{{ $loop->index }}]" value="{{ $v }}" class="form-control" />
                             </div>
                         </div>
                     </td>

resources/views/form/listbox.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -8,7 +8,7 @@
 
         <select class="form-control {{$class}}" style="width: 100%;" name="{{$name}}[]" multiple="multiple" data-placeholder="{{ $placeholder }}" {!! $attributes !!} >
             @foreach($options as $select => $option)
-                <option value="{{$select}}" {{  in_array($select, (array)old($column, $value)) ?'selected':'' }}>{{$option}}</option>
+                <option value="{{$select}}" {{  in_array($select, (array) $value) ?'selected':'' }}>{{$option}}</option>
             @endforeach
         </select>
         <input type="hidden" name="{{$name}}[]" />

resources/views/form/listfield.blade.php

@@ -1,16 +1,9 @@
-@php($listErrorKey = "$column.values")
-
-<div class="{{$viewClass['form-group']}} {{ $errors->has($listErrorKey) ? 'has-error' : '' }}">
+<div class="{{$viewClass['form-group']}}">
 
     <label class="{{$viewClass['label']}} control-label">{{$label}}</label>
 
     <div class="{{$viewClass['field']}}">
 
-        @if($errors->has($listErrorKey))
-            @foreach($errors->get($listErrorKey) as $message)
-                <label class="control-label" for="inputError"><i class="feather icon-x-circle"></i> {{$message}}</label><br/>
-            @endforeach
-        @endif
         <div class="help-block with-errors"></div>
 
         <span name="{{$name}}"></span>
@@ -20,21 +13,14 @@
 
             <tbody class="list-{{$columnClass}}-table">
 
-            @foreach(old("{$column}.values", ($value ?: [])) as $k => $v)
-
-                @php($itemErrorKey = "{$column}.values.{$loop->index}")
+            @foreach(($value ?: []) as $k => $v)
 
                 <tr>
                     <td>
-                        <div class="form-group {{ $errors->has($itemErrorKey) ? 'has-error' : '' }}">
+                        <div class="form-group">
                             <div class="col-sm-12">
-                                <input name="{{ $name }}[values][{{ (int) $k }}]" value="{{ old("{$column}.values.{$k}", $v) }}" class="form-control" />
+                                <input name="{{ $name }}[values][{{ (int) $k }}]" value="{{ $v }}" class="form-control" />
                                 <div class="help-block with-errors"></div>
-                                @if($errors->has($itemErrorKey))
-                                    @foreach($errors->get($itemErrorKey) as $message)
-                                        <label class="control-label" for="inputError"><i class="feather icon-x-circle"></i> {{$message}}</label><br/>
-                                    @endforeach
-                                @endif
                             </div>
                         </div>
                     </td>

resources/views/form/map.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id['lat']}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -20,8 +20,8 @@
         @endif
 
         <div id="map_{{$id['lat'].$id['lng']}}" style="width: 100%;height: 300px"></div>
-        <input type="hidden" id="{{$id['lat']}}" name="{{$name['lat']}}" value="{{ old($column['lat'], $value['lat'] ?? null) }}" {!! $attributes !!} />
-        <input type="hidden" id="{{$id['lng']}}" name="{{$name['lng']}}" value="{{ old($column['lng'], $value['lng'] ?? null) }}" {!! $attributes !!} />
+        <input type="hidden" id="{{$id['lat']}}" name="{{$name['lat']}}" value="{{ $value['lat'] ?? null }}" {!! $attributes !!} />
+        <input type="hidden" id="{{$id['lng']}}" name="{{$name['lng']}}" value="{{ $value['lng'] ?? null }}" {!! $attributes !!} />
 
         @include('admin::form.help-block')
 

resources/views/form/markdown.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -7,7 +7,7 @@
         @include('admin::form.error')
 
         <div id="{{$id}}" class="{{$class}}" {!! $attributes !!}>
-            <textarea class="d-none" name="{{$name}}" placeholder="{{ $placeholder }}">{!! old($column, $value) !!}</textarea>
+            <textarea class="d-none" name="{{$name}}" placeholder="{{ $placeholder }}">{!! $value !!}</textarea>
         </div>
 
         @include('admin::form.help-block')

resources/views/form/multipleselect.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <div for="{{ $id }}" class="{{$viewClass['label']}} control-label">
         <span>{!! $label !!}</span>
@@ -10,7 +10,7 @@
 
         <select class="form-control {{$class}}" style="width: 100%!important;" name="{{$name}}[]" multiple="multiple" data-placeholder="{{ $placeholder }}" {!! $attributes !!} >
             @foreach($options as $select => $option)
-                <option value="{{$select}}" {{  in_array($select, (array)old($column, $value)) ?'selected':'' }}>{{$option}}</option>
+                <option value="{{ $select }}" {{  in_array($select, (array) $value) ?'selected':'' }}>{{$option}}</option>
             @endforeach
         </select>
         <input type="hidden" name="{{$name}}[]" />

resources/views/form/number.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <div for="{{ $id }}" class="{{$viewClass['label']}} control-label">
         <span>{!! $label !!}</span>

resources/views/form/radio.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}" >
+<div class="{{$viewClass['form-group']}}" >
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 

resources/views/form/range.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! ($errors->has($errorKey['start'].'start') || $errors->has($errorKey['end'].'end')) ? 'has-error' : ''  !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id['start']}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -12,7 +12,7 @@
                      <span class="input-group-prepend">
                         <span class="input-group-text bg-white"><i class="feather icon-edit-2"></i></span>
                     </span>
-                    <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ old($column['start'], $value['start'] ?? null) }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ $value['start'] ?? null }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
 
@@ -21,7 +21,7 @@
                      <span class="input-group-prepend">
                         <span class="input-group-text bg-white"><i class="feather icon-edit-2"></i></span>
                     </span>
-                    <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ old($column['end'], $value['end'] ?? null) }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ $value['end'] ?? null }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
         </div>

resources/views/form/rate.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -7,7 +7,7 @@
         @include('admin::form.error')
 
         <div class="input-group" style="width: 150px">
-            <input type="text" id="{{$id}}" name="{{$name}}" value="{{ old($column, $value) }}" class="form-control {{$class}}" placeholder="0" style="text-align:right;" {!! $attributes !!} />
+            <input type="text" id="{{$id}}" name="{{$name}}" value="{{ $value }}" class="form-control {{ $class }}" placeholder="0" style="text-align:right;" {!! $attributes !!} />
             <span class="input-group-addon">%</span>
         </div>
 

resources/views/form/select.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <div for="{{ $id }}" class="{{ $viewClass['label'] }} control-label">
         <span>{!! $label !!}</span>
@@ -16,14 +16,14 @@
                 @foreach($groups as $group)
                     <optgroup label="{{ $group['label'] }}">
                         @foreach($group['options'] as $select => $option)
-                            <option value="{{$select}}" {{ $select == old($column, $value) ?'selected':'' }}>{{$option}}</option>
+                            <option value="{{$select}}" {{ $select == $value ?'selected':'' }}>{{$option}}</option>
                         @endforeach
                     </optgroup>
                 @endforeach
              @else
                 <option value=""></option>
                 @foreach($options as $select => $option)
-                    <option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, old($column, $value)) ?'selected':'' }}>{{$option}}</option>
+                    <option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, $value) ?'selected':'' }}>{{$option}}</option>
                 @endforeach
             @endif
         </select>

resources/views/form/selecttable.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($column) ?: 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
     <label class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
     <div class="{{$viewClass['field']}} select-resource">
         @include('admin::form.error')

resources/views/form/slider.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -6,7 +6,7 @@
 
         @include('admin::form.error')
 
-        <input type="text" class="{{$class}}" name="{{$name}}" data-from="{{ old($column, $value) }}" {!! $attributes !!} />
+        <input type="text" class="{{$class}}" name="{{$name}}" data-from="{{ $value }}" {!! $attributes !!} />
 
         @include('admin::form.help-block')
 

resources/views/form/switchfield.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -6,7 +6,7 @@
 
         @include('admin::form.error')
         <input name="{{$name}}" type="hidden" value="0" />
-        <input type="checkbox" name="{{$name}}" class="{{$class}} la_checkbox" {{ old($column, $value) == 1 ? 'checked' : '' }} {!! $attributes !!} />
+        <input type="checkbox" name="{{$name}}" class="{{$class}} la_checkbox" {{ $value == 1 ? 'checked' : '' }} {!! $attributes !!} />
 
         @include('admin::form.help-block')
 

resources/views/form/tags.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 

resources/views/form/textarea.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -6,7 +6,7 @@
 
         @include('admin::form.error')
 
-        <textarea name="{{$name}}" class="form-control {{$class}}" rows="{{ $rows }}" placeholder="{{ $placeholder }}" {!! $attributes !!} >{{ old($column, $value) }}</textarea>
+        <textarea name="{{$name}}" class="form-control {{$class}}" rows="{{ $rows }}" placeholder="{{ $placeholder }}" {!! $attributes !!} >{{ $value }}</textarea>
 
         @include('admin::form.help-block')
 

resources/views/form/timerange.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! ($errors->has($errorKey['start'].'start') || $errors->has($errorKey['end'].'end')) ? 'has-error' : ''  !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id['start']}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 
@@ -12,7 +12,7 @@
                     <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'] ?? null) }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['start']}}" value="{{ $value['start'] ?? null }}" class="form-control {{$class['start']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
 
@@ -21,7 +21,7 @@
                     <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'] ?? null) }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
+                    <input autocomplete="off" type="text" name="{{$name['end']}}" value="{{ $value['end'] ?? null }}" class="form-control {{$class['end']}}" style="width: 150px" {!! $attributes !!} />
                 </div>
             </div>
         </div>

resources/views/form/tree.blade.php

@@ -1,4 +1,4 @@
-<div class="{{$viewClass['form-group']}} {!! !$errors->has($errorKey) ? '' : 'has-error' !!}">
+<div class="{{$viewClass['form-group']}}">
 
     <label for="{{$id}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>
 

src/Admin.php

@@ -4,8 +4,8 @@ namespace Dcat\Admin;
 
 use Closure;
 use Dcat\Admin\Contracts\Repository;
-use Dcat\Admin\Controllers\AuthController;
-use Dcat\Admin\Exception\Handler;
+use Dcat\Admin\Http\Controllers\AuthController;
+use Dcat\Admin\Http\Exception\Handler;
 use Dcat\Admin\Layout\Menu;
 use Dcat\Admin\Layout\Navbar;
 use Dcat\Admin\Layout\SectionManager;
@@ -200,7 +200,7 @@ class Admin
         if (config('admin.auth.enable', true)) {
             app('router')->group($attributes, function ($router) {
                 /* @var \Illuminate\Routing\Router $router */
-                $router->namespace('Dcat\Admin\Controllers')->group(function ($router) {
+                $router->namespace('Dcat\Admin\Http\Controllers')->group(function ($router) {
                     /* @var \Illuminate\Routing\Router $router */
                     $router->resource('auth/users', 'UserController');
                     $router->resource('auth/menu', 'MenuController', ['except' => ['create', 'show']]);
@@ -241,7 +241,7 @@ class Admin
 
         app('router')->group($attributes, function ($router) {
             /* @var \Illuminate\Routing\Router $router */
-            $router->namespace('Dcat\Admin\Controllers')->group(function ($router) {
+            $router->namespace('Dcat\Admin\Http\Controllers')->group(function ($router) {
                 /* @var \Illuminate\Routing\Router $router */
                 $router->post('action', 'HandleActionController@handle')->name('action');
                 $router->post('form', 'HandleFormController@handle')->name('form');
@@ -274,12 +274,12 @@ class Admin
 
         app('router')->group($attributes, function ($router) {
             /* @var \Illuminate\Routing\Router $router */
-            $router->get('helpers/scaffold', 'Dcat\Admin\Controllers\ScaffoldController@index');
-            $router->post('helpers/scaffold', 'Dcat\Admin\Controllers\ScaffoldController@store');
-            $router->post('helpers/scaffold/table', 'Dcat\Admin\Controllers\ScaffoldController@table');
-            $router->get('helpers/icons', 'Dcat\Admin\Controllers\IconController@index');
-            $router->resource('helpers/extensions', 'Dcat\Admin\Controllers\ExtensionController', ['only' => ['index', 'store', 'update']]);
-            $router->post('helpers/extensions/import', 'Dcat\Admin\Controllers\ExtensionController@import');
+            $router->get('helpers/scaffold', 'Dcat\Admin\Http\Controllers\ScaffoldController@index');
+            $router->post('helpers/scaffold', 'Dcat\Admin\Http\Controllers\ScaffoldController@store');
+            $router->post('helpers/scaffold/table', 'Dcat\Admin\Http\Controllers\ScaffoldController@table');
+            $router->get('helpers/icons', 'Dcat\Admin\Http\Controllers\IconController@index');
+            $router->resource('helpers/extensions', 'Dcat\Admin\Http\Controllers\ExtensionController', ['only' => ['index', 'store', 'update']]);
+            $router->post('helpers/extensions/import', 'Dcat\Admin\Http\Controllers\ExtensionController@import');
         });
     }
 

src/AdminServiceProvider.php

@@ -49,13 +49,13 @@ class AdminServiceProvider extends ServiceProvider
      * @var array
      */
     protected $routeMiddleware = [
-        'admin.auth'       => Middleware\Authenticate::class,
-        'admin.pjax'       => Middleware\Pjax::class,
-        'admin.permission' => Middleware\Permission::class,
-        'admin.bootstrap'  => Middleware\Bootstrap::class,
-        'admin.session'    => Middleware\Session::class,
-        'admin.upload'     => Middleware\WebUploader::class,
-        'admin.app'        => Middleware\Application::class,
+        'admin.auth'       => Http\Middleware\Authenticate::class,
+        'admin.pjax'       => Http\Middleware\Pjax::class,
+        'admin.permission' => Http\Middleware\Permission::class,
+        'admin.bootstrap'  => Http\Middleware\Bootstrap::class,
+        'admin.session'    => Http\Middleware\Session::class,
+        'admin.upload'     => Http\Middleware\WebUploader::class,
+        'admin.app'        => Http\Middleware\Application::class,
     ];
 
     /**

src/Console/stubs/HomeController.stub

@@ -4,7 +4,7 @@ namespace DummyNamespace;
 
 use MetricsNamespace;
 use App\Http\Controllers\Controller;
-use Dcat\Admin\Controllers\Dashboard;
+use Dcat\Admin\Http\Controllers\Dashboard;
 use Dcat\Admin\Layout\Column;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;

src/Console/stubs/config.stub

@@ -296,7 +296,7 @@ return [
     |--------------------------------------------------------------------------
     |
     */
-    'exception_handler' => \Dcat\Admin\Exception\Handler::class,
+    'exception_handler' => Dcat\Admin\Http\Exception\Handler::class,
 
     /*
     |--------------------------------------------------------------------------

src/Form.php

@@ -421,15 +421,15 @@ class Form implements Renderable
     }
 
     /**
-     * Disable submit with ajax.
+     * 启用或禁用ajax表单提交.
      *
-     * @param bool $disable
+     * @param bool $value
      *
      * @return $this
      */
-    public function disableAjaxSubmit(bool $disable = true)
+    public function ajax(bool $value = true)
     {
-        $this->useAjaxSubmit = ! $disable;
+        $this->useAjaxSubmit = $value;
 
         return $this;
     }
@@ -890,7 +890,7 @@ class Form implements Renderable
 
         if ($this->request->get('after-save') == 1) {
             // continue editing
-            if ($this->builder->isEditing() && $this->isAjaxRequest()) {
+            if ($this->builder->isEditing()) {
                 return;
             }
 

src/Form/Concerns/HasEvents.php

@@ -146,10 +146,7 @@ trait HasEvents
 
             $ret = $callback($this, ...$event->payload);
 
-            if (
-                $ret instanceof Response
-                || ($ret instanceof RedirectResponse && ! $this->isAjaxRequest())
-            ) {
+            if ($ret instanceof Response) {
                 $event->form->eventResponse = $ret;
 
                 return false;

src/Form/Field.php

@@ -704,14 +704,6 @@ class Field implements Renderable
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
-    public function old()
-    {
-        return old($this->column, $this->value());
-    }
-
     /**
      * Get original value of the field.
      *

src/Form/Field/ArrayField.php

@@ -27,22 +27,12 @@ class ArrayField extends HasMany
 
         $forms = [];
 
-        if ($values = old($this->column)) {
-            foreach ($values as $key => $data) {
-                if ($data[NestedForm::REMOVE_FLAG_NAME] == 1) {
-                    continue;
-                }
-
-                $forms[$key] = $this->buildNestedForm($key)->fill($data);
+        foreach (Helper::array($this->value()) as $key => $data) {
+            if (isset($data['pivot'])) {
+                $data = array_merge($data, $data['pivot']);
             }
-        } else {
-            foreach ($this->value() as $key => $data) {
-                if (isset($data['pivot'])) {
-                    $data = array_merge($data, $data['pivot']);
-                }
 
-                $forms[$key] = $this->buildNestedForm($key)->fill($data);
-            }
+            $forms[$key] = $this->buildNestedForm($key)->fill($data);
         }
 
         return $forms;

src/Form/Field/Checkbox.php

@@ -88,7 +88,7 @@ class Checkbox extends MultipleSelect
 
         $checkbox
             ->inline()
-            ->check(old($this->column, $this->value()))
+            ->check($this->value())
             ->class($this->getElementClassString());
 
         $this->addVariables([

src/Form/Field/Embeds.php

@@ -4,6 +4,7 @@ namespace Dcat\Admin\Form\Field;
 
 use Dcat\Admin\Form\EmbeddedForm;
 use Dcat\Admin\Form\Field;
+use Dcat\Admin\Support\Helper;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
@@ -232,19 +233,7 @@ class Embeds extends Field
      */
     protected function getEmbeddedData()
     {
-        if ($old = old($this->column)) {
-            return $old;
-        }
-
-        if (empty($this->value)) {
-            return [];
-        }
-
-        if (is_string($this->value)) {
-            return json_decode($this->value, true);
-        }
-
-        return (array) $this->value;
+        return Helper::array($this->value);
     }
 
     /**

src/Form/Field/HasMany.php

@@ -424,24 +424,11 @@ class HasMany extends Field
          *
          * Else get data from database.
          */
-        if ($values = old($this->column)) {
-            foreach ($values as $key => $data) {
-                if ($data[NestedForm::REMOVE_FLAG_NAME] == 1) {
-                    continue;
-                }
-
-                $forms[$key] = $this->buildNestedForm($key)
-                    ->fill($data);
-            }
-        } else {
-            if (is_array($this->value)) {
-                foreach ($this->value as $idx => $data) {
-                    $key = Arr::get($data, $this->getKeyName(), $idx);
+        foreach (Helper::array($this->value()) as $idx => $data) {
+            $key = Arr::get($data, $this->getKeyName(), $idx);
 
-                    $forms[$key] = $this->buildNestedForm($key)
-                        ->fill($data);
-                }
-            }
+            $forms[$key] = $this->buildNestedForm($key)
+                ->fill($data);
         }
 
         return $forms;

src/Form/Field/Icon.php

@@ -9,18 +9,16 @@ class Icon extends Text
 
     public function render()
     {
-        $this->setupScript();
+        $this->addScript();
 
-        $value = old($this->column, $this->value());
-
-        $this->prepend("<i class='fa {$value}'>&nbsp;</i>")
+        $this->prepend("<i class='fa {$this->value()}'>&nbsp;</i>")
             ->defaultAttribute('autocomplete', 'off')
             ->defaultAttribute('style', 'width: 160px;flex:none');
 
         return parent::render();
     }
 
-    protected function setupScript()
+    protected function addScript()
     {
         $this->script = <<<JS
 setTimeout(function () {

src/Form/Field/KeyValue.php

@@ -67,7 +67,7 @@ class KeyValue extends Field
 
     protected function addScript()
     {
-        $value = old($this->column, $this->value());
+        $value = $this->value();
 
         $number = $value ? count($value) : 0;
         $class = $this->getElementClassString();

src/Form/Field/ListField.php

@@ -138,7 +138,7 @@ class ListField extends Field
      */
     protected function addScript()
     {
-        $value = old($this->column, $this->value());
+        $value = $this->value();
 
         $number = $value ? count($value) : 0;
 

src/Form/Field/Markdown.php

@@ -133,7 +133,7 @@ class Markdown extends Field
     /**
      * 初始化js.
      */
-    protected function setUpScript()
+    protected function addScript()
     {
         $this->options['path'] = admin_asset('@admin/dcat/plugins/editor-md/lib').'/';
         $this->options['name'] = $this->column;
@@ -185,7 +185,7 @@ JS;
      */
     public function render()
     {
-        $this->setUpScript();
+        $this->addScript();
 
         Admin::style('.editormd-fullscreen {z-index: 99999999;}');
 

src/Form/Field/Radio.php

@@ -67,7 +67,7 @@ class Radio extends Field
 
         $radio
             ->inline()
-            ->check(old($this->column, $this->value()))
+            ->check($this->value())
             ->class($this->getElementClassString());
 
         $this->addVariables([

src/Form/Field/SelectTable.php

@@ -109,7 +109,7 @@ class SelectTable extends Field
 
     protected function formatOptions()
     {
-        $value = Helper::array(old($this->column, $this->value()));
+        $value = Helper::array($this->value());
 
         if ($this->options instanceof \Closure) {
             $this->options = $this->options->call($this->values(), $value, $this);

src/Form/Field/Tags.php

@@ -223,7 +223,7 @@ JS;
             );
         }
 
-        $this->setupScript();
+        $this->addScript();
 
         if ($this->keyAsValue) {
             $options = $value + $this->options;
@@ -237,7 +237,7 @@ JS;
         ]);
     }
 
-    protected function setupScript()
+    protected function addScript()
     {
         // 解决部分浏览器开启 tags: true 后无法输入中文的BUG
         // 支持"逗号" "分号" "空格"结尾生成tags

src/Form/Field/Text.php

@@ -30,7 +30,7 @@ class Text extends Field
         $this->defaultAttribute('type', 'text')
             ->defaultAttribute('id', $this->id)
             ->defaultAttribute('name', $this->getElementName())
-            ->defaultAttribute('value', old($this->column, $this->value()))
+            ->defaultAttribute('value', $this->value())
             ->defaultAttribute('class', 'form-control '.$this->getElementClassString())
             ->defaultAttribute('placeholder', $this->placeholder());
 

src/Form/Field/Tree.php

@@ -134,14 +134,12 @@ class Tree extends Field
 
     protected function formatNodes()
     {
-        $value = Helper::array(
-            old($this->column, $this->value())
-        );
+        $value = Helper::array($this->value());
 
         $this->value = &$value;
 
         if ($this->nodes instanceof \Closure) {
-            $this->nodes = $this->nodes->call($this->values(), $this->value(), $this);
+            $this->nodes = $this->nodes->call($this->values(), $value, $this);
         }
 
         if (! $this->nodes) {

src/Extension/Grid/ImportButton.php → src/Http/Actions/ImportButton.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Extension\Grid;
+namespace Dcat\Admin\Http\Actions;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Grid\RowAction;

src/Controllers/AdminController.php → src/Http/Controllers/AdminController.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
-use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Illuminate\Routing\Controller;
 

src/Controllers/AuthController.php → src/Http/Controllers/AuthController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Models\Repositories\Administrator;
+use Dcat\Admin\Http\Repositories\Administrator;
 use Dcat\Admin\Traits\HasFormResponse;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Http\Request;

src/Controllers/Dashboard.php → src/Http/Controllers/Dashboard.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 class Dashboard
 {

src/Controllers/EditorMDController.php → src/Http/Controllers/EditorMDController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Http\Request;

src/Controllers/ExtensionController.php → src/Http/Controllers/ExtensionController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
-use Dcat\Admin\Extension\Grid\ImportButton;
+use Dcat\Admin\Http\Actions\ImportButton;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Models\Repositories\Extension;
+use Dcat\Admin\Http\Repositories\Extension;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Support\StringOutput;
 use Dcat\Admin\Widgets\Alert;
@@ -55,9 +55,9 @@ class ExtensionController extends Controller
     {
         return new Grid(new Extension(), function (Grid $grid) {
             $grid->number();
-            $grid->name;
-            $grid->version;
-            $grid->alias;
+            $grid->column('name');
+            $grid->column('version');
+            $grid->column('alias');
 
             $grid->description
                 ->if(function () {

src/Controllers/HandleActionController.php → src/Http/Controllers/HandleActionController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Actions\Action;
 use Dcat\Admin\Actions\Response;

src/Controllers/HandleFormController.php → src/Http/Controllers/HandleFormController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Form\Field\File;
 use Dcat\Admin\Traits\HasUploadedFile;

src/Controllers/HasResourceActions.php → src/Http/Controllers/HasResourceActions.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 trait HasResourceActions
 {

src/Controllers/IconController.php → src/Http/Controllers/IconController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Layout\Content;

src/Controllers/MenuController.php → src/Http/Controllers/MenuController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Form;
 use Dcat\Admin\Layout\Column;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
-use Dcat\Admin\Models\Repositories\Menu;
+use Dcat\Admin\Http\Repositories\Menu;
 use Dcat\Admin\Tree;
 use Dcat\Admin\Widgets\Box;
 use Dcat\Admin\Widgets\Form as WidgetForm;

src/Controllers/PermissionController.php → src/Http/Controllers/PermissionController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Models\Repositories\Permission;
+use Dcat\Admin\Http\Repositories\Permission;
 use Dcat\Admin\Tree;
 use Illuminate\Support\Str;
 

src/Controllers/RenderableController.php → src/Http/Controllers/RenderableController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Contracts\LazyRenderable;

src/Controllers/RoleController.php → src/Http/Controllers/RoleController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Auth\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Models\Repositories\Role;
+use Dcat\Admin\Http\Repositories\Role;
 use Dcat\Admin\Models\Role as RoleModel;
 use Dcat\Admin\Show;
 use Dcat\Admin\Support\Helper;

src/Controllers/ScaffoldController.php → src/Http/Controllers/ScaffoldController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Auth\Permission;

src/Controllers/TinymceController.php → src/Http/Controllers/TinymceController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Http\Request;

src/Controllers/UserController.php → src/Http/Controllers/UserController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Dcat\Admin\Auth\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Models\Administrator as AdministratorModel;
-use Dcat\Admin\Models\Repositories\Administrator;
+use Dcat\Admin\Http\Repositories\Administrator;
 use Dcat\Admin\Show;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\Tree;

src/Controllers/ValueController.php → src/Http/Controllers/ValueController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Controllers;
+namespace Dcat\Admin\Http\Controllers;
 
 use Exception;
 use Illuminate\Http\Request;

src/Exception/Handler.php → src/Http/Exception/Handler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Exception;
+namespace Dcat\Admin\Http\Exception;
 
 use Dcat\Admin\Support\Helper;
 use Illuminate\Support\MessageBag;

src/Middleware/Application.php → src/Http/Middleware/Application.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Middleware;
+namespace Dcat\Admin\Http\Middleware;
 
 use Dcat\Admin\Admin;
 

src/Middleware/Authenticate.php → src/Http/Middleware/Authenticate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Middleware;
+namespace Dcat\Admin\Http\Middleware;
 
 use Closure;
 use Dcat\Admin\Admin;

src/Middleware/Bootstrap.php → src/Http/Middleware/Bootstrap.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Middleware;
+namespace Dcat\Admin\Http\Middleware;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Support\Helper;

src/Middleware/Permission.php → src/Http/Middleware/Permission.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Middleware;
+namespace Dcat\Admin\Http\Middleware;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Auth\Permission as Checker;

src/Middleware/Pjax.php → src/Http/Middleware/Pjax.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Middleware;
+namespace Dcat\Admin\Http\Middleware;
 
 use Closure;
 use Dcat\Admin\Admin;

src/Middleware/Session.php → src/Http/Middleware/Session.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Middleware;
+namespace Dcat\Admin\Http\Middleware;
 
 use Illuminate\Http\Request;
 

src/Middleware/WebUploader.php → src/Http/Middleware/WebUploader.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Middleware;
+namespace Dcat\Admin\Http\Middleware;
 
 use Dcat\Admin\Support\WebUploader as Uploader;
 use Illuminate\Http\Request;

src/Models/Repositories/Administrator.php → src/Http/Repositories/Administrator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Models\Repositories;
+namespace Dcat\Admin\Http\Repositories;
 
 use Dcat\Admin\Grid;
 use Dcat\Admin\Repositories\EloquentRepository;

src/Models/Repositories/Extension.php → src/Http/Repositories/Extension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Models\Repositories;
+namespace Dcat\Admin\Http\Repositories;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Extension as AbstractExtension;

src/Models/Repositories/Menu.php → src/Http/Repositories/Menu.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Models\Repositories;
+namespace Dcat\Admin\Http\Repositories;
 
 use Dcat\Admin\Repositories\EloquentRepository;
 

src/Models/Repositories/Permission.php → src/Http/Repositories/Permission.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Models\Repositories;
+namespace Dcat\Admin\Http\Repositories;
 
 use Dcat\Admin\Repositories\EloquentRepository;
 

src/Models/Repositories/Role.php → src/Http/Repositories/Role.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dcat\Admin\Models\Repositories;
+namespace Dcat\Admin\Http\Repositories;
 
 use Dcat\Admin\Repositories\EloquentRepository;
 

src/Traits/HasFormResponse.php

@@ -56,16 +56,6 @@ trait HasFormResponse
         return $this->redirect($url, $options);
     }
 
-    /**
-     * @param Request $request
-     *
-     * @return bool
-     */
-    public function isAjaxRequest(Request $request = null)
-    {
-        return Helper::isAjaxRequest($request);
-    }
-
     /**
      * @param string $message
      * @param string $redirectTo
@@ -134,12 +124,6 @@ trait HasFormResponse
     public function error($message = null, $redirectTo = null, int $statusCode = 200)
     {
         if (! $redirectTo) {
-            if (! $this->isAjaxRequest()) {
-                admin_toastr($message, 'error');
-
-                return back()->withInput();
-            }
-
             return $this->ajaxResponse($message, null, false);
         }
 
@@ -174,19 +158,9 @@ trait HasFormResponse
 
         $status = (bool) ($options['status'] ?? true);
 
-        if ($this->isAjaxRequest()) {
-            $message = $message ?: trans('admin.save_succeeded');
+        $message = $message ?: trans('admin.save_succeeded');
 
-            return $this->ajaxResponse($message, $url, $status, $options);
-        }
-
-        $statusCode = (int) ($options['status_code'] ?? 302);
-
-        if ($message) {
-            admin_toastr($message, $status ? 'success' : 'error');
-        }
-
-        return $url ? redirect(admin_url($url), $statusCode) : redirect()->back($statusCode);
+        return $this->ajaxResponse($message, $url, $status, $options);
     }
 
     /**
@@ -213,10 +187,6 @@ trait HasFormResponse
             $validationMessages = $validationMessages->getMessageBag();
         }
 
-        if (! static::isAjaxRequest()) {
-            return back()->withInput()->withErrors($validationMessages);
-        }
-
         return response()->json([
             'errors' => is_array($validationMessages) ? $validationMessages : $validationMessages->getMessages(),
         ], 422);