bk-magic-vue 2.4.0-beta.1 → 2.4.0-beta.5

package/dist/bk-magic-vue.css

@@ -4025,6 +4025,12 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
     color:#979ba5;
     font-size:14px;
 }
+.bk-date-picker-top-wrapper{
+    margin-top:-5px;
+    clear:both;
+    color:#979ba5;
+    font-size:14px;
+}
 .bk-date-picker-cells{
     margin:9px;
     white-space:normal;
@@ -11239,7 +11245,6 @@ th.bk-table-column-selection .cell, th.bk-table-column-expand .cell, td.bk-table
         box-sizing:border-box;
         padding-top:6px;
         text-align:left;
-        //background-color:#e1ecff;
         background-color:rgba(58,132,255,.16);
         mix-blend-mode:multiply;
         color:#3a84ff;

package/dist/bk-magic-vue.js

@@ -7730,6 +7730,10 @@
         type: Number,
         default: -1
       },
+      headerSlotCls: {
+        type: String,
+        default: ''
+      },
       footerSlotCls: {
         type: String,
         default: ''
@@ -7849,7 +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 || !!this.$scopedSlots.header;
       },
       allowCrossDayProp: function allowCrossDayProp() {
         return this.panel === 'RangeTimePickerPanel' ? this.allowCrossDay : false;
@@ -8445,7 +8452,10 @@
           return _vm.handleTransferClick($event);
         }
       }
-    }, [_c(_vm.panel, _vm._b({
+    }, [_vm.hasHeader ? [_c('div', {
+      staticClass: "bk-date-picker-top-wrapper",
+      class: _vm.headerSlotCls
+    }, [_vm._t("header")], 2)] : _vm._e(), _c(_vm.panel, _vm._b({
       ref: "pickerPanel",
       tag: "component",
       attrs: {
@@ -8478,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);
@@ -11869,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();
@@ -12103,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",
@@ -12115,7 +12130,7 @@
           }
         }
       }, [_vm._v(_vm._s(shortcut.text))]);
-    }), 0) : _vm._e()]);
+    })], 2) : _vm._e()]);
   };
 
   var __vue_staticRenderFns__$t = [];