vxe-table 3.5.2 → 3.5.5-beta.0

package/lib/index.umd.js

@@ -6021,6 +6021,54 @@ module.exports = function (METHOD_NAME, argument) {
 };
 
 
+/***/ }),
+
+/***/ "a79d":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var $ = __webpack_require__("23e7");
+var IS_PURE = __webpack_require__("c430");
+var NativePromise = __webpack_require__("fea9");
+var fails = __webpack_require__("d039");
+var getBuiltIn = __webpack_require__("d066");
+var isCallable = __webpack_require__("1626");
+var speciesConstructor = __webpack_require__("4840");
+var promiseResolve = __webpack_require__("cdf9");
+var redefine = __webpack_require__("6eeb");
+
+// Safari bug https://bugs.webkit.org/show_bug.cgi?id=200829
+var NON_GENERIC = !!NativePromise && fails(function () {
+  NativePromise.prototype['finally'].call({ then: function () { /* empty */ } }, function () { /* empty */ });
+});
+
+// `Promise.prototype.finally` method
+// https://tc39.es/ecma262/#sec-promise.prototype.finally
+$({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, {
+  'finally': function (onFinally) {
+    var C = speciesConstructor(this, getBuiltIn('Promise'));
+    var isFunction = isCallable(onFinally);
+    return this.then(
+      isFunction ? function (x) {
+        return promiseResolve(C, onFinally()).then(function () { return x; });
+      } : onFinally,
+      isFunction ? function (e) {
+        return promiseResolve(C, onFinally()).then(function () { throw e; });
+      } : onFinally
+    );
+  }
+});
+
+// makes sure that native promise-based APIs `Promise#finally` properly works with patched `Promise#then`
+if (!IS_PURE && isCallable(NativePromise)) {
+  var method = getBuiltIn('Promise').prototype['finally'];
+  if (NativePromise.prototype['finally'] !== method) {
+    redefine(NativePromise.prototype, 'finally', method, { unsafe: true });
+  }
+}
+
+
 /***/ }),
 
 /***/ "a9e3":
@@ -8756,7 +8804,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.1", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.5-beta.0", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10025,7 +10073,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.1",
+  version: "3.5.5-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -11971,6 +12019,9 @@ var es_string_trim = __webpack_require__("498a");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
 var es_array_sort = __webpack_require__("4e82");
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
+var es_promise_finally = __webpack_require__("a79d");
+
 // CONCATENATED MODULE: ./packages/table/src/cell.js
 
 
@@ -12928,6 +12979,7 @@ var Cell = {
 
 
 
+
 
 
 var methods_setCellValue = utils.setCellValue,
@@ -17985,16 +18037,16 @@ var Methods = {
         row: row,
         rowIndex: _this40.getRowIndex(row),
         $rowIndex: _this40.getVMRowIndex(row)
-      }).catch(function (e) {
-        return e;
       }).then(function () {
         rest.expandLoaded = true;
+
+        _this40.rowExpandeds.push(row);
+      }).catch(function () {
+        rest.expandLoaded = false;
+      }).finally(function () {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this40.expandLazyLoadeds, function (item) {
           return item === row;
         });
-
-        _this40.rowExpandeds.push(row);
-
         resolve(_this40.$nextTick().then(_this40.recalculate));
       });
     });
@@ -18294,9 +18346,8 @@ var Methods = {
       loadMethod({
         $table: _this44,
         row: row
-      }).catch(function () {
-        return [];
       }).then(function (childRecords) {
+        // 响应成功后则展开行，并将子节点挂载到该节点下
         rest.treeLoaded = true;
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeLazyLoadeds, function (item) {
           return item === row;
@@ -18307,7 +18358,7 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this44.loadTreeChildren(row, childRecords).then(function (childRows) {
+          return _this44.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
@@ -18317,23 +18368,25 @@ var Methods = {
               _this44.setCheckboxRow(childRows, true);
             }
 
-            _this44.$nextTick().then(function () {
+            return _this44.$nextTick().then(function () {
               if (transform) {
                 return _this44.handleTableData();
               }
-            }).then(function () {
-              return _this44.recalculate();
-            }).then(function () {
-              return resolve();
             });
           });
-        } else {
-          _this44.$nextTick().then(function () {
-            return _this44.recalculate();
-          }).then(function () {
-            return resolve();
-          });
         }
+      }).catch(function () {
+        // 如果响应异常，则不展开，再次点击后将重新触发懒加载
+        rest.treeLoaded = false;
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeLazyLoadeds, function (item) {
+          return item === row;
+        });
+      }).finally(function () {
+        _this44.$nextTick().then(function () {
+          return _this44.recalculate();
+        }).then(function () {
+          return resolve();
+        });
       });
     });
   },
