bk-magic-vue 2.4.0-beta.3 → 2.4.1-beta.1

package/dist/bk-magic-vue.css

@@ -10344,9 +10344,11 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
             cursor:pointer;
             color:#C4C6CC
         }
-.bk-table th .bk-table-column-filter-trigger.is-open,
-            .bk-table th .bk-table-column-filter-trigger.is-filtered{
-                color:#63656E;
+.bk-table th .bk-table-column-filter-trigger.is-open{
+                color:#63656e;
+            }
+.bk-table th .bk-table-column-filter-trigger.is-filtered{
+                color:#3a84ff;
             }
 .bk-table th .bk-table-caret-wrapper{
             display:-webkit-inline-box;
@@ -10384,10 +10386,10 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
                 bottom:-1px;
             }
 .bk-table th.ascending .bk-table-sort-caret.ascending{
-            border-bottom-color:#63656E;
+            border-bottom-color:#3a84ff;
         }
 .bk-table th.descending .bk-table-sort-caret.descending{
-            border-top-color:#63656E;
+            border-top-color:#3a84ff;
         }
 .bk-table td.gutter{
         width:0;
@@ -14507,14 +14509,14 @@ th.bk-table-column-selection .cell, th.bk-table-column-expand .cell, td.bk-table
         min-height:21px;
         line-height:19px;
         word-break:break-all;
-        max-width:200px;
+        max-width:150px;
         overflow:hidden;
         display:inline-block;
         text-overflow:ellipsis;
         white-space:nowrap;
     }
 .bk-cascade-tag-list .remove-key{
-        position:relative;
+        position:absolute;
         width:18px;
         height:16px;
         top:3px;
@@ -15148,6 +15150,14 @@ th.bk-table-column-selection .cell, th.bk-table-column-expand .cell, td.bk-table
 .bk-breadcrumb-item:last-child .bk-breadcrumb-separator{
         display:none;
       }
+.bk-breadcrumb-goback{
+    color:#699df4;
+    margin-right:12px;
+    cursor:pointer
+  }
+.bk-breadcrumb-goback .icon-default{
+      font-size:26px;
+    }
 .bk-divider{
     position:relative
 }

package/dist/bk-magic-vue.js

@@ -120,7 +120,7 @@
       var ownKeys = Object.keys(source);
 
       if (typeof Object.getOwnPropertySymbols === 'function') {
-        ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
+        ownKeys.push.apply(ownKeys, Object.getOwnPropertySymbols(source).filter(function (sym) {
           return Object.getOwnPropertyDescriptor(source, sym).enumerable;
         }));
       }
@@ -7853,10 +7853,10 @@
         return !this.editable || this.readonly;
       },
       hasFooter: function hasFooter() {
-        return !!this.$slots.footer;
+        return !!this.$slots.footer || !!this.$scopedSlots.footer;
       },
       hasHeader: function hasHeader() {
-        return !!this.$slots.header;
+        return !!this.$slots.header || !!this.$scopedSlots.header;
       },
       allowCrossDayProp: function allowCrossDayProp() {
         return this.panel === 'RangeTimePickerPanel' ? this.allowCrossDay : false;
@@ -8488,7 +8488,12 @@
         },
         "selection-mode-change": _vm.onSelectionModeChange
       }
-    }, 'component', _vm.ownPickerProps, false)), _vm.hasFooter ? [_c('div', {
+    }, 'component', _vm.ownPickerProps, false), [_vm.$slots.shortcuts || _vm.$scopedSlots.shortcuts ? _c('div', {
+      attrs: {
+        "slot": "shortcuts"
+      },
+      slot: "shortcuts"
+    }, [_vm._t("shortcuts")], 2) : _vm._e()]), _vm.hasFooter ? [_c('div', {
       staticClass: "bk-date-picker-footer-wrapper",
       class: _vm.footerSlotCls
     }, [_vm._t("footer")], 2)] : _vm._e()], 2)], 1)], 1);
@@ -11879,7 +11884,7 @@
 
     return _c('div', {
       staticClass: "bk-picker-panel-body-wrapper bk-date-picker-with-range",
-      class: [_vm.shortcuts.length ? 'bk-picker-panel-with-sidebar' : ''],
+      class: [_vm.shortcuts.length || _vm.$slots.shortcuts ? 'bk-picker-panel-with-sidebar' : ''],
       on: {
         "mousedown": function mousedown($event) {
           $event.preventDefault();
@@ -12113,9 +12118,9 @@
         "pick-clear": _vm.handlePickClear,
         "pick-success": _vm.handlePickSuccess
       }
-    }) : _vm._e()], 1), _vm.shortcuts.length ? _c('div', {
+    }) : _vm._e()], 1), _vm.shortcuts.length || _vm.$slots.shortcuts ? _c('div', {
       staticClass: "bk-picker-panel-sidebar"
-    }, _vm._l(_vm.shortcuts, function (shortcut, index) {
+    }, [_vm.$slots.shortcuts ? _vm._t("shortcuts") : _vm._l(_vm.shortcuts, function (shortcut, index) {
       return _c('div', {
         key: index,
         staticClass: "bk-picker-panel-shortcut",
@@ -12125,7 +12130,7 @@
           }
         }
       }, [_vm._v(_vm._s(shortcut.text))]);
-    }), 0) : _vm._e()]);
+    })], 2) : _vm._e()]);
   };
 
   var __vue_staticRenderFns__$t = [];
