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

package/es/date/DateInput.js

@@ -8,6 +8,7 @@ import KeyCode from 'rc-util/es/KeyCode';
 import { polyfill } from 'react-lifecycles-compat';
 import dayjs from 'dayjs';
 import { formatDate, initializeStr } from '../util';
+
 var customParseFormat = require('dayjs/plugin/customParseFormat');
 
 dayjs.extend(customParseFormat);
@@ -31,11 +32,23 @@ var DateInput = function (_React$Component) {
     _this.state = {
       str: formatDate(selectedValue, _this.props.format),
       hasFocus: false,
+      isInputEmpty: false,
       localFormat: _this.props.format[0]
     };
     return _this;
   }
 
+  DateInput.prototype.componentDidMount = function componentDidMount() {
+    var _this2 = this;
+
+    setTimeout(function () {
+      _this2.focus();
+    }, 1);
+    setTimeout(function () {
+      _this2.focus();
+    }, 1000);
+  };
+
   DateInput.prototype.componentDidUpdate = function componentDidUpdate() {
     if (dateInputInstance && this.state.hasFocus && !(cachedSelectionStart === 0 && cachedSelectionEnd === 0)) {
       dateInputInstance.setSelectionRange(cachedSelectionStart, cachedSelectionEnd);
@@ -87,10 +100,11 @@ var DateInput = function (_React$Component) {
           onKeyDown: this.onKeyDown,
           onFocus: this.onFocus,
           onBlur: this.onBlur,
-          inputMode: inputMode
+          inputMode: inputMode,
+          tabIndex: '0'
         })
       ),
-      props.showClear ? React.createElement(
+      props.showClear && React.createElement(
         'a',
         {
           role: 'button',
@@ -98,7 +112,7 @@ var DateInput = function (_React$Component) {
           onClick: this.onClear
         },
         clearIcon || React.createElement('span', { className: prefixCls + '-clear-btn' })
-      ) : null
+      )
     );
   };
 
