@seafile/seafile-calendar 0.0.31 → 0.0.32-alpha.jh2

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: 'selectDateTime'
     };
     return _this;
   }
@@ -156,7 +157,8 @@ var Calendar = function (_React$Component) {
         showWeekNumber = props.showWeekNumber;
     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;
@@ -181,9 +183,10 @@ var Calendar = function (_React$Component) {
       timePickerEle = _react2['default'].cloneElement(timePicker, timePickerProps);
     }
     var calendarInputPlaceholder = dateInputPlaceholder || (Array.isArray(this.getFormat()) ? this.getFormat()[0] : this.getFormat());
+    var inputFormat = Array.isArray(this.getFormat()) ? this.getFormat() : [this.getFormat()];
 
     var dateInputElement = props.showDateInput ? _react2['default'].createElement(_DateInput2['default'], {
-      format: this.getFormat(),
+      format: inputFormat,
       key: 'date-input',
       value: value,
       locale: locale,
@@ -248,7 +251,8 @@ var Calendar = function (_React$Component) {
               onSelect: this.onDateTableSelect,
               disabledDate: disabledDate,
               showWeekNumber: showWeekNumber,
-              firstDayOfWeek: firstDayOfWeek
+              firstDayOfWeek: firstDayOfWeek,
+              currentStatus: currentStatus
             })
           ),
           _react2['default'].createElement(_CalendarFooter2['default'], {
@@ -280,7 +284,7 @@ var Calendar = function (_React$Component) {
           onSelect: this.onDateTableSelect,
           onClickRightPanelTime: onClickRightPanelTime,
           defaultMinutesTime: this.props.defaultMinutesTime,
-          format: this.getFormat()
+          format: inputFormat
         })
       )
     ));
@@ -423,6 +427,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onClear = function () {
     _this2.onSelect(null);
     _this2.props.onClear();
+    _this2.setState({ currentStatus: 'todayTime' });
   };
 
   this.onOk = function () {
@@ -449,6 +454,7 @@ var _initialiseProps = function _initialiseProps() {
     var timePicker = _this2.props.timePicker;
     var selectedValue = _this2.state.selectedValue;
 
+    _this2.setState({ currentStatus: 'selectDateTime' });
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {

package/lib/date/DateInput.js

@@ -63,6 +63,7 @@ var DateInput = function (_React$Component) {
     _this.state = {
       str: (0, _util.formatDate)(selectedValue, _this.props.format),
       hasFocus: false,
+      emptyValue: false,
       localFormat: _this.props.format[0]
     };
     return _this;
@@ -170,14 +171,14 @@ var _initialiseProps = function _initialiseProps() {
         format = _props.format,
         onChange = _props.onChange,
         selectedValue = _props.selectedValue;
-
     // 没有内容，合法并直接退出
 
-    if (!calendarStr) {
-      onChange(null);
-      _this2.setState({ str: '' });
+    if (!str || !calendarStr) {
+      _this2.setState({ emptyValue: true });
+      _this2.onClear();
       return;
     }
+    if (_this2.state.emptyValue) _this2.setState({ emptyValue: false });
     var parsed = (0, _dayjs2['default'])(calendarStr, format[0]);
     var value = _this2.props.value.clone();
     value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
@@ -216,7 +217,11 @@ var _initialiseProps = function _initialiseProps() {
     if (keyCode === _KeyCode2['default'].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
-        onSelect(value.clone());
+        if (_this2.state.emptyValue) {
+          onSelect(null);
+        } else {
+          onSelect(value.clone());
+        }
       }
       event.preventDefault();
     }

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 === 'todayTime') {
+          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'].string
 };
 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.31",
+  "version": "0.0.32-alpha.jh2",
   "description": "React Calendar",
   "keywords": [
     "react",