@titaui/pc 1.16.56 → 1.16.57

package/lib/components/picker/range-picker/components/shortcuts/index.js

@@ -22,22 +22,65 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 
 var Shortcuts = function Shortcuts(props) {
-  var onSelect = props.onSelect;
+  var onChange = props.onChange;
 
   var _useContext = (0, _react.useContext)(_context.RangePickerContext),
       picker = _useContext.picker;
 
-  var shortcuts = picker && picker === 'week' ? (0, _utils.RangeWeekPickerShortcutsKeysMapping)() : (0, _utils.RangePickerShortcutsKeysMapping)();
+  var shortcutsData = (0, _react.useMemo)(function () {
+    return picker === 'week' ? (0, _utils.RangeWeekPickerShortcutsKeysMapping)() : (0, _utils.RangePickerShortcutsKeysMapping)();
+  }, []);
+
+  var onItemClick = function onItemClick(shortCuts) {
+    var date;
+
+    switch (shortCuts.key) {
+      case _utils.SHORTCUTS.CURRENT_YEAR:
+        date = (0, _utils.getCurrentValues)('year');
+        break;
+
+      case _utils.SHORTCUTS.CURRENT_MONTH:
+        date = (0, _utils.getCurrentValues)('month');
+        break;
+
+      case _utils.SHORTCUTS.CURRENT_WEEKDAY:
+        date = (0, _utils.getCurrentWeekDay)();
+        break;
+
+      case _utils.SHORTCUTS.CURRENT_WEEK:
+        date = (0, _utils.getCurrentValues)('week');
+        break;
+
+      case _utils.SHORTCUTS.PREVIOUS_WEEK:
+        date = (0, _utils.getPreviousValues)('week');
+        break;
+
+      case _utils.SHORTCUTS.NEXT_WEEK:
+        date = (0, _utils.getNextValues)('week');
+        break;
+
+      case _utils.SHORTCUTS.TODAY:
+        date = (0, _utils.getCurrentValues)('date');
+        break;
+
+      default:
+        date = ['', ''];
+        break;
+    }
+
+    onChange(date);
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_utils.PickerRangesClass, "__shortcuts"))
-  }, shortcuts.map(function (shortcuts) {
+  }, shortcutsData.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(_utils.PickerRangesClass, "__shortcuts-item")),
-      key: shortcuts.key,
+      key: item.key,
       onClick: function onClick() {
-        return onSelect(shortcuts);
+        return onItemClick(item);
       }
-    }, shortcuts.title);
+    }, item.title);
   }));
 };
 

package/lib/components/picker/range-picker/index.css

@@ -71,6 +71,9 @@
 .tita-ui__picker-ranges__shortcuts {
   flex: 1;
   padding: 15px 9px 15px 12px;
+  display: grid;
+  grid-template: repeat(8, 28px)/100%;
+  gap: 4px;
   position: relative;
 }
 
@@ -102,7 +105,7 @@
   color: #2879ff;
 }
 
