vxe-table 4.2.2-beta.0 → 4.2.3-beta.0

package/lib/index.umd.js

@@ -6028,6 +6028,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":
@@ -8754,7 +8802,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.2-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.3-beta.0", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10759,7 +10807,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.2-beta.0",
+  version: "4.2.3-beta.0",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -11268,7 +11316,8 @@ var tableFilterHook = {
           var elemStore = internalData.elemStore;
           var fixed = column.fixed;
           return $xetable.scrollToColumn(column).then(function () {
-            var headerWrapperElem = elemStore["".concat(fixed || 'main', "-header-wrapper")] || elemStore['main-header-wrapper'];
+            var headerWrapperRef = elemStore["".concat(fixed || 'main', "-header-wrapper")] || elemStore['main-header-wrapper'];
+            var headerWrapperElem = headerWrapperRef ? headerWrapperRef.value : null;
 
             if (headerWrapperElem) {
               var filterBtnElem = headerWrapperElem.querySelector(".vxe-header--column.".concat(column.id, " .vxe-filter--btn"));
@@ -12774,9 +12823,7 @@ var editHook = {
           }, evnt || null);
         }
 
-        return ($xetable.clearValidate ? $xetable.clearValidate() : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])()).then(function () {
-          return $xetable.recalculate();
-        });
+        return $xetable.clearValidate ? $xetable.clearValidate() : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
       },
 
       /**
@@ -12905,7 +12952,11 @@ var editHook = {
               }
 
               $xetable.closeTooltip();
-              editMethods.clearActived(evnt);
+
+              if (actived.column) {
+                editMethods.clearActived(evnt);
+              }
+
               type = 'edit-actived';
               column.renderHeight = cell.offsetHeight;
               actived.args = params;
@@ -14846,6 +14897,9 @@ var msgQueue = [];
     return this.renderVN();
   }
 }));
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+var es_array_includes = __webpack_require__("caad");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.pad-start.js
 var es_string_pad_start = __webpack_require__("4d90");
 
@@ -14932,7 +14986,11 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
 
 
-var yearSize = 20;
+
+
+
+
+var yearSize = 12;
 var monthSize = 20;
 var quarterSize = 8;
 /* harmony default export */ var input = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
@@ -14971,6 +15029,7 @@ var quarterSize = 8;
         return conf.input.size || conf.size;
       }
     },
+    multiple: Boolean,
     // number、integer、float
     min: {
       type: [String, Number],
@@ -15165,6 +15224,43 @@ var quarterSize = 8;
     var computeDateMaxTime = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return props.maxDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(props.maxDate) : null;
     });
