@hi-ui/hiui 2.15.10 → 2.15.11

package/es/date-picker/WeekRangePanel.js

@@ -1,26 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _util = require("./util");
@@ -33,57 +17,67 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _dateUtil = require("./dateUtil");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-var _parseProps = function _parseProps(date) {
-  var startDate = date.startDate,
-      endDate = date.endDate;
-  var leftDate = (0, _dateUtil.getStartDate)(date);
-  var rightDate = (0, _dateUtil.isValid)(endDate) ? endDate : (0, _util.nextMonth)(leftDate);
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-  if (endDate) {
-    if ((0, _dateUtil.isSameMonth)(startDate, endDate)) {
-      rightDate = (0, _util.nextMonth)(leftDate);
-    }
-  }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-  return {
-    range: {
-      startDate: startDate,
-      endDate: endDate,
-      selecting: false
-    },
-    leftDate: leftDate,
-    rightDate: rightDate
-  };
-};
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var WeekRangePanel = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(WeekRangePanel, _Component);
+  _inherits(WeekRangePanel, _Component);
 
   var _super = _createSuper(WeekRangePanel);
 
   function WeekRangePanel(props) {
     var _this;
 
-    (0, _classCallCheck2["default"])(this, WeekRangePanel);
+    _classCallCheck(this, WeekRangePanel);
+
     _this = _super.call(this, props);
-    _this.state = _objectSpread(_objectSpread({}, _parseProps(props.date)), {}, {
-      layout: {
-        left: 'date',
-        right: 'date'
+    var _props$date = props.date,
+        startDate = _props$date.startDate,
+        endDate = _props$date.endDate;
+    var leftDate = new Date(startDate);
+    var rightDate = endDate || (0, _util.nextMonth)(leftDate);
+
+    if (endDate) {
+      if ((0, _dateUtil.isSameMonth)(startDate, endDate)) {
+        rightDate = (0, _util.nextMonth)(leftDate);
       }
-    });
+    }
+
+    _this.state = {
+      date: leftDate,
+      range: {
+        startDate: (0, _dateUtil.startOfWeek)(startDate),
+        endDate: endDate ? (0, _dateUtil.endOfWeek)(endDate) : (0, _dateUtil.endOfWeek)(startDate),
+        selecting: false
+      },
+      leftDate: leftDate,
+      rightDate: rightDate
+    };
     return _this;
   }
   /**
@@ -94,15 +88,15 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
    */
 
 
-  (0, _createClass2["default"])(WeekRangePanel, [{
+  _createClass(WeekRangePanel, [{
     key: "getHeaderCenterContent",
-    value: function getHeaderCenterContent(year, month, flag) {
+    value: function getHeaderCenterContent(year, month) {
       var _this$props = this.props,
           localeDatas = _this$props.localeDatas,
           locale = _this$props.locale;
-      var layout = this.state.layout;
+      var currentView = this.state.currentView;
 
-      if (layout[flag] === 'year') {
+      if (currentView === 'year') {
         return year - 4 + '~' + (year + 7);
       }
 
@@ -116,40 +110,6 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
 
       return arr;
     }
-  }, {
-    key: "getYearOrMonthData",
-    value: function getYearOrMonthData(val, type, _year) {
-      var start = type === 'year' ? val - 4 : 1;
-      var trs = [[], [], [], []];
-      var num = 0;
-      var currentYear = new Date().getFullYear();
-      var currentMonth = new Date().getMonth();
-
-      for (var i = 0; i < 4; i++) {
-        var row = trs[i];
-
-        for (var j = 0; j < 3; j++) {
-          var col = row[j] || (row[j] = {
-            type: 'normal'
-          });
-          var y = start + num;
-
-          if (y === currentYear || y === currentMonth + 1) {
-            col.type = 'today';
-          }
-
-          if (y === val) {
-            col.type = 'current';
-          }
-
-          col = (0, _util.colDisabled)(type, col, _year, this.props, y);
-          col.value = y;
-          num++;
-        }
-      }
-
-      return trs;
-    }
     /**
      * 渲染 Header 部分（包含箭头快捷操作）
      * @param {Object} args {
@@ -186,15 +146,8 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         name: "left"
       }))), /*#__PURE__*/_react["default"].createElement("span", {
-        className: "hi-datepicker__header-text",
-        onClick: function onClick() {
-          var layout = Object.assign({}, _this2.state.layout, (0, _defineProperty2["default"])({}, lr, 'year'));
-
-          _this2.setState({
-            layout: layout
-          });
-        }
-      }, this.getHeaderCenterContent(year, month, lr)), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "hi-datepicker__header-text"
+      }, this.getHeaderCenterContent(year, month)), /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-datepicker__header-btns"
       }, /*#__PURE__*/_react["default"].createElement("span", {
         onClick: function onClick() {
@@ -221,16 +174,60 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
           leftDate = _this$state.leftDate,
           rightDate = _this$state.rightDate;
-      var nLeftDate = (0, _dateUtil.toDate)(leftDate);
-      var nRightDate = (0, _dateUtil.toDate)(rightDate);
+      var nLeftDate = new Date(leftDate.getTime());
+      var nRightDate = new Date(rightDate.getTime());
+      var left = (0, _util.deconstructDate)(nLeftDate);
+      var right = (0, _util.deconstructDate)(nRightDate);
 
       if (pos === 'left') {
-        nLeftDate = (0, _dateUtil.changeMonth)(leftDate, flag);
+        if (flag) {
+          left.month -= 1;
+
+          if (left.month < 0) {
+            left.month = 12;
+            left.year -= 1;
+          }
+        } else {
+          left.month += 1;
+
+          if (left.month > 12) {
+            left.month = 1;
+            left.year += 1;
+          }
+        }
+
+        nLeftDate.setFullYear(left.year);
+        nLeftDate.setMonth(left.month - 1);
       } else {
-        nRightDate = (0, _dateUtil.changeMonth)(rightDate, flag);
+        if (flag) {
+          right.month -= 1;
+
+          if (right.month < 0) {
+            right.month = 12;
+            right.year -= 1;
+          }
+        } else {
+          right.month += 1;
+
+          if (right.month > 12) {
+            right.month = 1;
+            right.year += 1;
+          }
+        }
+
+        if (left.month === right.month - 1) {
+          this.setState({
+            disableArrow: {
+              month: false
+            }
+          });
+        }
+
+        nRightDate.setFullYear(right.year);
+        nRightDate.setMonth(right.month - 1);
       }
 
-      if (nLeftDate < nRightDate) {
+      if (nLeftDate <= nRightDate) {
         this.setState({
           leftDate: nLeftDate,
           rightDate: nRightDate
@@ -248,16 +245,34 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
       var _this$state2 = this.state,
           leftDate = _this$state2.leftDate,
           rightDate = _this$state2.rightDate;
-      var nLeftDate = (0, _dateUtil.toDate)(leftDate);
-      var nRightDate = (0, _dateUtil.toDate)(rightDate);
+      var nLeftDate = new Date(leftDate.getTime());
+      var nRightDate = new Date(rightDate.getTime());
+      var left = (0, _util.deconstructDate)(nLeftDate);
+      var right = (0, _util.deconstructDate)(nRightDate);
 
       if (pos === 'left') {
-        nLeftDate = (0, _dateUtil.changeYear)(leftDate, flag);
+        if (flag) {
+          left.year -= 1;
+        } else {
+          left.year += 1;
+        }
+
+        nLeftDate.setFullYear(left.year); // this.setState({
+        //   leftDate
+        // })
       } else {
-        nRightDate = (0, _dateUtil.changeYear)(rightDate, flag);
+        if (flag) {
+          right.year -= 1;
+        } else {
+          right.year += 1;
+        }
+
+        nRightDate.setFullYear(right.year); // this.setState({
+        //   rightDate
+        // })
       }
 
-      if (nLeftDate < nRightDate) {
+      if (nLeftDate <= nRightDate) {
         this.setState({
           leftDate: nLeftDate,
           rightDate: nRightDate
@@ -268,25 +283,15 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
     key: "pick",
     value: function pick(startDate, endDate) {
       var range = this.state.range;
-      var _this$props2 = this.props,
-          onPick = _this$props2.onPick,
-          weekOffset = _this$props2.weekOffset;
+      var onPick = this.props.onPick;
       range.startDate = startDate;
       range.endDate = endDate;
       this.setState({
-        range: range,
-        leftDate: startDate || this.state.leftDate,
-        rightDate: endDate || this.state.rightDate
+        range: range
       });
 
       if (endDate) {
-        var weekOptions = {
-          weekStartsOn: weekOffset
-        };
-        onPick({
-          startDate: (0, _dateUtil.startOfWeek)(range.startDate, weekOptions),
-          endDate: (0, _dateUtil.endOfWeek)(range.endDate, weekOptions)
-        });
+        onPick(range);
       }
     }
   }, {
@@ -299,124 +304,19 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
       });
     }
   }, {
-    key: "yearPick",
-    value: function yearPick(flag, date) {
-      var layout = Object.assign({}, this.state.layout, (0, _defineProperty2["default"])({}, flag, 'month'));
-
-      var _d = flag === 'left' ? {
-        leftDate: date
-      } : {
-        rightDate: date
-      };
-
-      this.setState(_objectSpread(_objectSpread({}, _d), {}, {
-        layout: layout
-      }));
-    }
-  }, {
-    key: "monthPick",
-    value: function monthPick(flag, date) {
-      var layout = Object.assign({}, this.state.layout, (0, _defineProperty2["default"])({}, flag, 'date'));
-
-      var _d = flag === 'left' ? {
-        leftDate: date
-      } : {
-        rightDate: date
-      };
-
-      this.setState(_objectSpread(_objectSpread({}, _d), {}, {
-        layout: layout
-      }));
-    }
-  }, {
-    key: "_getNormalComponent",
-    value: function _getNormalComponent(date, flag) {
+    key: "render",
+    value: function render() {
       var _this$state3 = this.state,
           range = _this$state3.range,
-          layout = _this$state3.layout;
-      var _this$props3 = this.props,
-          altCalendar = _this$props3.altCalendar,
-          altCalendarPreset = _this$props3.altCalendarPreset,
-          dateMarkRender = _this$props3.dateMarkRender,
-          dateMarkPreset = _this$props3.dateMarkPreset,
-          altCalendarPresetData = _this$props3.altCalendarPresetData,
-          dateMarkPresetData = _this$props3.dateMarkPresetData,
-          maxDate = _this$props3.max,
-          minDate = _this$props3.min,
-          weekOffset = _this$props3.weekOffset,
-          onSelect = _this$props3.onSelect;
-      var component = null;
-
-      var _deconstructDate2 = (0, _util.deconstructDate)(date),
-          year = _deconstructDate2.year,
-          month = _deconstructDate2.month;
-
-      switch (layout[flag]) {
-        case 'year':
-          var yearData = this.getYearOrMonthData(year, 'year');
-          component = /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
-            altCalendarPresetData: altCalendarPresetData,
-            dateMarkPresetData: dateMarkPresetData,
-            altCalendar: altCalendar,
-            altCalendarPreset: altCalendarPreset,
-            dateMarkRender: dateMarkRender,
-            dateMarkPreset: dateMarkPreset,
-            onSelect: onSelect,
-            weekOffset: weekOffset,
-            date: date,
-            data: yearData,
-            type: layout[flag],
-            onPick: this.yearPick.bind(this, flag)
-          });
-          break;
-
-        case 'month':
-          var monthData = this.getYearOrMonthData(month, 'month', year);
-          component = /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
-            altCalendarPresetData: altCalendarPresetData,
-            dateMarkPresetData: dateMarkPresetData,
-            altCalendar: altCalendar,
-            altCalendarPreset: altCalendarPreset,
-            dateMarkRender: dateMarkRender,
-            dateMarkPreset: dateMarkPreset,
-            weekOffset: weekOffset,
-            date: date,
-            onSelect: onSelect,
-            data: monthData,
-            type: layout[flag],
-            onPick: this.monthPick.bind(this, flag)
-          });
-          break;
-
-        default:
-          component = /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
-            date: date,
-            range: range,
-            type: "weekrange",
-            minDate: minDate,
-            maxDate: maxDate,
-            weekOffset: weekOffset,
-            onSelect: onSelect,
-            onPick: this.pick.bind(this),
-            mouseMove: this.onMouseMoveHandler.bind(this)
-          });
-          break;
-      }
+          leftDate = _this$state3.leftDate,
+          rightDate = _this$state3.rightDate;
+      var _this$props2 = this.props,
+          type = _this$props2.type,
+          theme = _this$props2.theme;
 
-      return component;
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$state4 = this.state,
-          leftDate = _this$state4.leftDate,
-          rightDate = _this$state4.rightDate,
-          layout = _this$state4.layout;
-      var _this$props4 = this.props,
-          type = _this$props4.type,
-          theme = _this$props4.theme;
+      var _c = (0, _classnames["default"])('hi-datepicker', theme && 'theme__' + theme); // const {year, month, day} = deconstructDate(date)
+      // const _date = new Date(year, month, day)
 
-      var _c = (0, _classnames["default"])('hi-datepicker', theme && 'theme__' + theme);
 
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: this.props.style,
@@ -426,14 +326,27 @@ var WeekRangePanel = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-datepicker__panel hi-datepicker__panel--left"
       }, this.renderHeader(type, leftDate, 'left'), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "hi-datepicker__calender-container hi-datepicker__calender-container--".concat(layout['left'])
-      }, this._getNormalComponent(leftDate, 'left'))), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "hi-datepicker__calender-container"
+      }, /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
+        date: leftDate,
+        range: range,
+        type: "weekrange",
+        onPick: this.pick.bind(this),
+        mouseMove: this.onMouseMoveHandler.bind(this)
+      }))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-datepicker__panel hi-datepicker__panel--right"
       }, this.renderHeader(type, rightDate, 'right'), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "hi-datepicker__calender-container hi-datepicker__calender-container--".concat(layout['right'])
-      }, this._getNormalComponent(rightDate, 'right')))));
+        className: "hi-datepicker__calender-container"
+      }, /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
+        date: rightDate,
+        range: range,
+        type: "weekrange",
+        onPick: this.pick.bind(this),
+        mouseMove: this.onMouseMoveHandler.bind(this)
+      })))));
     }
   }]);
