表单样式兼容

update

resources/assets/dcat/extra/resource-selector.js

@@ -13,9 +13,9 @@
             placeholder: '', // input placeholder
             showCloseButton: false,
             lang: {
-                close: '关闭',
-                exceed_max_item: '您已超出最大可选择的数量',
-                selected_options: '已选中:num个选项',
+                close: Dcat.lang.close || '关闭',
+                exceed_max_item: Dcat.lang.exceed_max_item || '您已超出最大可选择的数量',
+                selected_options: Dcat.lang.selected_options || '已选中:num个选项',
             },
             displayerContainer: null, // 选项展示容器dom对象
             hiddenInput: null, // 隐藏表单dom对象

resources/assets/dcat/sass/_variables.scss

@@ -67,8 +67,14 @@ $btn-shadow: $shadow-100;
 $btn-shadow-hover: $shadow-200;
 $btn-group-btn-shadow: 0 2px 0 0 rgba(0,0,0,.08);
 
+// 菜单阴影
+$menu-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.05);
+
 // 常用边框颜色
 $border-color: #eee;
 
+// 表单边框颜色
+$input-border-color: #d9d9d9;
+
 // 常用分割线颜色
 $divider-color: #f4f4f4;

resources/assets/dcat/sass/components/_button.scss

@@ -1,5 +1,5 @@
 .btn {
-  padding: .75rem 1.45rem!important;
+  padding: .75rem 1.35rem!important;
   font-size: .95rem;
   height: 36px;
   line-height: .7;
@@ -22,10 +22,10 @@
 }
 
 .btn-sm, .btn-group-sm > .btn {
-  padding: 0.7rem 1.3rem!important;;
+  padding: 0.6rem 1rem!important;;
   font-size: 0.6rem;
   line-height: 12px;
-  height: 32px;
+  height: 30px;
 }
 
 
@@ -81,3 +81,7 @@
 .btn-flat-primary, .btn-flat-success, .btn-flat-danger, .btn-flat-info, .btn-flat-warning, .btn-flat-dark {
   box-shadow: none;
 }
+
+.input-group-sm > .form-control, .input-group-sm > .custom-select, .input-group-sm > .input-group-prepend > .input-group-text, .input-group-sm > .input-group-append > .input-group-text, .input-group-sm > .input-group-prepend > .btn, .input-group-sm > .input-group-append > .btn {
+  padding: 0.5rem .7rem;
+}

resources/assets/dcat/sass/components/_form.scss

@@ -8,4 +8,95 @@
 
 select.form-control:not([multiple=multiple]) {
   background-image: url(/dcat-admin/images/arrow-down.png?8338497…);
-}
+}
+
+.input-group-sm > .form-control:not(textarea), .input-group-sm > .custom-select, .form-control-sm {
+  height: 30px;
+  line-height: 13px;
+}
+
+
+// --------------------- input-group-addon ---------------------
+.input-group-addon {
+  width: 1%;
+  white-space: nowrap;
+  vertical-align: middle;
+  padding: 6px 12px;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1;
+  text-align: center;
+  background-color: $white;
+  border: 1px solid $input-border-color;
+  min-width: 30px;
+}
+.input-group-sm>.input-group-addon {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: .7rem;
+  line-height: 1.5;
+}
+// --------------------- input-group-addon ---------------------
+
+
+
+// --------------------- select2 ---------------------
+.input-group-sm {
+  .select2-container--classic .select2-selection--single, .select2-container--default .select2-selection--single {
+    min-height: 31px;
+    padding: 1px 2px;
+    font-size: 0.7rem;
+  }
+
+  .select2-container--default .select2-selection--multiple {
+    min-height: 30px !important;
+    padding: 0 2px;
+    font-size: 0.7rem;
+    line-height: 14px;
+  }
+
+  .select2-container--default .select2-selection--single .select2-selection__arrow {
+    top: -3px;
+  }
+
+  .select2-container--classic .select2-selection--multiple .select2-selection__rendered li .select2-search__field, .select2-container--default .select2-selection--multiple .select2-selection__rendered li .select2-search__field {
+    margin-top: 6px;
+  }
+}
+
+.select2-container--default .select2-selection--single,
+.select2-container--default .select2-selection--multiple {
+  border-color: $input-border-color!important;
+}
+
+.form-group {
+  .select2-container {
+    width: 1%!important;
+    flex: 1 1 auto;
+  }
+}
+.select2-dropdown {
+  border: 1px solid rgba(0, 0, 0, 0.03)!important;
+  box-shadow: $shadow;
+}
+.select2-container--default .select2-results__option[aria-selected=true] {
+  background-color: $gray-background!important;
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: $dark40!important;
+  color: $font-color!important;
+}
+.select2-results__option {
+  padding: 6px 10px!important;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  padding: 2px 5px!important;
+  border: 0!important;
+}
+// --------------------- select2 ---------------------
+
+
+.select2-selection .default-text {
+  display: inline-block;
+  padding: 6px;
+}