@@ -12736,8 +12741,7 @@
         default: false
       },
       zIndex: {
-        type: Number,
-        default: 1000
+        type: Number
       },
       confirmFn: {
         type: Function,
@@ -12946,7 +12950,7 @@
                 }
               }, 0);
             }
-            _this.dialogIndex = _this.getLocalZIndex();
+            _this.dialogIndex = _this.zIndex !== undefined ? _this.zIndex : _this.getLocalZIndex();
             if (_this.showMask) {
               var options = {
                 tplAction: 'keepAll',
@@ -38898,12 +38902,11 @@
     _createClass(TableLayout, [{
       key: "updateScrollY",
       value: function updateScrollY() {
-        var height = this.height;
-        if (typeof height !== 'string' && typeof height !== 'number') return;
+        if (!this.bodyHeight) return;
         var bodyWrapper = this.table.bodyWrapper;
         if (this.table.$el && bodyWrapper) {
           if (this.table.isVirtualRender) {
-            var body = bodyWrapper.querySelector('.bk-virtual-render');
+            var body = bodyWrapper.querySelector('.bk-virtual-section');
             this.scrollY = body.offsetHeight > this.bodyHeight;
           } else {
             var _body = bodyWrapper.querySelector('.bk-table-body');
@@ -38963,10 +38966,8 @@
           });
         }
         var tableHeight = this.tableHeight = this.table.$el.offsetHeight - this.paginationHeight;
-        if (this.height !== null && (!isNaN(this.height) || typeof this.height === 'string')) {
-          var footerHeight = this.footerHeight = footerWrapper ? footerWrapper.offsetHeight : 0;
-          this.bodyHeight = tableHeight - headerHeight - footerHeight + (footerWrapper ? 1 : 0);
-        }
+        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;
@@ -41499,10 +41500,10 @@
       },
       doLayout: function doLayout() {
         if (this.$destroyed) return;
-        this.layout.updateColumnsWidth();
         if (this.shouldUpdateHeight) {
           this.layout.updateElsHeight();
         }
+        this.layout.updateColumnsWidth();
       },
       sort: function sort(prop, order) {
         this.store.commit('sort', {
@@ -42295,7 +42296,9 @@
           renderCell = DEFAULT_RENDER_CELL;
         }
         if (_self.showOverflowTooltip) {
-          var config = _typeof(_self.showOverflowTooltip) === 'object' ? _self.showOverflowTooltip : {};
+          var config = _typeof(_self.showOverflowTooltip) === 'object' ? _self.showOverflowTooltip : {
+            interactive: false
+          };
           return h("div", {
             "class": "cell",
             "directives": [{
@@ -53013,7 +53016,11 @@
         return selections;
       },
       changeValueList: function changeValueList() {
-        this.recursiveList(this.cascadeList, this.value, 'init');
+        if (this.isRemote) {
+          this.recursiveList(this.cascadeList, this.value, 'search');
+        } else {
+          this.recursiveList(this.cascadeList, this.value, 'init');
+        }
         this.checkListStatus(this.value);
         var newList = this.changeList();
         this.multipleSelectedList = newList.filter(function (item) {
@@ -53132,7 +53139,7 @@
         var itemId = item.id[item.id.length - 1];
         var changeCheckStatus = function changeCheckStatus(arr) {
           arr.forEach(function (item) {
-            if (itemId === item.id) {
+            if ("".concat(itemId) === "".concat(item.id)) {
               item.isSelected = false;
               item.isIndeterminate = false;
             }
@@ -53236,9 +53243,15 @@
     }, _vm._l(_vm.multipleSelectedList, function (item, index) {
       return _c('span', {
         key: index,
-        staticClass: "bk-cascade-tag-item"
+        staticClass: "bk-cascade-tag-item",
+        staticStyle: {
+          "padding-right": "18px"
+        }
       }, [_c('span', {
-        staticClass: "bk-cascade-item-name"
+        staticClass: "bk-cascade-item-name",
+        attrs: {
+          "title": item.name
+        }
       }, [_vm._v(_vm._s(item.name))]), _c('a', {
         staticClass: "remove-key",
         attrs: {
@@ -54342,6 +54355,16 @@
       separatorClass: {
         type: String,
         default: ''
+      },
+      backRouter: {
+        type: [Object, String],
+        default: function _default() {
+          return null;
+        }
+      },
+      replace: {
+        type: Boolean,
+        default: false
       }
     },
     provide: function provide() {
@@ -54354,6 +54377,14 @@
       if (items.length) {
         items[items.length - 1].setAttribute('aria-current', 'page');
       }
+    },
+    methods: {
+      goBack: function goBack() {
+        var backRouter = this.backRouter,
+            $router = this.$router;
+        if (!backRouter || !$router) return;
+        this.replace ? $router.replace(backRouter) : $router.push(backRouter);
+      }
     }
   };
 
@@ -54374,7 +54405,16 @@
         "aria-label": "Breadcrumb",
         "role": "navigation"
       }
-    }, [_vm._t("default")], 2);
+    }, [!_vm.$slots.prefix && _vm.backRouter ? _c('div', {
+      staticClass: "bk-breadcrumb-goback"
+    }, [_c('i', {
+      staticClass: "bk-icon icon-arrows-left icon-default",
+      on: {
+        "click": _vm.goBack
+      }
+    })]) : _vm._e(), _vm.$slots.prefix ? _c('div', {
+      staticClass: "bk-breadcrumb-goback"
+    }, [_vm._t("prefix")], 2) : _vm._e(), _vm._t("default")], 2);
   };
 
   var __vue_staticRenderFns__$1u = [];