-.tita-ui__picker-ranges__actions {
+.tita-ui__picker-ranges__operations {
   height: 27px;
   padding: 12px 16px;
   border-top: 1px solid #e9ecf0;
@@ -111,44 +114,44 @@
   justify-content: space-between;
 }
 
-.tita-ui__picker-ranges__actions-left, .tita-ui__picker-ranges__actions-right {
+.tita-ui__picker-ranges__operations-left, .tita-ui__picker-ranges__operations-right {
   flex: 1;
   display: flex;
   align-items: center;
 }
 
-.tita-ui__picker-ranges__actions-right {
+.tita-ui__picker-ranges__operations-right {
   justify-content: flex-end;
 }
 
-.tita-ui__picker-ranges__actions-right .tita-button-small {
+.tita-ui__picker-ranges__operations-right .tita-button-small {
   margin-left: 10px;
 }
 
-.tita-ui__picker-ranges__actions .tita-button-default,
-    .tita-ui__picker-ranges__actions .tita-button-primary {
+.tita-ui__picker-ranges__operations .tita-button-default,
+    .tita-ui__picker-ranges__operations .tita-button-primary {
   font-size: 13px;
   border-radius: 14px;
   transition: all 0.3s ease;
 }
 
-.tita-ui__picker-ranges__actions .tita-button-default {
+.tita-ui__picker-ranges__operations .tita-button-default {
   border-color: #dfe3ea;
   color: #6f7886;
 }
 
-.tita-ui__picker-ranges__actions .tita-button-default:hover {
+.tita-ui__picker-ranges__operations .tita-button-default:hover {
   background-color: #ffffff;
   border-color: #2879ff;
   color: #2879ff;
 }
 
-.tita-ui__picker-ranges__actions .titaui-text-btn {
+.tita-ui__picker-ranges__operations .titaui-text-btn {
   transition: color 0.3s ease;
   color: #2879ff;
 }
 
-.tita-ui__picker-ranges__actions .titaui-text-btn:hover {
+.tita-ui__picker-ranges__operations .titaui-text-btn:hover {
   color: #5c8eff;
 }
 

package/lib/components/picker/range-picker/index.js

@@ -15,17 +15,13 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _getLocale = require("../../../utils/getLocale");
 
-var _button = _interopRequireDefault(require("../../button"));
-
 var _popup = _interopRequireDefault(require("../../popup"));
 
 var _context = require("../context");
 
 var _utils = require("../utils");
 
-require("./index.css");
-
-var _shortcuts = _interopRequireDefault(require("./components/shortcuts"));
+var _operations = _interopRequireDefault(require("./components/operations"));
 
 var _placeholder = _interopRequireDefault(require("./components/placeholder"));
 
@@ -33,6 +29,10 @@ var _picker = _interopRequireDefault(require("../picker"));
 
 var _pickerTrigger = _interopRequireDefault(require("./components/picker-trigger"));
 
+var _shortcuts = _interopRequireDefault(require("./components/shortcuts"));
+
+require("./index.css");
+
 var _excluded = ["onChange", "format", "values", "picker", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible", "canEmpty", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -41,7 +41,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -61,12 +61,17 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var RangePicker = function RangePicker(props) {
   var onChange = props.onChange,
-      format = props.format,
-      values = props.values,
-      picker = props.picker,
+      _props$format = props.format,
+      format = _props$format === void 0 ? _utils.PickerFormat : _props$format,
+      _props$values = props.values,
+      values = _props$values === void 0 ? [] : _props$values,
+      _props$picker = props.picker,
+      picker = _props$picker === void 0 ? 'date' : _props$picker,
       children = props.children,
-      popupPlacement = props.popupPlacement,
-      direction = props.direction,
+      _props$popupPlacement = props.popupPlacement,
+      popupPlacement = _props$popupPlacement === void 0 ? 'bottomLeft' : _props$popupPlacement,
+      _props$direction = props.direction,
+      direction = _props$direction === void 0 ? 'ltr' : _props$direction,
       onPopupVisibleChange = props.onPopupVisibleChange,
       _props$visible = props.visible,
       visible = _props$visible === void 0 ? false : _props$visible,
@@ -113,52 +118,28 @@ var RangePicker = function RangePicker(props) {
 
   var onChangeHandler = function onChangeHandler(date) {
     setViewDate(function (prevDate) {
-      return (0, _utils.setPickerDateBySettingType)({
+      var nextDate = (0, _utils.setPickerDateBySettingType)({
         newDate: date[0],
         settingType: settingTypeRef.current,
         values: prevDate
       });
-    });
+      var endDate = nextDate === null || nextDate === void 0 ? void 0 : nextDate[1];
 
-    if (settingTypeRef.current === _utils.RangeSettingTypes.START) {
-      setSettingType(_utils.RangeSettingTypes.END);
-    }
+      if ([_utils.RangeSettingTypes.START, _utils.RangeSettingTypes.RESET].includes( // @ts-ignore
+      settingTypeRef.current) && !endDate) {
+        setSettingType(_utils.RangeSettingTypes.END);
+      } else if (settingTypeRef.current === _utils.RangeSettingTypes.END || !!endDate) {
+        setSettingType(_utils.RangeSettingTypes.RESET);
+      }
 
+      return nextDate;
+    });
     return true;
   };
 
-  var onShortcutsSelect = function onShortcutsSelect(shortCuts) {
-    var newDate;
-
-    switch (shortCuts.key) {
-      case _utils.SHORTCUTS.CURRENT_YEAR:
-        newDate = (0, _utils.getCurrentValues)('year');
-        break;
-
-      case _utils.SHORTCUTS.CURRENT_MONTH:
-        newDate = (0, _utils.getCurrentValues)('month');
-        break;
-
-      case _utils.SHORTCUTS.CURRENT_WEEKDAY:
-        newDate = (0, _utils.getCurrentWeekDay)();
-        break;
-
-      case _utils.SHORTCUTS.CURRENT_WEEK:
-        newDate = (0, _utils.getCurrentValues)('week');
-        break;
-
-      case _utils.SHORTCUTS.PREVIOUS_WEEK:
-        newDate = (0, _utils.getPreviousValues)('week');
-        break;
-
-      case _utils.SHORTCUTS.NEXT_WEEK:
-        newDate = (0, _utils.getNextValues)('week');
-
-      default:
-        break;
-    }
-
-    setViewDate(newDate);
+  var onShortcutsDateChange = function onShortcutsDateChange(date) {
+    setViewDate(date);
+    setSettingType(_utils.RangeSettingTypes.RESET);
   };
 
   var onClearHandler = function onClearHandler() {
@@ -185,24 +166,39 @@ var RangePicker = function RangePicker(props) {
     return setPopupVisible(false);
   };
 
-  var handlePopupVisibleChange = function handlePopupVisibleChange(visible) {
+  var onPopupVisibleChangeHandler = function onPopupVisibleChangeHandler(visible) {
     setPopupVisible(visible);
     onPopupVisibleChange === null || onPopupVisibleChange === void 0 ? void 0 : onPopupVisibleChange(visible);
   };
 
-  (0, _react.useEffect)(function () {
+  var getPickerSettingType = function getPickerSettingType() {
+    var _settingType = _utils.RangeSettingTypes.START;
+
     if (values instanceof Array) {
       var startDate = values[0] || '';
-      setSettingType(!startDate ? _utils.RangeSettingTypes.START : _utils.RangeSettingTypes.END);
-    } else {
-      setSettingType(_utils.RangeSettingTypes.START);
+      var endDate = values[1] || '';
+
+      if (!startDate) {
+        _settingType = _utils.RangeSettingTypes.START;
+      } else if (!endDate) {
+        _settingType = _utils.RangeSettingTypes.END;
+      } else {
+        _settingType = _utils.RangeSettingTypes.RESET;
+      }
     }
+
+    setSettingType(_settingType);
+  };
+
+  (0, _react.useEffect)(function () {
+    getPickerSettingType();
+    setPopupVisible(visible);
   }, [visible]);
   (0, _react.useEffect)(function () {
     settingTypeRef.current = settingType;
   }, [settingType]);
   var popContent = (0, _react.useMemo)(function () {
-    var okBtnDisabled = canEmpty ? viewDate.filter(function (v) {
+    var okBtnDisabled = canEmpty ? viewDate.length === 1 || viewDate.filter(function (v) {
       return !v;
     }).length === 1 : viewDate.filter(function (v) {
       return !!v;
@@ -216,34 +212,22 @@ var RangePicker = function RangePicker(props) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(_utils.PickerRangesClass, "__main"))
     }, /*#__PURE__*/_react["default"].createElement(_shortcuts["default"], {
-      onSelect: onShortcutsSelect
+      onChange: onShortcutsDateChange
     }), /*#__PURE__*/_react["default"].createElement(_picker["default"], _extends({
-      displayMode: "tiled",
-      value: viewDate,
+      onChange: onChangeHandler,
       picker: picker,
       settingType: settingType,
-      onChange: onChangeHandler
-    }, restProps))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_utils.PickerRangesClass, "__actions"))
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_utils.PickerRangesClass, "__actions-left"))
-    }, /*#__PURE__*/_react["default"].createElement(_button["default"].Text, {
-      onClick: onClearHandler,
-      text: (0, _getLocale.getLocale)('Mod_Empty')
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_utils.PickerRangesClass, "__actions-right"))
-    }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      onClick: onClose,
-      size: "small"
-    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      disable: okBtnDisabled,
-      onClick: function onClick() {
-        return !okBtnDisabled && onConfirmHandler();
-      },
-      size: "small",
-      type: "primary"
-    }, (0, _getLocale.getLocale)('Mod_Determiness')))));
-  }, [viewDate, canEmpty]);
+      value: viewDate
+    }, restProps, {
+      displayMode: "tiled",
+      multiple: true
+    }))), /*#__PURE__*/_react["default"].createElement(_operations["default"], {
+      disabled: okBtnDisabled,
+      onCancel: onClose,
+      onClear: onClearHandler,
+      onOk: onConfirmHandler
+    }));
+  }, [canEmpty, settingType, viewDate]);
   return /*#__PURE__*/_react["default"].createElement(_context.RangePickerContext.Provider, {
     value: {
       values: values,
@@ -252,30 +236,18 @@ var RangePicker = function RangePicker(props) {
       settingType: settingType
     }
   }, /*#__PURE__*/_react["default"].createElement(_popup["default"], _extends({
+    destroyPopupOnHide: true,
     extraClass: (0, _classnames["default"])(_utils.PickerDropdownClass),
     popup: popContent,
     popupVisible: popupVisible,
     popupPlacement: getPopupPlacement(),
-    onPopupVisibleChange: handlePopupVisibleChange
+    onPopupVisibleChange: onPopupVisibleChangeHandler
   }, restProps), /*#__PURE__*/_react["default"].createElement(_pickerTrigger["default"], _extends({
     focused: popupVisible,
     placeholder: (0, _getLocale.getLocale)('Rep_NewS_All'),
-    viewDate: values,
-    onClick: function onClick() {
-      return setPopupVisible(true);
-    }
+    viewDate: values
   }, restProps), children)));
 };
 