@@ -123,17 +137,17 @@ DateInput.propTypes = {
 };
 
 var _initialiseProps = function _initialiseProps() {
-  var _this2 = this;
+  var _this3 = this;
 
   this.onClear = function () {
-    _this2.setState({ str: '' });
-    _this2.props.onClear(null);
+    _this3.setState({ str: '' });
+    _this3.props.onClear(null);
   };
 
   this.onInputChange = function (event) {
     var str = event.target.value;
-    var calendarStr = initializeStr(str, _this2.state.localFormat) || '';
-    var _props = _this2.props,
+    var calendarStr = initializeStr(str, _this3.state.localFormat) || '';
+    var _props = _this3.props,
         disabledDate = _props.disabledDate,
         format = _props.format,
         onChange = _props.onChange,
@@ -141,32 +155,38 @@ var _initialiseProps = function _initialiseProps() {
 
     // 没有内容，合法并直接退出
 
-    if (!calendarStr) {
-      onChange(null);
-      _this2.setState({ str: '' });
+    if (!str || !calendarStr) {
+      console.log('没有内容，合法并直接退出');
+      _this3.setState({ isInputEmpty: true });
+      _this3.onClear();
       return;
     }
+
+    if (_this3.state.isInputEmpty) {
+      _this3.setState({ isInputEmpty: false });
+    }
+
     var parsed = dayjs(calendarStr, format[0]);
-    var value = _this2.props.value.clone();
+    var value = _this3.props.value.clone();
     value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
 
     if (!value || disabledDate && disabledDate(value)) {
-      _this2.setState({ str: str });
+      _this3.setState({ str: str });
       return;
     }
 
     if (selectedValue !== value || selectedValue && value && !selectedValue.isSame(value)) {
-      _this2.setState({ str: str });
+      _this3.setState({ str: str });
       onChange(value);
     }
   };
 
   this.onFocus = function () {
-    _this2.setState({ hasFocus: true });
+    _this3.setState({ hasFocus: true });
   };
 
   this.onBlur = function () {
-    _this2.setState(function (prevState, prevProps) {
+    _this3.setState(function (prevState, prevProps) {
       return {
         hasFocus: false,
         str: formatDate(prevProps.value, prevProps.format)
@@ -176,7 +196,7 @@ var _initialiseProps = function _initialiseProps() {
 
   this.onKeyDown = function (event) {
     var keyCode = event.keyCode;
-    var _props2 = _this2.props,
+    var _props2 = _this3.props,
         onSelect = _props2.onSelect,
         value = _props2.value,
         disabledDate = _props2.disabledDate;
@@ -184,14 +204,18 @@ var _initialiseProps = function _initialiseProps() {
     if (keyCode === KeyCode.ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
-        onSelect(value.clone());
+        if (_this3.state.isInputEmpty) {
+          onSelect(null);
+        } else {
+          onSelect(value.clone());
+        }
       }
       event.preventDefault();
     }
   };
 
   this.getRootDOMNode = function () {
-    return ReactDOM.findDOMNode(_this2);
+    return ReactDOM.findDOMNode(_this3);
   };
 
   this.focus = function () {

package/es/date/DateTBody.js

@@ -5,7 +5,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import DateConstants from './DateConstants';
-import { getTitleString, getTodayTime } from '../util/';
+import { getTitleString, getTodayTime, syncCurrentTime } from '../util/';
 
 var DATE_ROW_COLUMN_COUNT = DateConstants.DATE_ROW_COLUMN_COUNT,
     DAY_NAME_TO_INDEX = DateConstants.DAY_NAME_TO_INDEX;
@@ -52,7 +52,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;
@@ -120,7 +121,7 @@ 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];
+        current = syncCurrentTime(dateTable[passed], currentStatus);
         if (jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT - 1) {
           next = dateTable[passed + 1];
         }
@@ -272,7 +273,8 @@ DateTBody.propTypes = {
   value: PropTypes.object,
   hoverValue: PropTypes.any,
   showWeekNumber: PropTypes.bool,
-  firstDayOfWeek: PropTypes.string
+  firstDayOfWeek: PropTypes.string,
+  currentStatus: PropTypes.string
 };
 DateTBody.defaultProps = {
   hoverValue: []

package/es/util/index.js

@@ -27,6 +27,18 @@ export var DATE_FORMATS = {
   Germany_Russia_etcAndTime: 'DD.MM.YYYY HH:mm'
 };
 
+export var CALENDAR_STATUS = {
+  SPECIFIC_TIME: 'specific_time',
+  CURRENT_TIME: 'current_time'
+};
+
+export var syncCurrentTime = function syncCurrentTime(date, status) {
+  if (status === CALENDAR_STATUS.CURRENT_TIME) {
+    return date.hour(dayjs().hour()).minute(dayjs().minute()).second(dayjs().second());
+  }
+  return date;
+};
+
 var defaultDisabledTime = {
   disabledHours: function disabledHours() {
     return [];
@@ -478,7 +490,7 @@ export 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);
 
@@ -522,7 +534,7 @@ export 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/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: _util.CALENDAR_STATUS.SPECIFIC_TIME
     };
     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: _util.CALENDAR_STATUS.CURRENT_TIME });
   };
 
   this.onOk = function () {
@@ -449,6 +454,7 @@ var _initialiseProps = function _initialiseProps() {
     var timePicker = _this2.props.timePicker;
     var selectedValue = _this2.state.selectedValue;
 
+    _this2.setState({ currentStatus: _util.CALENDAR_STATUS.SPECIFIC_TIME });
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {

package/lib/date/DateInput.js

@@ -63,11 +63,23 @@ var DateInput = function (_React$Component) {
     _this.state = {
       str: (0, _util.formatDate)(selectedValue, _this.props.format),
       hasFocus: false,
+      isInputEmpty: false,
       localFormat: _this.props.format[0]
     };
     return _this;
   }
 
+  DateInput.prototype.componentDidMount = function componentDidMount() {
+    var _this2 = this;
+
+    setTimeout(function () {
+      _this2.focus();
+    }, 1);
+    setTimeout(function () {
+      _this2.focus();
+    }, 1000);
+  };
+
   DateInput.prototype.componentDidUpdate = function componentDidUpdate() {
     if (dateInputInstance && this.state.hasFocus && !(cachedSelectionStart === 0 && cachedSelectionEnd === 0)) {
       dateInputInstance.setSelectionRange(cachedSelectionStart, cachedSelectionEnd);
@@ -119,10 +131,11 @@ var DateInput = function (_React$Component) {
           onKeyDown: this.onKeyDown,
           onFocus: this.onFocus,
           onBlur: this.onBlur,
-          inputMode: inputMode
+          inputMode: inputMode,
+          tabIndex: '0'
         })
       ),
-      props.showClear ? _react2['default'].createElement(
+      props.showClear && _react2['default'].createElement(
         'a',
         {
           role: 'button',
@@ -130,7 +143,7 @@ var DateInput = function (_React$Component) {
           onClick: this.onClear
         },
         clearIcon || _react2['default'].createElement('span', { className: prefixCls + '-clear-btn' })
-      ) : null
+      )
     );
   };
 
@@ -155,17 +168,17 @@ DateInput.propTypes = {
 };
 
 var _initialiseProps = function _initialiseProps() {
-  var _this2 = this;
+  var _this3 = this;
 
   this.onClear = function () {
-    _this2.setState({ str: '' });
-    _this2.props.onClear(null);
+    _this3.setState({ str: '' });
+    _this3.props.onClear(null);
   };
 
   this.onInputChange = function (event) {
     var str = event.target.value;
-    var calendarStr = (0, _util.initializeStr)(str, _this2.state.localFormat) || '';
-    var _props = _this2.props,
+    var calendarStr = (0, _util.initializeStr)(str, _this3.state.localFormat) || '';
+    var _props = _this3.props,
         disabledDate = _props.disabledDate,
         format = _props.format,
         onChange = _props.onChange,
@@ -173,32 +186,38 @@ var _initialiseProps = function _initialiseProps() {
 
     // 没有内容，合法并直接退出
 
-    if (!calendarStr) {
-      onChange(null);
-      _this2.setState({ str: '' });
+    if (!str || !calendarStr) {
+      console.log('没有内容，合法并直接退出');
+      _this3.setState({ isInputEmpty: true });
+      _this3.onClear();
       return;
     }
+
+    if (_this3.state.isInputEmpty) {
+      _this3.setState({ isInputEmpty: false });
+    }
+
     var parsed = (0, _dayjs2['default'])(calendarStr, format[0]);
-    var value = _this2.props.value.clone();
+    var value = _this3.props.value.clone();
     value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
 
     if (!value || disabledDate && disabledDate(value)) {
-      _this2.setState({ str: str });
+      _this3.setState({ str: str });
       return;
     }
 
     if (selectedValue !== value || selectedValue && value && !selectedValue.isSame(value)) {
-      _this2.setState({ str: str });
+      _this3.setState({ str: str });
       onChange(value);
     }
   };
 
   this.onFocus = function () {
-    _this2.setState({ hasFocus: true });
+    _this3.setState({ hasFocus: true });
   };
 
   this.onBlur = function () {
-    _this2.setState(function (prevState, prevProps) {
+    _this3.setState(function (prevState, prevProps) {
       return {
         hasFocus: false,
         str: (0, _util.formatDate)(prevProps.value, prevProps.format)
@@ -208,7 +227,7 @@ var _initialiseProps = function _initialiseProps() {
 
   this.onKeyDown = function (event) {
     var keyCode = event.keyCode;
-    var _props2 = _this2.props,
+    var _props2 = _this3.props,
         onSelect = _props2.onSelect,
         value = _props2.value,
         disabledDate = _props2.disabledDate;
@@ -216,14 +235,18 @@ var _initialiseProps = function _initialiseProps() {
     if (keyCode === _KeyCode2['default'].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
-        onSelect(value.clone());
+        if (_this3.state.isInputEmpty) {
+          onSelect(null);
+        } else {
+          onSelect(value.clone());
+        }
       }
       event.preventDefault();
     }
   };
 
   this.getRootDOMNode = function () {
-    return _reactDom2['default'].findDOMNode(_this2);
+    return _reactDom2['default'].findDOMNode(_this3);
   };
 
   this.focus = function () {

package/lib/date/DateTBody.js

@@ -78,7 +78,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 +147,7 @@ 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];
+        current = (0, _util.syncCurrentTime)(dateTable[passed], currentStatus);
         if (jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT - 1) {
           next = dateTable[passed + 1];
         }
@@ -298,7 +299,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

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.isLeapYear = exports.DATE_FORMATS = exports.getCurrentTime = exports.getCurrentYear = exports.getCurrentMonth = exports.getCurrentDate = undefined;
+exports.isLeapYear = exports.syncCurrentTime = exports.CALENDAR_STATUS = exports.DATE_FORMATS = exports.getCurrentTime = exports.getCurrentYear = exports.getCurrentMonth = exports.getCurrentDate = undefined;
 
 var _extends2 = require('babel-runtime/helpers/extends');
 
@@ -62,6 +62,18 @@ var DATE_FORMATS = exports.DATE_FORMATS = {
   Germany_Russia_etcAndTime: 'DD.MM.YYYY HH:mm'
 };
 
+var CALENDAR_STATUS = exports.CALENDAR_STATUS = {
+  SPECIFIC_TIME: 'specific_time',
+  CURRENT_TIME: 'current_time'
+};
+
+var syncCurrentTime = exports.syncCurrentTime = function syncCurrentTime(date, status) {
+  if (status === CALENDAR_STATUS.CURRENT_TIME) {
+    return date.hour((0, _dayjs2['default'])().hour()).minute((0, _dayjs2['default'])().minute()).second((0, _dayjs2['default'])().second());
+  }
+  return date;
+};
+
 var defaultDisabledTime = {
   disabledHours: function disabledHours() {
     return [];
@@ -513,7 +525,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 +569,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.1",
   "description": "React Calendar",
   "keywords": [
     "react",
@@ -68,13 +68,13 @@
   "devDependencies": {
     "@types/react": "^16.3.13",
     "async": "~3.1.0",
+    "chokidar": "^4.0.3",
     "dtslint": "^0.9.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "^3.3.1",
     "jest": "^22.1.4",
     "mockdate": "^2.0.1",
-    "pre-commit": "1.x",
     "rc-dialog": "^7.0.0",
     "rc-select": "^9.1.5",
     "rc-time-picker": "^3.1.0",
@@ -85,9 +85,6 @@
     "tslint": "^5.9.1",
     "typescript": "^3.4.1"
   },
-  "pre-commit": [
-    "lint"
-  ],
   "dependencies": {
     "babel-runtime": "6.x",
     "classnames": "2.x",