jqh 5 years ago
parent
commit
ac85e32c6b

+ 1 - 1
resources/assets/dcat-admin/slider.js

@@ -3,7 +3,7 @@
     function Slider(cnf) {
     function Slider(cnf) {
         this.opts = {
         this.opts = {
             direction: cnf.direction || "left",
             direction: cnf.direction || "left",
-            wight: cnf.width || null,
+            width: cnf.width || null,
             height: cnf.height || null,
             height: cnf.height || null,
             dom: $(cnf.dom),
             dom: $(cnf.dom),
             time: cnf.time || null,
             time: cnf.time || null,

File diff suppressed because it is too large
+ 0 - 0
resources/assets/dcat-admin/slider.min.js


+ 1 - 1
resources/views/filter/right-side-container.blade.php

@@ -15,7 +15,7 @@
 
 
                 <div class="pull-right">
                 <div class="pull-right">
                     <span class="btn btn-trans close-slider font-16">
                     <span class="btn btn-trans close-slider font-16">
-                        <i class="fa  fa-long-arrow-right"></i>
+                        <i class="ti-shift-right"></i>
                     </span>
                     </span>
                 </div>
                 </div>
             </div>
             </div>

+ 1 - 1
src/Grid/Filter/AbstractFilter.php

@@ -81,7 +81,7 @@ abstract class AbstractFilter
     /**
     /**
      * @var int
      * @var int
      */
      */
-    protected $width = 8;
+    protected $width = 10;
 
 
     /**
     /**
      * @var string
      * @var string

+ 1 - 1
src/Grid/Filter/Between.php

@@ -16,7 +16,7 @@ class Between extends AbstractFilter
     /**
     /**
      * @var int
      * @var int
      */
      */
-    protected $width = 11;
+    protected $width = 12;
 
 
     /**
     /**
      * @var bool
      * @var bool

+ 1 - 1
src/Grid/Filter/In.php

@@ -14,7 +14,7 @@ class In extends AbstractFilter
     /**
     /**
      * @var int
      * @var int
      */
      */
-    protected $width = 10;
+    protected $width = 12;
 
 
     /**
     /**
      * Get condition of this filter.
      * Get condition of this filter.

+ 1 - 0
src/Grid/Tools/FilterButton.php

@@ -62,6 +62,7 @@ class FilterButton extends AbstractTool
             dom: '#{$id}',
             dom: '#{$id}',
             background: '#FFF',
             background: '#FFF',
             shade: false,
             shade: false,
+            width: '480px',
         });
         });
         
         
         $(document).one('pjax:complete', function () {// 跳转新页面时移除弹窗
         $(document).one('pjax:complete', function () {// 跳转新页面时移除弹窗

Some files were not shown because too many files changed in this diff