-RangePicker.defaultProps = {
-  children: null,
-  values: [],
-  picker: 'date',
-  format: 'YYYY/MM/DD',
-  popupStyle: {},
-  popupPlacement: 'bottomLeft',
-  direction: 'ltr',
-  visible: false
-};
 var _default = RangePicker;
 exports["default"] = _default;

package/lib/components/picker/utils.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setPickerDateBySettingType = exports.isCurrentDateInRanges = exports.getPreviousValues = exports.getPickerDateBySettingType = exports.getNextValues = exports.getCurrentWeekDay = exports.getCurrentValues = exports.YEAR_DECADE_COUNT = exports.WEEK_DAYS_COUNT = exports.SHORTCUTS = exports.RangeWeekPickerShortcutsKeysMapping = exports.RangeSettingTypes = exports.RangePickerShortcutsKeysMapping = exports.PickerTriggerClass = exports.PickerRangesClass = exports.PickerRangeTriggerClass = exports.PickerPanelClass = exports.PickerHeadClass = exports.PickerDropdownClass = exports.PickerClass = exports.PickerCellClass = exports.PickerBodyClass = exports.MONTHDATAMAPEN = exports.MONTHDATAMAP = void 0;
+exports.setPickerDateBySettingType = exports.isCurrentDateInRanges = exports.getPreviousValues = exports.getPickerDateBySettingType = exports.getNextValues = exports.getDaysOfMonth = exports.getCurrentWeekDay = exports.getCurrentValues = exports.YEAR_DECADE_COUNT = exports.WEEK_DAYS_COUNT = exports.SHORTCUTS = exports.RangeWeekPickerShortcutsKeysMapping = exports.RangeSettingTypes = exports.RangePickerShortcutsKeysMapping = exports.PickerTriggerClass = exports.PickerRangesClass = exports.PickerRangeTriggerClass = exports.PickerPanelClass = exports.PickerMinDate = exports.PickerMaxDate = exports.PickerHeadClass = exports.PickerFormat = exports.PickerDropdownClass = exports.PickerClass = exports.PickerCellClass = exports.PickerBodyClass = exports.MONTHDATAMAPEN = exports.MONTHDATAMAP = void 0;
+
+var _cloneDeep = _interopRequireDefault(require("clone-deep"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
@@ -37,6 +39,16 @@ var WEEK_DAYS_COUNT = 7;
 exports.WEEK_DAYS_COUNT = WEEK_DAYS_COUNT;
 var YEAR_DECADE_COUNT = 10;
 exports.YEAR_DECADE_COUNT = YEAR_DECADE_COUNT;
+var PickerFormat = 'YYYY/MM/DD';
+exports.PickerFormat = PickerFormat;
+var PickerMaxDate = (0, _moment["default"])().set({
+  year: (0, _moment["default"])().year() + YEAR_DECADE_COUNT,
+  month: 11,
+  date: 31
+}).format(PickerFormat);
+exports.PickerMaxDate = PickerMaxDate;
+var PickerMinDate = '2018/01/01';
+exports.PickerMinDate = PickerMinDate;
 var SHORTCUTS;
 exports.SHORTCUTS = SHORTCUTS;
 
@@ -47,6 +59,7 @@ exports.SHORTCUTS = SHORTCUTS;
   SHORTCUTS["CURRENT_WEEK"] = "currentWeek";
   SHORTCUTS["PREVIOUS_WEEK"] = "prevWeek";
   SHORTCUTS["NEXT_WEEK"] = "nextWeek";
+  SHORTCUTS["TODAY"] = "today";
 })(SHORTCUTS || (exports.SHORTCUTS = SHORTCUTS = {}));
 
 var getCurrentValues = function getCurrentValues(symbol) {
@@ -76,20 +89,24 @@ var RangeSettingTypes;
 exports.RangeSettingTypes = RangeSettingTypes;
 
 (function (RangeSettingTypes) {
-  RangeSettingTypes["START"] = "startDate";
   RangeSettingTypes["END"] = "endDate";
+  RangeSettingTypes["RESET"] = "reset";
+  RangeSettingTypes["START"] = "startDate";
 })(RangeSettingTypes || (exports.RangeSettingTypes = RangeSettingTypes = {}));
 
 var RangePickerShortcutsKeysMapping = function RangePickerShortcutsKeysMapping() {
   return [{
-    key: SHORTCUTS.CURRENT_YEAR,
-    title: (0, _getLocale.getLocale)('Feed_Tab_Title_Thisyear')
+    key: SHORTCUTS.TODAY,
+    title: (0, _getLocale.getLocale)('Mod_Today')
+  }, {
+    key: SHORTCUTS.CURRENT_WEEKDAY,
+    title: (0, _getLocale.getLocale)('Feed_Tab_Title_Thisweek')
   }, {
     key: SHORTCUTS.CURRENT_MONTH,
     title: (0, _getLocale.getLocale)('Feed_Tab_Title_Thismonth')
   }, {
-    key: SHORTCUTS.CURRENT_WEEKDAY,
-    title: (0, _getLocale.getLocale)('Feed_Tab_Title_Thisweek')
+    key: SHORTCUTS.CURRENT_YEAR,
+    title: (0, _getLocale.getLocale)('Feed_Tab_Title_Thisyear')
   }];
 };
 
@@ -114,7 +131,7 @@ var getPickerDateBySettingType = function getPickerDateBySettingType(params) {
   var _params$defaultValue = params.defaultValue,
       defaultValue = _params$defaultValue === void 0 ? (0, _moment["default"])() : _params$defaultValue,
       _params$format = params.format,
-      format = _params$format === void 0 ? 'YYYY/MM/DD' : _params$format,
+      format = _params$format === void 0 ? PickerFormat : _params$format,
       settingType = params.settingType,
       values = params.values;
 
@@ -136,16 +153,20 @@ var setPickerDateBySettingType = function setPickerDateBySettingType(params) {
       values = params.values;
 
   if (values instanceof Array && settingType) {
-    var valuesClone = JSON.parse(JSON.stringify(values));
-    var isSettingStart = settingType === RangeSettingTypes.START;
-    var updateIndex = isSettingStart ? 0 : 1;
+    var valuesClone = (0, _cloneDeep["default"])(values);
+    var isSettingStartDate = settingType === RangeSettingTypes.START;
+    var isResetRangeDate = settingType === RangeSettingTypes.RESET;
+    if (isResetRangeDate) return [(0, _moment["default"])(newDate)];
+    var updateIndex = isSettingStartDate ? 0 : 1;
     valuesClone.splice(updateIndex, 1, (0, _moment["default"])(newDate));
 
-    if (isSettingStart && (0, _moment["default"])(newDate, 'YYYY/MM/DD').isAfter((0, _moment["default"])(valuesClone[1]).format('YYYY/MM/DD'), 'date')) {
+    if (isSettingStartDate && (0, _moment["default"])(newDate, PickerFormat).isAfter((0, _moment["default"])(valuesClone[1]).format(PickerFormat), 'date')) {
+      valuesClone[0] = valuesClone[1];
       valuesClone[1] = (0, _moment["default"])(newDate);
     }
 
-    if (!isSettingStart && (0, _moment["default"])(newDate, 'YYYY/MM/DD').isBefore((0, _moment["default"])(valuesClone[0]).format('YYYY/MM/DD'), 'date')) {
+    if (!isSettingStartDate && (0, _moment["default"])(newDate, PickerFormat).isBefore((0, _moment["default"])(valuesClone[0]).format(PickerFormat), 'date')) {
+      valuesClone[1] = valuesClone[0];
       valuesClone[0] = (0, _moment["default"])(newDate);
     }
 
@@ -159,7 +180,7 @@ exports.setPickerDateBySettingType = setPickerDateBySettingType;
 
 var isCurrentDateInRanges = function isCurrentDateInRanges(params) {
   var _params$format2 = params.format,
-      format = _params$format2 === void 0 ? 'YYYY/MM/DD' : _params$format2,
+      format = _params$format2 === void 0 ? PickerFormat : _params$format2,
       nowDate = params.nowDate,
       values = params.values;
   var date = typeof nowDate === 'string' ? nowDate : nowDate.format(format);
@@ -187,6 +208,34 @@ var isCurrentDateInRanges = function isCurrentDateInRanges(params) {
   }
 
   return data;
+}; //获取某年某月有多少天
+
+
+exports.isCurrentDateInRanges = isCurrentDateInRanges;
+
+var getDaysOfMonth = function getDaysOfMonth(year, month) {
+  switch (month) {
+    case 1:
+    case 3:
+    case 5:
+    case 7:
+    case 8:
+    case 10:
+    case 12:
+      return 31;
+
+    case 4:
+    case 6:
+    case 9:
+    case 11:
+      return 30;
+
+    case 2:
+      return year % 4 == 0 && year % 100 != 0 || year % 400 == 0 ? 29 : 28;
+
+    default:
+      return 0;
+  }
 };
 
-exports.isCurrentDateInRanges = isCurrentDateInRanges;
+exports.getDaysOfMonth = getDaysOfMonth;

package/lib/components/point-demo/drop-down-box/index.js

@@ -21,7 +21,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 

package/lib/components/point-demo/input/index.js

@@ -15,7 +15,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -25,7 +25,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 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 } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+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); }; }
 
@@ -35,7 +35,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 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 _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var InputForm = /*#__PURE__*/function (_Component) {
   _inherits(InputForm, _Component);

package/lib/components/point-demo/popup/index.js

@@ -25,7 +25,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 

package/lib/components/popup/index.js

@@ -25,7 +25,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 

package/lib/components/popup-select/index.js

@@ -23,7 +23,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 

package/lib/components/praise-record/PraiseRecordItem.js

@@ -29,7 +29,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 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 } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+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); }; }
 
@@ -39,7 +39,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 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 _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var PraiseRecordItem = /*#__PURE__*/function (_PureComponent) {
   _inherits(PraiseRecordItem, _PureComponent);