amis-ui 2.9.0 → 3.1.0

package/esm/components/DatePicker.js

@@ -1,14 +1,13 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
 import { __extends, __spreadArray, __read, __assign } from 'tslib';
 import React__default from 'react';
 import moment from 'moment';
-import 'moment/locale/zh-cn';
 import { Icon } from './icons.js';
-import { isMobile, ucFirst, Overlay, PopOver, themeable, localeable } from 'amis-core';
+import { normalizeDate, filterDate, isExpression, FormulaExec, isMobile, ucFirst, Overlay, PopOver, themeable, localeable } from 'amis-core';
 import PopUp from './PopUp.js';
 import Calendar from './calendar/Calendar.js';
 import CalendarMobile from './CalendarMobile.js';
@@ -205,13 +204,6 @@ var advancedShortcuts = [
         }
     }
 ];
-function normalizeValue(value, format) {
-    if (!value || value === '0') {
-        return undefined;
-    }
-    var v = moment(value, format, true);
-    return v.isValid() ? v : undefined;
-}
 var DatePicker = /** @class */ (function (_super) {
     __extends(DatePicker, _super);
     function DatePicker(props) {
@@ -221,15 +213,15 @@ var DatePicker = /** @class */ (function (_super) {
         _this.state = {
             isOpened: false,
             isFocused: false,
-            value: normalizeValue(_this.props.value, _this.props.format),
-            inputValue: ((_a = normalizeValue(_this.props.value, _this.props.format)) === null || _a === void 0 ? void 0 : _a.format(_this.props.inputFormat)) || ''
+            value: normalizeDate(_this.props.value, _this.props.format),
+            inputValue: ((_a = normalizeDate(_this.props.value, _this.props.format)) === null || _a === void 0 ? void 0 : _a.format(_this.props.inputFormat)) || ''
         };
         _this.domRef = function (ref) {
             _this.dom = ref;
         };
         _this.inputRef = React__default.createRef();
         _this.handleChange = _this.handleChange.bind(_this);
-        _this.selectRannge = _this.selectRannge.bind(_this);
+        _this.selectShortcut = _this.selectShortcut.bind(_this);
         _this.checkIsValidDate = _this.checkIsValidDate.bind(_this);
         _this.open = _this.open.bind(_this);
         _this.close = _this.close.bind(_this);
@@ -251,7 +243,7 @@ var DatePicker = /** @class */ (function (_super) {
         (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onRef) === null || _b === void 0 ? void 0 : _b.call(_a, this);
         var _c = this.props, value = _c.value, format = _c.format, inputFormat = _c.inputFormat;
         if (value) {
-            var valueCache = normalizeValue(value, format);
+            var valueCache = normalizeDate(value, format);
             this.inputValueCache = (valueCache === null || valueCache === void 0 ? void 0 : valueCache.format(inputFormat)) || '';
         }
     };
@@ -261,7 +253,7 @@ var DatePicker = /** @class */ (function (_super) {
         var prevValue = prevProps.value;
         if (prevValue !== props.value) {
             var newState = {
-                value: normalizeValue(props.value, props.format)
+                value: normalizeDate(props.value, props.format)
             };
             newState.inputValue =
                 ((_a = newState.value) === null || _a === void 0 ? void 0 : _a.format(this.props.inputFormat)) || '';
@@ -339,7 +331,7 @@ var DatePicker = /** @class */ (function (_super) {
         var _b = this.props, format = _b.format, inputFormat = _b.inputFormat, onChange = _b.onChange;
         onChange(resetValue);
         this.setState({
-            inputValue: (_a = normalizeValue(resetValue, format)) === null || _a === void 0 ? void 0 : _a.format(inputFormat || '')
+            inputValue: (_a = normalizeDate(resetValue, format)) === null || _a === void 0 ? void 0 : _a.format(inputFormat || '')
         });
     };
     DatePicker.prototype.handleChange = function (value) {
@@ -399,10 +391,24 @@ var DatePicker = /** @class */ (function (_super) {
             inputValue: this.inputValueCache
         });
     };
-    DatePicker.prototype.selectRannge = function (item) {
-        var closeOnSelect = this.props.closeOnSelect;
+    DatePicker.prototype.selectShortcut = function (shortcut) {
+        var _a = this.props, closeOnSelect = _a.closeOnSelect, minDateRaw = _a.minDateRaw, maxDateRaw = _a.maxDateRaw, data = _a.data, format = _a.format;
         var now = moment();
-        this.handleChange(item.date(now));
+        /** minDate和maxDate要实时计算，因为用户可能设置为${NOW()}，暂时不考虑毫秒级的时间差 */
+        var minDate = minDateRaw
+            ? filterDate(minDateRaw, data, format)
+            : undefined;
+        var maxDate = maxDateRaw
+            ? filterDate(maxDateRaw, data, format)
+            : undefined;
+        var date = shortcut.date(now.clone());
+        if (minDate && moment.isMoment(minDate) && (minDate === null || minDate === void 0 ? void 0 : minDate.isValid())) {
+            date = moment.max(date, minDate);
+        }
+        if (maxDate && moment.isMoment(maxDate) && (maxDate === null || maxDate === void 0 ? void 0 : maxDate.isValid())) {
+            date = moment.min(maxDate, date);
+        }
+        this.handleChange(date);
         closeOnSelect && this.close();
     };
     DatePicker.prototype.checkIsValidDate = function (currentDate) {
@@ -440,7 +446,7 @@ var DatePicker = /** @class */ (function (_super) {
         if (!shortcuts) {
             return null;
         }
-        var _a = this.props; _a.classPrefix; var cx = _a.classnames;
+        var _a = this.props; _a.classPrefix; var cx = _a.classnames, __ = _a.translate, format = _a.format, data = _a.data;
         var shortcutArr;
         if (typeof shortcuts === 'string') {
             shortcutArr = shortcuts.split(',');
@@ -448,8 +454,7 @@ var DatePicker = /** @class */ (function (_super) {
         else {
             shortcutArr = shortcuts;
         }
-        var __ = this.props.translate;
-        return (React__default.createElement("ul", { className: cx("DatePicker-shortcuts") }, shortcutArr.map(function (item) {
+        return (React__default.createElement("ul", { className: cx("DatePicker-shortcuts") }, shortcutArr.map(function (item, index) {
             if (!item) {
                 return null;
             }
@@ -459,9 +464,17 @@ var DatePicker = /** @class */ (function (_super) {
                 shortcut.key = item;
             }
             else if (item.date) {
-                shortcut = __assign(__assign({}, item), { date: function () { return item.date; } });
+                var shortcutRaw_1 = __assign({}, item);
+                shortcut = __assign(__assign({}, item), { date: function () {
+                        var date = isExpression(shortcutRaw_1.date)
+                            ? moment(FormulaExec['formula'](shortcutRaw_1.date, data), format)
+                            : shortcutRaw_1.date;
+                        return date && moment.isMoment(date) && (date === null || date === void 0 ? void 0 : date.isValid())
+                            ? date
+                            : item.date;
+                    } });
             }
-            return (React__default.createElement("li", { className: cx("DatePicker-shortcut"), onClick: function () { return _this.selectRannge(shortcut); }, key: shortcut.key || shortcut.label },
+            return (React__default.createElement("li", { className: cx("DatePicker-shortcut"), onClick: function () { return _this.selectShortcut(shortcut); }, key: index },
                 React__default.createElement("a", null, __(shortcut.label))));
         })));
     };
@@ -509,8 +522,8 @@ var DatePicker = /** @class */ (function (_super) {
                 _a["DatePicker--border".concat(ucFirst(borderMode))] = borderMode,
                 _a['is-mobile'] = useMobileUI && isMobile(),
                 _a), className), ref: this.domRef, onClick: this.handleClick },
-            React__default.createElement(Input, { className: cx('DatePicker-input'), onChange: this.inputChange, onBlur: this.onInputBlur, ref: this.inputRef, placeholder: placeholder, autoComplete: "off", value: this.state.inputValue || '', disabled: disabled }),
-            clearable && !disabled && normalizeValue(value, format) ? (React__default.createElement("a", { className: cx("DatePicker-clear"), onClick: this.clearValue },
+            React__default.createElement(Input, { className: cx('DatePicker-input'), onChange: this.inputChange, onBlur: this.onInputBlur, ref: this.inputRef, placeholder: placeholder, autoComplete: "off", value: this.state.inputValue || '', disabled: disabled, readOnly: useMobileUI && isMobile() }),
+            clearable && !disabled && normalizeDate(value, format) ? (React__default.createElement("a", { className: cx("DatePicker-clear"), onClick: this.clearValue },
                 React__default.createElement(Icon, { icon: "input-clear", className: "icon" }))) : null,
             React__default.createElement("a", { className: cx("DatePicker-toggler") },
                 React__default.createElement(Icon, { icon: viewMode === 'time' ? 'clock' : 'date', className: "icon", iconContent: viewMode === 'time'