amis-ui 2.0.0 → 2.0.1

package/lib/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 
@@ -400,6 +400,8 @@ var DateRangePicker = /** @class */ (function (_super) {
             editState: 'start',
             startDate: startDate,
             endDate: endDate,
+            oldStartDate: startDate,
+            oldEndDate: endDate,
             startInputValue: startDate === null || startDate === void 0 ? void 0 : startDate.format(inputFormat),
             endInputValue: endDate === null || endDate === void 0 ? void 0 : endDate.format(inputFormat)
         };
@@ -518,7 +520,18 @@ var DateRangePicker = /** @class */ (function (_super) {
             editState: 'end'
         });
     };
-    DateRangePicker.prototype.close = function () {
+    DateRangePicker.prototype.close = function (isConfirm) {
+        if (isConfirm === void 0) { isConfirm = false; }
+        if (!isConfirm) {
+            var _a = this.state, oldEndDate = _a.oldEndDate, oldStartDate = _a.oldStartDate;
+            var inputFormat = this.props.inputFormat;
+            this.setState({
+                endDate: oldEndDate,
+                endInputValue: oldEndDate ? oldEndDate.format(inputFormat) : '',
+                startDate: oldStartDate,
+                startInputValue: oldStartDate ? oldStartDate.format(inputFormat) : ''
+            });
+        }
         this.setState({
             isOpened: false,
             editState: undefined
@@ -553,7 +566,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             this.setState({ editState: 'end' });
         }
         else {
-            this.close();
+            this.close(true);
         }
     };
     DateRangePicker.prototype.filterDate = function (date, originValue, timeFormat, type) {
@@ -598,6 +611,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         var date = this.filterDate(newValue, startDate || minDate, timeFormat, 'start');
         var newState = {
             startDate: date,
+            oldStartDate: startDate,
             startInputValue: date.format(inputFormat)
         };
         // 这些没有时间的选择点第一次后第二次就是选结束时间
@@ -618,12 +632,14 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (newValue.isBefore(startDate)) {
             this.setState({
                 startDate: undefined,
+                oldStartDate: startDate,
                 startInputValue: ''
             });
         }
         var date = this.filterDate(newValue, endDate, timeFormat, 'end');
         this.setState({
             endDate: date,
+            oldEndDate: endDate,
             endInputValue: date.format(inputFormat)
         }, function () {
             embed && _this.confirm();
@@ -741,12 +757,12 @@ var DateRangePicker = /** @class */ (function (_super) {
         }
         if (startDate &&
             minDuration &&
-            newValue.isAfter(startDate.clone().add(minDuration))) {
+            newValue.isBefore(startDate.clone().add(minDuration))) {
             newValue = startDate.clone().add(minDuration);
         }
         if (startDate &&
             maxDuration &&
-            newValue.isBefore(startDate.clone().add(maxDuration))) {
+            newValue.isAfter(startDate.clone().add(maxDuration))) {
             newValue = startDate.clone().add(maxDuration);
         }
         this.setState({
@@ -957,13 +973,14 @@ var DateRangePicker = /** @class */ (function (_super) {
             React__default["default"].createElement("span", null, year)));
     };
     DateRangePicker.prototype.renderCalendar = function () {
+        var _this = this;
         var _a;
-        var _b = this.props, ns = _b.classPrefix, cx = _b.classnames, dateFormat = _b.dateFormat, timeFormat = _b.timeFormat, inputFormat = _b.inputFormat, ranges = _b.ranges, locale = _b.locale, embed = _b.embed, type = _b.type, _c = _b.viewMode, viewMode = _c === void 0 ? 'days' : _c;
+        var _b = this.props, ns = _b.classPrefix, cx = _b.classnames, dateFormat = _b.dateFormat, timeFormat = _b.timeFormat, inputFormat = _b.inputFormat, ranges = _b.ranges, locale = _b.locale, embed = _b.embed, type = _b.type, _c = _b.viewMode, viewMode = _c === void 0 ? 'days' : _c; _b.useMobileUI;
         var __ = this.props.translate;
         var _d = this.state, startDate = _d.startDate, endDate = _d.endDate, editState = _d.editState;
         // timeRange需要单独选择范围
         var isTimeRange = type === 'input-datetime-range' || viewMode === 'time';
-        return (React__default["default"].createElement("div", { className: "".concat(ns, "DateRangePicker-wrap"), ref: this.calendarRef },
+        return (React__default["default"].createElement("div", { className: cx("".concat(ns, "DateRangePicker-wrap")), ref: this.calendarRef },
             this.renderRanges(ranges),
             (!isTimeRange || (editState === 'start' && !embed)) && (React__default["default"].createElement(Calendar["default"], { className: "".concat(ns, "DateRangePicker-start"), value: startDate, 
                 // 区分的原因是 time-range 左侧就只能选起始时间，而其它都能在左侧同时同时选择起始和结束
@@ -979,7 +996,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                         ? this.handleTimeEndChange
                         : this.handleDateChange, requiredConfirm: false, dateFormat: dateFormat, inputFormat: inputFormat, timeFormat: timeFormat, viewDate: this.nextMonth, isEndDate: true, isValidDate: this.checkEndIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u7ED3\u675F\u65F6\u95F4" })),
             embed ? null : (React__default["default"].createElement("div", { key: "button", className: "".concat(ns, "DateRangePicker-actions") },
-                React__default["default"].createElement("a", { className: cx('Button', 'Button--default'), onClick: this.close }, __('cancel')),
+                React__default["default"].createElement("a", { className: cx('Button', 'Button--default'), onClick: function () { return _this.close; } }, __('cancel')),
                 React__default["default"].createElement("a", { className: cx('Button', 'Button--primary', 'm-l-sm', {
                         'is-disabled': (!this.state.startDate &&
                             isTimeRange &&
@@ -991,7 +1008,7 @@ var DateRangePicker = /** @class */ (function (_super) {
     DateRangePicker.prototype.render = function () {
         var _a;
         var _this = this;
-        var _b = this.props, className = _b.className, popoverClassName = _b.popoverClassName, ns = _b.classPrefix, cx = _b.classnames, value = _b.value, startPlaceholder = _b.startPlaceholder, endPlaceholder = _b.endPlaceholder, popOverContainer = _b.popOverContainer, inputFormat = _b.inputFormat; _b.format; _b.joinValues; _b.delimiter; var clearable = _b.clearable, disabled = _b.disabled, embed = _b.embed, overlayPlacement = _b.overlayPlacement, borderMode = _b.borderMode, useMobileUI = _b.useMobileUI, timeFormat = _b.timeFormat, minDate = _b.minDate, maxDate = _b.maxDate, minDuration = _b.minDuration, maxDuration = _b.maxDuration, dateFormat = _b.dateFormat, _c = _b.viewMode, viewMode = _c === void 0 ? 'days' : _c, ranges = _b.ranges;
+        var _b = this.props, className = _b.className, popoverClassName = _b.popoverClassName, ns = _b.classPrefix, cx = _b.classnames, value = _b.value, startPlaceholder = _b.startPlaceholder, endPlaceholder = _b.endPlaceholder, popOverContainer = _b.popOverContainer, inputFormat = _b.inputFormat; _b.format; _b.joinValues; _b.delimiter; var clearable = _b.clearable, disabled = _b.disabled, embed = _b.embed, overlayPlacement = _b.overlayPlacement, borderMode = _b.borderMode, useMobileUI = _b.useMobileUI, timeFormat = _b.timeFormat, minDate = _b.minDate, maxDate = _b.maxDate, minDuration = _b.minDuration, maxDuration = _b.maxDuration, dateFormat = _b.dateFormat, _c = _b.viewMode, viewMode = _c === void 0 ? 'days' : _c, ranges = _b.ranges, label = _b.label;
         var useCalendarMobile = useMobileUI &&
             amisCore.isMobile() &&
             ['days', 'months', 'quarters'].indexOf(viewMode) > -1;
@@ -1003,7 +1020,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                     'is-disabled': disabled
                 }, className) }, useCalendarMobile ? calendarMobile : this.renderCalendar()));
         }
-        var CalendarMobileTitle = (React__default["default"].createElement("div", { className: "".concat(ns, "CalendarMobile-title") }, __('Calendar.datepicker')));
+        var CalendarMobileTitle = (React__default["default"].createElement("div", { className: "".concat(ns, "CalendarMobile-title") }, label && typeof label === 'string' ? label : __('Calendar.datepicker')));
         return (React__default["default"].createElement("div", { tabIndex: 0, onKeyPress: this.handleKeyPress, onFocus: this.handleFocus, onBlur: this.handleBlur, className: cx("".concat(ns, "DateRangePicker"), (_a = {
                     'is-disabled': disabled,
                     'is-focused': isFocused
@@ -1022,7 +1039,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                 React__default["default"].createElement(icons.Icon, { icon: "input-clear", className: "icon" }))) : null,
             React__default["default"].createElement("a", { className: "".concat(ns, "DateRangePicker-toggler") },
                 React__default["default"].createElement(icons.Icon, { icon: viewMode === 'time' ? 'clock' : 'date', className: "icon" })),
-            isOpened ? (useMobileUI && amisCore.isMobile() ? (React__default["default"].createElement(PopUp["default"], { isShow: isOpened, container: popOverContainer, className: cx("".concat(ns, "CalendarMobile-pop")), onHide: this.close, header: CalendarMobileTitle }, useCalendarMobile ? calendarMobile : this.renderCalendar())) : (React__default["default"].createElement(amisCore.Overlay, { target: function () { return _this.dom.current; }, onHide: this.close, container: popOverContainer || (function () { return reactDom.findDOMNode(_this); }), rootClose: false, placement: overlayPlacement, show: true },
+            isOpened ? (useMobileUI && amisCore.isMobile() ? (React__default["default"].createElement(PopUp["default"], { isShow: isOpened, container: popOverContainer, className: cx("".concat(ns, "CalendarMobile-pop"), "".concat(ns, "CalendarMobile-pop--").concat(viewMode)), onHide: this.close, header: CalendarMobileTitle }, useCalendarMobile ? calendarMobile : this.renderCalendar())) : (React__default["default"].createElement(amisCore.Overlay, { target: function () { return _this.dom.current; }, onHide: this.close, container: popOverContainer || (function () { return reactDom.findDOMNode(_this); }), rootClose: false, placement: overlayPlacement, show: true },
                 React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, className: cx("".concat(ns, "DateRangePicker-popover"), popoverClassName), onHide: this.close, onClick: this.handlePopOverClick }, this.renderCalendar())))) : null));
     };
     DateRangePicker.defaultProps = {

package/lib/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/FormField.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/GroupedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Html.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/ImageGallery.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Input.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/InputBox.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/InputBoxWithSuggestion.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/ListGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/ListMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Markdown2.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/ModalManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */