@hi-ui/hiui 2.15.9 → 2.15.11

package/es/date-picker/Calender.js

@@ -1,148 +1,79 @@
 "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 _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _util = require("./util");
 
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _context = _interopRequireDefault(require("../context"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _dateUtil = require("./dateUtil");
 
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _constants = require("./constants");
 
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-var _react = _interopRequireWildcard(require("react"));
+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; }
 
-var _reactTransitionGroup = require("react-transition-group");
+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); }
 
-var _util = require("./util");
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-var _context = _interopRequireDefault(require("../context"));
-
-var _toLunar = _interopRequireDefault(require("./toLunar"));
-
-var _constants = require("./constants");
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-var _dateUtil = require("./dateUtil");
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
 
-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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var Calender = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Calender, _Component);
+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 _super = _createSuper(Calender);
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-  function Calender(props) {
-    var _this;
+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); }
 
-    (0, _classCallCheck2["default"])(this, Calender);
-    _this = _super.call(this, props);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "showHolidayTimeId", null);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "showHolidayDetail", function (fullTimeInfo) {
-      clearTimeout(_this.showHolidayTimeId);
-
-      _this.setState({
-        show: true,
-        holidayFullName: fullTimeInfo.FullText || fullTimeInfo.text
-      });
-
-      _this.showHolidayTimeId = setTimeout(function () {
-        _this.setState({
-          show: false
-        });
-      }, 2000);
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "altCalendarText", function (datainfo, lunarcellinfo) {
-      var altCalendarPresetData = _this.props.altCalendarPresetData;
-
-      if (altCalendarPresetData && altCalendarPresetData[datainfo]) {
-        return altCalendarPresetData[datainfo].text || altCalendarPresetData[datainfo];
-      }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-      return lunarcellinfo.text;
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "altCalendar", function (td) {
-      var _this$props = _this.props,
-          layerType = _this$props.type,
-          date = _this$props.date,
-          altCalendarPresetData = _this$props.altCalendarPresetData,
-          dateMarkPresetData = _this$props.dateMarkPresetData,
-          altCalendarPreset = _this$props.altCalendarPreset;
-      var nDate = (0, _dateUtil.getYear)(new Date());
-      var propDate = (0, _dateUtil.getYear)(date);
-      var isAddToday = nDate === propDate;
-      var _class = [];
+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); }; }
 
-      switch (td.type) {
-        case 'normal':
-          _class.push('normal');
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
-          break;
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-        case 'today':
-          layerType !== 'week' && _class.push('today');
-          layerType === 'month' && !isAddToday && _class.pop();
-          break;
+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; } }
 
-        case 'current':
-          _class.push('current');
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-          break;
+var Calender = /*#__PURE__*/function (_Component) {
+  _inherits(Calender, _Component);
 
-        default:
-          _class.push(td.type);
+  var _super = _createSuper(Calender);
 
-          break;
-      }
+  function Calender(props) {
+    var _this;
 
-      if ((altCalendarPresetData || dateMarkPresetData) && layerType !== 'year' && layerType !== 'month') {
-        var fullTimeInfo = _this.getFullTime(td.value, _class);
+    _classCallCheck(this, Calender);
 
-        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, fullTimeInfo.nodeMark ? fullTimeInfo.nodeMark : null, fullTimeInfo.text ? /*#__PURE__*/_react["default"].createElement("div", {
-          className: "hi-datepicker__content hi-datepicker__content--showLunar",
-          value: td.value,
-          onMouseEnter: function onMouseEnter() {
-            altCalendarPreset === 'id-ID' && _this.showHolidayDetail(fullTimeInfo);
-          }
-        }, fullTimeInfo.highlight ? /*#__PURE__*/_react["default"].createElement("span", {
-          value: td.value,
-          className: "hi-datepicker__text--showLunar hi-datepicker__text--showLunar--festival"
-        }, fullTimeInfo.text) : /*#__PURE__*/_react["default"].createElement("span", {
-          value: td.value,
-          className: "hi-datepicker__text--showLunar"
-        }, fullTimeInfo.text)) : null);
-      } else {
-        return null;
-      }
-    });
+    _this = _super.call(this, props);
     _this.state = {
-      rows: [[], [], [], [], [], []],
-      show: false
+      rows: [[], [], [], [], [], []]
     };
     _this.weekNum = 0;
