@seafile/seafile-calendar 0.0.29-gzc32 → 0.0.29-prop3.2

package/dist/rc-calendar.js

@@ -317,28 +317,27 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /* unused harmony export stringCurrentDate */
 /* unused harmony export stringCurrentMonth */
 /* unused harmony export currentTime */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DATE_FORMATS; });
-/* harmony export (immutable) */ __webpack_exports__["i"] = getTodayTime;
-/* harmony export (immutable) */ __webpack_exports__["h"] = getTitleString;
-/* harmony export (immutable) */ __webpack_exports__["j"] = getTodayTimeStr;
-/* harmony export (immutable) */ __webpack_exports__["f"] = getMonthName;
-/* harmony export (immutable) */ __webpack_exports__["m"] = syncTime;
-/* harmony export (immutable) */ __webpack_exports__["g"] = getTimeConfig;
+/* unused harmony export DATE_FORMATS */
+/* harmony export (immutable) */ __webpack_exports__["e"] = getTodayTime;
+/* harmony export (immutable) */ __webpack_exports__["d"] = getTitleString;
+/* harmony export (immutable) */ __webpack_exports__["f"] = getTodayTimeStr;
+/* harmony export (immutable) */ __webpack_exports__["b"] = getMonthName;
+/* harmony export (immutable) */ __webpack_exports__["i"] = syncTime;
+/* harmony export (immutable) */ __webpack_exports__["c"] = getTimeConfig;
 /* unused harmony export isTimeValidByConfig */
 /* unused harmony export isTimeValid */
-/* harmony export (immutable) */ __webpack_exports__["k"] = isAllowedDate;
-/* harmony export (immutable) */ __webpack_exports__["c"] = formatDate;
-/* harmony export (immutable) */ __webpack_exports__["d"] = formatDateLocal;
+/* harmony export (immutable) */ __webpack_exports__["h"] = isAllowedDate;
+/* harmony export (immutable) */ __webpack_exports__["a"] = formatDate;
+/* unused harmony export validateCalendarDay */
+/* harmony export (immutable) */ __webpack_exports__["j"] = tokenizeFormattedDate;
 /* unused harmony export hasSpecialChar */
-/* unused harmony export isValidMonth */
-/* unused harmony export isValidDay */
-/* unused harmony export fullValidYear */
-/* harmony export (immutable) */ __webpack_exports__["b"] = delimate;
-/* harmony export (immutable) */ __webpack_exports__["e"] = getDateFormatByStr;
-/* unused harmony export isCurrentYear */
 /* unused harmony export validateTime */
-/* unused harmony export checkSpecialBetweenDigits */
-/* harmony export (immutable) */ __webpack_exports__["l"] = normalizeDateInput;
+/* unused harmony export delimate */
+/* unused harmony export validateCalendarYear */
+/* unused harmony export isLeapYear */
+/* unused harmony export validateCalendarDayAndMonth */
+/* unused harmony export getDatePart */
+/* harmony export (immutable) */ __webpack_exports__["g"] = initializeStr;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends__ = __webpack_require__(26);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends__);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_dayjs__ = __webpack_require__(20);
@@ -468,7 +467,28 @@ function formatDate(value, format) {
   return value.format(format);
 }
 
