@hi-ui/hiui 2.15.9 → 2.15.11

package/es/date-picker/DateRangePanel.js

@@ -1,28 +1,10 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-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 _Calender = _interopRequireDefault(require("./Calender"));
@@ -41,36 +23,61 @@ var _dateUtil = require("./dateUtil");
 
 var _TimeRangePanel = _interopRequireDefault(require("./TimeRangePanel"));
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+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 _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 _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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+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); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+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); }
+
+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; } }
 
-var DateRangePanel = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(DateRangePanel, _Component);
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+var DatePanel = /*#__PURE__*/function (_Component) {
+  _inherits(DatePanel, _Component);
 
-  var _super = _createSuper(DateRangePanel);
+  var _super = _createSuper(DatePanel);
 
-  function DateRangePanel(props) {
+  function DatePanel(props) {
     var _this;
 
-    (0, _classCallCheck2["default"])(this, DateRangePanel);
+    _classCallCheck(this, DatePanel);
+
     _this = _super.call(this, props);
     var _props$date = props.date,
         startDate = _props$date.startDate,
         endDate = _props$date.endDate;
-    var leftDate = (0, _dateUtil.getStartDate)(props.date);
-    var rightDate = (0, _dateUtil.isValid)(endDate) ? endDate : (0, _util.nextMonth)(leftDate);
+    var leftDate = new Date(startDate);
+    var rightDate = endDate ? new Date(endDate) : (0, _util.nextMonth)(leftDate);
 
     if (endDate) {
-      var _deconstructDate = (0, _util.deconstructDate)(leftDate),
+      var _deconstructDate = (0, _util.deconstructDate)(startDate),
           sYear = _deconstructDate.year,
           sMonth = _deconstructDate.month;
 
-      var _deconstructDate2 = (0, _util.deconstructDate)(rightDate),
+      var _deconstructDate2 = (0, _util.deconstructDate)(endDate),
           eYear = _deconstructDate2.year,
           eMonth = _deconstructDate2.month;
 
@@ -88,14 +95,10 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
     _this.state = {
       date: leftDate,
       currentView: props.type || 'date',
-      layout: {
-        left: 'date',
-        right: 'date'
-      },
       yearData: null,
       monthData: null,
-      minDate: props.min,
-      maxDate: props.max,
+      minDate: props.minDate,
+      maxDate: props.maxDate,
       range: range,
       leftDate: leftDate,
       rightDate: rightDate,
@@ -113,22 +116,66 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
    */
 
 
-  (0, _createClass2["default"])(DateRangePanel, [{
+  _createClass(DatePanel, [{
     key: "changeMonth",
     value: function changeMonth(flag, pos) {
       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
@@ -146,13 +193,31 @@ var DateRangePanel = /*#__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) {
@@ -171,13 +236,13 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
 
   }, {
     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);
       }
 
@@ -227,15 +292,8 @@ var DateRangePanel = /*#__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"
       }, type.indexOf('date') !== -1 && /*#__PURE__*/_react["default"].createElement("span", {
         onClick: function onClick() {
@@ -261,7 +319,9 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
       range.startDate = startDate;
       range.endDate = endDate;
       this.setState({
-        range: range
+        range: range,
+        leftDate: startDate || this.state.leftDate,
+        rightDate: endDate || this.state.rightDate
       });
 
       if (endDate) {
@@ -280,10 +340,7 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
   }, {
     key: "shortcutsClickEvent",
     value: function shortcutsClickEvent(e) {
-      var _this$props3 = this.props,
-          localeDatas = _this$props3.localeDatas,
-          max = _this$props3.max,
-          min = _this$props3.min;
+      var localeDatas = this.props.localeDatas;
       var range = this.state.range;
 
       var _date = new Date();
@@ -304,23 +361,14 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
           days = 90;
           break;
 
-        case localeDatas.datePicker.lastSixMonth:
-          days = 180;
-          break;
-
         case localeDatas.datePicker.lastYear:
           days = 365;
           break;
       }
 
-      var nDate = new Date((0, _dateUtil.endOfDay)(_date).getTime() + 1 - days * _constants.DAY_MILLISECONDS);
-
-      var _getInRangeDate = (0, _util.getInRangeDate)(nDate, _date, max, min),
-          startDate = _getInRangeDate.startDate,
-          endDate = _getInRangeDate.endDate;
-
-      range.startDate = startDate;
-      range.endDate = endDate;
+      var nDate = new Date(_date.getTime() - days * _constants.DAY_MILLISECONDS);
+      range.startDate = nDate;
+      range.endDate = _date;
       this.props.onPick(range);
     }
   }, {
@@ -332,25 +380,40 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
         className: "hi-datepicker__shortcuts"
       }, shortcuts.map(function (m, n) {
         return /*#__PURE__*/_react["default"].createElement("p", {
-          key: n,
+          key: n // onMouseOver={this.shortcutsMouseEvent.bind(this)}
+          ,
           onClick: _this3.shortcutsClickEvent.bind(_this3)
         }, m);
       }));
     }
+  }, {
+    key: "onTimePick",
+    value: function onTimePick(pos, date) {
+      var range = this.state.range;
+      pos === 'leftDate' && (range.startDate = date);
+      pos === 'rightDate' && (range.endDate = date);
+      this.setState(_defineProperty({}, pos, date));
+    }
+  }, {
+    key: "timeConfirm",
+    value: function timeConfirm() {
+      this.props.onPick(this.state.date);
+    }
+  }, {
+    key: "timeCancel",
+    value: function timeCancel() {}
   }, {
     key: "getRangeDateStr",
     value: function getRangeDateStr() {
       var _this$state3 = this.state,
-          range = _this$state3.range,
-          showMask = _this$state3.showMask,
           leftDate = _this$state3.leftDate,
-          rightDate = _this$state3.rightDate;
-      var format = this.props.format;
-      format = format.substr(format.match(/[H|h]\s*/).index);
+          rightDate = _this$state3.rightDate,
+          showMask = _this$state3.showMask;
+      var format = 'HH:mm:ss';
       var cls = (0, _classnames["default"])(showMask && 'hi-datepicker__time-text');
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: cls
-      }, "".concat((0, _dateUtil.dateFormat)(range.startDate ? range.startDate : leftDate, format), " - ").concat((0, _dateUtil.dateFormat)(range.endDate ? range.endDate : rightDate, format)));
+      }, "".concat((0, _dateUtil.dateFormat)(leftDate, format), " - ").concat((0, _dateUtil.dateFormat)(rightDate, format)));
     }
   }, {
     key: "selectTimeEvent",
@@ -360,173 +423,28 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
       });
     }
   }, {
-    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++;
-        }
-      }
+    key: "render",
+    value: function render() {
+      var _this4 = this;
 
-      return trs;
-    }
-  }, {
-    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) {
       var _this$state4 = this.state,
           minDate = _this$state4.minDate,
           maxDate = _this$state4.maxDate,
+          currentView = _this$state4.currentView,
           range = _this$state4.range,
-          layout = _this$state4.layout;
-      var _this$props4 = this.props,
-          altCalendar = _this$props4.altCalendar,
-          altCalendarPreset = _this$props4.altCalendarPreset,
-          dateMarkRender = _this$props4.dateMarkRender,
-          dateMarkPreset = _this$props4.dateMarkPreset,
-          altCalendarPresetData = _this$props4.altCalendarPresetData,
-          dateMarkPresetData = _this$props4.dateMarkPresetData,
-          type = _this$props4.type,
-          disabledDate = _this$props4.disabledDate,
-          weekOffset = _this$props4.weekOffset,
-          onSelect = _this$props4.onSelect;
-      var component = null;
-
-      var _deconstructDate4 = (0, _util.deconstructDate)(date),
-          year = _deconstructDate4.year,
-          month = _deconstructDate4.month;
-
-      switch (layout[flag]) {
-        case 'year':
-          var yearData = this.getYearOrMonthData(year, 'year');
-          component = /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
-            altCalendar: altCalendar,
-            altCalendarPreset: altCalendarPreset,
-            dateMarkRender: dateMarkRender,
-            dateMarkPreset: dateMarkPreset,
-            date: date,
-            weekOffset: weekOffset,
-            data: yearData,
-            onSelect: onSelect,
-            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,
-            onSelect: onSelect,
-            altCalendarPreset: altCalendarPreset,
-            dateMarkRender: dateMarkRender,
-            dateMarkPreset: dateMarkPreset,
-            date: date,
-            weekOffset: weekOffset,
-            data: monthData,
-            type: layout[flag],
-            onPick: this.monthPick.bind(this, flag)
-          });
-          break;
+          leftDate = _this$state4.leftDate,
+          rightDate = _this$state4.rightDate,
+          showMask = _this$state4.showMask; // const rightDate = nextMonth(leftDate)
 
-        default:
-          component = /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
-            altCalendarPresetData: altCalendarPresetData,
-            dateMarkPresetData: dateMarkPresetData,
-            altCalendar: altCalendar,
-            altCalendarPreset: altCalendarPreset,
-            dateMarkRender: dateMarkRender,
-            dateMarkPreset: dateMarkPreset,
-            date: date,
-            onSelect: onSelect,
-            range: range,
-            type: type,
-            minDate: minDate,
-            weekOffset: weekOffset,
-            maxDate: maxDate,
-            disabledDate: disabledDate,
-            onPick: this.pick.bind(this),
-            mouseMove: this.onMouseMoveHandler.bind(this)
-          });
-          break;
-      }
-
-      return component;
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this4 = this;
-
-      var _this$state5 = this.state,
-          currentView = _this$state5.currentView,
-          leftDate = _this$state5.leftDate,
-          rightDate = _this$state5.rightDate,
-          showMask = _this$state5.showMask,
-          layout = _this$state5.layout;
-      var _this$props5 = this.props,
-          shortcuts = _this$props5.shortcuts,
-          theme = _this$props5.theme,
-          showTime = _this$props5.showTime,
-          date = _this$props5.date;
+      var _this$props3 = this.props,
+          shortcuts = _this$props3.shortcuts,
+          theme = _this$props3.theme,
+          showTime = _this$props3.showTime,
+          date = _this$props3.date;
 
       var _c = (0, _classnames["default"])('hi-datepicker', theme && 'theme__' + theme);
 
