@seafile/seafile-calendar 0.0.29-gzc31 → 0.0.29-prop3.1

package/lib/Calendar.js

@@ -180,13 +180,14 @@ var Calendar = function (_React$Component) {
 
       timePickerEle = _react2['default'].cloneElement(timePicker, timePickerProps);
     }
+    var calanderInputPlaceholder = dateInputPlaceholder || (Array.isArray(this.getFormat()) ? this.getFormat()[0] : this.getFormat());
 
     var dateInputElement = props.showDateInput ? _react2['default'].createElement(_DateInput2['default'], {
       format: this.getFormat(),
       key: 'date-input',
       value: value,
       locale: locale,
-      placeholder: dateInputPlaceholder || this.getFormat()[0],
+      placeholder: calanderInputPlaceholder,
       showClear: true,
       disabledTime: disabledTime,
       disabledDate: disabledDate,
@@ -196,8 +197,7 @@ var Calendar = function (_React$Component) {
       onChange: this.onDateInputChange,
       onSelect: this.onDateInputSelect,
       clearIcon: clearIcon,
-      inputMode: inputMode,
-      showHourAndMinute: showHourAndMinute
+      inputMode: inputMode
     }) : null;
 
     var children = [];
@@ -434,7 +434,6 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.onDateInputChange = function (value) {
-    if (!value) return;
     _this2.onSelect(value, {
       source: 'dateInput'
     });

package/lib/Picker.js

@@ -251,7 +251,6 @@ var _initialiseProps = function _initialiseProps() {
           open: open
         }, callback);
       }
-      console.log(11111);
       onOpenChange(open);
     }
   };

package/lib/calendar/CalendarRightPanel.js