-    _this.months = props.localeDatas.datePicker.month;
     return _this;
   }
 
-  (0, _createClass2["default"])(Calender, [{
+  _createClass(Calender, [{
     key: "_getTime",
     value: function _getTime(week, y, m) {
       var r = new Date(y, m - 1, 1);
@@ -154,15 +85,13 @@ var Calender = /*#__PURE__*/function (_Component) {
   }, {
     key: "getRows",
     value: function getRows() {
-      var _this$props2 = this.props,
-          type = _this$props2.type,
-          range = _this$props2.range,
-          date = _this$props2.date,
-          minDate = _this$props2.minDate,
-          maxDate = _this$props2.maxDate,
-          weekOffset = _this$props2.weekOffset,
-          disabledDate = _this$props2.disabledDate;
-      var _date = date;
+      var _this$props = this.props,
+          type = _this$props.type,
+          range = _this$props.range,
+          _date = _this$props.date,
+          minDate = _this$props.minDate,
+          maxDate = _this$props.maxDate,
+          weekOffset = _this$props.weekOffset;
 
       var _deconstructDate = (0, _util.deconstructDate)(_date, weekOffset),
           year = _deconstructDate.year,
@@ -181,11 +110,9 @@ var Calender = /*#__PURE__*/function (_Component) {
 
       var firstDayWeek = (0, _dateUtil.getDay)((0, _dateUtil.startOfMonth)(_date)) - weekOffset;
 
-      if (firstDayWeek === 0) {
+      if (firstDayWeek <= 0) {
         // 如果为0 代表该月第一天是周日，在日历上需要第二行开始显示
         firstDayWeek = 7;
-      } else if (firstDayWeek < 0) {
-        firstDayWeek = 6;
       }
 
       var startTimeByCurrentPanel = this._getTime(firstDayWeek, year, month); // 当前日期面板中第一个日期的具体毫秒数(指向上一个月)
@@ -231,9 +158,12 @@ var Calender = /*#__PURE__*/function (_Component) {
               col.value = count - dayCount;
               col.type = 'next';
             }
-          }
+          } // if (range && (isSameDay(range.startDate, currentTime) || isSameDay(range.endDate, currentTime))) {
+          //   col.type = 'current'
+          // }
 
-          if ((0, _dateUtil.isToday)(currentTime) && col.type !== 'next' && col.type !== 'prev') {
+
+          if ((0, _dateUtil.isToday)(currentTime)) {
             col.type = 'today';
           }
 
@@ -242,30 +172,16 @@ var Calender = /*#__PURE__*/function (_Component) {
           }
 
           if (type === 'daterange' || type === 'weekrange') {
-            var sv = (0, _dateUtil.isValid)(startDate);
-            var ev = (0, _dateUtil.isValid)(endDate);
-
-            if (sv) {
-              col.rangeStart = startDate && (0, _dateUtil.isSameDay)(currentTime, startDate);
-            }
+            col.rangeStart = startDate && (0, _dateUtil.isSameDay)(currentTime, startDate);
+            col.rangeEnd = endDate && (0, _dateUtil.isSameDay)(currentTime, endDate);
 
-            if (ev) {
-              col.rangeEnd = endDate && (0, _dateUtil.isSameDay)(currentTime, endDate);
-            }
-
-            if (sv && ev) {
-              var _ds = [startDate, endDate].sort(_dateUtil.compareAsc);
-
-              col.range = endDate && (0, _dateUtil.isWithinInterval)((0, _dateUtil.toDate)(currentTime), {
-                start: _ds[0],
-                end: _ds[1]
-              });
-            }
+            var _ds = [startDate, endDate].sort(_dateUtil.compareAsc);
 
+            col.range = endDate && _dateUtil.isWithinRange.apply(void 0, [currentTime].concat(_toConsumableArray(_ds)));
             row.weekNum = (0, _util.getYearWeek)(new Date(currentTime), weekOffset).weekNum;
           }
 
-          col.disabled = minDate && (0, _dateUtil.compareAsc)(currentTime, (0, _dateUtil.toDate)(minDate).setHours(0, 0, 0, 0)) === -1 || maxDate && (0, _dateUtil.compareAsc)(currentTime, (0, _dateUtil.toDate)(maxDate).setHours(0, 0, 0, 0)) === 1 || disabledDate && disabledDate(currentTime);
+          col.disabled = minDate && (0, _dateUtil.compareAsc)(currentTime, minDate) === -1 || maxDate && (0, _dateUtil.compareAsc)(currentTime, maxDate) === 1;
         }
 
         if (type === 'week') {
@@ -320,17 +236,15 @@ var Calender = /*#__PURE__*/function (_Component) {
   }, {
     key: "handlerClick",
     value: function handlerClick(e) {
-      var _this$props3 = this.props,
-          onPick = _this$props3.onPick,
-          date = _this$props3.date,
-          type = _this$props3.type,
-          range = _this$props3.range,
-          onSelect = _this$props3.onSelect;
+      var _this$props2 = this.props,
+          onPick = _this$props2.onPick,
+          date = _this$props2.date,
+          type = _this$props2.type,
+          range = _this$props2.range;
 
       var _deconstructDate2 = (0, _util.deconstructDate)(date),
           year = _deconstructDate2.year,
           month = _deconstructDate2.month,
-          day = _deconstructDate2.day,
           hours = _deconstructDate2.hours,
           minutes = _deconstructDate2.minutes,
           seconds = _deconstructDate2.seconds;
@@ -342,16 +256,8 @@ var Calender = /*#__PURE__*/function (_Component) {
       var value = td.getAttribute('value');
       if (td.nodeName !== 'SPAN' && td.nodeName !== 'TD' && td.nodeName !== 'DIV' || td.disabled) return false;
       if (cls.indexOf('disabled') !== -1) return false;
-      var clickVal = parseInt(value);
-      var newDate = new Date(year, month - 1, day, hours, minutes, seconds);
-
-      if (type === 'year' || type === 'yearrange') {
-        year = parseInt(value);
-        newDate.setFullYear(year);
-      } else if (type === 'month' || type === 'monthrange') {
-        month = parseInt(value);
-        newDate.setMonth(month - 1);
-      }
+      var day = parseInt(value);
+      var newDate = new Date(year, month - 1);
 
       if (cls.indexOf('prev') !== -1) {
         newDate = (0, _dateUtil.addMonths)(newDate, -1);
@@ -361,28 +267,33 @@ var Calender = /*#__PURE__*/function (_Component) {
         newDate = (0, _dateUtil.addMonths)(newDate, 1);
       }
 
-      if (!(type === 'year' || type === 'month' || type === 'yearrange' || type === 'monthrange')) {
-        newDate.setDate(clickVal);
+      newDate.setDate(day);
+      newDate.setHours(hours, minutes, seconds);
+
+      if (type === 'year') {
+        year = parseInt(value);
+        newDate.setFullYear(year);
+      }
+
+      if (type === 'month') {
+        month = parseInt(value);
+        newDate.setMonth(month - 1);
       }
 
-      if (type === 'daterange' || type === 'weekrange' || type === 'yearrange' || type === 'monthrange') {
+      if (type === 'daterange' || type === 'weekrange') {
         if (range.selecting) {
           if (range.startDate > newDate) {
             range.selecting = false;
-            onSelect(newDate, true);
             onPick(newDate, range.startDate);
           } else {
             range.selecting = false;
-            onSelect(newDate, true);
             onPick(range.startDate, newDate);
           }
         } else {
           range.selecting = true;
-          onSelect(newDate, false);
           onPick(newDate, null);
         }
       } else {
-        onSelect(newDate, true);
         onPick(newDate);
       }
     }
@@ -390,11 +301,11 @@ var Calender = /*#__PURE__*/function (_Component) {
     key: "handlerMouseMove",
     value: function handlerMouseMove(e) {
       var td = e.target;
-      var _this$props4 = this.props,
-          mouseMove = _this$props4.mouseMove,
-          date = _this$props4.date,
-          type = _this$props4.type,
-          range = _this$props4.range;
+      var _this$props3 = this.props,
+          mouseMove = _this$props3.mouseMove,
+          date = _this$props3.date,
+          type = _this$props3.type,
+          range = _this$props3.range;
 
       var _deconstructDate3 = (0, _util.deconstructDate)(date),
           year = _deconstructDate3.year,
@@ -402,7 +313,7 @@ var Calender = /*#__PURE__*/function (_Component) {
 
       if (td.nodeName !== 'SPAN' || td.disabled || type.indexOf('range') === -1 || !range.selecting) return false;
       td = td.parentNode.parentNode;
-      var day = parseInt(td.textContent);
+      var day = parseInt(td.innerText);
       var cls = td.className;
       var newDate = new Date(year, month - 1, day);
 
@@ -414,148 +325,19 @@ var Calender = /*#__PURE__*/function (_Component) {
         newDate = (0, _dateUtil.addMonths)(newDate, 1);
       }
 
-      if (type === 'yearrange') {
-        newDate = new Date(day + '');
-      }
-
-      if (type === 'monthrange') {
-        newDate = new Date(year, this.months.indexOf(td.textContent));
-      }
-
       mouseMove(newDate);
     }
-  }, {
-    key: "getMarkNode",
-    value: function getMarkNode(node) {
-      return /*#__PURE__*/_react["default"].createElement("span", {
-        className: "hi-datepicker__text\u2014\u2014holiday"
-      }, node);
-    }
-    /**
-     * 获取完整时间
-     * @param {*} value 日
-     * @param {*} cls className
-     */
-
-  }, {
-    key: "getFullTime",
-    value: function getFullTime(value, cls) {
-      var _this$props5 = this.props,
-          date = _this$props5.date,
-          type = _this$props5.type,
-          altCalendarPreset = _this$props5.altCalendarPreset,
-          altCalendar = _this$props5.altCalendar,
-          dateMarkRender = _this$props5.dateMarkRender,
-          altCalendarPresetData = _this$props5.altCalendarPresetData,
-          dateMarkPresetData = _this$props5.dateMarkPresetData;
-
-      var _deconstructDate4 = (0, _util.deconstructDate)(date),
-          year = _deconstructDate4.year,
-          month = _deconstructDate4.month,
-          day = _deconstructDate4.day,
-          hours = _deconstructDate4.hours,
-          minutes = _deconstructDate4.minutes,
-          seconds = _deconstructDate4.seconds;
-
-      if (cls.indexOf('disabled') !== -1) return false;
-      var clickVal = parseInt(value);
-      var newDate = new Date(year, month - 1, day, hours, minutes, seconds);
-
-      if (type === 'year') {
-        year = parseInt(value);
-        newDate.setFullYear(year);
-      } else if (type === 'month') {
-        month = parseInt(value);
-        newDate.setMonth(month - 1);
-      } else {
-        newDate.setDate(clickVal);
-      }
-
-      if (cls.indexOf('prev') !== -1) {
-        newDate = (0, _dateUtil.addMonths)(newDate, -1);
-      }
-
-      if (cls.indexOf('next') !== -1) {
-        newDate = (0, _dateUtil.addMonths)(newDate, 1);
-      }
-
-      var _year = (0, _dateUtil.getYear)(newDate);
-
-      var _month = (0, _dateUtil.getMonth)(newDate) + 1;
-
-      var _value = type === 'year' ? 1 : value;
-
-      var datainfo = _year + '/' + _month + '/' + _value;
-
-      var LunarInfo = _toLunar["default"].toLunar(_year, _month, _value);
-
-      var lunarcellinfo = {
-        text: altCalendarPreset === 'zh-CN' ? LunarInfo[6] : null,
-        // 默认预置信息
-        highlight: false
-      };
-
-      if (altCalendar || dateMarkRender) {
-        lunarcellinfo = {
-          text: this.altCalendarText(datainfo, lunarcellinfo),
-          highlight: altCalendarPresetData && altCalendarPresetData[datainfo] && altCalendarPresetData[datainfo].highlight,
-          nodeMark: this.markRender(datainfo)
-        };
-      }
-
-      if (dateMarkPresetData && dateMarkPresetData[datainfo] || altCalendarPresetData && altCalendarPresetData[datainfo]) {
-        lunarcellinfo = {
-          text: this.altCalendarText(datainfo, lunarcellinfo),
-          highlight: altCalendarPresetData && altCalendarPresetData[datainfo] && altCalendarPresetData[datainfo].highlight,
-          nodeMark: this.markRender(datainfo)
-        };
-      }
-
-      return _objectSpread(_objectSpread({}, altCalendarPresetData[datainfo]), lunarcellinfo);
-    }
-  }, {
-    key: "markRender",
-    value: function markRender(datainfo) {
-      // 存在传入自定就优先使用自定义
-      var _this$props6 = this.props,
-          dateMarkRender = _this$props6.dateMarkRender,
-          dateMarkPresetData = _this$props6.dateMarkPresetData;
-      var markRenderNode = dateMarkRender ? dateMarkRender(new Date(datainfo).getTime(), new Date().getTime()) : false;
-
-      if (markRenderNode) {
-        return this.getMarkNode(markRenderNode);
-      }
-
-      if (dateMarkPresetData) {
-        return dateMarkPresetData[datainfo];
-      }
-
-      return null;
-    }
   }, {
     key: "getTDClass",
-    value: function getTDClass(td, _index) {
-      var _this$props7 = this.props,
-          layerType = _this$props7.type,
-          date = _this$props7.date;
+    value: function getTDClass(td) {
       var _class = ['hi-datepicker__cell'];
 
-      if ((0, _util.showLargeCalendar)(this.props)) {
-        _class.push('hi-datepicker__cell--large');
-
-        _index === 6 && _class.push('hi-datepicker__cell--large--laster');
-      }
-
       if (td.disabled) {
         _class.push('disabled');
 
         return _class.join(' ');
       }
 
-      var nDate = (0, _dateUtil.getYear)(new Date());
-      var propDate = (0, _dateUtil.getYear)(date);
-      var isAddToday = nDate === propDate;
-
       switch (td.type) {
         case 'normal':
           _class.push('normal');
@@ -563,8 +345,7 @@ var Calender = /*#__PURE__*/function (_Component) {
           break;
 
         case 'today':
-          layerType !== 'week' && _class.push('today');
-          layerType === 'month' && !isAddToday && _class.pop();
+          this.props.type !== 'week' && _class.push('today');
           break;
 
         case 'current':
@@ -589,9 +370,9 @@ var Calender = /*#__PURE__*/function (_Component) {
   }, {
     key: "getWeeks",
     value: function getWeeks() {
-      var _this$props8 = this.props,
-          weekOffset = _this$props8.weekOffset,
-          localeDatas = _this$props8.localeDatas;
+      var _this$props4 = this.props,
+          weekOffset = _this$props4.weekOffset,
+          localeDatas = _this$props4.localeDatas;
       var week = localeDatas.datePicker.week;
       return week.slice(weekOffset).concat(week.slice(0, weekOffset));
     }
@@ -609,22 +390,11 @@ var Calender = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this2 = this;
 
-      var _this$props9 = this.props,
-          type = _this$props9.type,
-          data = _this$props9.data;
-      var _this$state = this.state,
-          show = _this$state.show,
-          holidayFullName = _this$state.holidayFullName;
+      var _this$props5 = this.props,
+          type = _this$props5.type,
+          data = _this$props5.data;
       var rows = data || this.getRows();
-      return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_reactTransitionGroup.CSSTransition, {
-        "in": show,
-        timeout: 300,
-        classNames: "hi-datepicker__indiaHoli"
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "hi-datepicker__indiaHoli"
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "hi-datepicker__indiaHoli-text"
-      }, holidayFullName))), /*#__PURE__*/_react["default"].createElement("table", {
+      return /*#__PURE__*/_react["default"].createElement("table", {
         className: "hi-datepicker__calender",
         onClick: this.handlerClick.bind(this),
         onMouseMove: this.handlerMouseMove.bind(this)
@@ -641,21 +411,19 @@ var Calender = /*#__PURE__*/function (_Component) {
           return /*#__PURE__*/_react["default"].createElement("td", {
             key: _index,
             value: cell.value,
-            className: _this2.getTDClass(cell, _index)
-          }, /*#__PURE__*/_react["default"].createElement("div", {
-            className: "hi-datepicker__content__wrap",
-            value: cell.value
+            className: _this2.getTDClass(cell)
           }, /*#__PURE__*/_react["default"].createElement("div", {
             className: "hi-datepicker__content",
             value: cell.value
           }, /*#__PURE__*/_react["default"].createElement("span", {
             value: cell.value,
             className: "hi-datepicker__text"
-          }, cell.text || cell.value)), (0, _util.showLargeCalendar)(_this2.props) && _this2.altCalendar(cell)));
+          }, cell.text || cell.value)));
         }));
-      }))));
+      })));
     }
   }]);
+
   return Calender;
 }(_react.Component);