@kdcloudjs/kdesign 1.8.73 → 1.8.74

package/lib/date-picker/utils/date-fns.js

@@ -207,7 +207,12 @@ Object.defineProperty(exports, "subYears", {
     return _subYears.default;
   }
 });
+var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _sort = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/sort"));
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
+var _padStart = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/pad-start"));
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 var _isDate = _interopRequireDefault(require("date-fns/isDate"));
 var _isValid = _interopRequireDefault(require("date-fns/isValid"));
@@ -294,19 +299,63 @@ function newDate(value) {
   var d = value ? typeof value === 'string' || value instanceof String ? (0, _parseISO.default)(value) : (0, _toDate.default)(value) : new Date();
   return isValid(d) ? d : null;
 }
-function parseDate(value, dateFormat) {
+function parseDate(value, dateFormat, locale) {
   var parsedDate = null;
   var strictParsingValueMatch = true;
   if ((0, _includes.default)(dateFormat).call(dateFormat, 'wo')) {
     return parseWeek(value);
   }
-  parsedDate = (0, _parse.default)(value, dateFormat, new Date());
+  var normalizedValue = value;
+  var normalizedFormat = dateFormat;
+  if (locale) {
+    if ((0, _includes.default)(dateFormat).call(dateFormat, 'MMMM') && locale.months) {
+      var _context, _context2;
+      var sortedIndices = (0, _sort.default)(_context = (0, _map.default)(_context2 = locale.months).call(_context2, function (m, i) {
+        return {
+          name: m,
+          index: i
+        };
+      })).call(_context, function (a, b) {
+        return b.name.length - a.name.length;
+      });
+      var matched = (0, _find.default)(sortedIndices).call(sortedIndices, function (_ref) {
+        var name = _ref.name;
+        return (0, _includes.default)(value).call(value, name);
+      });
+      if (matched) {
+        var _context3;
+        normalizedValue = normalizedValue.replace(matched.name, (0, _padStart.default)(_context3 = String(matched.index + 1)).call(_context3, 2, '0'));
+        normalizedFormat = normalizedFormat.replace('MMMM', 'MM');
+      }
+    } else if ((0, _includes.default)(dateFormat).call(dateFormat, 'MMM') && locale.monthsShort) {
+      var _context4, _context5;
+      var _sortedIndices = (0, _sort.default)(_context4 = (0, _map.default)(_context5 = locale.monthsShort).call(_context5, function (m, i) {
+        return {
+          name: m,
+          index: i
+        };
+      })).call(_context4, function (a, b) {
+        return b.name.length - a.name.length;
+      });
+      var _matched = (0, _find.default)(_sortedIndices).call(_sortedIndices, function (_ref2) {
+        var name = _ref2.name;
+        return (0, _includes.default)(value).call(value, name);
+      });
+      if (_matched) {
+        var _context6;
+        normalizedValue = normalizedValue.replace(_matched.name, (0, _padStart.default)(_context6 = String(_matched.index + 1)).call(_context6, 2, '0'));
+        normalizedFormat = normalizedFormat.replace('MMM', 'MM');
+      }
+    }
+  }
+  parsedDate = (0, _parse.default)(normalizedValue, localeParse(normalizedFormat), new Date());
   if (!isValid(parsedDate)) {
-    if (value.length > 0) {
-      parsedDate = (0, _parse.default)(value, (0, _slice.default)(dateFormat).call(dateFormat, 0, value.length), new Date());
+    if (normalizedValue.length > 0) {
+      var _context7;
+      parsedDate = (0, _parse.default)(normalizedValue, (0, _slice.default)(_context7 = localeParse(normalizedFormat)).call(_context7, 0, normalizedValue.length), new Date());
     }
     if (!isValid(parsedDate)) {
-      parsedDate = new Date(value);
+      parsedDate = new Date(normalizedValue);
     }
   }
   return isValid(parsedDate) && strictParsingValueMatch ? parsedDate : null;
@@ -318,15 +367,27 @@ function formatDate(date, _format, _locale) {
   if (!isValid(date)) {
     return null;
   }
+  if (_locale && (0, _typeof2.default)(_locale) === 'object') {
+    var monthIndex = (0, _getMonth.default)(date);
+    var result = localeParse(_format);
+    if ((0, _includes.default)(result).call(result, 'MMMM') && _locale.months) {
+      var escaped = _locale.months[monthIndex].replace(/'/g, "''");
+      result = result.replace(/MMMM/g, "'".concat(escaped, "'"));
+    } else if ((0, _includes.default)(result).call(result, 'MMM') && _locale.monthsShort) {
+      var _escaped = _locale.monthsShort[monthIndex].replace(/'/g, "''");
+      result = result.replace(/MMM/g, "'".concat(_escaped, "'"));
+    }
+    return (0, _format2.default)(date, result);
+  }
   return (0, _format2.default)(date, localeParse(_format));
 }
-function setTime(date, _ref) {
-  var _ref$hour = _ref.hour,
-    hour = _ref$hour === void 0 ? 0 : _ref$hour,
-    _ref$minute = _ref.minute,
-    minute = _ref$minute === void 0 ? 0 : _ref$minute,
-    _ref$second = _ref.second,
-    second = _ref$second === void 0 ? 0 : _ref$second;
+function setTime(date, _ref3) {
+  var _ref3$hour = _ref3.hour,
+    hour = _ref3$hour === void 0 ? 0 : _ref3$hour,
+    _ref3$minute = _ref3.minute,
+    minute = _ref3$minute === void 0 ? 0 : _ref3$minute,
+    _ref3$second = _ref3.second,
+    second = _ref3$second === void 0 ? 0 : _ref3$second;
   return (0, _setHours.default)((0, _setMinutes.default)((0, _setSeconds.default)(date, second), minute), hour);
 }
 function getWeek(date) {

package/lib/locale/en-US.d.ts

@@ -13,6 +13,8 @@ declare const locale: {
     'DatePicker.year': string;
     'DatePicker.weekTitle': string[];
     'DatePicker.monthTitle': string[];
+    'DatePicker.months': string[];
+    'DatePicker.monthsShort': string[];
     'DatePicker.rangePlaceholder': string[];
     'DatePicker.rangeYearPlaceholder': string[];
     'DatePicker.rangeMonthPlaceholder': string[];

package/lib/locale/en-US.js

@@ -19,6 +19,8 @@ var locale = {
   'DatePicker.year': '',
   'DatePicker.weekTitle': ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
   'DatePicker.monthTitle': ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+  'DatePicker.months': ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+  'DatePicker.monthsShort': ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
   'DatePicker.rangePlaceholder': ['Start date', 'End date'],
   'DatePicker.rangeYearPlaceholder': ['Start year', 'End year'],
   'DatePicker.rangeMonthPlaceholder': ['Start month', 'End month'],

package/lib/locale/locale.d.ts

@@ -146,6 +146,8 @@ declare class LocaleCache {
         'DatePicker.month': string;
         'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
         'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
+        'DatePicker.months'?: import("../date-picker/interface").MonthTitleType | undefined;
+        'DatePicker.monthsShort'?: import("../date-picker/interface").MonthTitleType | undefined;
         'DatePicker.rangePlaceholder': [string, string];
         'DatePicker.rangeYearPlaceholder': [string, string];
         'DatePicker.rangeMonthPlaceholder': [string, string];

package/lib/locale/zh-CN.d.ts

@@ -118,6 +118,8 @@ declare const locale: {
     'DatePicker.month': string;
     'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
     'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
+    'DatePicker.months'?: import("../date-picker/interface").MonthTitleType | undefined;
+    'DatePicker.monthsShort'?: import("../date-picker/interface").MonthTitleType | undefined;
     'DatePicker.rangePlaceholder': [string, string];
     'DatePicker.rangeYearPlaceholder': [string, string];
     'DatePicker.rangeMonthPlaceholder': [string, string];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.8.73",
+  "version": "1.8.74",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [