bk-magic-vue 2.5.6-beta.4 → 2.5.7-beta.1

package/dist/bk-magic-vue.css

@@ -944,19 +944,28 @@
         cursor:not-allowed;
     }
 .bk-button.bk-primary.is-loading{
-        cursor:default
+      cursor:default
     }
 .bk-button.bk-primary.is-loading:hover,
-        .bk-button.bk-primary.is-loading.hover{
-            background-color:#3a84ff;
-            border-color:#3a84ff;
-            opacity:1;
-        }
+      .bk-button.bk-primary.is-loading.hover{
+          background-color:#3a84ff;
+          border-color:#3a84ff;
+          opacity:1;
+      }
 .bk-button.bk-primary.is-loading:active,
-        .bk-button.bk-primary.is-loading.active{
+      .bk-button.bk-primary.is-loading.active{
+          background-color:#3a84ff;
+          border-color:#3a84ff;
+      }
+.bk-button.bk-primary.is-loading.is-outline .bk-button-loading div{
             background-color:#3a84ff;
-            border-color:#3a84ff;
-        }
+          }
+.bk-button.bk-primary.is-loading.is-outline:hover .bk-button-loading div, .bk-button.bk-primary.is-loading.is-outline.hover .bk-button-loading div{
+              background-color:#fff;
+            }
+.bk-button.bk-primary.is-loading.is-outline.active .bk-button-loading div, .bk-button.bk-primary.is-loading.is-outline:active .bk-button-loading div{
+              background-color:#fff;
+            }
 .bk-button.bk-primary.is-outline{
         color:#3a84ff;
         border-color:#3a84ff;
@@ -1000,19 +1009,28 @@
         cursor:not-allowed;
     }
 .bk-button.bk-success.is-loading{
-        cursor:default
+      cursor:default
     }
 .bk-button.bk-success.is-loading:hover,
-        .bk-button.bk-success.is-loading.hover{
-            background-color:#2dcb56;
-            border-color:#2dcb56;
-            opacity:1;
-        }
+      .bk-button.bk-success.is-loading.hover{
+          background-color:#2dcb56;
+          border-color:#2dcb56;
+          opacity:1;
+      }
 .bk-button.bk-success.is-loading:active,
-        .bk-button.bk-success.is-loading.active{
+      .bk-button.bk-success.is-loading.active{
+          background-color:#2dcb56;
+          border-color:#2dcb56;
+      }
+.bk-button.bk-success.is-loading.is-outline .bk-button-loading div{
             background-color:#2dcb56;
-            border-color:#2dcb56;
-        }
+          }
+.bk-button.bk-success.is-loading.is-outline:hover .bk-button-loading div, .bk-button.bk-success.is-loading.is-outline.hover .bk-button-loading div{
+              background-color:#fff;
+            }
+.bk-button.bk-success.is-loading.is-outline.active .bk-button-loading div, .bk-button.bk-success.is-loading.is-outline:active .bk-button-loading div{
+              background-color:#fff;
+            }
 .bk-button.bk-success.is-outline{
         color:#2dcb56;
         border-color:#2dcb56;
@@ -1056,19 +1074,28 @@
         cursor:not-allowed;
     }
 .bk-button.bk-warning.is-loading{
-        cursor:default
+      cursor:default
     }
 .bk-button.bk-warning.is-loading:hover,
-        .bk-button.bk-warning.is-loading.hover{
-            background-color:#ff9c01;
-            border-color:#ff9c01;
-            opacity:1;
-        }
+      .bk-button.bk-warning.is-loading.hover{
+          background-color:#ff9c01;
+          border-color:#ff9c01;
+          opacity:1;
+      }
 .bk-button.bk-warning.is-loading:active,
-        .bk-button.bk-warning.is-loading.active{
+      .bk-button.bk-warning.is-loading.active{
+          background-color:#ff9c01;
+          border-color:#ff9c01;
+      }
+.bk-button.bk-warning.is-loading.is-outline .bk-button-loading div{
             background-color:#ff9c01;
-            border-color:#ff9c01;
-        }
+          }
+.bk-button.bk-warning.is-loading.is-outline:hover .bk-button-loading div, .bk-button.bk-warning.is-loading.is-outline.hover .bk-button-loading div{
+              background-color:#fff;
+            }
+.bk-button.bk-warning.is-loading.is-outline.active .bk-button-loading div, .bk-button.bk-warning.is-loading.is-outline:active .bk-button-loading div{
+              background-color:#fff;
+            }
 .bk-button.bk-warning.is-outline{
         color:#ff9c01;
         border-color:#ff9c01;
@@ -1112,19 +1139,28 @@
         cursor:not-allowed;
     }
 .bk-button.bk-danger.is-loading{
-        cursor:default
+      cursor:default
     }
 .bk-button.bk-danger.is-loading:hover,