-      var bodyCls = (0, _classnames["default"])('hi-datepicker__body', 'hi-datepicker__body--range', shortcuts && 'hi-datepicker__body--shortcuts', shortcuts && (0, _util.showLargeCalendar)(this.props) && 'hi-datepicker__body--shortcuts--large', !shortcuts && (0, _util.showLargeCalendar)(this.props) && 'hi-datepicker__body--range--large');
+      var bodyCls = (0, _classnames["default"])('hi-datepicker__body', 'hi-datepicker__body--range', shortcuts && 'hi-datepicker__body--shortcuts');
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: this.props.style,
         className: _c
@@ -535,12 +453,28 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
       }, shortcuts && this.renderShortcut(shortcuts), /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-datepicker__panel hi-datepicker__panel--left"
       }, this.renderHeader(currentView, 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 hi-datepicker__calender-container--".concat(currentView)
+      }, /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
+        date: leftDate,
+        range: range,
+        type: currentView,
+        minDate: minDate,
+        maxDate: maxDate,
+        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(currentView, rightDate, 'right'), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "hi-datepicker__calender-container hi-datepicker__calender-container--".concat(layout['right'])
-      }, this._getNormalComponent(rightDate, 'right')))), showTime && /*#__PURE__*/_react["default"].createElement("div", {
+        className: "hi-datepicker__calender-container hi-datepicker__calender-container--".concat(currentView)
+      }, /*#__PURE__*/_react["default"].createElement(_Calender["default"], {
+        date: rightDate,
+        range: range,
+        minDate: minDate,
+        maxDate: maxDate,
+        type: currentView,
+        onPick: this.pick.bind(this),
+        mouseMove: this.onMouseMoveHandler.bind(this)
+      })))), showTime && /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-datepicker__footer",
         onClick: this.selectTimeEvent.bind(this)
       }, this.getRangeDateStr()), showMask && /*#__PURE__*/_react["default"].createElement("div", {
@@ -551,9 +485,7 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
             showMask: false
           });
         }
-      }), showMask && /*#__PURE__*/_react["default"].createElement(_TimeRangePanel["default"], (0, _extends2["default"])({
-        isCheckTime: false
-      }, this.props, {
+      }), showMask && /*#__PURE__*/_react["default"].createElement(_TimeRangePanel["default"], _extends({}, this.props, {
         style: {
           position: 'absolute',
           top: 5,
@@ -562,7 +494,6 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
         date: date,
         onPick: function onPick(d, r) {
           _this4.setState({
-            range: d,
             leftDate: d.startDate,
             rightDate: d.endDate
           });
@@ -572,9 +503,10 @@ var DateRangePanel = /*#__PURE__*/function (_Component) {
       })));
     }
   }]);
-  return DateRangePanel;
+
+  return DatePanel;
 }(_react.Component);
 
-var _default = (0, _context["default"])(DateRangePanel);
+var _default = (0, _context["default"])(DatePanel);
 
 exports["default"] = _default;