@titaui/pc 1.16.42 → 1.16.43-beta.10

package/lib/components/communication/index.js

@@ -228,18 +228,62 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       isShowAllCommunicationRecord ? _this.getFeedInfo(feedId, communicationTrackTotal) : _this.getFeedInfo(feedId, commentCount);
     };
 
-    _this.handlerReply = function (submitType, sentData) {
+    _this.customSubmitCallback = function (res) {
+      var _this$state3 = _this.state,
+          communicationTrackList = _this$state3.communicationTrackList,
+          isShowAllCommunicationRecord = _this$state3.isShowAllCommunicationRecord,
+          communicationTrackTotal = _this$state3.communicationTrackTotal;
       var _this$props4 = _this.props,
           feedId = _this$props4.feedId,
-          commentCount = _this$props4.commentCount,
-          commentType = _this$props4.commentType,
-          okrFeedParams = _this$props4.okrFeedParams,
-          onReplyChange = _this$props4.onReplyChange;
-      var _this$state3 = _this.state,
-          isShowReplyToUser = _this$state3.isShowReplyToUser,
-          replyUserCommentId = _this$state3.replyUserCommentId,
-          communicationTrackTotal = _this$state3.communicationTrackTotal,
-          isShowAllCommunicationRecord = _this$state3.isShowAllCommunicationRecord;
+          commentCount = _this$props4.commentCount;
+
+      if (res.Code === 1) {
+        _this.setState({
+          submitStatus: 1,
+          isShowReplyToUser: false,
+          isShowDefaultInput: true
+        });
+
+        if (!feedId) {
+          _this.setState({
+            communicationTrackList: [].concat(_toConsumableArray(communicationTrackList), [res.Data])
+          });
+
+          return;
+        }
+
+        if (isShowAllCommunicationRecord) _this.getFeedInfo(feedId, communicationTrackTotal + 1);else _this.getFeedInfo(feedId, commentCount);
+      } else {
+        _this.setState({
+          submitStatus: 0
+        });
+      }
+    };
+
+    _this.handlerReply = function (submitType, sentData) {
+      var _this$state4 = _this.state,
+          isShowReplyToUser = _this$state4.isShowReplyToUser,
+          replyUserCommentId = _this$state4.replyUserCommentId,
+          communicationTrackTotal = _this$state4.communicationTrackTotal,
+          isShowAllCommunicationRecord = _this$state4.isShowAllCommunicationRecord;
+      var _this$props5 = _this.props,
+          feedId = _this$props5.feedId,
+          commentCount = _this$props5.commentCount,
+          commentType = _this$props5.commentType,
+          okrFeedParams = _this$props5.okrFeedParams,
+          onReplyChange = _this$props5.onReplyChange,
+          customSubmitHandlerSync = _this$props5.customSubmitHandlerSync,
+          customSubmitHandler = _this$props5.customSubmitHandler;
+
+      if (submitType === 'submit' && customSubmitHandlerSync) {
+        customSubmitHandlerSync(sentData).then(_this.customSubmitCallback);
+        return;
+      }
+
+      if (submitType === 'submit' && customSubmitHandler) {
+        customSubmitHandler(sentData, _this.customSubmitCallback);
+        return;
+      }
 
       if (submitType === 'submit') {
         // 发送
@@ -333,11 +377,11 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
   _createClass(Communication, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props5 = this.props,
-          feedId = _this$props5.feedId,
-          commentCount = _this$props5.commentCount,
-          commentType = _this$props5.commentType,
-          usePropsComment = _this$props5.usePropsComment;
+      var _this$props6 = this.props,
+          feedId = _this$props6.feedId,
+          commentCount = _this$props6.commentCount,
+          commentType = _this$props6.commentType,
+          usePropsComment = _this$props6.usePropsComment;
 
       if ((feedId || commentType === 2) && !usePropsComment) {
         this.getFeedInfo(feedId, commentCount);
@@ -347,9 +391,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
       if (prevProps.feedId !== this.props.feedId || prevProps.okrFeedParams !== this.props.okrFeedParams || prevProps.usePropsComment !== this.props.usePropsComment) {
-        var _this$props6 = this.props,
-            feedId = _this$props6.feedId,
-            commentCount = _this$props6.commentCount;
+        var _this$props7 = this.props,
+            feedId = _this$props7.feedId,
+            commentCount = _this$props7.commentCount;
         this.getFeedInfo(feedId, commentCount);
       }
     }
@@ -365,42 +409,42 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var _this$state4 = this.state,
-          communicationTrackList = _this$state4.communicationTrackList,
-          communicationTrackTotal = _this$state4.communicationTrackTotal,
-          isShowAllCommunicationRecord = _this$state4.isShowAllCommunicationRecord,
-          replyUser = _this$state4.replyUser,
-          replyUserId = _this$state4.replyUserId,
-          isShowReplyToUser = _this$state4.isShowReplyToUser,
-          submitStatus = _this$state4.submitStatus,
-          isShowPraiseRecordPop = _this$state4.isShowPraiseRecordPop,
-          praiseObjId = _this$state4.praiseObjId,
-          isShowDefaultInput = _this$state4.isShowDefaultInput,
-          needAutoFocus = _this$state4.needAutoFocus;
-      var _this$props7 = this.props,
-          feedId = _this$props7.feedId,
-          className = _this$props7.className,
-          isShowSendSms = _this$props7.isShowSendSms,
-          confirmPopAlign = _this$props7.confirmPopAlign,
-          setTextareaRef = _this$props7.setTextareaRef,
-          userSelectorPopAlign = _this$props7.userSelectorPopAlign,
-          emotionsSelectorPopAlign = _this$props7.emotionsSelectorPopAlign,
-          showAtAll = _this$props7.showAtAll,
-          atAllTipText = _this$props7.atAllTipText,
-          atAllValue = _this$props7.atAllValue,
-          atAllText = _this$props7.atAllText,
-          commentCount = _this$props7.commentCount,
-          useCustomMblog = _this$props7.useCustomMblog,
-          _this$props7$submitTe = _this$props7.submitText,
-          submitText = _this$props7$submitTe === void 0 ? (0, _getLocale.getLocale)('Mod_Reply') : _this$props7$submitTe,
-          _this$props7$highLigh = _this$props7.highLightKeyWord,
-          highLightKeyWord = _this$props7$highLigh === void 0 ? '' : _this$props7$highLigh,
-          _this$props7$autoFocu = _this$props7.autoFocus,
-          autoFocus = _this$props7$autoFocu === void 0 ? false : _this$props7$autoFocu,
-          _this$props7$showUser = _this$props7.showUser,
-          showUser = _this$props7$showUser === void 0 ? false : _this$props7$showUser,
-          _this$props7$attachem = _this$props7.attachemntCanSubmit,
-          attachemntCanSubmit = _this$props7$attachem === void 0 ? true : _this$props7$attachem;
+      var _this$state5 = this.state,
+          communicationTrackList = _this$state5.communicationTrackList,
+          communicationTrackTotal = _this$state5.communicationTrackTotal,
+          isShowAllCommunicationRecord = _this$state5.isShowAllCommunicationRecord,
+          replyUser = _this$state5.replyUser,
+          replyUserId = _this$state5.replyUserId,
+          isShowReplyToUser = _this$state5.isShowReplyToUser,
+          submitStatus = _this$state5.submitStatus,
+          isShowPraiseRecordPop = _this$state5.isShowPraiseRecordPop,
+          praiseObjId = _this$state5.praiseObjId,
+          isShowDefaultInput = _this$state5.isShowDefaultInput,
+          needAutoFocus = _this$state5.needAutoFocus;
+      var _this$props8 = this.props,
+          feedId = _this$props8.feedId,
+          className = _this$props8.className,
+          isShowSendSms = _this$props8.isShowSendSms,
+          confirmPopAlign = _this$props8.confirmPopAlign,
+          setTextareaRef = _this$props8.setTextareaRef,
+          userSelectorPopAlign = _this$props8.userSelectorPopAlign,
+          emotionsSelectorPopAlign = _this$props8.emotionsSelectorPopAlign,
+          showAtAll = _this$props8.showAtAll,
+          atAllTipText = _this$props8.atAllTipText,
+          atAllValue = _this$props8.atAllValue,
+          atAllText = _this$props8.atAllText,
+          commentCount = _this$props8.commentCount,
+          useCustomMblog = _this$props8.useCustomMblog,
+          _this$props8$submitTe = _this$props8.submitText,
+          submitText = _this$props8$submitTe === void 0 ? (0, _getLocale.getLocale)('Mod_Reply') : _this$props8$submitTe,
+          _this$props8$highLigh = _this$props8.highLightKeyWord,
+          highLightKeyWord = _this$props8$highLigh === void 0 ? '' : _this$props8$highLigh,
+          _this$props8$autoFocu = _this$props8.autoFocus,
+          autoFocus = _this$props8$autoFocu === void 0 ? false : _this$props8$autoFocu,
+          _this$props8$showUser = _this$props8.showUser,
+          showUser = _this$props8$showUser === void 0 ? false : _this$props8$showUser,
+          _this$props8$attachem = _this$props8.attachemntCanSubmit,
+          attachemntCanSubmit = _this$props8$attachem === void 0 ? true : _this$props8$attachem;
       var user = (0, _bsGlobal.getUserInfo)();
       return /*#__PURE__*/_react["default"].createElement(_style.CommunicationWrapper, {
         className: "communcation-wrapper ".concat(className)

package/lib/components/date-picker/BodyItem.js

@@ -47,7 +47,7 @@ var BodyItem = /*#__PURE__*/function (_Component) {
   var _super = _createSuper(BodyItem);
 
   function BodyItem() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, BodyItem);
 
@@ -55,7 +55,7 @@ var BodyItem = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.getClass = function () {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.getClass = function () {
       var _this$props = _this.props,
           isAllowSelect = _this$props.isAllowSelect,
           date = _this$props.date,
@@ -86,7 +86,7 @@ var BodyItem = /*#__PURE__*/function (_Component) {
       if (_this.disabled) return;
 
       _this.props.onSelectDate((0, _moment["default"])(date.format("YYYY/MM/DD")));
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(BodyItem, [{

package/lib/components/date-picker/CalendarHeader.js

@@ -87,7 +87,7 @@ var CalendarHeader = /*#__PURE__*/function (_Component) {
   var _super = _createSuper(CalendarHeader);
 
   function CalendarHeader() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, CalendarHeader);
 
@@ -95,7 +95,7 @@ var CalendarHeader = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.setDate = function (func) {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.setDate = function (func) {
       var date = (0, _moment["default"])(_this.props.date);
 
       for (var _len2 = arguments.length, rest = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
@@ -113,7 +113,7 @@ var CalendarHeader = /*#__PURE__*/function (_Component) {
       }
 
       return years;
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(CalendarHeader, [{

package/lib/components/delete-confirm-pop/ConfirmPop.js

@@ -49,7 +49,7 @@ var ConfirmPop = /*#__PURE__*/function (_PureComponent) {
   var _super = _createSuper(ConfirmPop);
 
   function ConfirmPop() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, ConfirmPop);
 
@@ -57,13 +57,13 @@ var ConfirmPop = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.handleShowPop = function () {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.handleShowPop = function () {
       // @ts-ignore
       _this.refs.pop.show(_this.refs.trigger);
     }, _this.handleHide = function () {
       // @ts-ignore
       _this.refs.pop.hide();
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(ConfirmPop, [{

package/lib/components/eReport/eReportLists/reportList.js

@@ -55,7 +55,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
   var _super = _createSuper(EReportList);
 
   function EReportList() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, EReportList);
 
@@ -63,7 +63,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.state = {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.state = {
       selectedPeriodValue: '',
       showDatePick: false,
       eReportWeekList: [],
@@ -178,7 +178,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
           return _this.handlerEReportShareSubmit(submitStatus);
         }
       })));
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(EReportList, [{

package/lib/components/emotions-selector/selector-pop.js

@@ -47,7 +47,7 @@ var EmotionsSelectorPop = /*#__PURE__*/function (_PureComponent) {
   var _super = _createSuper(EmotionsSelectorPop);
 
   function EmotionsSelectorPop() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, EmotionsSelectorPop);
 
@@ -55,7 +55,7 @@ var EmotionsSelectorPop = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.handleShowPop = function () {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.handleShowPop = function () {
       setTimeout(function () {
         // @ts-ignore
         _this.refs.pop.show(_this.refs.trigger);
@@ -63,7 +63,7 @@ var EmotionsSelectorPop = /*#__PURE__*/function (_PureComponent) {
     }, _this.handleHide = function () {
       // @ts-ignore
       _this.refs.pop.hide();
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(EmotionsSelectorPop, [{

package/lib/components/ereport-list/index.js

@@ -57,7 +57,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
   var _super = _createSuper(EReportList);
 
   function EReportList() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, EReportList);
 
@@ -65,7 +65,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.state = {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.state = {
       selectedPeriodValue: "",
       showDatePick: false,
       eReportWeekList: [],
@@ -178,7 +178,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
           return _this.handlerEReportShareSubmit(submitStatus);
         }
       })));
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(EReportList, [{

package/lib/components/mblog/components/MblogAction.js

@@ -83,7 +83,7 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
   var _super = _createSuper(MblogAction);
 
   function MblogAction() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, MblogAction);
 
@@ -91,7 +91,7 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.state = {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.state = {
       isSendSms: false,
       // 是否短信通知
       isShowConfirmPop: false
@@ -121,7 +121,7 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
           isSendSms: false
         });
       }
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(MblogAction, [{

package/lib/components/mblog/components/MblogContent.js

@@ -217,6 +217,8 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
         editable: true,
         showToolbar: false,
         withMentions: true,
+        onKeyUp: this._handlerKeyUp,
+        onKeyDown: this._handlerKeyDown,
         initialState: {},
         onDocChange: this.onChangeEditor,
         placeholder: placeholderText

package/lib/components/mblog/index.js

@@ -224,7 +224,9 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           visibility = _this$state.visibility,
           mentionUsers = _this$state.mentionUsers,
           richText = _this$state.richText,
-          pureText = _this$state.pureText;
+          pureText = _this$state.pureText,
+          isAllowSubmit = _this$state.isAllowSubmit;
+      if (!isAllowSubmit) return;
       var _this$props2 = _this.props,
           isShowAttachment = _this$props2.isShowAttachment,
           isShowSendSms = _this$props2.isShowSendSms,

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/kr-score-editor/edit-pop.js

@@ -81,7 +81,7 @@ var EditPop = /*#__PURE__*/function (_PureComponent) {
   var _super = _createSuper(EditPop);
 
   function EditPop() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, EditPop);
 
@@ -89,7 +89,7 @@ var EditPop = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.state = {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.state = {
       value: _this.props.value,
       showError: false,
       errMsg: "",
@@ -152,7 +152,7 @@ var EditPop = /*#__PURE__*/function (_PureComponent) {
         errMsg: (0, _i18nFrontTranslate.inputWordTrans)(value.length, maxLength),
         disable: !!(maxLength && value.length > maxLength && disable)
       });
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(EditPop, [{

package/lib/components/okr-review/components/confirm-pop/ConfirmPop.js

@@ -49,7 +49,7 @@ var ConfirmPop = /*#__PURE__*/function (_PureComponent) {
   var _super = _createSuper(ConfirmPop);
 
   function ConfirmPop() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, ConfirmPop);
 
@@ -57,13 +57,13 @@ var ConfirmPop = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.handleShowPop = function () {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.handleShowPop = function () {
       // @ts-ignore
       _this.refs.pop.show(_this.refs.trigger);
     }, _this.handleHide = function () {
       // @ts-ignore
       _this.refs.pop.hide();
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(ConfirmPop, [{

package/lib/components/picker/components/panels/date-panel/date-body.js

@@ -1,130 +1,56 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 var _getLocale = require("../../../../../utils/getLocale");
 
 var _utils = require("../../../utils");
 
-var _context = _interopRequireDefault(require("../../../context"));
+var _dateRows = _interopRequireDefault(require("./date-rows"));
 
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-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 _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 _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; }
-
-// const ROWS_HEIGHT = 32;
-var DATE_ROW_NUM = 6;
+var getWeekDayData = function getWeekDayData() {
+  return [(0, _getLocale.getLocale)('Mod_Sun'), (0, _getLocale.getLocale)('Mod_Mon'), (0, _getLocale.getLocale)('Mod_Tues'), (0, _getLocale.getLocale)('Mod_Wed'), (0, _getLocale.getLocale)('Mod_Thur'), (0, _getLocale.getLocale)('Mod_Fri'), (0, _getLocale.getLocale)('Mod_Sat')];
+};
 
 var DatePanelBody = function DatePanelBody(props) {
-  var viewDate = props.viewDate,
+  var mergeDate = props.mergeDate,
+      onSelect = props.onSelect,
+      setMergeDate = props.setMergeDate,
       _props$weekStartDay = props.weekStartDay,
-      weekStartDay = _props$weekStartDay === void 0 ? 'SUNDAY' : _props$weekStartDay,
-      onSelect = props.onSelect;
-
-  var _useContext = (0, _react.useContext)(_context["default"]),
-      format = _useContext.format,
-      value = _useContext.value;
-
+      weekStartDay = _props$weekStartDay === void 0 ? 'SUNDAY' : _props$weekStartDay;
   var weekStartDaySun = weekStartDay === 'SUNDAY';
-
-  var getCells = function getCells(sunday, currentMonth) {
-    var dates = [];
-
-    var _loop = function _loop(day) {
-      var _classNames;
-
-      var date = (0, _moment["default"])(sunday).add(day, 'd');
-
-      var _isCurrentDateInRange = (0, _utils.isCurrentDateInRanges)({
-        nowDate: date,
-        values: value
-      }),
-          inRanges = _isCurrentDateInRange.inRanges,
-          rangeStart = _isCurrentDateInRange.rangeStart,
-          rangeEnd = _isCurrentDateInRange.rangeEnd;
-
-      var classes = (0, _classnames["default"])(_utils.PickerCellClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--today"), date.isSame((0, _moment["default"])(), 'date')), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--in-view"), date.format('YYYY/MM') === currentMonth), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--in-ranges"), inRanges), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--in-ranges--start"), rangeStart), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--in-ranges--end"), rangeEnd), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--selected"), value === null || value === void 0 ? void 0 : value.some(function (v) {
-        return date.isSame((0, _moment["default"])(v).format('YYYY/MM/DD'), 'date');
-      })), _classNames));
-      dates.push( /*#__PURE__*/_react["default"].createElement("td", {
-        className: classes,
-        key: date.format('YYYY/MM/DD')
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: (0, _classnames["default"])("".concat(_utils.PickerCellClass, "__inner")),
-        title: date.format('YYYY-MM-DD'),
-        onClick: function onClick() {
-          return onSelect && onSelect(date, 'date');
-        }
-      }, date.date())));
-    };
-
-    for (var day = 0; day < _utils.WEEK_DAYS_COUNT; day += 1) {
-      _loop(day);
-    }
-
-    return dates;
-  };
-
-  var getRows = function getRows(date) {
-    var currentDate = (0, _moment["default"])(date);
-    var monthFirstDay = currentDate.date(1);
-    var currentMonth = monthFirstDay.format('YYYY/MM');
-    var daysDiff = weekStartDaySun ? 0 : 1;
-    var weekStartDay = monthFirstDay.subtract(monthFirstDay.day() - daysDiff, 'days');
-    var rows = [];
-
-    for (var row = 0; row < DATE_ROW_NUM; row += 1) {
-      rows.push( /*#__PURE__*/_react["default"].createElement("tr", {
-        key: row
-      }, getCells(weekStartDay, currentMonth)));
-      weekStartDay = weekStartDay.add(1, 'w');
-    }
-
-    return rows;
-  };
-
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(_utils.PickerBodyClass)
-  }, /*#__PURE__*/_react["default"].createElement("table", {
-    className: (0, _classnames["default"])("".concat(_utils.PickerClass, "-content"))
-  }, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, weekStartDaySun && /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Sun')), /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Mon')), /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Tues')), /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Wed')), /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Thur')), /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Fri')), /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Sat')), weekStartDay !== 'SUNDAY' && /*#__PURE__*/_react["default"].createElement("th", {
-    className: _utils.PickerCellClass
-  }, (0, _getLocale.getLocale)('Mod_Sun')))), /*#__PURE__*/_react["default"].createElement("tbody", null, getRows((0, _moment["default"])(viewDate)))));
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(_utils.PickerBodyClass, "__cell-container"))
+  }, weekStartDaySun && /*#__PURE__*/_react["default"].createElement("div", {
+    className: _utils.PickerCellClass
+  }, (0, _getLocale.getLocale)('Mod_Sun')), getWeekDayData().slice(1).map(function (day) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: _utils.PickerCellClass,
+      key: day
+    }, day);
+  }), !weekStartDaySun && /*#__PURE__*/_react["default"].createElement("div", {
+    className: _utils.PickerCellClass
+  }, (0, _getLocale.getLocale)('Mod_Sun'))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(_utils.PickerBodyClass, "__calendar"))
+  }, /*#__PURE__*/_react["default"].createElement(_dateRows["default"], {
+    mergeDate: mergeDate,
+    onSelect: onSelect,
+    setMergeDate: setMergeDate
+  })));
 };
 
-DatePanelBody.defaultProps = {
-  weekStartDay: 'SUNDAY'
-};
 var _default = DatePanelBody;
 exports["default"] = _default;