+    var computeSupportMultiples = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return ['date', 'week', 'month', 'quarter', 'year'].includes(props.type);
+    });
+    var computeDateListValue = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      var modelValue = props.modelValue,
+          multiple = props.multiple;
+      var isDatePickerType = computeIsDatePickerType.value;
+      var dateValueFormat = computeDateValueFormat.value;
+
+      if (multiple && modelValue && isDatePickerType) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(modelValue).split(',').map(function (item) {
+          var date = 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 [];
+    });
+    var computeDateMultipleValue = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      var dateListValue = computeDateListValue.value;
+      var dateValueFormat = computeDateValueFormat.value;
+      return dateListValue.map(function (date) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(date, dateValueFormat);
+      });
+    });
+    var computeDateMultipleLabel = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      var dateListValue = computeDateListValue.value;
+      var dateLabelFormat = computeDateLabelFormat.value;
+      return dateListValue.map(function (date) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(date, dateLabelFormat);
+      }).join(', ');
+    });
     var computeDateValueFormat = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var type = props.type;
       return type === 'time' ? 'HH:mm:ss' : props.valueFormat || (type === 'datetime' ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd');
@@ -15235,15 +15331,18 @@ var quarterSize = 8;
 
       if (selectMonth && currentDate) {
         var currFullYear = currentDate.getFullYear();
-        var startYear = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(('' + 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();
           years.push({
             date: date,
             isCurrent: true,
+            isPrev: index < 0,
             isNow: currFullYear === itemFullYear,
+            isNext: index >= yearSize,
             year: itemFullYear
           });
         }
@@ -15495,8 +15594,9 @@ var quarterSize = 8;
     var computeInpReadonly = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var type = props.type,
           readonly = props.readonly,
-          editable = props.editable;
-      return readonly || !editable || type === 'week' || type === 'quarter';
+          editable = props.editable,
+          multiple = props.multiple;
+      return readonly || multiple || !editable || type === 'week' || type === 'quarter';
     });
     var computeInputType = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var type = props.type;
@@ -15706,7 +15806,7 @@ var quarterSize = 8;
 
       if (isDatePickerType) {
         dateParseValue(inputValue);
-        reactData.inputValue = reactData.datePanelLabel;
+        reactData.inputValue = props.multiple ? computeDateMultipleLabel.value : reactData.datePanelLabel;
       }
     };
     /**
@@ -15744,7 +15844,7 @@ var quarterSize = 8;
     };
 
     var dateRevert = function dateRevert() {
-      reactData.inputValue = reactData.datePanelLabel;
+      reactData.inputValue = props.multiple ? computeDateMultipleLabel.value : reactData.datePanelLabel;
     };
 
     var dateCheckMonth = function dateCheckMonth(date) {
@@ -15756,7 +15856,8 @@ var quarterSize = 8;
     };
 
     var dateChange = function dateChange(date) {
-      var modelValue = props.modelValue;
+      var modelValue = props.modelValue,
+          multiple = props.multiple;
       var datetimePanelValue = reactData.datetimePanelValue;
       var isDateTimeType = computeIsDateTimeType.value;
       var dateValueFormat = computeDateValueFormat.value;
@@ -15776,10 +15877,51 @@ var quarterSize = 8;
       });
       dateCheckMonth(date);
 
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(modelValue, inpVal)) {
-        emitModel(inpVal, {
-          type: 'update'
-        });
+      if (multiple) {
+        // 如果为多选
+        var dateMultipleValue = computeDateMultipleValue.value;
+
+        if (isDateTimeType) {
+          // 如果是datetime特殊类型
+          var dateListValue = computeDateListValue.value;
+          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);
+          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);
+          })) {
+            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 {
+            emitModel(dateMultipleValue.concat([inpVal]).join(','), {
+              type: 'update'
+            });
+          }
+        }
+      } else {
+        // 如果为单选
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(modelValue, inpVal)) {
+          emitModel(inpVal, {
+            type: 'update'
+          });
+        }
       }
     };
 
@@ -16118,8 +16260,12 @@ var quarterSize = 8;
 
     var dateTodayMonthEvent = function dateTodayMonthEvent(evnt) {
       dateNowHandle();
-      dateChange(reactData.currentDate);
-      hidePanel();
+
+      if (!props.multiple) {
+        dateChange(reactData.currentDate);
+        hidePanel();
+      }
+
       inputMethods.dispatchEvent('date-today', {
         type: props.type
       }, evnt);
@@ -16168,7 +16314,8 @@ var quarterSize = 8;
     };
 
     var dateSelectItem = function dateSelectItem(date) {
-      var type = props.type;
+      var type = props.type,
+          multiple = props.multiple;
       var datePanelType = reactData.datePanelType;
 
       if (type === 'month') {
@@ -16177,18 +16324,27 @@ var quarterSize = 8;
           dateCheckMonth(date);
         } else {
           dateChange(date);
-          hidePanel();
+
+          if (!multiple) {
+            hidePanel();
+          }
         }
       } else if (type === 'year') {
         dateChange(date);
-        hidePanel();
+
+        if (!multiple) {
+          hidePanel();
+        }
       } else if (type === 'quarter') {
         if (datePanelType === 'year') {
           reactData.datePanelType = 'quarter';
           dateCheckMonth(date);
         } else {
           dateChange(date);
-          hidePanel();
+
+          if (!multiple) {
+            hidePanel();
+          }
         }
       } else {
         if (datePanelType === 'month') {
@@ -16199,7 +16355,10 @@ var quarterSize = 8;
           dateCheckMonth(date);
         } else {
           dateChange(date);
-          hidePanel();
+
+          if (!multiple) {
+            hidePanel();
+          }
         }
       }
     };
@@ -16309,8 +16468,13 @@ var quarterSize = 8;
     };
 
     var dateConfirmEvent = function dateConfirmEvent() {
+      var type = props.type;
       var dateValue = computeDateValue.value;
-      dateChange(dateValue || reactData.currentDate);
+
+      if (type === 'datetime') {
+        dateChange(dateValue || reactData.currentDate);
+      }
+
       hidePanel();
     };
 
@@ -16754,11 +16918,13 @@ var quarterSize = 8;
     };
 
     var renderDateDayTable = function renderDateDayTable() {
+      var multiple = props.multiple;
       var datePanelType = reactData.datePanelType,
           datePanelValue = reactData.datePanelValue;
       var dateValue = computeDateValue.value;
       var dateHeaders = computeDateHeaders.value;
       var dayDatas = computeDayDatas.value;
+      var dateListValue = computeDateListValue.value;
       var matchFormat = 'yyyyMMdd';
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('table', {
         class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -16776,7 +16942,9 @@ var quarterSize = 8;
               'is--now': item.isNow,
               'is--next': item.isNext,
               'is--disabled': isDateDisabled(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)
             },
             onClick: function onClick() {
@@ -16791,11 +16959,13 @@ var quarterSize = 8;
     };
 
     var renderDateWeekTable = function renderDateWeekTable() {
+      var multiple = props.multiple;
       var datePanelType = reactData.datePanelType,
           datePanelValue = reactData.datePanelValue;
       var dateValue = computeDateValue.value;
       var weekHeaders = computeWeekHeaders.value;
       var weekDates = computeWeekDates.value;
+      var dateListValue = computeDateListValue.value;
       var matchFormat = 'yyyyMMdd';
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('table', {
         class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -16805,7 +16975,11 @@ var quarterSize = 8;
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('thead', [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('tr', weekHeaders.map(function (item) {
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('th', item.label);
       }))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["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) {
@@ -16835,10 +17009,12 @@ var quarterSize = 8;
     };
 
     var renderDateMonthTable = function renderDateMonthTable() {
+      var multiple = props.multiple;
       var datePanelType = reactData.datePanelType,
           datePanelValue = reactData.datePanelValue;
       var dateValue = computeDateValue.value;
       var monthDatas = computeMonthDatas.value;
+      var dateListValue = computeDateListValue.value;
       var matchFormat = 'yyyyMM';
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('table', {
         class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -16854,7 +17030,9 @@ var quarterSize = 8;
               'is--now': item.isNow,
               'is--next': item.isNext,
               'is--disabled': isDateDisabled(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)
             },
             onClick: function onClick() {
@@ -16869,10 +17047,12 @@ var quarterSize = 8;
     };
 
     var renderDateQuarterTable = function renderDateQuarterTable() {
+      var multiple = props.multiple;
       var datePanelType = reactData.datePanelType,
           datePanelValue = reactData.datePanelValue;
       var dateValue = computeDateValue.value;
       var quarterDatas = computeQuarterDatas.value;
+      var dateListValue = computeDateListValue.value;
       var matchFormat = 'yyyyq';
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('table', {
         class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -16888,7 +17068,9 @@ var quarterSize = 8;
               'is--now': item.isNow,
               'is--next': item.isNext,
               'is--disabled': isDateDisabled(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)
             },
             onClick: function onClick() {
@@ -16903,10 +17085,12 @@ var quarterSize = 8;
     };
 
     var renderDateYearTable = function renderDateYearTable() {
+      var multiple = props.multiple;
       var datePanelType = reactData.datePanelType,
           datePanelValue = reactData.datePanelValue;
       var dateValue = computeDateValue.value;
       var yearDatas = computeYearDatas.value;
+      var dateListValue = computeDateListValue.value;
       var matchFormat = 'yyyy';
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('table', {
         class: "vxe-input--date-".concat(datePanelType, "-view"),
@@ -16917,10 +17101,14 @@ var quarterSize = 8;
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('tr', rows.map(function (item) {
           return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('td', {
             class: {
-              'is--disabled': isDateDisabled(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)
             },
             onClick: function onClick() {
@@ -16955,6 +17143,7 @@ var quarterSize = 8;
     };
 
     var renderDatePanel = function renderDatePanel() {
+      var multiple = props.multiple;
       var datePanelType = reactData.datePanelType;
       var isDisabledPrevDateBtn = computeIsDisabledPrevDateBtn.value;
       var isDisabledNextDateBtn = computeIsDisabledNextDateBtn.value;
@@ -16989,7 +17178,13 @@ var quarterSize = 8;
         onClick: dateNextEvent
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
         class: 'vxe-icon--caret-right'
-      })])])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+      })]), multiple && computeSupportMultiples.value ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
+        class: 'vxe-input--date-picker-btn vxe-input--date-picker-confirm-btn'
+      }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('button', {
+        class: 'vxe-input--date-picker-confirm',
+        type: 'button',
+        onClick: dateConfirmEvent
+      }, conf.i18n('vxe.button.confirm'))]) : null])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-input--date-picker-body'
       }, renderDateTable())];
     };
@@ -17270,7 +17465,7 @@ var quarterSize = 8;
 
       if (isDatePickerType) {
         dateParseValue(reactData.datePanelValue);
-        reactData.inputValue = reactData.datePanelLabel;
+        reactData.inputValue = props.multiple ? computeDateMultipleLabel.value : reactData.datePanelLabel;
       }
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -17362,9 +17557,6 @@ var quarterSize = 8;
     return this.renderVN();
   }
 }));
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
-var es_array_includes = __webpack_require__("caad");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__("2532");
 
@@ -21323,7 +21515,13 @@ var tableKeyboardHook = {
         var elemStore = internalData.elemStore;
         var disX = evnt.clientX;
         var disY = evnt.clientY;
-        var bodyWrapperElem = elemStore["".concat(column.fixed || 'main', "-body-wrapper")] || elemStore['main-body-wrapper'];
+        var bodyWrapperRef = elemStore["".concat(column.fixed || 'main', "-body-wrapper")] || elemStore['main-body-wrapper'];
+        var bodyWrapperElem = bodyWrapperRef ? bodyWrapperRef.value : null;
+
+        if (!bodyWrapperElem) {
+          return;
+        }
+
         var checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
         var domMousemove = document.onmousemove;
         var domMouseup = document.onmouseup;
@@ -22479,12 +22677,12 @@ var renderType = 'header';
         var internalData = $xetable.internalData;
         var elemStore = internalData.elemStore;
         var prefix = "".concat(fixedType || 'main', "-header-");
-        elemStore["".concat(prefix, "wrapper")] = refElem.value;
-        elemStore["".concat(prefix, "table")] = refHeaderTable.value;
-        elemStore["".concat(prefix, "colgroup")] = refHeaderColgroup.value;
-        elemStore["".concat(prefix, "list")] = refHeaderTHead.value;
-        elemStore["".concat(prefix, "xSpace")] = refHeaderXSpace.value;
-        elemStore["".concat(prefix, "repair")] = refHeaderBorderRepair.value;
+        elemStore["".concat(prefix, "wrapper")] = refElem;
+        elemStore["".concat(prefix, "table")] = refHeaderTable;
+        elemStore["".concat(prefix, "colgroup")] = refHeaderColgroup;
+        elemStore["".concat(prefix, "list")] = refHeaderTHead;
+        elemStore["".concat(prefix, "xSpace")] = refHeaderXSpace;
+        elemStore["".concat(prefix, "repair")] = refHeaderBorderRepair;
         uploadColumn();
       });
     });
@@ -22828,11 +23026,11 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         var fixedType = props.fixedType;
         var elemStore = tableInternalData.elemStore;
         var prefix = "".concat(fixedType || 'main', "-footer-");
-        elemStore["".concat(prefix, "wrapper")] = refElem.value;
-        elemStore["".concat(prefix, "table")] = refFooterTable.value;
-        elemStore["".concat(prefix, "colgroup")] = refFooterColgroup.value;
-        elemStore["".concat(prefix, "list")] = refFooterTFoot.value;
-        elemStore["".concat(prefix, "xSpace")] = refFooterXSpace.value;
+        elemStore["".concat(prefix, "wrapper")] = refElem;
+        elemStore["".concat(prefix, "table")] = refFooterTable;
+        elemStore["".concat(prefix, "colgroup")] = refFooterColgroup;
+        elemStore["".concat(prefix, "list")] = refFooterTFoot;
+        elemStore["".concat(prefix, "xSpace")] = refFooterXSpace;
       });
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["onUnmounted"])(function () {
@@ -25486,7 +25684,7 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                   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);
                       reactData.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);
@@ -29271,15 +29469,17 @@ function getResetValue(value, resetValue) {
 
       if (!props.preventSubmit) {
         clearValidate();
-        beginValidate(getItems()).then(function () {
-          formMethods.dispatchEvent('submit', {
-            data: props.data
-          }, evnt);
-        }).catch(function (errMap) {
-          formMethods.dispatchEvent('submit-invalid', {
-            data: props.data,
-            errMap: errMap
-          }, evnt);
+        beginValidate(getItems()).then(function (errMap) {
+          if (errMap) {
+            formMethods.dispatchEvent('submit-invalid', {
+              data: props.data,
+              errMap: errMap
+            }, evnt);
+          } else {
+            formMethods.dispatchEvent('submit', {
+              data: props.data
+            }, evnt);
+          }
         });
       }
     };
@@ -31125,6 +31325,9 @@ var Pulldown = Object.assign(pulldown, {
 });
 dynamicApp.component(pulldown.name, pulldown);
 /* harmony default export */ var packages_pulldown = (Pulldown);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
