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

package/es/date/DateInput.js

@@ -7,7 +7,10 @@ import PropTypes from 'prop-types';
 import KeyCode from 'rc-util/es/KeyCode';
 import { polyfill } from 'react-lifecycles-compat';
 import dayjs from 'dayjs';
-import { formatDate, DATE_FORMATS, getDateFormatByStr, formatDateLocal, delimate, normalizeDateInput } from '../util';
+import { formatDate, initializeStr } from '../util';
+var customParseFormat = require('dayjs/plugin/customParseFormat');
+
+dayjs.extend(customParseFormat);
 
 var cachedSelectionStart = void 0;
 var cachedSelectionEnd = void 0;
@@ -24,12 +27,11 @@ var DateInput = function (_React$Component) {
     _initialiseProps.call(_this);
 
     var selectedValue = props.selectedValue;
-    var formatPrefix = _this.props.format[0];
+
     _this.state = {
       str: formatDate(selectedValue, _this.props.format),
       hasFocus: false,
-      localeFormat: formatPrefix,
-      delimiter: delimate(formatPrefix)
+      localFormat: _this.props.format[0]
     };
     return _this;
   }
@@ -50,30 +52,7 @@ var DateInput = function (_React$Component) {
     // when popup show, click body will call this, bug!
     var selectedValue = nextProps.selectedValue;
     if (!state.hasFocus) {
-      var timeStr = formatDate(selectedValue, nextProps.format).split(' ')[0];
-      var parts = timeStr.split(state.delimiter);
-      var timeParts = formatDate(selectedValue, nextProps.format).split(' ')[1];
-      if (parts.length === 3) {
-        if (state.localeFormat === DATE_FORMATS.ISO) {
-          newState = { str: parts[0].padStart(4, 0) + '-' + parts[1] + '-' + parts[2] };
-        } else if (state.localeFormat === 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 === DATE_FORMATS.US) {
-          newState = { str: Number(parts[0]) + '/' + Number(parts[1]) + '/' + parts[2].padStart(4, 0) };
-        } else if (state.localeFormat === 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 === DATE_FORMATS.European || state.localeFormat === 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 === DATE_FORMATS.EuropeanAndTime || state.localeFormat === 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: formatDate(selectedValue, nextProps.format) };
     }
 
     return newState;
@@ -140,64 +119,43 @@ DateInput.propTypes = {
   onSelect: PropTypes.func,
   selectedValue: PropTypes.object,
   clearIcon: PropTypes.node,
-  inputMode: PropTypes.string,
-  showHourAndMinute: PropTypes.bool
+  inputMode: PropTypes.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 = normalizeDateInput(str, _this2.state.localeFormat, _this2.state.delimiter);
+    var calendarStr = initializeStr(str, _this2.state.localFormat) || '';
     var _props = _this2.props,
         disabledDate = _props.disabledDate,
+        format = _props.format,
         onChange = _props.onChange,
         selectedValue = _props.selectedValue;
 
-    var parts = formatDateLocal(cananderStr, _this2.state.localeFormat);
     // 没有内容，合法并直接退出
-    console.log('cananderStr', cananderStr);
 
-    if (!str) {
-      console.log('我不想走进来');
+    if (!calendarStr) {
       onChange(null);
       _this2.setState({ str: '' });
       return;
     }
-    // 不合法直接退出
-    var format = getDateFormatByStr(cananderStr, _this2.state.localeFormat);
-    var parsed = dayjs(cananderStr, format);
+    var parsed = dayjs(calendarStr, format[0]);
     var value = _this2.props.value.clone();
-    value.locale('zh-cn');
-    if (_this2.state.localeFormat === DATE_FORMATS.ISO || _this2.state.localeFormat === 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 === DATE_FORMATS.European || _this2.state.localeFormat === DATE_FORMATS.EuropeanAndTime || _this2.state.localeFormat === DATE_FORMATS.US || _this2.state.localeFormat === DATE_FORMATS.USAndTime || _this2.state.localeFormat === DATE_FORMATS.Germany_Russia_etc || _this2.state.localeFormat === 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);
     }