bk-magic-vue 2.5.8-beta.2 → 2.5.8-beta.4

package/dist/bk-magic-vue.js

@@ -11065,12 +11065,13 @@
       var selectionMode = this.selectionMode,
         value = this.value;
       var dates = value.slice().sort();
+      var pickerTable = this.getTableType(selectionMode);
       return {
         currentView: selectionMode || 'date',
-        pickerTable: this.getTableType(selectionMode),
+        pickerTable: pickerTable,
+        realPickerType: pickerTable.replace('-table', ''),
         dates: dates,
-        panelDate: this.startDate || dates[0] || new Date(),
-        realPickerType: this.getRealPickerType(selectionMode)
+        panelDate: this.startDate || dates[0] || new Date()
       };
     },
     computed: {
@@ -11088,7 +11089,6 @@
         var handler = function handler(type) {
           return function () {
             _this.pickerTable = _this.getTableType(type);
-            _this.realPickerType = _this.getRealPickerType(type);
           };
         };
         return {
@@ -11122,7 +11122,6 @@
       selectionMode: function selectionMode(type) {
         this.currentView = type;
         this.pickerTable = this.getTableType(type);
-        this.realPickerType = this.getRealPickerType(type);
       },
       focusedDate: function focusedDate(date) {
         var isDifferentYear = date.getFullYear() !== this.panelDate.getFullYear();
@@ -11132,13 +11131,15 @@
             this.panelDate = date;
           }
         }
+      },
+      pickerTable: function pickerTable(val) {
+        this.realPickerType = val.replace('-table', '');
       }
     },
     methods: {
       reset: function reset() {
         this.currentView = this.selectionMode;
         this.pickerTable = this.getTableType(this.currentView);
-        this.realPickerType = this.getRealPickerType(this.currentView);
       },
       changeYear: function changeYear(dir) {
         if (this.selectionMode === 'year' || this.pickerTable === 'year-table') {
@@ -11150,9 +11151,6 @@
       getTableType: function getTableType(currentView) {
         return currentView.match(/^time/) ? 'time-picker' : "".concat(currentView, "-table");
       },
-      getRealPickerType: function getRealPickerType(currentView) {
-        return currentView.match(/^time/) ? 'time-picker' : "".concat(currentView);
-      },
       changeMonth: function changeMonth(dir) {
         this.panelDate = siblingMonth(this.panelDate, dir);
       },
@@ -11160,10 +11158,8 @@
         this.panelDate = value;
         if (this.pickerTable === 'year-table') {
           this.pickerTable = 'month-table';
-          this.realPickerType = 'month';
         } else {
           this.pickerTable = this.getTableType(this.currentView);
-          this.realPickerType = this.getRealPickerType(this.currentView);
         }
       },
       handlePick: function handlePick(value, type) {
@@ -11595,7 +11591,9 @@
         },
         currentView: this.selectionMode || 'range',
         leftPickerTable: "".concat(this.selectionMode, "-table"),
+        leftRealPickerType: this.selectionMode,
         rightPickerTable: "".concat(this.selectionMode, "-table"),
+        rightRealPickerType: this.selectionMode,
         leftPanelDate: leftPanelDate,
         rightPanelDate: new Date(leftPanelDate.getFullYear(), leftPanelDate.getMonth() + 1, 1),
         upToNowEnable: false
@@ -11668,6 +11666,12 @@
       },
       focusedDate: function focusedDate(date) {
         this.setPanelDates(date || new Date());
+      },
+      leftPickerTable: function leftPickerTable(val) {
+        this.leftRealPickerType = val.replace('-table', '');
+      },
+      rightPickerTable: function rightPickerTable(val) {
+        this.rightRealPickerType = val.replace('-table', '');
       }
     },
     methods: {
@@ -11901,7 +11905,8 @@
         "range-state": _vm.rangeState,
         "value": _vm.preSelecting.left ? [_vm.dates[0]] : _vm.dates,
         "focused-date": _vm.focusedDate,
-        "cell-class": _vm.cellClass
+        "cell-class": _vm.cellClass,
+        "real-picker-type": _vm.leftRealPickerType
       },
       on: {
         "change-range": _vm.handleChangeRange,
@@ -12004,7 +12009,8 @@
         "disabled-date": _vm.disabledDate,
         "value": _vm.preSelecting.right ? [_vm.dates[_vm.dates.length - 1]] : _vm.dates,
         "focused-date": _vm.focusedDate,
-        "cell-class": _vm.cellClass
+        "cell-class": _vm.cellClass,
+        "real-picker-type": _vm.rightRealPickerType
       },
       on: {
         "change-range": _vm.handleChangeRange,
@@ -31426,7 +31432,15 @@
   var messageList = [];
   var seed$2 = 0;
   var BkMessage = function BkMessage(config) {
-    var originConfig = _typeof(config) === 'object' ? JSON.parse(stringify$1(config)) : config;
+    var formatConfig = function formatConfig() {
+      if (_typeof(config) === 'object') {
+        if (config.message && !config.message.hasOwnProperty('componentOptions')) {
+          return JSON.parse(stringify$1(config));
+        }
+      }
+      return config;
+    };
+    var originConfig = formatConfig();
     if (config.limit === 0) {
       BkMessage.batchClose();
       return;