-        .bk-button.bk-danger.is-loading.hover{
-            background-color:#ea3636;
-            border-color:#ea3636;
-            opacity:1;
-        }
+      .bk-button.bk-danger.is-loading.hover{
+          background-color:#ea3636;
+          border-color:#ea3636;
+          opacity:1;
+      }
 .bk-button.bk-danger.is-loading:active,
-        .bk-button.bk-danger.is-loading.active{
+      .bk-button.bk-danger.is-loading.active{
+          background-color:#ea3636;
+          border-color:#ea3636;
+      }
+.bk-button.bk-danger.is-loading.is-outline .bk-button-loading div{
             background-color:#ea3636;
-            border-color:#ea3636;
-        }
+          }
+.bk-button.bk-danger.is-loading.is-outline:hover .bk-button-loading div, .bk-button.bk-danger.is-loading.is-outline.hover .bk-button-loading div{
+              background-color:#fff;
+            }
+.bk-button.bk-danger.is-loading.is-outline.active .bk-button-loading div, .bk-button.bk-danger.is-loading.is-outline:active .bk-button-loading div{
+              background-color:#fff;
+            }
 .bk-button.bk-danger.is-outline{
         color:#ea3636;
         border-color:#ea3636;
@@ -1427,6 +1463,9 @@
     transition:background-color ease 0.3s;
     min-width:68px;
 }
+.bk-button-hover .bk-loading-wrapper{
+        opacity:0;
+    }
 .bk-button-hover .bk-button-loading{
         width:58px;
         display:inline-block;

package/dist/bk-magic-vue.js

@@ -30281,6 +30281,7 @@
         icon: '',
         dismissable: true,
         verticalOffset: 0,
+        zIndex: 2500,
         horizonOffset: 0,
         visible: false,
         countID: null,
@@ -30297,7 +30298,8 @@
       },
       verticalStyle: function verticalStyle() {
         return {
-          top: "".concat(this.verticalOffset, "px")
+          top: "".concat(this.verticalOffset, "px"),
+          zIndex: this.zIndex
         };
       },
       tipsIcon: function tipsIcon() {
@@ -39183,15 +39185,18 @@
             return _this2.updateElsHeight();
           });
         }
-        var tableHeight = this.tableHeight = this.table.$el.offsetHeight - this.paginationHeight;
-        var footerHeight = this.footerHeight = footerWrapper ? footerWrapper.offsetHeight : 0;
-        this.bodyHeight = tableHeight - headerHeight - footerHeight + (footerWrapper ? 1 : 0);
-        this.fixedBodyHeight = this.scrollX ? this.bodyHeight - this.gutterWidth : this.bodyHeight;
-        var noData = !this.table.data || this.table.data.length === 0;
-        this.viewportHeight = this.scrollX ? tableHeight - (noData ? 0 : this.gutterWidth) : tableHeight;
-        this.syncRowHeight();
-        this.updateScrollY();
-        this.notifyObservers('scrollable');
+        setTimeout(function () {
+          var tableHeight = _this2.tableHeight = _this2.table.$el.offsetHeight - _this2.paginationHeight;
+          console.warn("this.table.$el.offsetHeight: ".concat(_this2.table.$el.offsetHeight, " --- this.paginationHeight: ").concat(_this2.paginationHeight, " --- tableHeight: ").concat(tableHeight));
+          var footerHeight = _this2.footerHeight = footerWrapper ? footerWrapper.offsetHeight : 0;
+          _this2.bodyHeight = tableHeight - headerHeight - footerHeight + (footerWrapper ? 1 : 0);
+          _this2.fixedBodyHeight = _this2.scrollX ? _this2.bodyHeight - _this2.gutterWidth : _this2.bodyHeight;
+          var noData = !_this2.table.data || _this2.table.data.length === 0;
+          _this2.viewportHeight = _this2.scrollX ? tableHeight - (noData ? 0 : _this2.gutterWidth) : tableHeight;
+          _this2.syncRowHeight();
+          _this2.updateScrollY();
+          _this2.notifyObservers('scrollable');
+        }, 0);
       }
     }, {
       key: "getFlattenColumns",