@@ -18705,7 +18758,7 @@ var Methods = {
   updateScrollXData: function updateScrollXData() {
     var _this49 = this;
 
-    this.tableColumn = [];
+    // this.tableColumn = []
     this.$nextTick(function () {
       _this49.handleTableColumn();
 
@@ -18768,7 +18821,7 @@ var Methods = {
   updateScrollYData: function updateScrollYData() {
     var _this50 = this;
 
-    this.tableData = [];
+    // this.tableData = []
     this.$nextTick(function () {
       _this50.handleTableData();
 
@@ -22155,7 +22208,11 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             }
 
             this.closeTooltip();
-            this.clearActived(evnt);
+
+            if (actived.column) {
+              this.clearActived(evnt);
+            }
+
             type = 'edit-actived';
             column.renderHeight = cell.offsetHeight;
             actived.args = params;
@@ -22281,7 +22338,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         }, evnt);
       }
 
-      return (v_x_e_table._valid ? this.clearValidate() : this.$nextTick()).then(this.recalculate);
+      return v_x_e_table._valid ? this.clearValidate() : this.$nextTick();
     },
     _getActiveRecord: function _getActiveRecord() {
       var $el = this.$el,
@@ -23873,7 +23930,11 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
 
 
-var yearSize = 20;
+
+
+
+
+var yearSize = 12;
 var monthSize = 20;
 var quarterSize = 8;
 
@@ -23952,7 +24013,9 @@ function renderDateDayTable(h, _vm) {
       dateValue = _vm.dateValue,
       datePanelValue = _vm.datePanelValue,
       dateHeaders = _vm.dateHeaders,
-      dayDatas = _vm.dayDatas;
+      dayDatas = _vm.dayDatas,
+      multiple = _vm.multiple,
+      dateListValue = _vm.dateListValue;
   var matchFormat = 'yyyy-MM-dd';
   return [h('table', {
     class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -23972,7 +24035,9 @@ function renderDateDayTable(h, _vm) {
           'is--now': item.isNow,
           'is--next': item.isNext,
           'is--disabled': isDateDisabled(_vm, item),
-          'is--selected': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
+          'is--selected': multiple ? dateListValue.some(function (val) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(val, item.date, matchFormat);
+          }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
           'is--hover': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(datePanelValue, item.date, matchFormat)
         },
         on: {
@@ -23993,7 +24058,9 @@ function renderDateWeekTable(h, _vm) {
       dateValue = _vm.dateValue,
       datePanelValue = _vm.datePanelValue,
       weekHeaders = _vm.weekHeaders,
-      weekDates = _vm.weekDates;
+      weekDates = _vm.weekDates,
+      multiple = _vm.multiple,
+      dateListValue = _vm.dateListValue;
   var matchFormat = 'yyyyMMdd';
   return [h('table', {
     class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -24005,7 +24072,11 @@ function renderDateWeekTable(h, _vm) {
   }, [h('thead', [h('tr', weekHeaders.map(function (item) {
     return h('th', item.label);
   }))]), h('tbody', weekDates.map(function (rows) {
-    var isSelected = rows.some(function (item) {
+    var isSelected = multiple ? rows.some(function (item) {
+      return dateListValue.some(function (val) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(val, item.date, matchFormat);
+      });
+    }) : rows.some(function (item) {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat);
     });
     var isHover = rows.some(function (item) {
@@ -24039,7 +24110,9 @@ function renderDateMonthTable(h, _vm) {
   var dateValue = _vm.dateValue,
       datePanelType = _vm.datePanelType,
       monthDatas = _vm.monthDatas,
-      datePanelValue = _vm.datePanelValue;
+      datePanelValue = _vm.datePanelValue,
+      multiple = _vm.multiple,
+      dateListValue = _vm.dateListValue;
   var matchFormat = 'yyyyMM';
   return [h('table', {
     class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -24057,7 +24130,9 @@ function renderDateMonthTable(h, _vm) {
           'is--now': item.isNow,
           'is--next': item.isNext,
           'is--disabled': isDateDisabled(_vm, item),
-          'is--selected': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
+          'is--selected': multiple ? dateListValue.some(function (val) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(val, item.date, matchFormat);
+          }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
           'is--hover': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(datePanelValue, item.date, matchFormat)
         },
         on: {
@@ -24077,7 +24152,9 @@ function renderDateQuarterTable(h, _vm) {
   var dateValue = _vm.dateValue,
       datePanelType = _vm.datePanelType,
       quarterDatas = _vm.quarterDatas,
-      datePanelValue = _vm.datePanelValue;
+      datePanelValue = _vm.datePanelValue,
+      multiple = _vm.multiple,
+      dateListValue = _vm.dateListValue;
   var matchFormat = 'yyyyq';
   return [h('table', {
     class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -24095,7 +24172,9 @@ function renderDateQuarterTable(h, _vm) {
           'is--now': item.isNow,
           'is--next': item.isNext,
           'is--disabled': isDateDisabled(_vm, item),
-          'is--selected': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
+          'is--selected': multiple ? dateListValue.some(function (val) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(val, item.date, matchFormat);
+          }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
           'is--hover': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(datePanelValue, item.date, matchFormat)
         },
         on: {
@@ -24115,7 +24194,9 @@ function renderDateYearTable(h, _vm) {
   var dateValue = _vm.dateValue,
       datePanelType = _vm.datePanelType,
       yearDatas = _vm.yearDatas,
-      datePanelValue = _vm.datePanelValue;
+      datePanelValue = _vm.datePanelValue,
+      multiple = _vm.multiple,
+      dateListValue = _vm.dateListValue;
   var matchFormat = 'yyyy';
   return [h('table', {
     class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -24128,10 +24209,14 @@ function renderDateYearTable(h, _vm) {
     return h('tr', rows.map(function (item) {
       return h('td', {
         class: {
-          'is--disabled': isDateDisabled(_vm, item),
+          'is--prev': item.isPrev,
           'is--current': item.isCurrent,
           'is--now': item.isNow,
-          'is--selected': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
+          'is--next': item.isNext,
+          'is--disabled': isDateDisabled(item),
+          'is--selected': multiple ? dateListValue.some(function (val) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(val, item.date, matchFormat);
+          }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(dateValue, item.date, matchFormat),
           'is--hover': external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(datePanelValue, item.date, matchFormat)
         },
         on: {
@@ -24171,7 +24256,9 @@ function renderDatePanel(h, _vm) {
   var datePanelType = _vm.datePanelType,
       selectDatePanelLabel = _vm.selectDatePanelLabel,
       isDisabledPrevDateBtn = _vm.isDisabledPrevDateBtn,
-      isDisabledNextDateBtn = _vm.isDisabledNextDateBtn;
+      isDisabledNextDateBtn = _vm.isDisabledNextDateBtn,
+      multiple = _vm.multiple,
+      supportMultiples = _vm.supportMultiples;
   return [h('div', {
     class: 'vxe-input--date-picker-header'
   }, [h('div', {
@@ -24210,7 +24297,17 @@ function renderDatePanel(h, _vm) {
     }
   }, [h('i', {
     class: 'vxe-icon--caret-right'
-  })])])]), h('div', {
+  })]), multiple && supportMultiples ? h('span', {
+    class: 'vxe-input--date-picker-btn vxe-input--date-picker-confirm-btn'
+  }, [h('button', {
+    class: 'vxe-input--date-picker-confirm',
+    attrs: {
+      type: 'button'
+    },
+    on: {
+      click: _vm.dateConfirmEvent
+    }
+  }, conf.i18n('vxe.button.confirm'))]) : null])]), h('div', {
     class: 'vxe-input--date-picker-body'
   }, renderDateTable(h, _vm))];
 }
@@ -24507,6 +24604,7 @@ function renderExtraSuffixIcon(h, _vm) {
         return conf.input.size || conf.size;
       }
     },
+    multiple: Boolean,
     // number、integer、float
     min: {
       type: [String, Number],
@@ -24627,9 +24725,9 @@ function renderExtraSuffixIcon(h, _vm) {
       return ['number', 'integer', 'float'].indexOf(this.type) > -1;
     },
     isDatePickerType: function isDatePickerType() {
-      return this.hasTime || ['date', 'week', 'month', 'quarter', 'year'].indexOf(this.type) > -1;
+      return this.isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(this.type) > -1;
     },
-    hasTime: function hasTime() {
+    isDateTimeType: function isDateTimeType() {
       var type = this.type;
       return type === 'time' || type === 'datetime';
     },
@@ -24683,6 +24781,45 @@ function renderExtraSuffixIcon(h, _vm) {
     dateMaxTime: function dateMaxTime() {
       return this.maxDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.maxDate) : null;
     },
+    supportMultiples: function supportMultiples() {
+      return ['date', 'week', 'month', 'quarter', 'year'].includes(this.type);
+    },
+    dateListValue: function dateListValue() {
+      var _this = this;
+
+      var value = this.value,
+          multiple = this.multiple,
+          isDatePickerType = this.isDatePickerType,
+          dateValueFormat = this.dateValueFormat;
+
+      if (multiple && value && isDatePickerType) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(value).split(',').map(function (item) {
+          var date = _this.parseDate(item, dateValueFormat);
+
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isValidDate(date)) {
+            return date;
+          }
+
+          return null;
+        });
+      }
+
+      return [];
+    },
+    dateMultipleValue: function dateMultipleValue() {
+      var dateListValue = this.dateListValue,
+          dateValueFormat = this.dateValueFormat;
+      return dateListValue.map(function (date) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(date, dateValueFormat);
+      });
+    },
+    dateMultipleLabel: function dateMultipleLabel() {
+      var dateListValue = this.dateListValue,
+          dateLabelFormat = this.dateLabelFormat;
+      return dateListValue.map(function (date) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(date, dateLabelFormat);
+      }).join(', ');
+    },
     dateValue: function dateValue() {
       var value = this.value,
           isDatePickerType = this.isDatePickerType,
@@ -24710,7 +24847,7 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     hmsTime: function hmsTime() {
       var dateValue = this.dateValue;
-      return dateValue && this.hasTime ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
+      return dateValue && this.isDateTimeType ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
     },
     dateLabelFormat: function dateLabelFormat() {
       if (this.isDatePickerType) {
@@ -24802,15 +24939,18 @@ function renderExtraSuffixIcon(h, _vm) {
 
       if (selectMonth && currentDate) {
         var currFullYear = currentDate.getFullYear();
-        var startYear = new Date(('' + selectMonth.getFullYear()).replace(/\d{1}$/, '0'), 0, 1);
+        var selectFullYear = selectMonth.getFullYear();
+        var startYearDate = new Date(selectFullYear - selectFullYear % yearSize, 0, 1);
 
-        for (var index = -10; index < yearSize - 10; index++) {
-          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatYear(startYear, index, 'first');
+        for (var index = -4; index < yearSize + 4; index++) {
+          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatYear(startYearDate, index, 'first');
           var itemFullYear = date.getFullYear();
           months.push({
             date: date,
             isCurrent: true,
+            isPrev: index < 0,
             isNow: currFullYear === itemFullYear,
+            isNext: index >= yearSize,
             year: itemFullYear
           });
         }
@@ -24943,7 +25083,7 @@ function renderExtraSuffixIcon(h, _vm) {
     hourList: function hourList() {
       var list = [];
 
-      if (this.hasTime) {
+      if (this.isDateTimeType) {
         for (var index = 0; index < 24; index++) {
           list.push({
             value: index,
@@ -24957,7 +25097,7 @@ function renderExtraSuffixIcon(h, _vm) {
     minuteList: function minuteList() {
       var list = [];
 
-      if (this.hasTime) {
+      if (this.isDateTimeType) {
         for (var index = 0; index < 60; index++) {
           list.push({
             value: index,
@@ -25007,8 +25147,9 @@ function renderExtraSuffixIcon(h, _vm) {
     inpReadonly: function inpReadonly() {
       var type = this.type,
           readonly = this.readonly,
-          editable = this.editable;
-      return readonly || !editable || type === 'week' || type === 'quarter';
+          editable = this.editable,
+          multiple = this.multiple;
+      return readonly || multiple || !editable || type === 'week' || type === 'quarter';
     }
   },
   watch: {
@@ -25032,7 +25173,7 @@ function renderExtraSuffixIcon(h, _vm) {
     dateLabelFormat: function dateLabelFormat() {
       if (this.isDatePickerType) {
         this.dateParseValue(this.datePanelValue);
-        this.inputValue = this.datePanelLabel;
+        this.inputValue = this.multiple ? this.dateMultipleLabel : this.datePanelLabel;
       }
     }
   },
@@ -25365,7 +25506,7 @@ function renderExtraSuffixIcon(h, _vm) {
     changeValue: function changeValue() {
       if (this.isDatePickerType) {
         this.dateParseValue(this.inputValue);
-        this.inputValue = this.datePanelLabel;
+        this.inputValue = this.multiple ? this.dateMultipleLabel : this.datePanelLabel;
       }
     },
     afterCheckValue: function afterCheckValue() {
@@ -25489,21 +25630,21 @@ function renderExtraSuffixIcon(h, _vm) {
       clearTimeout(this.downbumTimeout);
     },
     numberDownPrevEvent: function numberDownPrevEvent(evnt) {
-      var _this = this;
+      var _this2 = this;
 
       this.downbumTimeout = setTimeout(function () {
-        _this.numberPrevEvent(evnt);
+        _this2.numberPrevEvent(evnt);
 
-        _this.numberDownPrevEvent(evnt);
+        _this2.numberDownPrevEvent(evnt);
       }, 60);
     },
     numberDownNextEvent: function numberDownNextEvent(evnt) {
-      var _this2 = this;
+      var _this3 = this;
 
       this.downbumTimeout = setTimeout(function () {
-        _this2.numberNextEvent(evnt);
+        _this3.numberNextEvent(evnt);
 
-        _this2.numberDownNextEvent(evnt);
+        _this3.numberDownNextEvent(evnt);
       }, 60);
     },
     numberKeydownEvent: function numberKeydownEvent(evnt) {
@@ -25522,7 +25663,7 @@ function renderExtraSuffixIcon(h, _vm) {
       }
     },
     numberMousedownEvent: function numberMousedownEvent(evnt) {
-      var _this3 = this;
+      var _this4 = this;
 
       this.numberStopDown();
 
@@ -25537,9 +25678,9 @@ function renderExtraSuffixIcon(h, _vm) {
 
         this.downbumTimeout = setTimeout(function () {
           if (isPrevNumber) {
-            _this3.numberDownPrevEvent(evnt);
+            _this4.numberDownPrevEvent(evnt);
           } else {
-            _this3.numberDownNextEvent(evnt);
+            _this4.numberDownNextEvent(evnt);
           }
         }, 500);
       }
@@ -25651,8 +25792,12 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     dateTodayMonthEvent: function dateTodayMonthEvent(evnt) {
       this.dateNowHandle();
-      this.dateChange(this.currentDate);
-      this.hidePanel();
+
+      if (!this.multiple) {
+        this.dateChange(this.currentDate);
+        this.hidePanel();
+      }
+
       this.$emit('date-today', {
         type: this.type,
         $event: evnt
@@ -25695,7 +25840,8 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     dateSelectItem: function dateSelectItem(date) {
       var type = this.type,
-          datePanelType = this.datePanelType;
+          datePanelType = this.datePanelType,
+          multiple = this.multiple;
       var isWeekType = type === 'week';
 
       if (type === 'month') {
@@ -25704,18 +25850,27 @@ function renderExtraSuffixIcon(h, _vm) {
           this.dateCheckMonth(date);
         } else {
           this.dateChange(date);
-          this.hidePanel();
+
+          if (!multiple) {
+            this.hidePanel();
+          }
         }
       } else if (type === 'year') {
-        this.hidePanel();
         this.dateChange(date);
+
+        if (!multiple) {
+          this.hidePanel();
+        }
       } else if (type === 'quarter') {
         if (datePanelType === 'year') {
           this.datePanelType = 'quarter';
           this.dateCheckMonth(date);
         } else {
           this.dateChange(date);
-          this.hidePanel();
+
+          if (!multiple) {
+            this.hidePanel();
+          }
         }
       } else {
         if (datePanelType === 'month') {
@@ -25726,7 +25881,10 @@ function renderExtraSuffixIcon(h, _vm) {
           this.dateCheckMonth(date);
         } else {
           this.dateChange(date);
-          this.hidePanel();
+
+          if (!multiple) {
+            this.hidePanel();
+          }
         }
       }
 
@@ -25957,12 +26115,14 @@ function renderExtraSuffixIcon(h, _vm) {
       var value = this.value,
           datetimePanelValue = this.datetimePanelValue,
           dateValueFormat = this.dateValueFormat,
-          firstDayOfWeek = this.firstDayOfWeek;
+          firstDayOfWeek = this.firstDayOfWeek,
+          isDateTimeType = this.isDateTimeType,
+          multiple = this.multiple;
 
       if (this.type === 'week') {
         var sWeek = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(this.selectDay);
         date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(date, 0, sWeek, firstDayOfWeek);
-      } else if (this.hasTime) {
+      } else if (isDateTimeType) {
         date.setHours(datetimePanelValue.getHours());
         date.setMinutes(datetimePanelValue.getMinutes());
         date.setSeconds(datetimePanelValue.getSeconds());
@@ -25973,10 +26133,51 @@ function renderExtraSuffixIcon(h, _vm) {
       });
       this.dateCheckMonth(date);
 
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(value, inpVal)) {
-        this.emitModel(inpVal, {
-          type: 'update'
-        });
+      if (multiple) {
+        // 如果为多选
+        var dateMultipleValue = this.dateMultipleValue;
+
+        if (isDateTimeType) {
+          // 如果是datetime特殊类型
+          var dateListValue = this.dateListValue;
+          var datetimeRest = [];
+          dateListValue.forEach(function (item) {
+            if (item && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDateSame(date, item, 'yyyyMMdd')) {
+              item.setHours(datetimePanelValue.getHours());
+              item.setMinutes(datetimePanelValue.getMinutes());
+              item.setSeconds(datetimePanelValue.getSeconds());
+              datetimeRest.push(item);
+            }
+          });
+          datetimeRest.push(date);
+          this.emitModel(datetimeRest.map(function (date) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(date, dateValueFormat);
+          }).join(','), {
+            type: 'update'
+          });
+        } else {
+          // 如果是日期类型
+          if (dateMultipleValue.some(function (val) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(val, inpVal);
+          })) {
+            this.emitModel(dateMultipleValue.filter(function (val) {
+              return !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(val, inpVal);
+            }).join(','), {
+              type: 'update'
+            });
+          } else {
+            this.emitModel(dateMultipleValue.concat([inpVal]).join(','), {
+              type: 'update'
+            });
+          }
+        }
+      } else {
+        // 如果为单选
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(value, inpVal)) {
+          this.emitModel(inpVal, {
+            type: 'update'
+          });
+        }
       }
     },
     dateCheckMonth: function dateCheckMonth(date) {
@@ -25987,7 +26188,7 @@ function renderExtraSuffixIcon(h, _vm) {
       }
     },
     dateOpenPanel: function dateOpenPanel() {
-      var _this4 = this;
+      var _this5 = this;
 
       var type = this.type,
           dateValue = this.dateValue;
@@ -26007,15 +26208,15 @@ function renderExtraSuffixIcon(h, _vm) {
         this.dateNowHandle();
       }
 
-      if (this.hasTime) {
+      if (this.isDateTimeType) {
         this.datetimePanelValue = this.datePanelValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(Date.now(), 0, 'first');
         this.$nextTick(function () {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(_this4.$refs.timeBody.querySelectorAll('li.is--selected'), _this4.updateTimePos);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(_this5.$refs.timeBody.querySelectorAll('li.is--selected'), _this5.updateTimePos);
         });
       }
     },
     dateRevert: function dateRevert() {
-      this.inputValue = this.datePanelLabel;
+      this.inputValue = this.multiple ? this.dateMultipleLabel : this.datePanelLabel;
     },
     // 日期
     // 弹出面板
@@ -26025,7 +26226,7 @@ function renderExtraSuffixIcon(h, _vm) {
       }
     },
     showPanel: function showPanel() {
-      var _this5 = this;
+      var _this6 = this;
 
       var disabled = this.disabled,
           visiblePanel = this.visiblePanel,
@@ -26041,28 +26242,28 @@ function renderExtraSuffixIcon(h, _vm) {
         }
 
         setTimeout(function () {
-          _this5.visiblePanel = true;
+          _this6.visiblePanel = true;
         }, 10);
         this.updateZindex();
         this.updatePlacement();
       }
     },
     hidePanel: function hidePanel() {
-      var _this6 = this;
+      var _this7 = this;
 
       this.visiblePanel = false;
       this.hidePanelTimeout = setTimeout(function () {
-        _this6.animatVisible = false;
+        _this7.animatVisible = false;
       }, 350);
     },
     updatePlacement: function updatePlacement() {
-      var _this7 = this;
+      var _this8 = this;
 
       return this.$nextTick().then(function () {
-        var $refs = _this7.$refs,
-            transfer = _this7.transfer,
-            placement = _this7.placement,
-            panelIndex = _this7.panelIndex;
+        var $refs = _this8.$refs,
+            transfer = _this8.transfer,
+            placement = _this8.placement,
+            panelIndex = _this8.panelIndex;
         var targetElem = $refs.input;
         var panelElem = $refs.panel;
 
@@ -26136,9 +26337,9 @@ function renderExtraSuffixIcon(h, _vm) {
             }
           }
 
-          _this7.panelStyle = panelStyle;
-          _this7.panelPlacement = panelPlacement;
-          return _this7.$nextTick();
+          _this8.panelStyle = panelStyle;
+          _this8.panelPlacement = panelPlacement;
+          return _this8.$nextTick();
         }
       });
     },
@@ -32806,7 +33007,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
                 if (rest) {
                   if (isEnableConf(pagerConfig)) {
                     var total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(rest, proxyProps.total || 'page.total') || 0;
-                    tablePage.total = total;
+                    tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(total);
                     _this5.tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(rest, proxyProps.result || 'result') || []; // 检验当前页码，不能超出当前最大页数
 
                     var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
@@ -35920,32 +36121,35 @@ function tooltip_renderContent(h, _vm) {
         content = this.content,
         value = this.value;
     var parentNode = $el.parentNode;
-    var target;
-    this.tipContent = content;
-    this.tipZindex = utils.nextZIndex();
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.children, function (elem, index) {
-      if (index > 1) {
-        parentNode.insertBefore(elem, $el);
 
-        if (!target) {
-          target = elem;
+    if (parentNode) {
+      var target;
+      this.tipContent = content;
+      this.tipZindex = utils.nextZIndex();
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.children, function (elem, index) {
+        if (index > 1) {
+          parentNode.insertBefore(elem, $el);
+
+          if (!target) {
+            target = elem;
+          }
         }
-      }
-    });
-    parentNode.removeChild($el);
-    this.target = target;
+      });
+      parentNode.removeChild($el);
+      this.target = target;
 
-    if (target) {
-      if (trigger === 'hover') {
-        target.onmouseleave = this.targetMouseleaveEvent;
-        target.onmouseenter = this.targetMouseenterEvent;
-      } else if (trigger === 'click') {
-        target.onclick = this.clickEvent;
+      if (target) {
+        if (trigger === 'hover') {
+          target.onmouseleave = this.targetMouseleaveEvent;
+          target.onmouseenter = this.targetMouseenterEvent;
+        } else if (trigger === 'click') {
+          target.onclick = this.clickEvent;
+        }
       }
-    }
 
-    if (value) {
-      this.open();
+      if (value) {
+        this.open();
+      }
     }
   },
   beforeDestroy: function beforeDestroy() {
@@ -36761,19 +36965,15 @@ function renderItems(h, _vm, itemList) {
 
       if (!this.preventSubmit) {
         this.clearValidate();
-        this.beginValidate(this.getItems()).then(function () {
-          _this3.$emit('submit', {
-            data: _this3.data,
-            $form: _this3,
-            $event: evnt
-          });
-        }).catch(function (errMap) {
-          _this3.$emit('submit-invalid', {
-            data: _this3.data,
-            errMap: errMap,
-            $form: _this3,
-            $event: evnt
-          });
+        this.beginValidate(this.getItems()).then(function (errMap) {
+          if (errMap) {
+            _this3.$emit('submit-invalid', {
+              data: _this3.data,
+              errMap: errMap,
+              $form: _this3,
+              $event: evnt
+            });
+          } else {}
         });
       }
     },