+
   return WeekRangePanel;
 }(_react.Component);
 

package/es/date-picker/constants.js

@@ -7,7 +7,9 @@ exports.formatterDate = exports.isVaildDate = exports.FORMATS = exports.RANGE_SP
 
 var _util = require("./util");
 
-var _dateUtil = require("./dateUtil");
+var _format = _interopRequireDefault(require("date-fns/format"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var TIME_BLOCK = {
   lineHeight: 22,
@@ -19,16 +21,14 @@ 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',
-  monthrange: 'yyyy-MM',
-  yearrange: 'yyyy'
+  daterange: 'YYYY-MM-DD',
+  week: 'YYYY',
+  weekrange: 'YYYY',
+  timeperiod: 'YYYY-MM-DD HH:mm:ss'
 };
 exports.FORMATS = FORMATS;
 
@@ -38,10 +38,10 @@ var isVaildDate = function isVaildDate(date) {
 
 exports.isVaildDate = isVaildDate;
 
-var formatterDate = function formatterDate(type, date, formatter, showTime, localeDatas, weekOffset, isFormat) {
-  weekOffset = weekOffset || 0;
+var formatterDate = function formatterDate(type, date, formatter, showTime, localeDatas) {
+  var weekOffset = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
 
-  if (!(0, _dateUtil.isValid)(date)) {
+  if (!isVaildDate(date)) {
     return '';
   }
 
@@ -49,13 +49,27 @@ 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, _dateUtil.dateFormat)(date, formatter);
+      str = (0, _format["default"])(date, "".concat(formatter).concat(showTime ? ' HH:mm:ss' : ''));
       break;
   }