@seafile/seafile-calendar 0.0.30-beta.5 → 0.0.31-APloi0.1

package/lib/Calendar.js

@@ -108,7 +108,8 @@ var Calendar = function (_React$Component) {
     _this.state = {
       mode: _this.props.mode || 'date',
       value: getMomentObjectIfValid(props.value) || getMomentObjectIfValid(props.defaultValue) || (0, _dayjs2['default'])(),
-      selectedValue: props.selectedValue || props.defaultSelectedValue
+      selectedValue: props.selectedValue || props.defaultSelectedValue,
+      currentStatus: 0
     };
     return _this;
   }
@@ -153,10 +154,12 @@ var Calendar = function (_React$Component) {
         inputMode = props.inputMode,
         showHourAndMinute = props.showHourAndMinute,
         firstDayOfWeek = props.firstDayOfWeek,
-        showWeekNumber = props.showWeekNumber;
+        showWeekNumber = props.showWeekNumber,
+        shouldDisplayCurrent = props.shouldDisplayCurrent;
     var value = state.value,
         selectedValue = state.selectedValue,
-        mode = state.mode;
+        mode = state.mode,
+        currentStatus = state.currentStatus;
 
     var showTimePicker = mode === 'time';
     var disabledTimeConfig = showTimePicker && disabledTime && timePicker ? (0, _util.getTimeConfig)(selectedValue, disabledTime) : null;
@@ -189,6 +192,7 @@ var Calendar = function (_React$Component) {
       locale: locale,
       placeholder: calendarInputPlaceholder,
       showClear: true,
+      shouldDisplayCurrent: shouldDisplayCurrent,
       disabledTime: disabledTime,
       disabledDate: disabledDate,
       onClear: this.onClear,
@@ -248,7 +252,8 @@ var Calendar = function (_React$Component) {
               onSelect: this.onDateTableSelect,
               disabledDate: disabledDate,
               showWeekNumber: showWeekNumber,
-              firstDayOfWeek: firstDayOfWeek
+              firstDayOfWeek: firstDayOfWeek,
+              currentStatus: currentStatus
             })
           ),
           _react2['default'].createElement(_CalendarFooter2['default'], {
@@ -328,7 +333,8 @@ Calendar.propTypes = (0, _extends3['default'])({}, _CalendarMixin.calendarMixinP
   inputMode: _propTypes2['default'].string,
   onBlur: _propTypes2['default'].func,
   onClickRightPanelTime: _propTypes2['default'].func,
-  firstDayOfWeek: _propTypes2['default'].string
+  firstDayOfWeek: _propTypes2['default'].string,
+  shouldDisplayCurrent: _propTypes2['default'].bool
 });
 Calendar.defaultProps = (0, _extends3['default'])({}, _CalendarMixin.calendarMixinDefaultProps, _CommonMixin.defaultProp, {
   showToday: true,
@@ -423,6 +429,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onClear = function () {
     _this2.onSelect(null);
     _this2.props.onClear();
+    _this2.setState({ currentStatus: 1 });
   };
 
   this.onOk = function () {
@@ -449,6 +456,7 @@ var _initialiseProps = function _initialiseProps() {
     var timePicker = _this2.props.timePicker;
     var selectedValue = _this2.state.selectedValue;
 
+    _this2.setState({ currentStatus: 0 });
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {

package/lib/Picker.js

@@ -232,6 +232,7 @@ var _initialiseProps = function _initialiseProps() {
       ref: _this2.saveCalendarRef,
       defaultValue: defaultValue || calendarProps.defaultValue,
       selectedValue: value,
+      shouldDisplayCurrent: calendarProps.shouldDisplayCurrent,
       onKeyDown: _this2.onCalendarKeyDown,
       onOk: (0, _createChainedFunction2['default'])(calendarProps.onOk, _this2.onCalendarOk),
       onSelect: (0, _createChainedFunction2['default'])(calendarProps.onSelect, _this2.onCalendarSelect),

package/lib/date/DateInput.js

@@ -151,7 +151,8 @@ DateInput.propTypes = {
   onSelect: _propTypes2['default'].func,
   selectedValue: _propTypes2['default'].object,
   clearIcon: _propTypes2['default'].node,
-  inputMode: _propTypes2['default'].string
+  inputMode: _propTypes2['default'].string,
+  shouldDisplayCurrent: _propTypes2['default'].bool
 };
 
 var _initialiseProps = function _initialiseProps() {
@@ -169,13 +170,17 @@ var _initialiseProps = function _initialiseProps() {
         disabledDate = _props.disabledDate,
         format = _props.format,
         onChange = _props.onChange,
-        selectedValue = _props.selectedValue;
-
+        selectedValue = _props.selectedValue,
+        shouldDisplayCurrent = _props.shouldDisplayCurrent;
     // 没有内容，合法并直接退出
 
-    if (!calendarStr) {
-      onChange(null);
-      _this2.setState({ str: '' });
+    if (!str || !calendarStr) {
+      if (shouldDisplayCurrent) {
+        _this2.setState({ str: '' });
+        onChange((0, _dayjs2['default'])());
+      } else {
+        _this2.onClear();
+      }
       return;
     }
     var parsed = (0, _dayjs2['default'])(calendarStr, format[0]);

package/lib/date/DateTBody.js

@@ -32,6 +32,10 @@ var _DateConstants2 = _interopRequireDefault(_DateConstants);
 
 var _util = require('../util/');
 
+var _dayjs = require('dayjs');
+
+var _dayjs2 = _interopRequireDefault(_dayjs);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var DATE_ROW_COLUMN_COUNT = _DateConstants2['default'].DATE_ROW_COLUMN_COUNT,
@@ -78,7 +82,8 @@ var DateTBody = function (_React$Component) {
         dateRender = props.dateRender,
         disabledDate = props.disabledDate,
         hoverValue = props.hoverValue,
-        firstDayOfWeek = props.firstDayOfWeek;
+        firstDayOfWeek = props.firstDayOfWeek,
+        currentStatus = props.currentStatus;
 
     var iIndex = void 0;
     var jIndex = void 0;
@@ -146,7 +151,11 @@ var DateTBody = function (_React$Component) {
       for (jIndex = 0; jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT; jIndex++) {
         var next = null;
         var last = null;
-        current = dateTable[passed];
+        if (currentStatus === 1) {
+          current = dateTable[passed].hour((0, _dayjs2['default'])().hour()).minute((0, _dayjs2['default'])().minute()).second((0, _dayjs2['default'])().second()); // eslint-disable-line max-len
+        } else {
+          current = dateTable[passed];
+        }
         if (jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT - 1) {
           next = dateTable[passed + 1];
         }
@@ -298,7 +307,8 @@ DateTBody.propTypes = {
   value: _propTypes2['default'].object,
   hoverValue: _propTypes2['default'].any,
   showWeekNumber: _propTypes2['default'].bool,
-  firstDayOfWeek: _propTypes2['default'].string
+  firstDayOfWeek: _propTypes2['default'].string,
+  currentStatus: _propTypes2['default'].number
 };
 DateTBody.defaultProps = {
   hoverValue: []

package/lib/util/index.js

@@ -513,7 +513,7 @@ function initializeStr(str, format) {
       return '' + _day10 + dateDelimater + _month10 + dateDelimater + _year10;
     } else if (inputStrLength >= 1 && inputStrLength <= 8) {
       var _dateStr6 = inputStr.slice(0, 2);
-      var _monthStr6 = inputStr.slice(2, 4);
+      var _monthStr6 = inputStr.slice(2, 4) || getCurrentMonth();
       var _yearStr6 = inputStr.slice(4, inputStr.length);
       var _validateYear11 = validateCalendarYear(_yearStr6);
 
@@ -557,7 +557,7 @@ function initializeStr(str, format) {
       return '' + _day12 + dateDelimater + _month12 + dateDelimater + _year12 + ' ' + time;
     } else if (_datePart2.length >= 1 && _datePart2.length <= 8) {
       var _dateStr7 = _datePart2.slice(0, 2);
-      var _monthStr7 = _datePart2.slice(2, 4);
+      var _monthStr7 = _datePart2.slice(2, 4) || getCurrentMonth();
       var _yearStr7 = _datePart2.slice(4, _datePart2.length);
       var _timeParts2 = tokenizeFormattedDate(inputStr, format);
       time = validateTime(_timeParts2[1] + ':' + _timeParts2[2]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-calendar",
-  "version": "0.0.30-beta.5",
+  "version": "0.0.31APloi0.1",
   "description": "React Calendar",
   "keywords": [
     "react",