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

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,
+      isInputEmpty: false,
       localFormat: _this.props.format[0]
     };
     return _this;
@@ -171,14 +171,19 @@ var _initialiseProps = function _initialiseProps() {
         format = _props.format,
         onChange = _props.onChange,
         selectedValue = _props.selectedValue;
+
     // 没有内容，合法并直接退出
 
     if (!str || !calendarStr) {
-      _this2.setState({ emptyValue: true });
+      _this2.setState({ isInputEmpty: true });
       _this2.onClear();
       return;
     }
-    if (_this2.state.emptyValue) _this2.setState({ emptyValue: false });
+
+    if (_this2.state.isInputEmpty) {
+      _this2.setState({ isInputEmpty: 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());
@@ -217,7 +222,7 @@ var _initialiseProps = function _initialiseProps() {
     if (keyCode === _KeyCode2['default'].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
-        if (_this2.state.emptyValue) {
+        if (_this2.state.isInputEmpty) {
           onSelect(null);
         } else {
           onSelect(value.clone());

package/lib/date/DateTBody.js

@@ -32,10 +32,6 @@ 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,
@@ -151,11 +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;
-        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];
-        }
+        current = (0, _util.syncCurrentTime)(dateTable[passed], currentStatus);
         if (jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT - 1) {
           next = dateTable[passed + 1];
         }

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 [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-calendar",
-  "version": "0.0.32-alpha.jh2",
+  "version": "0.0.32-alpha.jh7",
   "description": "React Calendar",
   "keywords": [
     "react",