浏览代码

Merge pull request #5296 from cocowalla/feat/loading-enhancement

Enable CSS transitions for loading (fixes #5295)
Dustin Utecht 5 年之前
父节点
当前提交
735af31e11
共有 2 个文件被更改,包括 11 次插入3 次删除
  1. 2 2
      src/bootstrap-table.js
  2. 9 1
      src/themes/_theme.scss

+ 2 - 2
src/bootstrap-table.js

@@ -2845,7 +2845,7 @@ class BootstrapTable {
   }
   }
 
 
   showLoading () {
   showLoading () {
-    this.$tableLoading.css('display', 'flex')
+    this.$tableLoading.toggleClass('open', true)
 
 
     let fontSize = this.options.loadingFontSize
     let fontSize = this.options.loadingFontSize
 
 
@@ -2860,7 +2860,7 @@ class BootstrapTable {
   }
   }
 
 
   hideLoading () {
   hideLoading () {
-    this.$tableLoading.css('display', 'none')
+    this.$tableLoading.toggleClass('open', false)
   }
   }
 
 
   togglePagination () {
   togglePagination () {

+ 9 - 1
src/themes/_theme.scss

@@ -199,12 +199,20 @@
       .fixed-table-loading {
       .fixed-table-loading {
         align-items: center;
         align-items: center;
         background: $background;
         background: $background;
-        display: none;
+        display: flex;
         justify-content: center;
         justify-content: center;
         position: absolute;
         position: absolute;
         bottom: 0;
         bottom: 0;
         width: 100%;
         width: 100%;
         z-index: 1000;
         z-index: 1000;
+        transition: visibility 0s, opacity 0.15s ease-in-out;
+        opacity: 0;
+        visibility: hidden;
+
+        &.open {
+          visibility: visible;
+          opacity: 1;
+        }
 
 
         .loading-wrap {
         .loading-wrap {
           align-items: baseline;
           align-items: baseline;