@seafile/seafile-calendar 0.0.29-alpha33 → 0.0.29-alpha35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/rc-calendar.js +14 -5
- package/dist/rc-calendar.js.map +1 -1
- package/dist/rc-calendar.min.js +1 -1
- package/es/date/DateInput.js +14 -5
- package/lib/date/DateInput.js +14 -5
- package/package.json +1 -1
package/dist/rc-calendar.js
CHANGED
|
@@ -7466,19 +7466,28 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
7466
7466
|
console.log('cananderStr', cananderStr, format, parts); // eslint-disable-next-line no-console
|
|
7467
7467
|
var value = _this2.props.value.clone();
|
|
7468
7468
|
value.locale('zh-cn');
|
|
7469
|
-
value = value
|
|
7469
|
+
// value = value
|
|
7470
|
+
// .year(parsed.year())
|
|
7471
|
+
// .month(parsed.month())
|
|
7472
|
+
// .date(parsed.date())
|
|
7473
|
+
// .hour(parsed.hour())
|
|
7474
|
+
// .minute(parsed.minute())
|
|
7475
|
+
// .second(parsed.second());
|
|
7470
7476
|
|
|
7471
7477
|
if (_this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].ISO || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].ISOAndTime) {
|
|
7472
7478
|
if (parts[0] && parts[0].length === 4 && (parts[0].slice(0, 3) === '000' || parts[0].slice(0, 2) === '00')) {
|
|
7473
7479
|
console.log('ISO format', parts[0]);
|
|
7474
|
-
value.year(parts[0]);
|
|
7480
|
+
value = value.year(parts[0]).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
|
|
7475
7481
|
// eslint-disable-next-line no-console
|
|
7476
7482
|
console.log('ISO format year', value);
|
|
7483
|
+
} else {
|
|
7484
|
+
value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
|
|
7477
7485
|
}
|
|
7478
|
-
}
|
|
7479
|
-
if (_this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].European || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].EuropeanAndTime || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].US || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].USAndTime || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etc || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etcAndTime) {
|
|
7486
|
+
} else if (_this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].European || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].EuropeanAndTime || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].US || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].USAndTime || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etc || _this2.state.localeFormat === __WEBPACK_IMPORTED_MODULE_9__util__["a" /* DATE_FORMATS */].Germany_Russia_etcAndTime) {
|
|
7480
7487
|
if (parts[2] && parts[2].length === 4 && (parts[2].slice(0, 3) === '000' || parts[2].slice(0, 2) === '00')) {
|
|
7481
|
-
value.year(parts[2]);
|
|
7488
|
+
value = value.year(parts[2]).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
|
|
7489
|
+
} else {
|
|
7490
|
+
value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
|
|
7482
7491
|
}
|
|
7483
7492
|
}
|
|
7484
7493
|
if (!value || disabledDate && disabledDate(value)) {
|