+var es_promise_finally = __webpack_require__("a79d");
+
 // CONCATENATED MODULE: ./packages/table/src/body.ts
 
 
@@ -31751,8 +31954,10 @@ var lineOffsetSizes = {
       var bodyElem = tableBody.$el;
       var leftElem = leftBody ? leftBody.$el : null;
       var rightElem = rightBody ? rightBody.$el : null;
-      var bodyYElem = elemStore['main-body-ySpace'];
-      var bodyXElem = elemStore['main-body-xSpace'];
+      var bodyYRef = elemStore['main-body-ySpace'];
+      var bodyYElem = bodyYRef ? bodyYRef.value : null;
+      var bodyXRef = elemStore['main-body-xSpace'];
+      var bodyXElem = bodyXRef ? bodyXRef.value : null;
       var bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight;
       var bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth;
       var scrollTop = scrollBodyElem.scrollTop;
@@ -31835,8 +32040,10 @@ var lineOffsetSizes = {
       var leftElem = leftBody ? leftBody.$el : null;
       var rightElem = rightBody ? rightBody.$el : null;
       var bodyElem = tableBody.$el;
-      var bodyYElem = elemStore['main-body-ySpace'];
-      var bodyXElem = elemStore['main-body-xSpace'];
+      var bodyYRef = elemStore['main-body-ySpace'];
+      var bodyYElem = bodyYRef ? bodyYRef.value : null;
+      var bodyXRef = elemStore['main-body-xSpace'];
+      var bodyXElem = bodyXRef ? bodyXRef.value : null;
       var bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight;
       var bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth;
       var remainSize = isPrevWheelTop === isTopWheel ? Math.max(0, wheelYSize - wheelYTotal) : 0;
@@ -31944,13 +32151,13 @@ var lineOffsetSizes = {
         var elemStore = tableInternalData.elemStore;
         var prefix = "".concat(fixedType || 'main', "-body-");
         var el = refElem.value;
-        elemStore["".concat(prefix, "wrapper")] = refElem.value;
-        elemStore["".concat(prefix, "table")] = refBodyTable.value;
-        elemStore["".concat(prefix, "colgroup")] = refBodyColgroup.value;
-        elemStore["".concat(prefix, "list")] = refBodyTBody.value;
-        elemStore["".concat(prefix, "xSpace")] = refBodyXSpace.value;
-        elemStore["".concat(prefix, "ySpace")] = refBodyYSpace.value;
-        elemStore["".concat(prefix, "emptyBlock")] = refBodyEmptyBlock.value;
+        elemStore["".concat(prefix, "wrapper")] = refElem;
+        elemStore["".concat(prefix, "table")] = refBodyTable;
+        elemStore["".concat(prefix, "colgroup")] = refBodyColgroup;
+        elemStore["".concat(prefix, "list")] = refBodyTBody;
+        elemStore["".concat(prefix, "xSpace")] = refBodyXSpace;
+        elemStore["".concat(prefix, "ySpace")] = refBodyYSpace;
+        elemStore["".concat(prefix, "emptyBlock")] = refBodyEmptyBlock;
         el.onscroll = scrollEvent;
         el._onscroll = scrollEvent;
       });
@@ -32144,6 +32351,7 @@ var lineOffsetSizes = {
 
 
 
+
 
 
 var isWebkit = browse['-webkit'] && !browse.edge;
@@ -33194,14 +33402,21 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
      * 支持 px、%、固定 混合分配
      * 支持动态列表调整分配
      * 支持自动分配偏移量
-     * @param {Element} headerElem
-     * @param {Element} bodyElem
-     * @param {Element} footerElem
-     * @param {Number} bodyWidth
      */
 
 
-    var autoCellWidth = function autoCellWidth(headerElem, bodyElem, footerElem) {
+    var autoCellWidth = function autoCellWidth() {
+      var tableHeader = refTableHeader.value;
+      var tableBody = refTableBody.value;
+      var tableFooter = refTableFooter.value;
+      var bodyElem = tableBody ? tableBody.$el : null;
+      var headerElem = tableHeader ? tableHeader.$el : null;
+      var footerElem = tableFooter ? tableFooter.$el : null;
+
+      if (!bodyElem) {
+        return;
+      }
+
       var tableWidth = 0;
       var minCellWidth = 40; // 列宽最少限制 40px
 
@@ -33313,6 +33528,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         });
       }
 
+      console.log(headerHeight);
       internalData.headerHeight = headerHeight;
       var overflowX = false;
       var footerHeight = 0;
@@ -33722,7 +33938,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       var cellOffsetWidth = computeCellOffsetWidth.value;
       var mouseOpts = computeMouseOpts.value;
       var keyboardOpts = computeKeyboardOpts.value;
-      var bodyWrapperElem = elemStore['main-body-wrapper'];
+      var bodyWrapperRef = elemStore['main-body-wrapper'];
+      var bodyWrapperElem = bodyWrapperRef ? bodyWrapperRef.value : null;
 
       if (emptyPlaceholderElem) {
         emptyPlaceholderElem.style.top = "".concat(headerHeight, "px");
@@ -33748,8 +33965,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         }
 
         layoutList.forEach(function (layout) {
-          var wrapperElem = elemStore["".concat(name, "-").concat(layout, "-wrapper")];
-          var tableElem = elemStore["".concat(name, "-").concat(layout, "-table")];
+          var wrapperRef = elemStore["".concat(name, "-").concat(layout, "-wrapper")];
+          var wrapperElem = wrapperRef ? wrapperRef.value : null;
+          var tableRef = elemStore["".concat(name, "-").concat(layout, "-table")];
+          var tableElem = tableRef ? tableRef.value : null;
 
           if (layout === 'header') {
             // 表头体样式处理
@@ -33784,13 +34003,15 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               }
             }
 
-            var repairElem = elemStore["".concat(name, "-").concat(layout, "-repair")];
+            var repairRef = elemStore["".concat(name, "-").concat(layout, "-repair")];
+            var repairElem = repairRef ? repairRef.value : null;
 
             if (repairElem) {
               repairElem.style.width = "".concat(tableWidth, "px");
             }
 
-            var listElem = elemStore["".concat(name, "-").concat(layout, "-list")];
+            var listRef = elemStore["".concat(name, "-").concat(layout, "-list")];
+            var listElem = listRef ? listRef.value : null;
 
             if (isGroup && listElem) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
@@ -33824,7 +34045,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               });
             }
           } else if (layout === 'body') {
-            var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
+            var emptyBlockRef = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
+            var emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null;
 
             if (isNodeElement(wrapperElem)) {
               if (customMaxHeight) {
@@ -33910,7 +34132,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             }
           }
 
-          var colgroupElem = elemStore["".concat(name, "-").concat(layout, "-colgroup")];
+          var colgroupRef = elemStore["".concat(name, "-").concat(layout, "-colgroup")];
+          var colgroupElem = colgroupRef ? colgroupRef.value : null;
 
           if (colgroupElem) {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(colgroupElem.children, function (colElem) {
@@ -33940,7 +34163,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 var showTitle = cellOverflow === 'title';
                 var showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
                 var hasEllipsis = showTitle || showTooltip || showEllipsis;
-                var _listElem = elemStore["".concat(name, "-").concat(layout, "-list")]; // 纵向虚拟滚动不支持动态行高
+                var _listRef = elemStore["".concat(name, "-").concat(layout, "-list")];
+
+                var _listElem = _listRef ? _listRef.value : null; // 纵向虚拟滚动不支持动态行高
+
 
                 if (scrollYLoad && !hasEllipsis) {
                   hasEllipsis = true;
@@ -34270,7 +34496,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             }
 
             if (childRecords) {
-              tableMethods.loadTreeChildren(row, childRecords).then(function (childRows) {
+              return tableMethods.loadTreeChildren(row, childRecords).then(function (childRows) {
                 if (childRows.length && $xetable.findRowIndexOf(treeExpandeds, row) === -1) {
                   treeExpandeds.push(row);
                 } // 如果当前节点已选中，则展开后子节点也被选中
@@ -34280,23 +34506,24 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                   tableMethods.setCheckboxRow(childRows, true);
                 }
 
-                Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
+                return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
                   if (transform) {
                     return tablePrivateMethods.handleTableData();
                   }
-                }).then(function () {
-                  return tableMethods.recalculate();
-                }).then(function () {
-                  return resolve();
                 });
               });
-            } else {
-              Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
-                return tableMethods.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 $xetable.eqRow(item, row);
+            });
+          }).finally(function () {
+            Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
+              return tableMethods.recalculate();
+            }).then(function () {
+              return resolve();
+            });
           });
         } else {
           resolve();
@@ -34320,31 +34547,29 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
     };
 
     var handleAsyncRowExpand = function handleAsyncRowExpand(row) {
-      var rowExpandeds = reactData.rowExpandeds,
-          expandLazyLoadeds = reactData.expandLazyLoadeds;
       var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-
-      var rest = fullAllDataRowIdData[util_getRowid($xetable, row)];
-
       return new Promise(function (resolve) {
         var expandOpts = computeExpandOpts.value;
         var loadMethod = expandOpts.loadMethod;
 
         if (loadMethod) {
-          expandLazyLoadeds.push(row);
+          var rest = fullAllDataRowIdData[util_getRowid($xetable, row)];
+
+          reactData.expandLazyLoadeds.push(row);
           loadMethod({
             $table: $xetable,
             row: row,
             rowIndex: tableMethods.getRowIndex(row),
             $rowIndex: tableMethods.getVMRowIndex(row)
-          }).catch(function (e) {
-            return e;
           }).then(function () {
             rest.expandLoaded = true;
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(expandLazyLoadeds, function (item) {
+            reactData.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(reactData.expandLazyLoadeds, function (item) {
               return $xetable.eqRow(item, row);
             });
-            rowExpandeds.push(row);
             resolve(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
               return tableMethods.recalculate();
             }));
@@ -35789,23 +36014,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
        */
       recalculate: function recalculate(refull) {
-        var tableHeader = refTableHeader.value;
-        var tableBody = refTableBody.value;
-        var tableFooter = refTableFooter.value;
-        var bodyElem = tableBody ? tableBody.$el : null;
-        var headerElem = tableHeader ? tableHeader.$el : null;
-        var footerElem = tableFooter ? tableFooter.$el : null;
+        autoCellWidth();
 
-        if (bodyElem) {
-          autoCellWidth(headerElem, bodyElem, footerElem);
-
-          if (refull === true) {
-            // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-            return computeScrollLoad().then(function () {
-              autoCellWidth(headerElem, bodyElem, footerElem);
-              return computeScrollLoad();
-            });
-          }
+        if (refull === true) {
+          // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
+          return computeScrollLoad().then(function () {
+            autoCellWidth();
+            return computeScrollLoad();
+          });
         }
 
         return computeScrollLoad();
@@ -38868,7 +39084,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           containerList.forEach(function (name) {
             var layoutList = ['header', 'body', 'footer'];
             layoutList.forEach(function (layout) {
-              var xSpaceElem = elemStore["".concat(name, "-").concat(layout, "-xSpace")];
+              var xSpaceRef = elemStore["".concat(name, "-").concat(layout, "-xSpace")];
+              var xSpaceElem = xSpaceRef ? xSpaceRef.value : null;
 
               if (xSpaceElem) {
                 xSpaceElem.style.width = scrollXLoad ? "".concat(tableWidth + (layout === 'header' ? scrollbarWidth : 0), "px") : '';
@@ -38899,14 +39116,16 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
         containerList.forEach(function (name) {
           var layoutList = ['header', 'body', 'footer'];
-          var tableElem = elemStore["".concat(name, "-body-table")];
+          var tableRef = elemStore["".concat(name, "-body-table")];
+          var tableElem = tableRef ? tableRef.value : null;
 
           if (tableElem) {
             tableElem.style.marginTop = marginTop;
           }
 
           layoutList.forEach(function (layout) {
-            var ySpaceElem = elemStore["".concat(name, "-").concat(layout, "-ySpace")];
+            var ySpaceRef = elemStore["".concat(name, "-").concat(layout, "-ySpace")];
+            var ySpaceElem = ySpaceRef ? ySpaceRef.value : null;
 
             if (ySpaceElem) {
               ySpaceElem.style.height = ySpaceHeight;
@@ -38916,14 +39135,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(updateStyle);
       },
       updateScrollXData: function updateScrollXData() {
-        reactData.tableColumn = [];
+        // reactData.tableColumn = []
         Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
           handleTableColumn();
           tablePrivateMethods.updateScrollXSpace();
         });
       },
       updateScrollYData: function updateScrollYData() {
-        reactData.tableData = [];
+        // reactData.tableData = []
         Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
           tablePrivateMethods.handleTableData();
           tablePrivateMethods.updateScrollYSpace();