@seafile/seafile-calendar 0.0.98 → 0.0.888

package/dist/rc-calendar.js

@@ -2836,9 +2836,9 @@ 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 = Array.isArray(this.getFormat()) ? this.getFormat()[0] : this.getFormat();
     var dateInputElement = props.showDateInput ? __WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_16__date_DateInput__["a" /* default */], {
-      format: this.getFormat(),
+      format: inputFormat,
       key: 'date-input',
       value: value,
       locale: locale,
@@ -2937,7 +2937,7 @@ var Calendar = function (_React$Component) {
           onSelect: this.onDateTableSelect,
           onClickRightPanelTime: onClickRightPanelTime,
           defaultMinutesTime: this.props.defaultMinutesTime,
-          format: this.getFormat()
+          format: inputFormat
         })
       )
     ));
@@ -7419,7 +7419,10 @@ var _initialiseProps = function _initialiseProps() {
         shouldDisplayCurrent = _props.shouldDisplayCurrent;
     // 没有内容，合法并直接退出
 
-    if (!str || !calendarStr) {
+    console.log('str', str);
+    console.log('calendarStr', calendarStr);
+
+    if (!str) {
       console.log('没有内容，合法并直接退出');
       if (shouldDisplayCurrent) {
         _this2.setState({ str: '' });
@@ -7433,10 +7436,10 @@ var _initialiseProps = function _initialiseProps() {
     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());
 
-    // if (!value || (disabledDate && disabledDate(value))) {
-    //   this.setState({ str });
-    //   return;
-    // }
+    if (!value || disabledDate && disabledDate(value)) {
+      _this2.setState({ str: str });
+      return;
+    }
 
     if (selectedValue !== value || selectedValue && value && !selectedValue.isSame(value)) {
       _this2.setState({ str: str });