@hi-ui/hiui 2.15.11 → 2.15.12

package/es/date-picker/constants.js

@@ -7,9 +7,7 @@ exports.formatterDate = exports.isVaildDate = exports.FORMATS = exports.RANGE_SP
 
 var _util = require("./util");
 
-var _format = _interopRequireDefault(require("date-fns/format"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _dateUtil = require("./dateUtil");
 
 var TIME_BLOCK = {
   lineHeight: 22,
@@ -21,14 +19,16 @@ exports.DAY_MILLISECONDS = DAY_MILLISECONDS;
 var RANGE_SPLIT = '~';
 exports.RANGE_SPLIT = RANGE_SPLIT;
 var FORMATS = {
-  date: 'YYYY-MM-DD',
-  month: 'YYYY-MM',
-  year: 'YYYY',
+  date: 'yyyy-MM-dd',
+  month: 'yyyy-MM',
+  year: 'yyyy',
   time: 'HH:mm:ss',
-  daterange: 'YYYY-MM-DD',
-  week: 'YYYY',
-  weekrange: 'YYYY',
-  timeperiod: 'YYYY-MM-DD HH:mm:ss'
+  daterange: 'yyyy-MM-dd',
+  week: 'yyyy',
+  weekrange: 'yyyy',
+  timeperiod: 'yyyy-MM-dd HH:mm:ss',
+  monthrange: 'yyyy-MM',
+  yearrange: 'yyyy'
 };
 exports.FORMATS = FORMATS;
 
@@ -38,10 +38,10 @@ var isVaildDate = function isVaildDate(date) {
 
 exports.isVaildDate = isVaildDate;
 
-var formatterDate = function formatterDate(type, date, formatter, showTime, localeDatas) {
-  var weekOffset = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+var formatterDate = function formatterDate(type, date, formatter, showTime, localeDatas, weekOffset, isFormat) {
+  weekOffset = weekOffset || 0;
 
-  if (!isVaildDate(date)) {
+  if (!(0, _dateUtil.isValid)(date)) {
     return '';
   }
 
@@ -49,27 +49,13 @@ var formatterDate = function formatterDate(type, date, formatter, showTime, loca
   var str = '';
 
   switch (type) {
-    // case 'daterange':
-    //   if (date instanceof Date) { date = {startDate: date, endDate: date} }
-    //   str = dateFormat(date.startDate, `${formatter}${showTime ? ' hh:mm:ss' : ''}`) + RANGE_SPLIT + dateFormat(date.endDate, `${formatter}${showTime ? ' hh:mm:ss' : ''}`)
-    //   break
     case 'weekrange':
-      // if (date instanceof Date) { date = {startDate: date, endDate: date} }
-      str = localeDatas.datePicker.weekrange(date.getFullYear(), (0, _util.getYearWeek)(date, weekOffset).weekNum);
-      break;
-
-    case 'year':
-    case 'month':
-    case 'time':
-      str = (0, _format["default"])(date, formatter);
-      break;
-
     case 'week':
       str = localeDatas.datePicker.weekrange(date.getFullYear(), (0, _util.getYearWeek)(date, weekOffset).weekNum);
       break;
 
     default:
-      str = (0, _format["default"])(date, "".concat(formatter).concat(showTime ? ' HH:mm:ss' : ''));
+      str = (0, _dateUtil.dateFormat)(date, formatter);
       break;
   }
 

package/es/date-picker/dateUtil.js

@@ -1,60 +1,62 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 Object.defineProperty(exports, "getDaysInMonth", {
   enumerable: true,
   get: function get() {
-    return _get_days_in_month["default"];
+    return _getDaysInMonth["default"];
   }
 });
 Object.defineProperty(exports, "subMonths", {
   enumerable: true,
   get: function get() {
-    return _sub_months["default"];
+    return _subMonths["default"];
   }
 });
 Object.defineProperty(exports, "getDay", {
   enumerable: true,
   get: function get() {
-    return _get_day["default"];
+    return _getDay["default"];
   }
 });
 Object.defineProperty(exports, "startOfMonth", {
   enumerable: true,
   get: function get() {
-    return _start_of_month["default"];
+    return _startOfMonth["default"];
   }
 });
-Object.defineProperty(exports, "isWithinRange", {
+Object.defineProperty(exports, "isWithinInterval", {
   enumerable: true,
   get: function get() {
-    return _is_within_range["default"];
+    return _isWithinInterval["default"];
   }
 });
 Object.defineProperty(exports, "isSameDay", {
   enumerable: true,
   get: function get() {
-    return _is_same_day["default"];
+    return _isSameDay["default"];
   }
 });
 Object.defineProperty(exports, "compareAsc", {
   enumerable: true,
   get: function get() {
-    return _compare_asc["default"];
+    return _compareAsc["default"];
   }
 });
 Object.defineProperty(exports, "startOfDay", {
   enumerable: true,
   get: function get() {
-    return _start_of_day["default"];
+    return _startOfDay["default"];
   }
 });
 Object.defineProperty(exports, "endOfDay", {
   enumerable: true,
   get: function get() {
-    return _end_of_day["default"];
+    return _endOfDay["default"];
   }
 });
 Object.defineProperty(exports, "parse", {
@@ -63,145 +65,312 @@ Object.defineProperty(exports, "parse", {
     return _parse["default"];
   }
 });
-Object.defineProperty(exports, "startOfWeek", {
+Object.defineProperty(exports, "toDate", {
   enumerable: true,
   get: function get() {
-    return _start_of_week["default"];
+    return _toDate["default"];
   }
 });
-Object.defineProperty(exports, "endOfWeek", {
+Object.defineProperty(exports, "startOfWeek", {
   enumerable: true,
   get: function get() {
-    return _end_of_week["default"];
+    return _startOfWeek["default"];
   }
 });
-Object.defineProperty(exports, "dateFormat", {
+Object.defineProperty(exports, "endOfWeek", {
   enumerable: true,
   get: function get() {
-    return _format["default"];
+    return _endOfWeek["default"];
   }
 });
 Object.defineProperty(exports, "addMonths", {
   enumerable: true,
   get: function get() {
-    return _add_months["default"];
+    return _addMonths["default"];
   }
 });
 Object.defineProperty(exports, "isSameMonth", {
   enumerable: true,
   get: function get() {
-    return _is_same_month["default"];
+    return _isSameMonth["default"];
   }
 });
 Object.defineProperty(exports, "getYear", {
   enumerable: true,
   get: function get() {
-    return _get_year["default"];
+    return _getYear["default"];
   }
 });
 Object.defineProperty(exports, "getMonth", {
   enumerable: true,
   get: function get() {
-    return _get_month["default"];
+    return _getMonth["default"];
   }
 });
 Object.defineProperty(exports, "isToday", {
   enumerable: true,
   get: function get() {
-    return _is_today["default"];
+    return _isToday["default"];
   }
 });
 Object.defineProperty(exports, "getHours", {
   enumerable: true,
   get: function get() {
-    return _get_hours["default"];
+    return _getHours["default"];
   }
 });
 Object.defineProperty(exports, "getMinutes", {
   enumerable: true,
   get: function get() {
-    return _get_minutes["default"];
+    return _getMinutes["default"];
   }
 });
 Object.defineProperty(exports, "getSeconds", {
   enumerable: true,
   get: function get() {
-    return _get_seconds["default"];
+    return _getSeconds["default"];
   }
 });
 Object.defineProperty(exports, "addHours", {
   enumerable: true,
   get: function get() {
-    return _add_hours["default"];
+    return _addHours["default"];
   }
 });
 Object.defineProperty(exports, "addDays", {
   enumerable: true,
   get: function get() {
-    return _add_days["default"];
+    return _addDays["default"];
   }
 });
 Object.defineProperty(exports, "subDays", {
   enumerable: true,
   get: function get() {
-    return _sub_days["default"];
+    return _subDays["default"];
   }
 });
 Object.defineProperty(exports, "differenceInDays", {
   enumerable: true,
   get: function get() {
-    return _difference_in_days["default"];
+    return _differenceInDays["default"];
+  }
+});
+Object.defineProperty(exports, "addYears", {
+  enumerable: true,
+  get: function get() {
+    return _addYears["default"];
+  }
+});
+Object.defineProperty(exports, "subYears", {
+  enumerable: true,
+  get: function get() {
+    return _subYears["default"];
+  }
+});
+Object.defineProperty(exports, "parseISO", {
+  enumerable: true,
+  get: function get() {
+    return _parseISO["default"];
+  }
+});
+Object.defineProperty(exports, "getDate", {
+  enumerable: true,
+  get: function get() {
+    return _getDate["default"];
+  }
+});
+Object.defineProperty(exports, "startOfYear", {
+  enumerable: true,
+  get: function get() {
+    return _startOfYear["default"];
+  }
+});
+Object.defineProperty(exports, "endOfYear", {
+  enumerable: true,
+  get: function get() {
+    return _endOfYear["default"];
+  }
+});
+Object.defineProperty(exports, "isSameYear", {
+  enumerable: true,
+  get: function get() {
+    return _isSameYear["default"];
+  }
+});
+Object.defineProperty(exports, "endOfMonth", {
+  enumerable: true,
+  get: function get() {
+    return _endOfMonth["default"];
+  }
+});
+Object.defineProperty(exports, "set", {
+  enumerable: true,
+  get: function get() {
+    return _set["default"];
   }
 });
+exports.changeMonth = exports.changeYear = exports.compatibleFormatString = exports.compatibleToDate = exports.getValidDate = exports.getStartDate = exports.isValid = exports.dateFormat = void 0;
 
-var _get_days_in_month = _interopRequireDefault(require("date-fns/get_days_in_month"));
+var _getDaysInMonth = _interopRequireDefault(require("date-fns/getDaysInMonth"));
 
-var _sub_months = _interopRequireDefault(require("date-fns/sub_months"));
+var _subMonths = _interopRequireDefault(require("date-fns/subMonths"));
 
-var _get_day = _interopRequireDefault(require("date-fns/get_day"));
+var _getDay = _interopRequireDefault(require("date-fns/getDay"));
 
-var _start_of_month = _interopRequireDefault(require("date-fns/start_of_month"));
+var _startOfMonth = _interopRequireDefault(require("date-fns/startOfMonth"));
 
-var _is_within_range = _interopRequireDefault(require("date-fns/is_within_range"));
+var _isWithinInterval = _interopRequireDefault(require("date-fns/isWithinInterval"));
 
-var _is_same_day = _interopRequireDefault(require("date-fns/is_same_day"));
+var _isSameDay = _interopRequireDefault(require("date-fns/isSameDay"));
 
-var _compare_asc = _interopRequireDefault(require("date-fns/compare_asc"));
+var _compareAsc = _interopRequireDefault(require("date-fns/compareAsc"));
 
-var _start_of_day = _interopRequireDefault(require("date-fns/start_of_day"));
+var _startOfDay = _interopRequireDefault(require("date-fns/startOfDay"));
 
-var _end_of_day = _interopRequireDefault(require("date-fns/end_of_day"));
+var _endOfDay = _interopRequireDefault(require("date-fns/endOfDay"));
 
 var _parse = _interopRequireDefault(require("date-fns/parse"));
 
-var _start_of_week = _interopRequireDefault(require("date-fns/start_of_week"));
+var _toDate = _interopRequireDefault(require("date-fns/toDate"));
 
-var _end_of_week = _interopRequireDefault(require("date-fns/end_of_week"));
+var _startOfWeek = _interopRequireDefault(require("date-fns/startOfWeek"));
+
+var _endOfWeek = _interopRequireDefault(require("date-fns/endOfWeek"));
 
 var _format = _interopRequireDefault(require("date-fns/format"));
 
-var _add_months = _interopRequireDefault(require("date-fns/add_months"));
+var _addMonths = _interopRequireDefault(require("date-fns/addMonths"));
+
+var _isSameMonth = _interopRequireDefault(require("date-fns/isSameMonth"));
+
+var _getYear = _interopRequireDefault(require("date-fns/getYear"));
+
+var _getMonth = _interopRequireDefault(require("date-fns/getMonth"));
+
+var _isToday = _interopRequireDefault(require("date-fns/isToday"));
+
+var _getHours = _interopRequireDefault(require("date-fns/getHours"));
+
+var _getMinutes = _interopRequireDefault(require("date-fns/getMinutes"));
+
+var _getSeconds = _interopRequireDefault(require("date-fns/getSeconds"));
+
+var _addHours = _interopRequireDefault(require("date-fns/addHours"));
+
+var _addDays = _interopRequireDefault(require("date-fns/addDays"));
+
+var _subDays = _interopRequireDefault(require("date-fns/subDays"));
+
+var _differenceInDays = _interopRequireDefault(require("date-fns/differenceInDays"));
+
+var _isValid = _interopRequireDefault(require("date-fns/isValid"));
+
+var _addYears = _interopRequireDefault(require("date-fns/addYears"));
+
+var _subYears = _interopRequireDefault(require("date-fns/subYears"));
+
+var _parseISO = _interopRequireDefault(require("date-fns/parseISO"));
+
+var _getDate = _interopRequireDefault(require("date-fns/getDate"));
+
+var _startOfYear = _interopRequireDefault(require("date-fns/startOfYear"));
+
+var _endOfYear = _interopRequireDefault(require("date-fns/endOfYear"));
+
+var _isSameYear = _interopRequireDefault(require("date-fns/isSameYear"));
 
-var _is_same_month = _interopRequireDefault(require("date-fns/is_same_month"));
+var _endOfMonth = _interopRequireDefault(require("date-fns/endOfMonth"));
 
-var _get_year = _interopRequireDefault(require("date-fns/get_year"));
+var _set = _interopRequireDefault(require("date-fns/set"));
 
-var _get_month = _interopRequireDefault(require("date-fns/get_month"));
+var isValid = function isValid(date) {
+  if (typeof date === 'string') {
+    return (0, _isValid["default"])((0, _parseISO["default"])(date));
+  }
+
+  if (typeof date === 'number') {
+    return (0, _isValid["default"])((0, _toDate["default"])(date));
+  }
+
+  return date && (0, _isValid["default"])((0, _toDate["default"])(date));
+};
+
+exports.isValid = isValid;
+
+var getValidDate = function getValidDate(date) {
+  return isValid(date) ? (0, _toDate["default"])(date) : new Date();
+};
+
+exports.getValidDate = getValidDate;
+
+var getStartDate = function getStartDate(dateObj) {
+  return getValidDate(dateObj.startDate);
+};
+/**
+ * 兼容 datefns 的 转换日期方法
+ * @param {}} value
+ * @param {*} format
+ */
+
+
+exports.getStartDate = getStartDate;
 
-var _is_today = _interopRequireDefault(require("date-fns/is_today"));
+var compatibleToDate = function compatibleToDate(value, format) {
+  if (typeof value === 'string') {
+    return (0, _parse["default"])(value, format, new Date());
+  }
+
+  return (0, _toDate["default"])(value);
+};
+
+exports.compatibleToDate = compatibleToDate;
+
+var compatibleFormatString = function compatibleFormatString(formatStr) {
+  return formatStr.replace(/[Y+|D+]/g, function (word) {
+    return word.toLowerCase();
+  });
+};
+
+exports.compatibleFormatString = compatibleFormatString;
 
-var _get_hours = _interopRequireDefault(require("date-fns/get_hours"));
+var dateFormat = function dateFormat(value, formatStr) {
+  return isValid(value) ? (0, _format["default"])(value, compatibleFormatString(formatStr)) : '';
+};
+/**
+ * 箭头切换年份
+ * @param {*} date
+ * @param {*} flag
+ */
 
-var _get_minutes = _interopRequireDefault(require("date-fns/get_minutes"));
 
-var _get_seconds = _interopRequireDefault(require("date-fns/get_seconds"));
+exports.dateFormat = dateFormat;
 
-var _add_hours = _interopRequireDefault(require("date-fns/add_hours"));
+var changeYear = function changeYear(date, flag) {
+  var num = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var nDate;
 
-var _add_days = _interopRequireDefault(require("date-fns/add_days"));
+  if (flag) {
+    nDate = (0, _subYears["default"])(date, num);
+  } else {
+    nDate = (0, _addYears["default"])(date, num);
+  }
+
+  return nDate;
+};
+
+exports.changeYear = changeYear;
 
-var _sub_days = _interopRequireDefault(require("date-fns/sub_days"));
+var changeMonth = function changeMonth(date, flag) {
+  var num = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var nDate;
+
+  if (flag) {
+    nDate = (0, _subMonths["default"])(date, num);
+  } else {
+    nDate = (0, _addMonths["default"])(date, num);
+  }
 
-var _difference_in_days = _interopRequireDefault(require("date-fns/difference_in_days"));
+  return nDate;
+};
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+exports.changeMonth = changeMonth;