@@ -111,7 +111,7 @@ var CalendarRightPanel = function (_React$Component) {
           'ul',
           null,
           this.times.map(function (time) {
-            var parts = (0, _util.formatDateLocal)(selectedDate, _this2.state.localeFormat);
+            var parts = (0, _util.tokenizeFormattedDate)(selectedDate, _this2.state.localeFormat);
             var current = (0, _dayjs2['default'])(selectedDate + ' ' + time).year(parts[0]).month(parts[1] - 1).date(parts[2]); // eslint-disable-line max-len
             current = isZhcn ? current.locale('zh-cn') : current.locale('en-gb');
             return _react2['default'].createElement(

package/lib/date/DateInput.js

@@ -40,6 +40,10 @@ var _util = require('../util');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var customParseFormat = require('dayjs/plugin/customParseFormat');
+
+_dayjs2['default'].extend(customParseFormat);
+
 var cachedSelectionStart = void 0;
 var cachedSelectionEnd = void 0;
 var dateInputInstance = void 0;
@@ -55,12 +59,11 @@ var DateInput = function (_React$Component) {
     _initialiseProps.call(_this);
 
     var selectedValue = props.selectedValue;
-    var formatPrefix = _this.props.format[0];
+
     _this.state = {
       str: (0, _util.formatDate)(selectedValue, _this.props.format),
       hasFocus: false,
-      localeFormat: formatPrefix,
-      delimiter: (0, _util.delimate)(formatPrefix)
+      localFormat: _this.props.format[0]
     };
     return _this;
   }
@@ -81,30 +84,7 @@ var DateInput = function (_React$Component) {
     // when popup show, click body will call this, bug!
     var selectedValue = nextProps.selectedValue;
     if (!state.hasFocus) {
-      var timeStr = (0, _util.formatDate)(selectedValue, nextProps.format).split(' ')[0];
-      var parts = timeStr.split(state.delimiter);
-      var timeParts = (0, _util.formatDate)(selectedValue, nextProps.format).split(' ')[1];
-      if (parts.length === 3) {
-        if (state.localeFormat === _util.DATE_FORMATS.ISO) {
-          newState = { str: parts[0].padStart(4, 0) + '-' + parts[1] + '-' + parts[2] };
-        } else if (state.localeFormat === _util.DATE_FORMATS.ISOAndTime) {
-          newState = {
-            str: parts[0].padStart(4, 0) + '-' + parts[1] + '-' + parts[2] + ' ' + (nextProps.showHourAndMinute ? timeParts : '') // eslint-disable-line max-len
-          };
-        } else if (state.localeFormat === _util.DATE_FORMATS.US) {
-          newState = { str: Number(parts[0]) + '/' + Number(parts[1]) + '/' + parts[2].padStart(4, 0) };
-        } else if (state.localeFormat === _util.DATE_FORMATS.USAndTime) {
-          newState = {
-            str: Number(parts[0]) + '/' + Number(parts[1]) + '/' + parts[2].padStart(4, 0) + ' ' + (nextProps.showHourAndMinute ? timeParts : '') // eslint-disable-line max-len
-          };
-        } else if (state.localeFormat === _util.DATE_FORMATS.European || state.localeFormat === _util.DATE_FORMATS.Germany_Russia_etc) {
-          newState = { str: '' + Number(parts[0]) + state.delimiter + Number(parts[1]) + state.delimiter + parts[2].padStart(4, 0) }; // eslint-disable-line max-len
-        } else if (state.localeFormat === _util.DATE_FORMATS.EuropeanAndTime || state.localeFormat === _util.DATE_FORMATS.Germany_Russia_etcAndTime) {
-          newState = {
-            str: '' + Number(parts[0]) + state.delimiter + Number(parts[1]) + state.delimiter + parts[2].padStart(4, 0) + ' ' + (nextProps.showHourAndMinute ? timeParts : '') // eslint-disable-line max-len
-          };
-        }
-      }
+      newState = { str: (0, _util.formatDate)(selectedValue, nextProps.format) };
     }
 
     return newState;
@@ -171,64 +151,43 @@ DateInput.propTypes = {
   onSelect: _propTypes2['default'].func,
   selectedValue: _propTypes2['default'].object,
   clearIcon: _propTypes2['default'].node,
-  inputMode: _propTypes2['default'].string,
-  showHourAndMinute: _propTypes2['default'].bool
+  inputMode: _propTypes2['default'].string
 };
 
 var _initialiseProps = function _initialiseProps() {
   var _this2 = this;
 
   this.onClear = function () {
-    _this2.setState({
-      str: ''
-    });
+    _this2.setState({ str: '' });
     _this2.props.onClear(null);
   };
 
   this.onInputChange = function (event) {
     var str = event.target.value;
-    console.log('str', str);
-    var cananderStr = (0, _util.normalizeDateInput)(str, _this2.state.localeFormat, _this2.state.delimiter);
+    var calendarStr = (0, _util.initializeStr)(str, _this2.state.localFormat) || '';
     var _props = _this2.props,
         disabledDate = _props.disabledDate,
+        format = _props.format,
         onChange = _props.onChange,
         selectedValue = _props.selectedValue;
 
-    var parts = (0, _util.formatDateLocal)(cananderStr, _this2.state.localeFormat);
     // 没有内容，合法并直接退出
-    console.log('cananderStr', cananderStr);
 
-    if (!str) {
-      console.log('我不想走进来');
+    if (!calendarStr) {
       onChange(null);
       _this2.setState({ str: '' });
       return;
     }
-    // 不合法直接退出
-    var format = (0, _util.getDateFormatByStr)(cananderStr, _this2.state.localeFormat);
-    var parsed = (0, _dayjs2['default'])(cananderStr, format);
+    var parsed = (0, _dayjs2['default'])(calendarStr, format[0]);
     var value = _this2.props.value.clone();
-    value.locale('zh-cn');
-    if (_this2.state.localeFormat === _util.DATE_FORMATS.ISO || _this2.state.localeFormat === _util.DATE_FORMATS.ISOAndTime) {
-      if (parts[0] && parts[0].length === 4 && (parts[0].slice(0, 3) === '000' || parts[0].slice(0, 2) === '00')) {
-        value = value.year(parts[0]).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      } else {
-        value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      }
-    } else if (_this2.state.localeFormat === _util.DATE_FORMATS.European || _this2.state.localeFormat === _util.DATE_FORMATS.EuropeanAndTime || _this2.state.localeFormat === _util.DATE_FORMATS.US || _this2.state.localeFormat === _util.DATE_FORMATS.USAndTime || _this2.state.localeFormat === _util.DATE_FORMATS.Germany_Russia_etc || _this2.state.localeFormat === _util.DATE_FORMATS.Germany_Russia_etcAndTime) {
-      if (parts[2] && parts[2].length === 4 && (parts[2].slice(0, 3) === '000' || parts[2].slice(0, 2) === '00')) {
-        value = value.year(parts[2]).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      } else {
-        value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
-      }
-    }
+    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 });
       return;
     }
 
     if (selectedValue !== value || selectedValue && value && !selectedValue.isSame(value)) {
-      console.log('成功🏅');
       _this2.setState({ str: str });
       onChange(value);
     }