-function formatDateLocal(formatStr, format) {
+function validateCalendarDay(dayStr) {
+  if (!/^\d+$/.test(dayStr)) return false;
+  var day = Number(dayStr);
+  if ([1, 3, 5, 7, 8, 10, 12].includes(currentMonth)) {
+    return day >= 1 && day <= 31;
+  }
+  if ([4, 6, 9, 11].includes(currentMonth)) {
+    return day >= 1 && day <= 30;
+  }
+  if (currentMonth === 2) {
+    var _isLeapYear = function _isLeapYear(year) {
+      return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+    };
+    var year = currentYear;
+    if (_isLeapYear(year)) {
+      return day >= 1 && day <= 29;
+    }
+    return day >= 1 && day <= 28;
+  }
+}
+
+function tokenizeFormattedDate(formatStr, format) {
   var str = formatStr || '';
   var cleanStr = void 0;
   switch (format) {
@@ -496,38 +516,37 @@ function hasSpecialChar(str) {
   return matches ? matches.length : 0;
 }
 
-function isValidMonth(monthStr) {
-  if (typeof monthStr === 'undefined' || monthStr === null) return currentMonth;
-  if (!/^\d+$/.test(Number(monthStr))) return currentMonth;
-  var month = Number(monthStr);
-  if (month >= 1 && month <= 12) {
-    return monthStr;
+function validateTime(inputTime) {
+  if (!inputTime || typeof inputTime !== 'string') {
+    return currentTime;
   }
-  return currentMonth;
-}
-
-function isValidDay(dayStr) {
-  if (!/^\d+$/.test(dayStr)) return false;
-  var day = Number(dayStr);
-  if ([1, 3, 5, 7, 8, 10, 12].includes(currentMonth)) {
-    return day >= 1 && day <= 31;
+  var trimmed = inputTime.trim();
+  var timeRegex = /^(\d{2}):(\d{2})$/;
+  var match = trimmed.match(timeRegex);
+  if (!match) {
+    return currentTime;
   }
-  if ([4, 6, 9, 11].includes(currentMonth)) {
-    return day >= 1 && day <= 30;
+  var hour = Number(match[1]);
+  var minute = Number(match[2]);
+  if (hour > 23 || minute > 59) {
+    return currentTime;
   }
-  if (currentMonth === 2) {
-    var isLeapYear = function isLeapYear(year) {
-      return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
-    };
-    var year = currentYear;
-    if (isLeapYear(year)) {
-      return day >= 1 && day <= 29;
-    }
-    return day >= 1 && day <= 28;
+  return match[1] + ':' + match[2];
+}
+
+function delimate(format) {
+  var delimiter = void 0;
+  if (format === DATE_FORMATS.Germany_Russia_etc || format === DATE_FORMATS.Germany_Russia_etcAndTime) {
+    delimiter = '.';
+  } else if (format === DATE_FORMATS.ISO || format === DATE_FORMATS.ISOAndTime) {
+    delimiter = '-';
+  } else {
+    delimiter = '/';
   }
+  return delimiter;
 }
 
-function fullValidYear(yearStr) {
+function validateCalendarYear(yearStr) {
   var year = yearStr;
   if (!year || isNaN(year)) return currentYear;
   if (year.length === 2) {
@@ -543,95 +562,45 @@ function fullValidYear(yearStr) {
   return year ? year.padStart(4, '0') : currentYear;
 }
 
-function delimate(formatPrefix) {
-  var delimiter = void 0;
-  if (formatPrefix === DATE_FORMATS.Germany_Russia_etc || formatPrefix === DATE_FORMATS.Germany_Russia_etcAndTime) {
-    delimiter = '.';
-  } else if (formatPrefix === DATE_FORMATS.ISO || formatPrefix === DATE_FORMATS.ISOAndTime) {
-    delimiter = '-';
-  } else {
-    delimiter = '/';
-  }
-  return delimiter;
-}
+var isLeapYear = function isLeapYear(year) {
+  return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+};
 
-function getDateFormatByStr(str, format) {
-  var cananderStr = str || '';
-  var delimiter = delimate(format);
-  var parts = cananderStr.split(delimiter);
-  if (parts.length !== 3) return format;
-  if (format === DATE_FORMATS.ISO) {
-    return DATE_FORMATS.ISO;
-  }
-  if (format === DATE_FORMATS.ISOAndTime) {
-    return DATE_FORMATS.ISOAndTime;
-  }
-  if (format === DATE_FORMATS.US) {
-    return DATE_FORMATS.US;
-  }
-  if (format === DATE_FORMATS.USAndTime) {
-    return DATE_FORMATS.USAndTime;
-  }
-  if (format === DATE_FORMATS.European || format === DATE_FORMATS.Germany_Russia_etc) {
-    var day = parts[0],
-        month = parts[1];
-
-    var dayLen = day.length;
-    var monthLen = month.length;
-    if (dayLen === 2 && monthLen === 2) {
-      return 'DD' + delimiter + 'MM' + delimiter + 'YYYY';
-    } else if (dayLen === 2 && monthLen === 1) {
-      return 'DD' + delimiter + 'M' + delimiter + 'YYYY';
-    } else if (dayLen === 1 && monthLen === 2) {
-      return 'D' + delimiter + 'MM' + delimiter + 'YYYY';
-    } else if (dayLen === 1 && monthLen === 1) {
-      return 'D' + delimiter + 'M' + delimiter + 'YYYY';
-    }
-  }
-  if (format === DATE_FORMATS.EuropeanAndTime || format === DATE_FORMATS.Germany_Russia_etcAndTime) {
-    var _day = parts[0],
-        _month = parts[1];
-
-    var _dayLen = _day.length;
-    var _monthLen = _month.length;
-    if (_dayLen === 2 && _monthLen === 2) {
-      return 'DD' + delimiter + 'MM' + delimiter + 'YYYY HH:mm';
-    } else if (_dayLen === 2 && _monthLen === 1) {
-      return 'DD' + delimiter + 'M' + delimiter + 'YYYY HH:mm';
-    } else if (_dayLen === 1 && _monthLen === 2) {
-      return 'D' + delimiter + 'MM' + delimiter + 'YYYY HH:mm';
-    } else if (_dayLen === 1 && _monthLen === 1) {
-      return 'D' + delimiter + 'M' + delimiter + 'YYYY HH:mm';
-    }
+function validateCalendarDayAndMonth(dayStr, monthStr, yearStr) {
+  var day = Number(dayStr);
+  var month = Number(monthStr);
+  var year = yearStr;
+  var isInThirtyOneDaysMonths = [1, 3, 5, 7, 8, 10, 12].includes(month);
+  var isInThirtyDaysMonths = [4, 6, 9, 11].includes(month);
+  var isValidDayThirtyOne = day < 1 || day > 31;
+  var isValidDayThirty = day < 1 || day > 30;
+  var isValidDayTwentyNight = day < 1 || day > 29;
+  var isValidDayTwentyEight = day < 1 || day > 28;
+
+  if (month > 12 || month < 0 || !month) {
+    day = currentDate;
+    month = currentMonth;
+    year = currentYear;
   }
-  return format;
-}
-
-function isCurrentYear(year, month, day) {
-  return Number(month) >= 1 && Number(month) <= 12 && Number(day) >= 1 && Number(day) <= 31 ? year : currentYear; // eslint-disable-line max-len
-}
 
-function validateTime(inputTime) {
-  if (!inputTime || typeof inputTime !== 'string') {
-    return currentTime;
-  }
-  var trimmed = inputTime.trim();
-  var timeRegex = /^(\d{2}):(\d{2})$/;
-  var match = trimmed.match(timeRegex);
-  if (!match) {
-    return currentTime;
+  if (isInThirtyOneDaysMonths && isValidDayThirtyOne || isInThirtyDaysMonths && isValidDayThirty) {
+    day = currentDate;
+    month = currentMonth;
+    year = currentYear;
   }
-  var hour = Number(match[1]);
-  var minute = Number(match[2]);
-  if (hour > 23 || minute > 59) {
-    return currentTime;
-  }
-  return match[1] + ':' + match[2];
-}
 
-function checkSpecialBetweenDigits(str) {
-  var regex = /^\d+[^0-9]\d+$/;
-  return regex.test(str);
+  if (month === 2) {
+    if (isLeapYear(year) && isValidDayTwentyNight) {
+      day = currentDate;
+      month = currentMonth;
+      year = currentYear;
+    } else if (isValidDayTwentyEight) {
+      day = currentDate;
+      month = currentMonth;
+      year = currentYear;
+    }
+  }
+  return { day: day, month: month, year: year };
 }
 
 function getDatePart(str) {
@@ -640,273 +609,279 @@ function getDatePart(str) {
   return parts[0];
 }
 
-function normalizeDateInput(str, localeFormat, delimiter) {
-  var day = void 0;
-  var month = void 0;
-  var year = void 0;
+function initializeStr(str, format) {
+  var inputStr = str;
+  var inputStrLength = inputStr.length;
   var time = currentTime;
-  var parts = formatDateLocal(str, localeFormat, DATE_FORMATS);
-  if (localeFormat === DATE_FORMATS.ISO) {
-    var hasSpecial = hasSpecialChar(str);
-    var numStr = str.replace(/[^0-9]/g, '');
-    if (numStr.length === 7) {
-      year = numStr.slice(0, 4);
-      month = numStr.slice(4, 6).padStart(2, '0');
-      day = numStr.slice(6, 7).padStart(2, '0');
-      if (!isValidDay(day)) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate;
-      }
-      return year + '-' + month + '-' + day;
+  var hasSpecial = hasSpecialChar(inputStr);
+  var formattedArray = tokenizeFormattedDate(inputStr, format, DATE_FORMATS);
+  var dateDelimater = delimate(format);
+  if (format === DATE_FORMATS.ISO) {
+    var numStr = inputStr.replace(/[^0-9]/g, '');
+    if (numStr.length === 7 || numStr.length === 8) {
+      var yearStr = numStr.slice(0, 4);
+      var monthStr = numStr.slice(4, 6) || '01';
+      var dateStr = numStr.slice(6, numStr.length) || '01';
+      var validateYear = validateCalendarYear(yearStr);
+
+      var _validateCalendarDayA = validateCalendarDayAndMonth(dateStr, monthStr, validateYear),
+          day = _validateCalendarDayA.day,
+          month = _validateCalendarDayA.month;
+
+      var _validateCalendarDayA2 = validateCalendarDayAndMonth(dateStr, monthStr, validateYear),
+          year = _validateCalendarDayA2.year;
+
+      day = String(day).padStart(2, 0);
+      month = String(month).padStart(2, 0);
+      return '' + year + dateDelimater + month + dateDelimater + day;
     }
     if (hasSpecial) {
-      year = fullValidYear(parts[0]);
-      month = Number(parts[1]);
-      day = Number(parts[2]);
-      if (month >= 1 && month <= 12) {
-        if (isValidDay(day)) {
-          return year + '-' + String(month).padStart(2, '0') + '-' + String(day).padStart(2, '0');
-        }
-        return year + '-' + String(month).padStart(2, '0') + '-01';
-      }
-      if ((month >= 13 || month < 1) && isNaN(day)) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate;
-      }
-      if ((month >= 13 || month < 1) && day) {
-        return String(currentYear) + '-' + stringCurrentMonth + '-' + stringCurrentDate;
-      }
-      if (!month && !day) {
-        return year + '-01-01';
-      }
-    }
-    if (str.length >= 1 && str.length <= 8) {
-      year = fullValidYear(str.slice(0, 4));
-      month = str.slice(4, 6);
-      day = Number(str.slice(6, 8));
-      if (str.length === 5 && Number(month) < 1) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate + ' ';
-      }
-      if (str.length === 6 && Number(month) < 1) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate;
-      }
-      if (str.length === 7) {
-        if (!isValidDay(day)) {
-          return year + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + stringCurrentDate;
-        }
-        return year + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + String(day).padStart(2, '0'); // eslint-disable-line max-len
-      }
-      if (str.length === 8) {
-        if (!isValidDay(day)) {
-          return isCurrentYear(year, month, day) + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + stringCurrentDate; // eslint-disable-line max-len
-        }
-        return isCurrentYear(year, month, day) + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + String(day).padStart(2, '0'); // eslint-disable-line max-len
-      }
-      if (Number(month) >= 1 && Number(month) <= 12 && isValidDay(day)) {
-        return year + '-' + month.padStart(2, '0') + '-' + String(day).padStart(2, '0');
-      }
-      return year + '-' + (month ? month.padStart(2, '0') : '01') + '-' + (day ? String(day).padStart(2, '0') : '01'); // eslint-disable-line max-len
+      var _validateYear = validateCalendarYear(formattedArray[0]);
+
+      var _validateCalendarDayA3 = validateCalendarDayAndMonth(formattedArray[2] || '01', formattedArray[1] || '01', _validateYear),
+          _day = _validateCalendarDayA3.day,
+          _month = _validateCalendarDayA3.month; // eslint-disable-line max-len
+
+
+      var _validateCalendarDayA4 = validateCalendarDayAndMonth(formattedArray[2] || '01', formattedArray[1] || '01', _validateYear),
+          _year = _validateCalendarDayA4.year; // eslint-disable-line max-len
+
+
+      _day = String(_day).padStart(2, 0);
+      _month = String(_month).padStart(2, 0);
+      return '' + _year + dateDelimater + _month + dateDelimater + _day;
+    } else if (inputStrLength >= 1 && inputStrLength <= 8) {
+      var _yearStr = inputStr.slice(0, 4);
+      var _monthStr = inputStr.slice(4, 6) || '01';
+      var _dateStr = inputStr.slice(6, 8) || '01';
+      var _validateYear2 = validateCalendarYear(_yearStr);
+
+      var _validateCalendarDayA5 = validateCalendarDayAndMonth(_dateStr, _monthStr, _validateYear2),
+          _day2 = _validateCalendarDayA5.day,
+          _month2 = _validateCalendarDayA5.month;
+
+      var _validateCalendarDayA6 = validateCalendarDayAndMonth(_dateStr, _monthStr, _validateYear2),
+          _year2 = _validateCalendarDayA6.year;
+
+      _day2 = String(_day2).padStart(2, 0);
+      _month2 = String(_month2).padStart(2, 0);
+      return '' + _year2 + dateDelimater + _month2 + dateDelimater + _day2;
+    } else if (inputStrLength > 8) {
+      return '' + currentYear + dateDelimater + String(currentMonth).padStart(2, 0) + dateDelimater + String(currentDate).padStart(2, 0); // eslint-disable-line max-len
     }
-    return currentYear + '/' + stringCurrentMonth + '/' + stringCurrentDate;
-  }
-  if (localeFormat === DATE_FORMATS.ISOAndTime) {
-    var unNormalDate = getDatePart(str);
-    var unNormalDateParts = formatDateLocal(unNormalDate, localeFormat, DATE_FORMATS);
-    var _hasSpecial = hasSpecialChar(unNormalDate);
-    var _numStr = unNormalDate.replace(/[^0-9]/g, '');
-    if (_numStr.length === 7) {
-      year = _numStr.slice(0, 4);
-      month = _numStr.slice(4, 6).padStart(2, '0');
-      day = _numStr.slice(6, 7).padStart(2, '0');
-      if (parts.length === 3) {
-        time = validateTime(parts[1] + ':' + parts[2]);
+  } else if (format === DATE_FORMATS.ISOAndTime) {
+    var datePart = getDatePart(inputStr);
+    var formattedDateArray = tokenizeFormattedDate(datePart, format);
+    var isDateSpecial = hasSpecialChar(datePart);
+    var _numStr = datePart.replace(/[^0-9]/g, '');
+    if (_numStr.length === 7 || _numStr.length === 8) {
+      var _yearStr2 = _numStr.slice(0, 4);
+      var _monthStr2 = _numStr.slice(4, 6) || '01';
+      var _dateStr2 = _numStr.slice(6, _numStr.length) || '01';
+      if (formattedArray.length === 3) {
+        time = validateTime(formattedArray[1] + ':' + formattedArray[2]);
       }
-      if (parts.length === 4) {
-        time = validateTime(parts[2] + ':' + parts[3]);
+      if (formattedArray.length === 4) {
+        time = validateTime(formattedArray[2] + ':' + formattedArray[3]);
       }
-      if (parts.length === 5) {
-        time = validateTime(parts[3] + ':' + parts[4]);
+      if (formattedArray.length === 5) {
+        time = validateTime(formattedArray[3] + ':' + formattedArray[4]);
       }
-      if (!isValidDay(day)) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate + ' ' + time;
-      }
-      return year + '-' + month + '-' + day + ' ' + time;
+      var _validateYear3 = validateCalendarYear(_yearStr2);
+
+      var _validateCalendarDayA7 = validateCalendarDayAndMonth(_dateStr2, _monthStr2, _validateYear3),
+          _day3 = _validateCalendarDayA7.day,
+          _month3 = _validateCalendarDayA7.month;
+
+      var _validateCalendarDayA8 = validateCalendarDayAndMonth(_dateStr2, _monthStr2, _validateYear3),
+          _year3 = _validateCalendarDayA8.year;
+
+      _day3 = String(_day3).padStart(2, 0);
+      _month3 = String(_month3).padStart(2, 0);
+      return '' + _year3 + dateDelimater + _month3 + dateDelimater + _day3 + ' ' + time;
     }
-    if (_hasSpecial) {
-      if (unNormalDateParts.length < 3) {
-        parts.splice(2, 0, '1');
-      }
-      year = fullValidYear(parts[0]);
-      month = Number(parts[1]);
-      day = Number(parts[2]);
-      time = validateTime(parts[3] + ':' + parts[4]);
-      if (month >= 1 && month <= 12) {
-        if (isValidDay(day)) {
-          return year + '-' + String(month).padStart(2, '0') + '-' + String(day).padStart(2, '0') + ' ' + time; // eslint-disable-line max-len
-        }
-        return year + '-' + String(month).padStart(2, '0') + '-01 ' + time;
-      }
-      if ((month >= 13 || month < 1) && isNaN(day)) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate + ' ' + time; // eslint-disable-line max-len
+    if (isDateSpecial) {
+      if (formattedDateArray.length < 3) {
+        formattedArray.splice(2, 0, '01');
       }
-      if ((month >= 13 || month < 1) && day) {
-        return String(currentYear) + '-' + stringCurrentMonth + '-' + stringCurrentDate + ' ' + time; // eslint-disable-line max-len
-      }
-      if (!month && !day) {
-        return year + '-01-01 ' + time;
-      }
-    }
-    if (unNormalDate.length >= 1 && unNormalDate.length <= 8) {
-      year = fullValidYear(unNormalDate.slice(0, 4));
-      month = unNormalDate.slice(4, 6);
-      day = Number(unNormalDate.slice(6, 8));
-      var timeParts = formatDateLocal(str, localeFormat, DATE_FORMATS);
+      var _validateYear4 = validateCalendarYear(formattedArray[0]);
+
+      var _validateCalendarDayA9 = validateCalendarDayAndMonth(formattedArray[2] || '01', formattedArray[1] || '01', _validateYear4),
+          _day4 = _validateCalendarDayA9.day,
+          _month4 = _validateCalendarDayA9.month; // eslint-disable-line max-len
+
+
+      var _validateCalendarDayA10 = validateCalendarDayAndMonth(formattedArray[2] || '01', formattedArray[1] || '01', _validateYear4),
+          _year4 = _validateCalendarDayA10.year; // eslint-disable-line max-len
+
+
+      time = validateTime(formattedArray[3] + ':' + formattedArray[4]);
+      _day4 = String(_day4).padStart(2, 0);
+      _month4 = String(_month4).padStart(2, 0);
+      return '' + _year4 + dateDelimater + _month4 + dateDelimater + _day4 + ' ' + time;
+    } else if (datePart.length >= 1 && datePart.length <= 8) {
+      var _yearStr3 = datePart.slice(0, 4);
+      var _monthStr3 = datePart.slice(4, 6) || '01';
+      var _dateStr3 = datePart.slice(6, 8) || '01';
+      var timeParts = tokenizeFormattedDate(inputStr, format);
       time = validateTime(timeParts[1] + ':' + timeParts[2]);
-      if (unNormalDate.length === 5 && Number(month) < 1) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate + ' ' + time;
-      }
-      if (unNormalDate.length === 6 && Number(month) < 1) {
-        return year + '-' + stringCurrentMonth + '-' + stringCurrentDate + ' ' + time;
-      }
-      if (unNormalDate.length === 7) {
-        if (!isValidDay(day)) {
-          return year + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + stringCurrentDate + ' ' + time; // eslint-disable-line max-len
-        }
-        return year + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + String(day).padStart(2, '0') + ' ' + time; // eslint-disable-line max-len
-      }
-      if (unNormalDate.length === 8) {
-        if (!isValidDay(day)) {
-          return isCurrentYear(year, month, day) + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + stringCurrentDate + ' ' + time; // eslint-disable-line max-len
-        }
-        return isCurrentYear(year, month, day) + '-' + String(isValidMonth(month)).padStart(2, '0') + '-' + String(day).padStart(2, '0') + ' ' + time; // eslint-disable-line max-len
-      }
-      if (Number(month) >= 1 && Number(month) <= 12 && isValidDay(day)) {
-        return year + '-' + month.padStart(2, '0') + '-' + String(day).padStart(2, '0') + ' ' + time;
-      }
-      return year + '-' + (month ? month.padStart(2, '0') : '01') + '-' + (day ? String(day).padStart(2, '0') : '01') + ' ' + time; // eslint-disable-line max-len
-    }
-    return currentYear + '/' + stringCurrentMonth + '/' + stringCurrentDate + ' ' + time;
-  }
-  if (localeFormat === DATE_FORMATS.US) {
-    var _hasSpecial2 = hasSpecialChar(str);
-    if (_hasSpecial2) {
-      month = Number(parts[0]);
-      day = Number(parts[1]);
-      year = fullValidYear(parts[2]);
-      if (month >= 1 && month <= 12 && isValidDay(day)) {
-        return month + '/' + day + '/' + year;
-      }
-      return currentMonth + '/' + currentDate + '/' + currentYear;
-    }
-    if (str.length >= 1 && str.length <= 8) {
-      month = Number(str.slice(0, 2));
-      day = Number(str.slice(2, 4));
-      year = fullValidYear(str.slice(4, str.length));
-      if (month >= 1 && month <= 12) {
-        if (isValidDay(day)) {
-          return month + '/' + day + '/' + year;
-        }
-        if (!day) {
-          return month + '/1/' + year;
-        }
-        return currentMonth + '/' + currentDate + '/' + currentYear;
-      }
-    }
-    return currentMonth + '/' + currentDate + '/' + currentYear;
-  }
-  if (localeFormat === DATE_FORMATS.USAndTime) {
-    var _unNormalDate = getDatePart(str);
-    var _unNormalDateParts = formatDateLocal(_unNormalDate, localeFormat, DATE_FORMATS);
-    var _hasSpecial3 = hasSpecialChar(_unNormalDate);
-    if (_hasSpecial3) {
-      if (_unNormalDateParts.length < 3) {
-        parts.splice(2, 0, String(currentYear));
-      }
-      month = Number(parts[0]);
-      day = Number(parts[1]);
-      year = fullValidYear(parts[2]);
-      time = validateTime(parts[3] + ':' + parts[4]);
-      if (month >= 1 && month <= 12 && isValidDay(day)) {
-        return month + '/' + day + '/' + year + ' ' + time;
-      }
-      return currentMonth + '/' + currentDate + '/' + currentYear + ' ' + time;
+      var _validateYear5 = validateCalendarYear(_yearStr3);
+
+      var _validateCalendarDayA11 = validateCalendarDayAndMonth(_dateStr3, _monthStr3, _validateYear5),
+          _day5 = _validateCalendarDayA11.day,
+          _month5 = _validateCalendarDayA11.month;
+
+      var _validateCalendarDayA12 = validateCalendarDayAndMonth(_dateStr3, _monthStr3, _validateYear5),
+          _year5 = _validateCalendarDayA12.year;
+
+      _day5 = String(_day5).padStart(2, 0);
+      _month5 = String(_month5).padStart(2, 0);
+      return '' + _year5 + dateDelimater + _month5 + dateDelimater + _day5 + ' ' + time;
+    } else if (datePart.length > 8) {
+      return '' + currentYear + dateDelimater + String(currentMonth).padStart(2, 0) + dateDelimater + String(currentDate).padStart(2, 0) + '  ' + currentTime; // eslint-disable-line max-len
     }
-    if (_unNormalDate.length >= 1 && _unNormalDate.length <= 8) {
-      month = Number(_unNormalDate.slice(0, 2));
-      day = Number(_unNormalDate.slice(2, 4));
-      year = fullValidYear(_unNormalDate.slice(4, _unNormalDate.length));
-      var _timeParts = formatDateLocal(str, localeFormat, DATE_FORMATS);
-      time = validateTime(_timeParts[1] + ':' + _timeParts[2]);
-      if (month >= 1 && month <= 12) {
-        if (isValidDay(day)) {
-          return month + '/' + day + '/' + year + ' ' + time;
-        }
-        if (!day) {
-          return month + '/1/' + year + ' ' + time;
-        }
-        return currentMonth + '/' + currentDate + '/' + currentYear + ' ' + time;
-      }
+  } else if (format === DATE_FORMATS.US) {
+    if (hasSpecial) {
+      var _validateYear6 = validateCalendarYear(formattedArray[2]);
+
+      var _validateCalendarDayA13 = validateCalendarDayAndMonth(formattedArray[1] || '1', formattedArray[0], _validateYear6),
+          _day6 = _validateCalendarDayA13.day,
+          _month6 = _validateCalendarDayA13.month,
+          _year6 = _validateCalendarDayA13.year; // eslint-disable-line max-len
+
+
+      return '' + _month6 + dateDelimater + _day6 + dateDelimater + _year6;
+    } else if (inputStrLength >= 1 && inputStrLength <= 8) {
+      var _monthStr4 = inputStr.slice(0, 2);
+      var _dateStr4 = inputStr.slice(2, 4) || '1';
+      var _yearStr4 = inputStr.slice(4, inputStr.length);
+      var _validateYear7 = validateCalendarYear(_yearStr4);
+
+      var _validateCalendarDayA14 = validateCalendarDayAndMonth(_dateStr4, _monthStr4, _validateYear7),
+          _day7 = _validateCalendarDayA14.day,
+          _month7 = _validateCalendarDayA14.month,
+          _year7 = _validateCalendarDayA14.year;
+
+      return '' + _month7 + dateDelimater + _day7 + dateDelimater + _year7; // eslint-disable-line max-len
+    } else if (inputStrLength > 8) {
+      return '' + String(currentMonth).padStart(2, 0) + dateDelimater + String(currentDate).padStart(2, 0) + dateDelimater + currentYear; // eslint-disable-line max-len
     }
-    return currentMonth + '/' + currentDate + '/' + currentYear + ' ' + time;
-  }
-  if (localeFormat === DATE_FORMATS.European || localeFormat === DATE_FORMATS.Germany_Russia_etc) {
-    var _hasSpecial4 = hasSpecialChar(str);
-    if (_hasSpecial4) {
-      day = parts[0];
-      month = parts[1];
-      year = fullValidYear(parts[2]);
-      if (isValidDay(day) && Number(month) >= 1 && Number(month) <= 12) {
-        return '' + Number(day) + delimiter + Number(month) + delimiter + year;
+  } else if (format === DATE_FORMATS.USAndTime) {
+    var _datePart = getDatePart(inputStr);
+    var _formattedDateArray = tokenizeFormattedDate(_datePart, format);
+    var _isDateSpecial = hasSpecialChar(_datePart);
+    if (_isDateSpecial) {
+      if (_formattedDateArray.length < 3) {
+        formattedArray.splice(2, 0, String(currentYear));
       }
-      return '' + currentDate + delimiter + currentMonth + delimiter + currentYear;
+      var _validateYear8 = validateCalendarYear(formattedArray[2]);
+
+      var _validateCalendarDayA15 = validateCalendarDayAndMonth(formattedArray[1] || '1', formattedArray[0], _validateYear8),
+          _day8 = _validateCalendarDayA15.day,
+          _month8 = _validateCalendarDayA15.month,
+          _year8 = _validateCalendarDayA15.year; // eslint-disable-line max-len
+
+
+      time = validateTime(formattedArray[3] + ':' + formattedArray[4]);
+      return '' + _month8 + dateDelimater + _day8 + dateDelimater + _year8 + ' ' + time;
+    } else if (_datePart.length >= 1 && _datePart.length <= 8) {
+      var _monthStr5 = _datePart.slice(0, 2);
+      var _dateStr5 = _datePart.slice(2, 4) || '1';
+      var _yearStr5 = _datePart.slice(4, _datePart.length);
+      var _validateYear9 = validateCalendarYear(_yearStr5); // eslint-disable-line max-len
+
+      var _validateCalendarDayA16 = validateCalendarDayAndMonth(_dateStr5, _monthStr5, _validateYear9),
+          _day9 = _validateCalendarDayA16.day,
+          _month9 = _validateCalendarDayA16.month,
+          _year9 = _validateCalendarDayA16.year;
+
+      var _timeParts = tokenizeFormattedDate(inputStr, format);
+      time = validateTime(_timeParts[1] + ':' + _timeParts[2]) || currentTime;
+      return '' + _month9 + dateDelimater + _day9 + dateDelimater + _year9 + ' ' + time;
+    } else if (_datePart.length > 8) {
+      return '' + String(currentMonth).padStart(2, 0) + dateDelimater + String(currentDate).padStart(2, 0) + dateDelimater + currentYear + ' ' + currentTime; // eslint-disable-line max-len
     }
-    if (str.length >= 1 && str.length <= 8) {
-      day = Number(str.slice(0, 2));
-      var monthStr = str.slice(2, 4);
-      month = isValidMonth(monthStr);
-      var yearStr = str.slice(4, str.length);
-      year = fullValidYear(yearStr);
-
-      if (isValidDay(day)) {
-        if (Number(monthStr) < 1 && Number(monthStr) > 12) {
-          return '' + currentDate + delimiter + currentMonth + delimiter + currentYear;
-        }
-        return '' + Number(day) + delimiter + Number(month) + delimiter + year;
-      }
+  } else if (format === DATE_FORMATS.European || format === DATE_FORMATS.Germany_Russia_etc) {
+    if (hasSpecial) {
+      var _validateYear10 = validateCalendarYear(formattedArray[2]);
+
+      var _validateCalendarDayA17 = validateCalendarDayAndMonth(formattedArray[0], formattedArray[1], _validateYear10),
+          _day10 = _validateCalendarDayA17.day,
+          _month10 = _validateCalendarDayA17.month; // eslint-disable-line max-len
+
+
+      var _validateCalendarDayA18 = validateCalendarDayAndMonth(formattedArray[0], formattedArray[1], _validateYear10),
+          _year10 = _validateCalendarDayA18.year; // eslint-disable-line max-len
+
+
+      _day10 = String(_day10).padStart(2, 0);
+      _month10 = String(_month10).padStart(2, 0);
+      return '' + _day10 + dateDelimater + _month10 + dateDelimater + _year10;
+    } else if (inputStrLength >= 1 && inputStrLength <= 8) {
+      var _dateStr6 = inputStr.slice(0, 2);
+      var _monthStr6 = inputStr.slice(2, 4);
+      var _yearStr6 = inputStr.slice(4, inputStr.length);
+      var _validateYear11 = validateCalendarYear(_yearStr6);
+
+      var _validateCalendarDayA19 = validateCalendarDayAndMonth(_dateStr6, _monthStr6, _validateYear11),
+          _year11 = _validateCalendarDayA19.year; // eslint-disable-line max-len
+
+
+      var _validateCalendarDayA20 = validateCalendarDayAndMonth(_dateStr6, _monthStr6, _validateYear11),
+          _day11 = _validateCalendarDayA20.day,
+          _month11 = _validateCalendarDayA20.month; // eslint-disable-line max-len
+
+
+      _day11 = String(_day11).padStart(2, 0);
+      _month11 = String(_month11).padStart(2, 0);
+      return '' + _day11 + dateDelimater + _month11 + dateDelimater + _year11;
+    } else if (inputStrLength > 8) {
+      return '' + String(currentDate).padStart(2, 0) + dateDelimater + String(currentMonth).padStart(2, 0) + dateDelimater + currentYear; // eslint-disable-line max-len
     }
-    return '' + currentDate + delimiter + currentMonth + delimiter + currentYear;
-  }
-  if (localeFormat === DATE_FORMATS.EuropeanAndTime || localeFormat === DATE_FORMATS.Germany_Russia_etcAndTime) {
-    var _unNormalDate2 = getDatePart(str);
-    var _unNormalDateParts2 = formatDateLocal(_unNormalDate2, localeFormat, DATE_FORMATS);
-    var _hasSpecial5 = hasSpecialChar(_unNormalDate2);
-    if (_hasSpecial5) {
-      if (_unNormalDateParts2.length < 3) {
-        parts.splice(2, 0, String(currentYear));
-      }
-      day = parts[0];
-      month = parts[1];
-      year = fullValidYear(parts[2]);
-      time = validateTime(parts[3] + ':' + parts[4]);
-      if (isValidDay(day) && Number(month) >= 1 && Number(month) <= 12) {
-        return '' + Number(day) + delimiter + Number(month) + delimiter + year + ' ' + time;
+  } else if (format === DATE_FORMATS.EuropeanAndTime || format === DATE_FORMATS.Germany_Russia_etcAndTime) {
+    var _datePart2 = getDatePart(inputStr);
+    var _formattedDateArray2 = tokenizeFormattedDate(_datePart2, format);
+    var _isDateSpecial2 = hasSpecialChar(_datePart2);
+    if (_isDateSpecial2) {
+      if (_formattedDateArray2.length < 3) {
+        formattedArray.splice(2, 0, String(currentYear));
       }
-      return '' + currentDate + delimiter + currentMonth + delimiter + currentYear + ' ' + time;
-    }
-    if (_unNormalDate2.length >= 1 && _unNormalDate2.length <= 8) {
-      day = Number(_unNormalDate2.slice(0, 2));
-      var _monthStr = _unNormalDate2.slice(2, 4);
-      month = isValidMonth(_monthStr);
-      var _yearStr = _unNormalDate2.slice(4, _unNormalDate2.length);
-      year = fullValidYear(_yearStr);
-      var _timeParts2 = formatDateLocal(str, localeFormat, DATE_FORMATS);
+      var _validateYear12 = validateCalendarYear(formattedArray[2]);
+
+      var _validateCalendarDayA21 = validateCalendarDayAndMonth(formattedArray[0], formattedArray[1], _validateYear12),
+          _day12 = _validateCalendarDayA21.day,
+          _month12 = _validateCalendarDayA21.month; // eslint-disable-line max-len
+
+
+      var _validateCalendarDayA22 = validateCalendarDayAndMonth(formattedArray[0], formattedArray[1], _validateYear12),
+          _year12 = _validateCalendarDayA22.year; // eslint-disable-line max-len
+
+
+      time = validateTime(formattedArray[3] + ':' + formattedArray[4]);
+      _day12 = String(_day12).padStart(2, 0);
+      _month12 = String(_month12).padStart(2, 0);
+      return '' + _day12 + dateDelimater + _month12 + dateDelimater + _year12 + ' ' + time;
+    } else if (_datePart2.length >= 1 && _datePart2.length <= 8) {
+      var _dateStr7 = _datePart2.slice(0, 2);
+      var _monthStr7 = _datePart2.slice(2, 4);
+      var _yearStr7 = _datePart2.slice(4, _datePart2.length);
+      var _timeParts2 = tokenizeFormattedDate(inputStr, format);
       time = validateTime(_timeParts2[1] + ':' + _timeParts2[2]);
-      if (isValidDay(day)) {
-        if (Number(_monthStr) < 1 && Number(_monthStr) > 12) {
-          return '' + currentDate + delimiter + currentMonth + delimiter + currentYear + ' ' + time;
-        }
-        return '' + Number(day) + delimiter + Number(month) + delimiter + year + ' ' + time;
-      }
+      var _validateYear13 = validateCalendarYear(_yearStr7);
+
+      var _validateCalendarDayA23 = validateCalendarDayAndMonth(_dateStr7, _monthStr7, _validateYear13),
+          _day13 = _validateCalendarDayA23.day,
+          _month13 = _validateCalendarDayA23.month;
+
+      var _validateCalendarDayA24 = validateCalendarDayAndMonth(_dateStr7, _monthStr7, _validateYear13),
+          _year13 = _validateCalendarDayA24.year;
+
+      _day13 = String(_day13).padStart(2, 0);
+      _month13 = String(_month13).padStart(2, 0);
+      return '' + _day13 + dateDelimater + _month13 + dateDelimater + _year13 + ' ' + time;
+    } else if (_datePart2.length > 8) {
+      return '' + String(currentDate).padStart(2, 0) + dateDelimater + String(currentMonth).padStart(2, 0) + dateDelimater + currentYear + ' ' + currentTime; // eslint-disable-line max-len
     }
-    return '' + currentDate + delimiter + currentMonth + delimiter + currentYear + ' ' + time;
   }
 }
 
@@ -2727,12 +2702,12 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__mixin_CommonMixin__ = __webpack_require__(121);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__date_DateInput__ = __webpack_require__(123);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__util__ = __webpack_require__(10);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__util_toTime__ = __webpack_require__(124);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19_dayjs_plugin_localeData__ = __webpack_require__(125);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__util_toTime__ = __webpack_require__(125);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19_dayjs_plugin_localeData__ = __webpack_require__(126);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_19_dayjs_plugin_localeData___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_19_dayjs_plugin_localeData__);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_20_dayjs_plugin_utc__ = __webpack_require__(58);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_20_dayjs_plugin_utc___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_20_dayjs_plugin_utc__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21_dayjs_plugin_weekOfYear__ = __webpack_require__(126);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21_dayjs_plugin_weekOfYear__ = __webpack_require__(127);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_21_dayjs_plugin_weekOfYear___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_21_dayjs_plugin_weekOfYear__);
 
 
@@ -2833,7 +2808,7 @@ var Calendar = function (_React$Component) {
         mode = state.mode;
 
     var showTimePicker = mode === 'time';
-    var disabledTimeConfig = showTimePicker && disabledTime && timePicker ? Object(__WEBPACK_IMPORTED_MODULE_17__util__["g" /* getTimeConfig */])(selectedValue, disabledTime) : null;
+    var disabledTimeConfig = showTimePicker && disabledTime && timePicker ? Object(__WEBPACK_IMPORTED_MODULE_17__util__["c" /* getTimeConfig */])(selectedValue, disabledTime) : null;
 
     var timePickerEle = null;
 
@@ -2854,13 +2829,14 @@ var Calendar = function (_React$Component) {
 
       timePickerEle = __WEBPACK_IMPORTED_MODULE_4_react___default.a.cloneElement(timePicker, timePickerProps);
     }
+    var calanderInputPlaceholder = dateInputPlaceholder || (Array.isArray(this.getFormat()) ? this.getFormat()[0] : this.getFormat());
 
     var dateInputElement = props.showDateInput ? __WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_16__date_DateInput__["a" /* default */], {
       format: this.getFormat(),
       key: 'date-input',
       value: value,
       locale: locale,
-      placeholder: dateInputPlaceholder || this.getFormat()[0],
+      placeholder: calanderInputPlaceholder,
       showClear: true,
       disabledTime: disabledTime,
       disabledDate: disabledDate,
@@ -2870,8 +2846,7 @@ var Calendar = function (_React$Component) {
       onChange: this.onDateInputChange,
       onSelect: this.onDateInputSelect,
       clearIcon: clearIcon,
-      inputMode: inputMode,
-      showHourAndMinute: showHourAndMinute
+      inputMode: inputMode
     }) : null;
 
     var children = [];
@@ -3108,7 +3083,6 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.onDateInputChange = function (value) {
-    if (!value) return;
     _this2.onSelect(value, {
       source: 'dateInput'
     });
@@ -3127,7 +3101,7 @@ var _initialiseProps = function _initialiseProps() {
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {
-        Object(__WEBPACK_IMPORTED_MODULE_17__util__["m" /* syncTime */])(timePickerDefaultValue, value);
+        Object(__WEBPACK_IMPORTED_MODULE_17__util__["i" /* syncTime */])(timePickerDefaultValue, value);
       }
     }
     _this2.onSelect(value);
@@ -3136,7 +3110,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onToday = function () {
     var value = _this2.state.value;
 
-    var now = Object(__WEBPACK_IMPORTED_MODULE_17__util__["i" /* getTodayTime */])(value);
+    var now = Object(__WEBPACK_IMPORTED_MODULE_17__util__["e" /* getTodayTime */])(value);
     _this2.onSelect(now, {
       source: 'todayButton'
     });
@@ -5345,7 +5319,7 @@ var DateTBody = function (_React$Component) {
     var jIndex = void 0;
     var current = void 0;
     var dateTable = [];
-    var today = Object(__WEBPACK_IMPORTED_MODULE_7__util___["i" /* getTodayTime */])(value);
+    var today = Object(__WEBPACK_IMPORTED_MODULE_7__util___["e" /* getTodayTime */])(value);
     var cellClass = prefixCls + '-cell';
     var weekNumberCellClass = prefixCls + '-week-number-cell';
     var dateClass = prefixCls + '-date';
@@ -5520,7 +5494,7 @@ var DateTBody = function (_React$Component) {
             onClick: disabled ? undefined : props.onSelect.bind(null, current),
             onMouseEnter: disabled ? undefined : props.onDayHover && props.onDayHover.bind(null, current) || undefined,
             role: 'gridcell',
-            title: Object(__WEBPACK_IMPORTED_MODULE_7__util___["h" /* getTitleString */])(current),
+            title: Object(__WEBPACK_IMPORTED_MODULE_7__util___["d" /* getTitleString */])(current),
             className: cls
           },
           dateHtml
@@ -6090,7 +6064,7 @@ var MonthTable = function (_Component) {
       months[rowIndex] = [];
       for (var colIndex = 0; colIndex < COL; colIndex++) {
         current = current.month(index);
-        var content = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["f" /* getMonthName */])(current);
+        var content = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["b" /* getMonthName */])(current);
         months[rowIndex][colIndex] = {
           value: index,
           content: content,
@@ -6107,7 +6081,7 @@ var MonthTable = function (_Component) {
 
     var props = this.props;
     var value = this.state.value;
-    var today = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["i" /* getTodayTime */])(value);
+    var today = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["e" /* getTodayTime */])(value);
     var months = this.months();
     var currentMonth = value.month();
     var prefixCls = props.prefixCls,
@@ -6743,7 +6717,7 @@ function TodayButton(_ref) {
       text = _ref.text;
 
   var localeNow = (!text && timePicker ? locale.now : text) || locale.today;
-  var disabledToday = disabledDate && !Object(__WEBPACK_IMPORTED_MODULE_1__util___["k" /* isAllowedDate */])(Object(__WEBPACK_IMPORTED_MODULE_1__util___["i" /* getTodayTime */])(value), disabledDate);
+  var disabledToday = disabledDate && !Object(__WEBPACK_IMPORTED_MODULE_1__util___["h" /* isAllowedDate */])(Object(__WEBPACK_IMPORTED_MODULE_1__util___["e" /* getTodayTime */])(value), disabledDate);
   var isDisabled = disabledToday || disabled;
   var disabledTodayClass = isDisabled ? prefixCls + '-today-btn-disabled' : '';
   return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
@@ -6752,7 +6726,7 @@ function TodayButton(_ref) {
       className: prefixCls + '-today-btn ' + disabledTodayClass,
       role: 'button',
       onClick: isDisabled ? null : onToday,
-      title: Object(__WEBPACK_IMPORTED_MODULE_1__util___["j" /* getTodayTimeStr */])(value)
+      title: Object(__WEBPACK_IMPORTED_MODULE_1__util___["f" /* getTodayTimeStr */])(value)
     },
     localeNow
   );
@@ -6935,7 +6909,7 @@ var CalendarRightPanel = function (_React$Component) {
           'ul',
           null,
           this.times.map(function (time) {
-            var parts = Object(__WEBPACK_IMPORTED_MODULE_6__util__["d" /* formatDateLocal */])(selectedDate, _this2.state.localeFormat);
+            var parts = Object(__WEBPACK_IMPORTED_MODULE_6__util__["j" /* tokenizeFormattedDate */])(selectedDate, _this2.state.localeFormat);
             var current = __WEBPACK_IMPORTED_MODULE_5_dayjs___default()(selectedDate + ' ' + time).year(parts[0]).month(parts[1] - 1).date(parts[2]); // eslint-disable-line max-len
             current = isZhcn ? current.locale('zh-cn') : current.locale('en-gb');
             return __WEBPACK_IMPORTED_MODULE_3_react___default.a.createElement(
@@ -7010,7 +6984,7 @@ function noop() {}
 function getNowByCurrentStateValue(value) {
   var ret = void 0;
   if (value) {
-    ret = Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["i" /* getTodayTime */])(value);
+    ret = Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["e" /* getTodayTime */])(value);
   } else {
     ret = __WEBPACK_IMPORTED_MODULE_6_dayjs___default()();
   }
@@ -7091,7 +7065,7 @@ var calendarMixinWrapper = function calendarMixinWrapper(ComposeComponent) {
       }, _this.isAllowedDate = function (value) {
         var disabledDate = _this.props.disabledDate;
         var disabledTime = _this.props.disabledTime;
-        return Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["k" /* isAllowedDate */])(value, disabledDate, disabledTime);
+        return Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["h" /* isAllowedDate */])(value, disabledDate, disabledTime);
       }, _temp), __WEBPACK_IMPORTED_MODULE_1_babel_runtime_helpers_possibleConstructorReturn___default()(_this, _ret);
     }
 
@@ -7289,6 +7263,9 @@ var commonMixinWrapper = function commonMixinWrapper(ComposeComponent) {
 
 
 
+var customParseFormat = __webpack_require__(124);
+
+__WEBPACK_IMPORTED_MODULE_8_dayjs___default.a.extend(customParseFormat);
 
 var cachedSelectionStart = void 0;
 var cachedSelectionEnd = void 0;
@@ -7305,12 +7282,11 @@ var DateInput = function (_React$Component) {
     _initialiseProps.call(_this);
 
     var selectedValue = props.selectedValue;
-    var formatPrefix = _this.props.format[0];
+
     _this.state = {
-      str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["c" /* formatDate */])(selectedValue, _this.props.format),
+      str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["a" /* formatDate */])(selectedValue, _this.props.format),
       hasFocus: false,
-      localeFormat: formatPrefix,
-      delimiter: Object(__WEBPACK_IMPORTED_MODULE_9__util__["b" /* delimate */])(formatPrefix)
+      localFormat: _this.props.format[0]
     };
     return _this;
   }
@@ -7331,30 +7307,7 @@ var DateInput = function (_React$Component) {
     // when popup show, click body will call this, bug!
     var selectedValue = nextProps.selectedValue;
     if (!state.hasFocus) {
-      var timeStr = Object(__WEBPACK_IMPORTED_MODULE_9__util__["c" /* formatDate */])(selectedValue, nextProps.format).split(' ')[0];
-      var parts = timeStr.split(state.delimiter);
-      var timeParts = Object(__WEBPACK_IMPORTED_MODULE_9__util__["c" /* formatDate */])(selectedValue, nextProps.format).split(' ')[1];
-      if (parts.length === 3) {
-        if (state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].ISO) {
-          newState = { str: parts[0].padStart(4, 0) + '-' + parts[1] + '-' + parts[2] };
-        } else if (state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].ISOAndTime) {
-          newState = {
-            str: parts[0].padStart(4, 0) + '-' + parts[1] + '-' + parts[2] + ' ' + (nextProps.showHourAndMinute ? timeParts : '') // eslint-disable-line max-len
-          };
-        } else if (state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].US) {
-          newState = { str: Number(parts[0]) + '/' + Number(parts[1]) + '/' + parts[2].padStart(4, 0) };
-        } else if (state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].USAndTime) {
-          newState = {
-            str: Number(parts[0]) + '/' + Number(parts[1]) + '/' + parts[2].padStart(4, 0) + ' ' + (nextProps.showHourAndMinute ? timeParts : '') // eslint-disable-line max-len
-          };
-        } else if (state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].European || state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etc) {
-          newState = { str: '' + Number(parts[0]) + state.delimiter + Number(parts[1]) + state.delimiter + parts[2].padStart(4, 0) }; // eslint-disable-line max-len
-        } else if (state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].EuropeanAndTime || state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etcAndTime) {
-          newState = {
-            str: '' + Number(parts[0]) + state.delimiter + Number(parts[1]) + state.delimiter + parts[2].padStart(4, 0) + ' ' + (nextProps.showHourAndMinute ? timeParts : '') // eslint-disable-line max-len
-          };
-        }
-      }
+      newState = { str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["a" /* formatDate */])(selectedValue, nextProps.format) };
     }
 
     return newState;
@@ -7421,65 +7374,43 @@ DateInput.propTypes = {
   onSelect: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.func,
   selectedValue: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.object,
   clearIcon: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.node,
-  inputMode: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.string,
-  showHourAndMinute: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.bool
+  inputMode: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.string
 };
 
 var _initialiseProps = function _initialiseProps() {
   var _this2 = this;
 
   this.onClear = function () {
-    _this2.setState({
-      str: ''
-    });
+    _this2.setState({ str: '' });
     _this2.props.onClear(null);
   };
 
   this.onInputChange = function (event) {
-    console.log(11111);
     var str = event.target.value;
-    console.log('str', str);
-    var cananderStr = Object(__WEBPACK_IMPORTED_MODULE_9__util__["l" /* normalizeDateInput */])(str, _this2.state.localeFormat, _this2.state.delimiter);
+    var calendarStr = Object(__WEBPACK_IMPORTED_MODULE_9__util__["g" /* initializeStr */])(str, _this2.state.localFormat) || '';
     var _props = _this2.props,
         disabledDate = _props.disabledDate,
+        format = _props.format,
         onChange = _props.onChange,
         selectedValue = _props.selectedValue;
 
-    var parts = Object(__WEBPACK_IMPORTED_MODULE_9__util__["d" /* formatDateLocal */])(cananderStr, _this2.state.localeFormat);
     // 没有内容，合法并直接退出
-    console.log('cananderStr', cananderStr);
 
-    if (!str) {
-      console.log('我不想走进来');
+    if (!calendarStr) {
       onChange(null);
       _this2.setState({ str: '' });
       return;
     }
-    // 不合法直接退出
-    var format = Object(__WEBPACK_IMPORTED_MODULE_9__util__["e" /* getDateFormatByStr */])(cananderStr, _this2.state.localeFormat);
-    var parsed = __WEBPACK_IMPORTED_MODULE_8_dayjs___default()(cananderStr, format);
+    var parsed = __WEBPACK_IMPORTED_MODULE_8_dayjs___default()(calendarStr, format[0]);
     var value = _this2.props.value.clone();
-    value.locale('zh-cn');
-    if (_this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].ISO || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].ISOAndTime) {
-      if (parts[0] && parts[0].length === 4 && (parts[0].slice(0, 3) === '000' || parts[0].slice(0, 2) === '00')) {
-        value = value.year(parts[0]).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      } else {
-        value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      }
-    } else if (_this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].European || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].EuropeanAndTime || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].US || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].USAndTime || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etc || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etcAndTime) {
-      if (parts[2] && parts[2].length === 4 && (parts[2].slice(0, 3) === '000' || parts[2].slice(0, 2) === '00')) {
-        value = value.year(parts[2]).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      } else {
-        value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      }
-    }
+    value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
+
     if (!value || disabledDate && disabledDate(value)) {
       _this2.setState({ str: str });
       return;
     }
 
     if (selectedValue !== value || selectedValue && value && !selectedValue.isSame(value)) {
-      console.log('成功🏅');
       _this2.setState({ str: str });
       onChange(value);
     }
@@ -7493,7 +7424,7 @@ var _initialiseProps = function _initialiseProps() {
     _this2.setState(function (prevState, prevProps) {
       return {
         hasFocus: false,
-        str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["c" /* formatDate */])(prevProps.value, prevProps.format)
+        str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["a" /* formatDate */])(prevProps.value, prevProps.format)
       };
     });
   };
@@ -7535,6 +7466,12 @@ Object(__WEBPACK_IMPORTED_MODULE_7_react_lifecycles_compat__["a" /* polyfill */]
 
 /***/ }),
 /* 124 */
+/***/ (function(module, exports, __webpack_require__) {
+
+!function(t,e){ true?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_customParseFormat=e()}(this,(function(){"use strict";var t={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},e=/(\[[^[]*\])|([-:/.()\s]+)|(A|a|YYYY|YY?|MM?M?M?|Do|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g,n=/\d\d/,r=/\d\d?/,i=/\d*[^\s\d-_:/()]+/,o={},s=function(t){return(t=+t)+(t>68?1900:2e3)};var a=function(t){return function(e){this[t]=+e}},f=[/[+-]\d\d:?(\d\d)?|Z/,function(t){(this.zone||(this.zone={})).offset=function(t){if(!t)return 0;if("Z"===t)return 0;var e=t.match(/([+-]|\d\d)/g),n=60*e[1]+(+e[2]||0);return 0===n?0:"+"===e[0]?-n:n}(t)}],u=function(t){var e=o[t];return e&&(e.indexOf?e:e.s.concat(e.f))},h=function(t,e){var n,r=o.meridiem;if(r){for(var i=1;i<=24;i+=1)if(t.indexOf(r(i,0,e))>-1){n=i>12;break}}else n=t===(e?"pm":"PM");return n},d={A:[i,function(t){this.afternoon=h(t,!1)}],a:[i,function(t){this.afternoon=h(t,!0)}],S:[/\d/,function(t){this.milliseconds=100*+t}],SS:[n,function(t){this.milliseconds=10*+t}],SSS:[/\d{3}/,function(t){this.milliseconds=+t}],s:[r,a("seconds")],ss:[r,a("seconds")],m:[r,a("minutes")],mm:[r,a("minutes")],H:[r,a("hours")],h:[r,a("hours")],HH:[r,a("hours")],hh:[r,a("hours")],D:[r,a("day")],DD:[n,a("day")],Do:[i,function(t){var e=o.ordinal,n=t.match(/\d+/);if(this.day=n[0],e)for(var r=1;r<=31;r+=1)e(r).replace(/\[|\]/g,"")===t&&(this.day=r)}],M:[r,a("month")],MM:[n,a("month")],MMM:[i,function(t){var e=u("months"),n=(u("monthsShort")||e.map((function(t){return t.substr(0,3)}))).indexOf(t)+1;if(n<1)throw new Error;this.month=n%12||n}],MMMM:[i,function(t){var e=u("months").indexOf(t)+1;if(e<1)throw new Error;this.month=e%12||e}],Y:[/[+-]?\d+/,a("year")],YY:[n,function(t){this.year=s(t)}],YYYY:[/\d{4}/,a("year")],Z:f,ZZ:f};function c(n){var r,i;r=n,i=o&&o.formats;for(var s=(n=r.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,(function(e,n,r){var o=r&&r.toUpperCase();return n||i[r]||t[r]||i[o].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(t,e,n){return e||n.slice(1)}))}))).match(e),a=s.length,f=0;f<a;f+=1){var u=s[f],h=d[u],c=h&&h[0],l=h&&h[1];s[f]=l?{regex:c,parser:l}:u.replace(/^\[|\]$/g,"")}return function(t){for(var e={},n=0,r=0;n<a;n+=1){var i=s[n];if("string"==typeof i)r+=i.length;else{var o=i.regex,f=i.parser,u=t.substr(r),h=o.exec(u)[0];f.call(e,h),t=t.replace(h,"")}}return function(t){var e=t.afternoon;if(void 0!==e){var n=t.hours;e?n<12&&(t.hours+=12):12===n&&(t.hours=0),delete t.afternoon}}(e),e}}return function(t,e,n){n.p.customParseFormat=!0,t&&t.parseTwoDigitYear&&(s=t.parseTwoDigitYear);var r=e.prototype,i=r.parse;r.parse=function(t){var e=t.date,r=t.utc,s=t.args;this.$u=r;var a=s[1];if("string"==typeof a){var f=!0===s[2],u=!0===s[3],h=f||u,d=s[2];u&&(d=s[2]),o=this.$locale(),!f&&d&&(o=n.Ls[d]),this.$d=function(t,e,n){try{if(["x","X"].indexOf(e)>-1)return new Date(("X"===e?1e3:1)*t);var r=c(e)(t),i=r.year,o=r.month,s=r.day,a=r.hours,f=r.minutes,u=r.seconds,h=r.milliseconds,d=r.zone,l=new Date,m=s||(i||o?1:l.getDate()),M=i||l.getFullYear(),Y=0;i&&!o||(Y=o>0?o-1:l.getMonth());var p=a||0,v=f||0,D=u||0,g=h||0;return d?new Date(Date.UTC(M,Y,m,p,v,D,g+60*d.offset*1e3)):n?new Date(Date.UTC(M,Y,m,p,v,D,g)):new Date(M,Y,m,p,v,D,g)}catch(t){return new Date("")}}(e,a,r),this.init(),d&&!0!==d&&(this.$L=this.locale(d).$L),h&&e!=this.format(a)&&(this.$d=new Date("")),o={}}else if(a instanceof Array)for(var l=a.length,m=1;m<=l;m+=1){s[1]=a[m-1];var M=n.apply(this,s);if(M.isValid()){this.$d=M.$d,this.$L=M.$L,this.init();break}m===l&&(this.$d=new Date(""))}else i.call(this,t)}}}));
+
+/***/ }),
+/* 125 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7565,13 +7502,13 @@ function includesTime() {
 }
 
 /***/ }),
-/* 125 */
+/* 126 */
 /***/ (function(module, exports, __webpack_require__) {
 
 !function(n,e){ true?module.exports=e():"function"==typeof define&&define.amd?define(e):(n="undefined"!=typeof globalThis?globalThis:n||self).dayjs_plugin_localeData=e()}(this,(function(){"use strict";return function(n,e,t){var r=e.prototype,o=function(n){return n&&(n.indexOf?n:n.s)},u=function(n,e,t,r,u){var i=n.name?n:n.$locale(),a=o(i[e]),s=o(i[t]),f=a||s.map((function(n){return n.substr(0,r)}));if(!u)return f;var d=i.weekStart;return f.map((function(n,e){return f[(e+(d||0))%7]}))},i=function(){return t.Ls[t.locale()]},a=function(n,e){return n.formats[e]||function(n){return n.replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(n,e,t){return e||t.slice(1)}))}(n.formats[e.toUpperCase()])},s=function(){var n=this;return{months:function(e){return e?e.format("MMMM"):u(n,"months")},monthsShort:function(e){return e?e.format("MMM"):u(n,"monthsShort","months",3)},firstDayOfWeek:function(){return n.$locale().weekStart||0},weekdays:function(e){return e?e.format("dddd"):u(n,"weekdays")},weekdaysMin:function(e){return e?e.format("dd"):u(n,"weekdaysMin","weekdays",2)},weekdaysShort:function(e){return e?e.format("ddd"):u(n,"weekdaysShort","weekdays",3)},longDateFormat:function(e){return a(n.$locale(),e)},meridiem:this.$locale().meridiem,ordinal:this.$locale().ordinal}};r.localeData=function(){return s.bind(this)()},t.localeData=function(){var n=i();return{firstDayOfWeek:function(){return n.weekStart||0},weekdays:function(){return t.weekdays()},weekdaysShort:function(){return t.weekdaysShort()},weekdaysMin:function(){return t.weekdaysMin()},months:function(){return t.months()},monthsShort:function(){return t.monthsShort()},longDateFormat:function(e){return a(n,e)},meridiem:n.meridiem,ordinal:n.ordinal}},t.months=function(){return u(i(),"months")},t.monthsShort=function(){return u(i(),"monthsShort","months",3)},t.weekdays=function(n){return u(i(),"weekdays",null,null,n)},t.weekdaysShort=function(n){return u(i(),"weekdaysShort","weekdays",3,n)},t.weekdaysMin=function(n){return u(i(),"weekdaysMin","weekdays",2,n)}}}));
 
 /***/ }),
-/* 126 */
+/* 127 */
 /***/ (function(module, exports, __webpack_require__) {
 
 !function(e,t){ true?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_weekOfYear=t()}(this,(function(){"use strict";var e="week",t="year";return function(i,n,r){var f=n.prototype;f.week=function(i){if(void 0===i&&(i=null),null!==i)return this.add(7*(i-this.week()),"day");var n=this.$locale().yearStart||1;if(11===this.month()&&this.date()>25){var f=r(this).startOf(t).add(1,t).date(n),s=r(this).endOf(e);if(f.isBefore(s))return 1}var a=r(this).startOf(t).date(n).startOf(e).subtract(1,"millisecond"),o=this.diff(a,e,!0);return o<0?r(this).startOf("week").week():Math.ceil(o)},f.weeks=function(e){return void 0===e&&(e=null),this.week(e)}}}));