@seafile/seafile-calendar 0.0.8882 → 0.0.88881

package/dist/rc-calendar.js

@@ -2761,7 +2761,7 @@ var Calendar = function (_React$Component) {
       mode: _this.props.mode || 'date',
       value: getMomentObjectIfValid(props.value) || getMomentObjectIfValid(props.defaultValue) || __WEBPACK_IMPORTED_MODULE_9_dayjs___default()(),
       selectedValue: props.selectedValue || props.defaultSelectedValue,
-      currentStatus: 0
+      currentStatus: 'selectDateTime'
     };
     return _this;
   }
@@ -2806,8 +2806,7 @@ var Calendar = function (_React$Component) {
         inputMode = props.inputMode,
         showHourAndMinute = props.showHourAndMinute,
         firstDayOfWeek = props.firstDayOfWeek,
-        showWeekNumber = props.showWeekNumber,
-        shouldDisplayCurrent = props.shouldDisplayCurrent;
+        showWeekNumber = props.showWeekNumber;
     var value = state.value,
         selectedValue = state.selectedValue,
         mode = state.mode,
@@ -2836,7 +2835,8 @@ var Calendar = function (_React$Component) {
       timePickerEle = __WEBPACK_IMPORTED_MODULE_4_react___default.a.cloneElement(timePicker, timePickerProps);
     }
     var calendarInputPlaceholder = dateInputPlaceholder || (Array.isArray(this.getFormat()) ? this.getFormat()[0] : this.getFormat());
-    var inputFormat = dateInputPlaceholder || (Array.isArray(this.getFormat()) ? this.getFormat() : [this.getFormat()]);
+    var inputFormat = Array.isArray(this.getFormat()) ? this.getFormat() : [this.getFormat()];
+
     var dateInputElement = props.showDateInput ? __WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_16__date_DateInput__["a" /* default */], {
       format: inputFormat,
       key: 'date-input',
@@ -2844,7 +2844,6 @@ var Calendar = function (_React$Component) {
       locale: locale,
       placeholder: calendarInputPlaceholder,
       showClear: true,
-      shouldDisplayCurrent: shouldDisplayCurrent,
       disabledTime: disabledTime,
       disabledDate: disabledDate,
       onClear: this.onClear,
@@ -2985,8 +2984,7 @@ Calendar.propTypes = __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends__
   inputMode: __WEBPACK_IMPORTED_MODULE_6_prop_types___default.a.string,
   onBlur: __WEBPACK_IMPORTED_MODULE_6_prop_types___default.a.func,
   onClickRightPanelTime: __WEBPACK_IMPORTED_MODULE_6_prop_types___default.a.func,
-  firstDayOfWeek: __WEBPACK_IMPORTED_MODULE_6_prop_types___default.a.string,
-  shouldDisplayCurrent: __WEBPACK_IMPORTED_MODULE_6_prop_types___default.a.bool
+  firstDayOfWeek: __WEBPACK_IMPORTED_MODULE_6_prop_types___default.a.string
 });
 Calendar.defaultProps = __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends___default()({}, __WEBPACK_IMPORTED_MODULE_14__mixin_CalendarMixin__["a" /* calendarMixinDefaultProps */], __WEBPACK_IMPORTED_MODULE_15__mixin_CommonMixin__["b" /* defaultProp */], {
   showToday: true,
@@ -3018,6 +3016,7 @@ var _initialiseProps = function _initialiseProps() {
       return undefined;
     }
     var keyCode = event.keyCode;
+    console.log('keyCode', keyCode);
     // mac
     var ctrlKey = event.ctrlKey || event.metaKey;
     var disabledDate = _this2.props.disabledDate;
@@ -3081,7 +3080,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onClear = function () {
     _this2.onSelect(null);
     _this2.props.onClear();
-    _this2.setState({ currentStatus: 1 });
+    _this2.setState({ currentStatus: 'todayTime' });
   };
 
   this.onOk = function () {
@@ -3108,7 +3107,7 @@ var _initialiseProps = function _initialiseProps() {
     var timePicker = _this2.props.timePicker;
     var selectedValue = _this2.state.selectedValue;
 
-    _this2.setState({ currentStatus: 0 });
+    _this2.setState({ currentStatus: 'selectDateTime' });
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {
@@ -5396,7 +5395,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 === 1) {
+        if (currentStatus === 'todayTime') {
           current = dateTable[passed].hour(__WEBPACK_IMPORTED_MODULE_8_dayjs___default()().hour()).minute(__WEBPACK_IMPORTED_MODULE_8_dayjs___default()().minute()).second(__WEBPACK_IMPORTED_MODULE_8_dayjs___default()().second()); // eslint-disable-line max-len
         } else {
           current = dateTable[passed];
@@ -5553,7 +5552,7 @@ DateTBody.propTypes = {
   hoverValue: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.any,
   showWeekNumber: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.bool,
   firstDayOfWeek: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.string,
-  currentStatus: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.number
+  currentStatus: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.string
 };
 DateTBody.defaultProps = {
   hoverValue: []
@@ -7307,6 +7306,7 @@ var DateInput = function (_React$Component) {
     _this.state = {
       str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["a" /* formatDate */])(selectedValue, _this.props.format),
       hasFocus: false,
+      emptyValue: false,
       localFormat: _this.props.format[0]
     };
     return _this;
@@ -7395,8 +7395,7 @@ DateInput.propTypes = {
   onSelect: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.func,
   selectedValue: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.object,
   clearIcon: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.node,
-  inputMode: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.string,
-  shouldDisplayCurrent: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.bool
+  inputMode: __WEBPACK_IMPORTED_MODULE_5_prop_types___default.a.string
 };
 
 var _initialiseProps = function _initialiseProps() {
@@ -7414,19 +7413,15 @@ var _initialiseProps = function _initialiseProps() {
         disabledDate = _props.disabledDate,
         format = _props.format,
         onChange = _props.onChange,
-        selectedValue = _props.selectedValue,
-        shouldDisplayCurrent = _props.shouldDisplayCurrent;
+        selectedValue = _props.selectedValue;
     // 没有内容，合法并直接退出
 
     if (!str || !calendarStr) {
-      if (shouldDisplayCurrent) {
-        _this2.setState({ str: '' });
-        onChange(__WEBPACK_IMPORTED_MODULE_8_dayjs___default()());
-      } else {
-        _this2.onClear();
-      }
+      _this2.setState({ emptyValue: true });
+      _this2.onClear();
       return;
     }
+    if (emptyValue) _this2.setState({ emptyValue: false });
     var parsed = __WEBPACK_IMPORTED_MODULE_8_dayjs___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());
@@ -7462,9 +7457,13 @@ var _initialiseProps = function _initialiseProps() {
         value = _props2.value,
         disabledDate = _props2.disabledDate;
 
+    console.log('keyCode', keyCode, value);
     if (keyCode === __WEBPACK_IMPORTED_MODULE_6_rc_util_es_KeyCode__["a" /* default */].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
+        if (emptyValue) {
+          onSelect(null);
+        }
         onSelect(value.clone());
       }
       event.preventDefault();