@seafile/seafile-calendar 0.0.88881 → 0.0.88887

package/lib/date/DateInput.js

@@ -63,7 +63,7 @@ var DateInput = function (_React$Component) {
     _this.state = {
       str: (0, _util.formatDate)(selectedValue, _this.props.format),
       hasFocus: false,
-      emptyValue: false,
+      isEmpty: false,
       localFormat: _this.props.format[0]
     };
     return _this;
@@ -174,11 +174,11 @@ var _initialiseProps = function _initialiseProps() {
     // 没有内容，合法并直接退出
 
     if (!str || !calendarStr) {
-      _this2.setState({ emptyValue: true });
+      _this2.setState({ isEmpty: true });
       _this2.onClear();
       return;
     }
-    if (emptyValue) _this2.setState({ emptyValue: false });
+    if (_this2.state.isEmpty) _this2.setState({ isEmpty: 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());
@@ -214,14 +214,14 @@ var _initialiseProps = function _initialiseProps() {
         value = _props2.value,
         disabledDate = _props2.disabledDate;
 
-    console.log('keyCode', keyCode, value);
     if (keyCode === _KeyCode2['default'].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
-        if (emptyValue) {
+        if (_this2.state.isEmpty) {
           onSelect(null);
+        } else {
+          onSelect(value.clone());
         }
-        onSelect(value.clone());
       }
       event.preventDefault();
     }

package/lib/date/DateTBody.js

@@ -151,7 +151,7 @@ var DateTBody = function (_React$Component) {
       for (jIndex = 0; jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT; jIndex++) {
         var next = null;
         var last = null;
-        if (currentStatus === 'todayTime') {
+        if (currentStatus === _util.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];

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.CURRENTSTATUS = exports.DATE_FORMATS = exports.getCurrentTime = exports.getCurrentYear = exports.getCurrentMonth = exports.getCurrentDate = undefined;
 
 var _extends2 = require('babel-runtime/helpers/extends');
 
@@ -62,6 +62,11 @@ var DATE_FORMATS = exports.DATE_FORMATS = {
   Germany_Russia_etcAndTime: 'DD.MM.YYYY HH:mm'
 };
 
+var CURRENTSTATUS = exports.CURRENTSTATUS = {
+  SELECTDATETIME: 'selectDateTime',
+  TODAYTIME: 'todayTime'
+};
+
 var defaultDisabledTime = {
   disabledHours: function disabledHours() {
     return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-calendar",
-  "version": "0.0.88881",
+  "version": "0.0.88887",
   "description": "React Calendar",
   "keywords": [
     "react",