浏览代码

fix Responsive

jqh 5 年之前
父节点
当前提交
7a0b87b5ef

+ 1 - 1
resources/assets/dcat/sass/components/_button.scss

@@ -22,7 +22,7 @@
 }
 
 .btn-sm, .btn-group-sm > .btn {
-  padding: 0.6rem 1rem!important;;
+  padding: 0.65rem 1rem!important;;
   font-size: 0.6rem;
   line-height: 1.1;
   height: 30px;

+ 1 - 1
resources/assets/dcat/sass/components/_grid.scss

@@ -44,7 +44,7 @@
 .quick-create {
   td {
     padding-left: 45px;
-    background-color: $gray-bg;
+    background-color: #f3f3f3;
     vertical-align: middle;
     border-radius: .5rem;
     height: 35px;

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

@@ -1782,7 +1782,7 @@ dl {
 
 .btn-sm,
 .btn-group-sm > .btn {
-  padding: 0.6rem 1rem !important;
+  padding: 0.65rem 1rem !important;
   font-size: 0.6rem;
   line-height: 1.1;
   height: 30px;
@@ -2244,7 +2244,7 @@ table.dataTable.complex-headers tfoot td {
 
 .quick-create td {
   padding-left: 45px;
-  background-color: #f1f1f1;
+  background-color: #f3f3f3;
   vertical-align: middle;
   border-radius: 0.5rem;
   height: 35px;

+ 2 - 5
src/Grid/Responsive.php

@@ -71,10 +71,7 @@ class Responsive
 
         $opt = json_encode($this->options);
 
-        if (request()->pjax()) {
-            Admin::script("$('#{$this->grid->getTableId()}').parent().responsiveTable($opt);");
-        } else {
-            Admin::script("setTimeout(function(){ $('#{$this->grid->getTableId()}').parent().responsiveTable($opt); },10);");
-        }
+        // 这里需要延迟执行,否则可能会造成页面元素跳跃闪动
+        Admin::script("setTimeout(function(){ $('#{$this->grid->getTableId()}').parent().responsiveTable($opt); },350);");
     }
 }