resources/assets/dcat/sass/components/_slider.scss

@@ -0,0 +1,5 @@
+.customizer {
+  width: 450px;
+  box-shadow: $menu-shadow;
+  z-index: 48;
+}

resources/assets/dcat/sass/components/_table.scss

@@ -63,4 +63,7 @@ table.data-list-view.dataTable tbody tr:hover, table.data-thumb-view.dataTable t
   overflow: visible!important;
   padding-bottom: 0!important;
 }
+.sticky-table-header {
+  z-index: 45!important;
+}
 // 解决 rwd-table 下拉选框显示bug

resources/assets/dcat/sass/dcat-app.scss

@@ -52,6 +52,8 @@ html body .content .content-wrapper {
 @import "./components/nestable";
 // layer弹窗
 @import "./components/layer";
+// 滑动面板
+@import "./components/slider";
 
 body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
    font-size: 1.3rem;
@@ -64,7 +66,7 @@ body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation >
 
 // 菜单
 .main-menu.menu-shadow {
-  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: $menu-shadow;
 }
 
 // 面包屑导航

resources/dist/dcat/css/dcat-app.css

@@ -1750,7 +1750,7 @@ html body .content .content-wrapper {
 }
 
 .btn {
-  padding: 0.75rem 1.45rem !important;
+  padding: 0.75rem 1.35rem !important;
   font-size: 0.95rem;
   height: 36px;
   line-height: 0.7;
@@ -1776,10 +1776,10 @@ html body .content .content-wrapper {
 
 .btn-sm,
 .btn-group-sm > .btn {
-  padding: 0.7rem 1.3rem !important;
+  padding: 0.6rem 1rem !important;
   font-size: 0.6rem;
   line-height: 12px;
-  height: 32px;
+  height: 30px;
 }
 
 .btn-custom {
@@ -1849,6 +1849,15 @@ html body .content .content-wrapper {
   box-shadow: none;
 }
 
+.input-group-sm > .form-control,
+.input-group-sm > .custom-select,
+.input-group-sm > .input-group-prepend > .input-group-text,
+.input-group-sm > .input-group-append > .input-group-text,
+.input-group-sm > .input-group-prepend > .btn,
+.input-group-sm > .input-group-append > .btn {
+  padding: 0.5rem 0.7rem;
+}
+
 .form-control-sm {
   padding: 0.5rem 1.5rem;
 }
@@ -1857,6 +1866,95 @@ select.form-control:not([multiple=multiple]) {
   background-image: url(/dcat-admin/images/arrow-down.png?8338497…);
 }
 
+.input-group-sm > .form-control:not(textarea),
+.input-group-sm > .custom-select,
+.form-control-sm {
+  height: 30px;
+  line-height: 13px;
+}
+
+.input-group-addon {
+  width: 1%;
+  white-space: nowrap;
+  vertical-align: middle;
+  padding: 6px 12px;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1;
+  text-align: center;
+  background-color: #fff;
+  border: 1px solid #d9d9d9;
+  min-width: 30px;
+}
+
+.input-group-sm > .input-group-addon {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 0.7rem;
+  line-height: 1.5;
+}
+
+.input-group-sm .select2-container--classic .select2-selection--single,
+.input-group-sm .select2-container--default .select2-selection--single {
+  min-height: 31px;
+  padding: 1px 2px;
+  font-size: 0.7rem;
+}
+
+.input-group-sm .select2-container--default .select2-selection--multiple {
+  min-height: 30px !important;
+  padding: 0 2px;
+  font-size: 0.7rem;
+  line-height: 14px;
+}
+
+.input-group-sm .select2-container--default .select2-selection--single .select2-selection__arrow {
+  top: -3px;
+}
+
+.input-group-sm .select2-container--classic .select2-selection--multiple .select2-selection__rendered li .select2-search__field,
+.input-group-sm .select2-container--default .select2-selection--multiple .select2-selection__rendered li .select2-search__field {
+  margin-top: 6px;
+}
+
+.select2-container--default .select2-selection--single,
+.select2-container--default .select2-selection--multiple {
+  border-color: #d9d9d9 !important;
+}
+
+.form-group .select2-container {
+  width: 1% !important;
+  flex: 1 1 auto;
+}
+
+.select2-dropdown {
+  border: 1px solid rgba(0, 0, 0, 0.03) !important;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+}
+
+.select2-container--default .select2-results__option[aria-selected=true] {
+  background-color: #f1f1f1 !important;
+}
+
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: #ebf0f3 !important;
+  color: #414750 !important;
+}
+
+.select2-results__option {
+  padding: 6px 10px !important;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  padding: 2px 5px !important;
+  border: 0 !important;
+}
+
+.select2-selection .default-text {
+  display: inline-block;
+  padding: 6px;
+}
+
 .pagination .page-item .page-link {
   font-weight: 600;
 }
@@ -1933,6 +2031,10 @@ table.data-thumb-view.dataTable tbody tr:hover {
   padding-bottom: 0 !important;
 }
 
+.sticky-table-header {
+  z-index: 45 !important;
+}
+
 .grid-column-header a {
   color: #b3b9bf;
 }
@@ -2116,6 +2218,12 @@ table.data-thumb-view.dataTable tbody tr:hover {
   top: 3px;
 }
 
+.customizer {
+  width: 450px;
+  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.05);
+  z-index: 48;
+}
+
 body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
   font-size: 1.3rem;
 }

resources/dist/dcat/extra/resource-selector.js

@@ -13,9 +13,9 @@
             placeholder: '', // input placeholder
             showCloseButton: false,
             lang: {
-                close: '关闭',
-                exceed_max_item: '您已超出最大可选择的数量',
-                selected_options: '已选中:num个选项',
+                close: Dcat.lang.close || '关闭',
+                exceed_max_item: Dcat.lang.exceed_max_item || '您已超出最大可选择的数量',
+                selected_options: Dcat.lang.selected_options || '已选中:num个选项',
             },
             displayerContainer: null, // 选项展示容器dom对象
             hiddenInput: null, // 隐藏表单dom对象

resources/lang/en/admin.php

@@ -30,6 +30,9 @@ return [
         'confirm'           => 'Confirm',
         'cancel'            => 'Cancel',
         'refresh_succeeded' => 'Refresh succeeded !',
+        'close'             => 'Close',
+        'selected_options'  => ':num options selected',
+        'exceed_max_item'   => 'Maximum items exceeded.',
 
         '500' => 'Internal server error !',
         '403' => 'Permission deny !',
@@ -184,7 +187,6 @@ return [
         'F_DUPLICATE'            => 'Duplicate file.',
     ],
     'import_extension_confirm' => 'Are you sure import the extension?',
-    'selected_must_less_then'  => 'Only supports maximum :num options.',
     'quick_create'             => 'Quick create',
     'grid_items_selected'      => '{n} items selected',
     'nothing_updated'          => 'Nothing has been updated.',

resources/lang/zh-CN/admin.php

@@ -30,6 +30,9 @@ return [
         'confirm'           => '确认',
         'cancel'            => '取消',
         'refresh_succeeded' => '刷新成功 !',
+        'close'             => '关闭',
+        'selected_options'  => '已选中:num个选项',
+        'exceed_max_item'   => '已超出最大可选数量',
 
         '500' => '系统繁忙，请稍后再试！',
         '403' => '对不起，您没有权限访问，请与管理员联系。',
@@ -185,7 +188,6 @@ return [
         'F_DUPLICATE'            => '文件重复',
     ],
     'import_extension_confirm' => '确认导入拓展？',
-    'selected_must_less_then'  => '最多只能选择:num个选项',
     'quick_create'             => '快速创建',
     'grid_items_selected'      => '已选择 {n} 项',
     'nothing_updated'          => '没有任何数据被更改',

resources/views/filter/between-datetime.blade.php

@@ -1,7 +1,11 @@
 <div class="filter-input col-sm-{{ $width }}"  style="{!! $style !!}">
     <div class="form-group">
         <div class="input-group input-group-sm">
-            <span class="input-group-addon"><b>{{$label}}</b>  &nbsp;<i class="fa fa-calendar"></i></span>
+
+            <div class="input-group-prepend">
+                <span class="input-group-text bg-white"><b>{!! $label !!}</b>&nbsp;<i class="feather icon-calendar"></i></span>
+            </div>
+
             <input autocomplete="off" type="text" class="form-control" id="{{$id['start']}}" placeholder="{{$label}}" name="{{$name['start']}}" value="{{ request($name['start'], \Illuminate\Support\Arr::get($value, 'start')) }}">
             <span class="input-group-addon" style="border-left: 0; border-right: 0;">To</span>
             <input autocomplete="off" type="text" class="form-control" id="{{$id['end']}}" placeholder="{{$label}}" name="{{$name['end']}}" value="{{ request($name['end'], \Illuminate\Support\Arr::get($value, 'end')) }}">

resources/views/filter/between.blade.php

@@ -1,7 +1,10 @@
 <div class="filter-input col-sm-{{ $width }} "  style="{!! $style !!}">
     <div class="form-group" >
         <div class="input-group input-group-sm">
-            <span class="input-group-addon"><b>{!! $label !!}</b></span>
+            <div class="input-group-prepend">
+                <span class="input-group-text bg-white"><b>{!! $label !!}</b></span>
+            </div>
+
             <input type="text" class="form-control" placeholder="{{$label}}" name="{{$name['start']}}" value="{{ request($name['start'], \Illuminate\Support\Arr::get($value, 'start')) }}">
             <span class="input-group-addon" style="border-left: 0; border-right: 0;">To</span>
             <input type="text" class="form-control" placeholder="{{$label}}" name="{{$name['end']}}" value="{{ request($name['end'], \Illuminate\Support\Arr::get($value, 'end')) }}">

resources/views/filter/datetime.blade.php

@@ -15,7 +15,7 @@
         </div>
     @endif
     <div class="input-group-addon">
-        <b>{{$label}}</b> &nbsp;<i class="fa fa-calendar"></i>
+        <b>{{$label}}</b> &nbsp;<i class="feather icon-calendar"></i>
     </div>
         <input class="form-control" id="{{$id}}" autocomplete="off" placeholder="{{$label}}" name="{{$name}}" value="{{ request($name, $value) }}">
 </div>

resources/views/filter/modal.blade.php

@@ -1,33 +0,0 @@
-<div class="btn-group pull-right" style="margin-right: 10px">
-    <a href="" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#{{ $modalID }}"><i class="fa fa-filter"></i>&nbsp;&nbsp;{{ trans('admin.filter') }}</a>
-    <a href="{!! $action !!}" class="btn btn-sm btn-facebook"><i class="fa fa-undo"></i>&nbsp;&nbsp;{{ trans('admin.reset') }}</a>
-</div>
-
-<div class="modal fade" id="{{ $modalID }}" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                    <span class="sr-only">Close</span>
-                </button>
-                <h4 class="modal-title" id="myModalLabel">{{ trans('admin.filter') }}</h4>
-            </div>
-            <form action="{!! $action !!}" method="get" pjax-container>
-                <div class="modal-body">
-                    <div class="form">
-                        @foreach($filters as $filter)
-                            <div class="form-group">
-                                {!! $filter->render() !!}
-                            </div>
-                        @endforeach
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" class="btn btn-primary submit">{{ trans('admin.submit') }}</button>
-                    <button type="reset" class="btn btn-warning pull-left">{{ trans('admin.reset') }}</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>

resources/views/filter/multipleselect.blade.php

@@ -1,5 +1,8 @@
 <div class="input-group input-group-sm">
-    <span class="input-group-addon"><b>{{$label}}</b></span>
+    <div class="input-group-prepend">
+        <span class="input-group-text bg-white"><b>{!! $label !!}</b></span>
+    </div>
+
     <select class="form-control {{ $class }}" name="{{$name}}[]" multiple style="width: 100%;">
         @foreach($options as $select => $option)
             <option value="{{$select}}" {{ in_array((string)$select, request($name, []))  ?'selected':'' }}>{{$option}}</option>

resources/views/filter/select.blade.php

@@ -1,5 +1,8 @@
 <div class="input-group input-group-sm">
-    <span class="input-group-addon"><b>{!! $label !!}</b></span>
+    <div class="input-group-prepend">
+        <span class="input-group-text bg-white"><b>{!! $label !!}</b></span>
+    </div>
+
     <select class="form-control {{ $class }}" name="{{$name}}" style="width: 100%;">
         @if($selectAll)
             <option value="">{{trans('admin.all')}}</option>

resources/views/filter/selectresource.blade.php

@@ -1,7 +1,10 @@
 <div class="input-group input-group-sm select-resource">
-    <span class="input-group-addon"><b>{!! $label !!}</b></span>
-    <div class="{{ $id }} {!! $containerClass !!}" placeholder="{{$placeholder}}" name="{{$name}}" style="width:100%;">
-        @if($maxItem > 2 || !$maxItem)
+    <div class="input-group-prepend">
+        <span class="input-group-text bg-white"><b>{!! $label !!}</b></span>
+    </div>
+
+    <div item="{{ $maxItem }}" class="{{ $id }} {!! $containerClass !!}" placeholder="{{$placeholder}}" name="{{$name}}">
+        @if($maxItem > 2 || ! $maxItem)
             <span class="selection">
                 <span class="select2-selection select2-selection--multiple" role="combobox" >
                     <ul class="select2-selection__rendered"></ul>
@@ -10,9 +13,9 @@
         @endif
     </div>
     <input name="{{$name}}" type="hidden" />
-    <div class="input-group-btn">
+    <div class="input-group-append">
         <div class="btn btn-{{$btnStyle}} btn-sm " id="{{$name}}-filter-select-source">
-            &nbsp;<i class="fa fa-long-arrow-up"></i>&nbsp;
+            &nbsp;<i class="feather icon-arrow-up"></i>&nbsp;
         </div>
     </div>
 </div>
@@ -29,9 +32,7 @@ Dcat.ready(function () {
         items: {!! $value !!},
         placeholder: '{{$placeholder ?: $label}}',
         showCloseButton: false,
-        closeButtonText: '{!! ucfirst(trans('admin.close')) !!}',
-        exceedMaxItemTip: '{{trans('admin.selected_must_less_then', ['num' => $maxItem])}}',
-        @if($maxItem > 2 || !$maxItem) $displayerContainer: $('div[name="{!! $name !!}"] .select2-selection'), @endif
+        @if($maxItem > 2 || !$maxItem) displayerContainer: $('div[name="{!! $name !!}"] .select2-selection'), @endif
     });
 });
 </script>

resources/views/filter/text.blade.php

@@ -1,8 +1,8 @@
 <div class="input-group input-group-sm">
     @if($group)
-        <div class="input-group-btn">
+        <div class="input-group-prepend">
             <input type="hidden" name="{{ $id }}_group" class="{{ $group_name }}-operation" value="0"/>
-            <a class=" filter-group btn btn-white dropdown-toggle" data-toggle="dropdown">
+            <a class="filter-group input-group-text bg-white dropdown-toggle" data-toggle="dropdown">
                 <span class="{{ $group_name }}-label">{{ $default['label'] }} </span>
                 <span class="fa fa-caret-down"></span>
             </a>
@@ -13,6 +13,8 @@
             </ul>
         </div>
     @endif
-    <span class="input-group-addon"><b>{!! $label !!}</b></span>
+    <div class="input-group-prepend">
+        <span class="input-group-text bg-white"><b>{!! $label !!}</b></span>
+    </div>
     <input type="{{ $type }}" class="form-control {{ $id }}" placeholder="{{$placeholder}}" name="{{$name}}" value="{{ request($name, $value) }}">
 </div>

resources/views/form/daterange.blade.php

@@ -9,14 +9,14 @@
         <div class="row" style="width: 370px">
             <div class="col-lg-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <span class="input-group-addon"><i class="feather icon-calendar"></i></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="fa fa-calendar"></i></span>
+                    <span class="input-group-addon"><i class="feather icon-calendar"></i></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

@@ -9,14 +9,14 @@
         <div class="row" style="width: 433px">
             <div class="col-lg-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <span class="input-group-addon"><i class="feather icon-calendar"></i></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="input-group">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <span class="input-group-addon"><i class="feather icon-calendar"></i></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/selectresource.blade.php

@@ -11,9 +11,9 @@
             @endif
             <div {!! $attributes !!}>
             </div>
-            <div class="input-group-btn">
+            <div class="input-group-append">
                 <div class="btn btn-{{$style}} " id="{{ $btnId }}">
-                    &nbsp;<i class="fa fa-long-arrow-up"></i>&nbsp;
+                    &nbsp;<i class="feather icon-arrow-up"></i>&nbsp;
                 </div>
             </div>
         </div>

resources/views/form/timerange.blade.php

@@ -9,14 +9,14 @@
         <div class="row" style="width: 370px">
             <div class="col-lg-6">
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <span class="input-group-addon"><i class="feather icon-calendar"></i></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="fa fa-calendar"></i></span>
+                    <span class="input-group-addon"><i class="feather icon-calendar"></i></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/grid/quick-create/selectresource.blade.php

@@ -6,9 +6,9 @@
         @endif
         <div {!! $attributes !!}>
         </div>
-        <div class="input-group-btn">
+        <div class="input-group-append">
             <div class="btn btn-sm btn-{{$style}} " id="{{ $btnId }}">
-                &nbsp;<i class="fa fa-long-arrow-up"></i>&nbsp;
+                &nbsp;<i class="feather icon-arrow-up"></i>&nbsp;
             </div>
         </div>
     </div>

resources/views/helpers/font-awesome.blade.php

@@ -455,7 +455,7 @@
             <div class="col-sm-6 col-md-4 col-lg-3"><i class="fa fa-cab"></i> fa-cab <span class="text-muted">(alias)</span>
             </div>
 
-            <div class="col-sm-6 col-md-4 col-lg-3"><i class="fa fa-calendar"></i> fa-calendar</div>
+            <div class="col-sm-6 col-md-4 col-lg-3"><i class="feather icon-calendar"></i> fa-calendar</div>
 
             <div class="col-sm-6 col-md-4 col-lg-3"><i class="fa fa-calendar-o"></i> fa-calendar-o</div>
 
@@ -1413,7 +1413,7 @@
 
             <div class="col-sm-6 col-md-4 col-lg-3"><i class="fa fa-long-arrow-right"></i> fa-long-arrow-right</div>
 
-            <div class="col-sm-6 col-md-4 col-lg-3"><i class="fa fa-long-arrow-up"></i> fa-long-arrow-up</div>
+            <div class="col-sm-6 col-md-4 col-lg-3"><i class="feather icon-arrow-up"></i> fa-long-arrow-up</div>
 
             <div class="col-sm-6 col-md-4 col-lg-3"><i class="fa fa-toggle-down"></i> fa-toggle-down <span class="text-muted">(alias)</span>
             </div>

src/Form/Field/Date.php

@@ -6,7 +6,7 @@ use Dcat\Admin\Admin;
 
 class Date extends Text
 {
-    protected $format = 'YYYY-MM-DD';
+    protected $format = 'yyyy-mm-dd';
 
     public function format($format)
     {

src/Form/Field/DateRange.php

@@ -7,7 +7,7 @@ use Dcat\Admin\Form\Field;
 
 class DateRange extends Field
 {
-    protected $format = 'YYYY-MM-DD';
+    protected $format = 'yyyy-mm-dd';
 
     /**
      * Column name.

src/Form/Field/Datetime.php

@@ -4,7 +4,7 @@ namespace Dcat\Admin\Form\Field;
 
 class Datetime extends Date
 {
-    protected $format = 'YYYY-MM-DD HH:mm:ss';
+    protected $format = 'yyyy-mm-dd HH:mm:ss';
 
     public function render()
     {

src/Form/Field/DatetimeRange.php

@@ -4,5 +4,5 @@ namespace Dcat\Admin\Form\Field;
 
 class DatetimeRange extends DateRange
 {
-    protected $format = 'YYYY-MM-DD HH:mm:ss';
+    protected $format = 'yyyy-mm-dd HH:mm:ss';
 }

src/Form/Field/SelectResource.php

@@ -167,9 +167,6 @@ class SelectResource extends Field
     {
         $label = ucfirst(trans('admin.choose')).' '.$this->label;
         $area = json_encode($this->area);
-        $closeLabel = ucfirst(trans('admin.close'));
-        $lessThenLabel = trans('admin.selected_must_less_then', ['num' => $this->maxItem]);
-        $selectedOptionsLabel = trans('admin.selected_options');
         $disabled = empty($this->attributes['disabled']) ? '' : 'disabled';
         $containerId = $this->id.$this->getFormElementId();
         $maxItem = (int) $this->maxItem;
@@ -186,12 +183,9 @@ Dcat.ResourceSelector({
     items: {$this->value()},
     placeholder: '{$this->placeholder()}',
     showCloseButton: false,
-    closeButtonText: '{$closeLabel}',
-    exceedMaxItemTip: '{$lessThenLabel}',
-    selectedOptionsTip: '{$selectedOptionsLabel}',
     disabled: '{$disabled}',
     displayer: 'navList',
-    \$displayerContainer: $('#{$containerId}'),
+    displayerContainer: $('#{$containerId}'),
 });
 JS
         );
@@ -223,7 +217,7 @@ JS
 
         $name = $this->elementName ?: $this->formatName($this->column);
 
-        $this->prepend('<i class="fa fa-long-arrow-up"></i>')
+        $this->prepend('<i class="feather icon-arrow-up"></i>')
             ->defaultAttribute('class', 'form-control '.$this->getElementClassString())
             ->defaultAttribute('type', 'text')
             ->defaultAttribute('id', $this->id.$this->getFormElementId())

src/Grid/Column/Filter/Between.php

@@ -42,7 +42,7 @@ class Between extends Filter
      */
     public function date()
     {
-        return $this->setDateFormat('YYYY-MM-DD');
+        return $this->setDateFormat('yyyy-mm-dd');
     }
 
     /**
@@ -62,7 +62,7 @@ class Between extends Filter
      */
     public function datetime()
     {
-        return $this->setDateFormat('YYYY-MM-DD HH:mm:ss');
+        return $this->setDateFormat('yyyy-mm-dd HH:mm:ss');
     }
 
     /**

src/Grid/Column/Filter/Equal.php

@@ -34,7 +34,7 @@ class Equal extends Filter
      */
     public function date()
     {
-        return $this->setDateFormat('YYYY-MM-DD');
+        return $this->setDateFormat('yyyy-mm-dd');
     }
 
     /**
@@ -52,7 +52,7 @@ class Equal extends Filter
      *
      * @return $this
      */
-    public function datetime(string $format = 'YYYY-MM-DD HH:mm:ss')
+    public function datetime(string $format = 'yyyy-mm-dd HH:mm:ss')
     {
         return $this->setDateFormat($format);
     }

src/Grid/Displayers/Editable.php

@@ -112,7 +112,7 @@ class Editable extends AbstractDisplayer
      */
     public function datetime()
     {
-        $this->combodate('YYYY-MM-DD HH:mm:ss');
+        $this->combodate('yyyy-mm-dd HH:mm:ss');
     }
 
     /**
@@ -144,7 +144,7 @@ class Editable extends AbstractDisplayer
      *
      * @param string $format
      */
-    public function combodate($format = 'YYYY-MM-DD')
+    public function combodate($format = 'yyyy-mm-dd')
     {
         $this->type = 'combodate';
 

src/Grid/Filter/AbstractFilter.php

@@ -335,7 +335,7 @@ abstract class AbstractFilter
      */
     public function date()
     {
-        return $this->datetime(['format' => 'YYYY-MM-DD']);
+        return $this->datetime(['format' => 'yyyy-mm-dd']);
     }
 
     /**

src/Grid/Filter/Between.php

@@ -141,7 +141,7 @@ class Between extends AbstractFilter
      */
     protected function setupDatetime($options = [])
     {
-        $options['format'] = Arr::get($options, 'format', 'YYYY-MM-DD HH:mm:ss');
+        $options['format'] = Arr::get($options, 'format', 'yyyy-mm-dd HH:mm:ss');
         $options['locale'] = Arr::get($options, 'locale', config('app.locale'));
 
         $startOptions = json_encode($options);

src/Grid/Filter/Presenter/DateTime.php

@@ -15,7 +15,7 @@ class DateTime extends Presenter
     /**
      * @var string
      */
-    protected $format = 'YYYY-MM-DD HH:mm:ss';
+    protected $format = 'yyyy-mm-dd HH:mm:ss';
 
     /**
      * DateTime constructor.

src/Grid/Filter/Presenter/SelectResource.php

@@ -188,7 +188,7 @@ class SelectResource extends Presenter
             // 选项大于两个时使用select2样式布局
             Admin::collectAssets('select2', 'css');
 
-            $containerClass = 'select2 select2-container select2-container--default select2-container--below select2-container--focus ';
+            $containerClass = 'select2 select2-container select2-container--default select2-container--below ';
         }
 
         return [

src/Grid/Tools/QuickCreate.php

@@ -198,7 +198,7 @@ class QuickCreate implements Renderable
      */
     public function datetime($column, $placeholder = '')
     {
-        return $this->date($column, $placeholder)->format('YYYY-MM-DD HH:mm:ss');
+        return $this->date($column, $placeholder)->format('yyyy-mm-dd HH:mm:ss');
     }
 
     /**