amis-ui 3.5.2 → 3.6.0

package/esm/components/DatePicker.js

@@ -1,17 +1,18 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
-import { __extends, __spreadArray, __read, __assign } from 'tslib';
+import { __extends, __spreadArray, __read, __assign, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import moment from 'moment';
 import { Icon } from './icons.js';
-import { normalizeDate, string2regExp, filterDate, isExpression, FormulaExec, ucFirst, Overlay, PopOver, themeable, localeable } from 'amis-core';
+import { normalizeDate, filterDate, isExpression, FormulaExec, ucFirst, Overlay, PopOver, autobind, themeable, localeable } from 'amis-core';
 import PopUp from './PopUp.js';
 import Calendar from './calendar/Calendar.js';
 import CalendarMobile from './CalendarMobile.js';
 import Input from './Input.js';
+import Button from './Button.js';
 
 /**
  * @file DatePicker
@@ -270,7 +271,8 @@ var DatePicker = /** @class */ (function (_super) {
             value: normalizeDate(value, valueFormat || format),
             inputValue: ((_a = normalizeDate(value, valueFormat || format)) === null || _a === void 0 ? void 0 : _a.format(displayFormat || inputFormat)) || '',
             curTimeFormat: curTimeFormat,
-            curDateFormat: curDateFormat
+            curDateFormat: curDateFormat,
+            isModified: false
         };
         return _this;
     }
@@ -319,6 +321,12 @@ var DatePicker = /** @class */ (function (_super) {
             this.setState(newState);
         }
     };
+    DatePicker.prototype.isConfirmMode = function () {
+        var _a = this.props, closeOnSelect = _a.closeOnSelect, embed = _a.embed, mobileUI = _a.mobileUI;
+        var curTimeFormat = this.state.curTimeFormat;
+        /** 日期时间选择器才支持confirm */
+        return closeOnSelect === false && !!curTimeFormat && !embed && !mobileUI;
+    };
     DatePicker.prototype.focus = function () {
         if (!this.dom) {
             return;
@@ -363,22 +371,29 @@ var DatePicker = /** @class */ (function (_super) {
         input && input.focus();
     };
     DatePicker.prototype.close = function () {
-        this.setState({
-            isOpened: false
-        });
+        var _a;
+        var isConfirmMode = this.isConfirmMode();
+        if (isConfirmMode) {
+            var _b = this.props, value = _b.value, valueFormat = _b.valueFormat, format = _b.format, displayFormat = _b.displayFormat, inputFormat = _b.inputFormat;
+            this.setState({
+                value: normalizeDate(value, valueFormat || format),
+                inputValue: ((_a = normalizeDate(value, valueFormat || format)) === null || _a === void 0 ? void 0 : _a.format(displayFormat || inputFormat)) || ''
+            });
+        }
+        this.setState({ isOpened: false, isModified: false });
     };
     DatePicker.prototype.clearValue = function (e) {
         e.preventDefault();
         e.stopPropagation();
         var onChange = this.props.onChange;
         onChange('');
-        this.setState({ inputValue: '' });
+        this.setState({ inputValue: '', isModified: false });
     };
     // 清空
     DatePicker.prototype.clear = function () {
         var onChange = this.props.onChange;
         onChange('');
-        this.setState({ inputValue: '' });
+        this.setState({ inputValue: '', isModified: false });
     };
     // 重置
     DatePicker.prototype.reset = function (resetValue) {
@@ -389,13 +404,18 @@ var DatePicker = /** @class */ (function (_super) {
         var _b = this.props, format = _b.format, valueFormat = _b.valueFormat, inputFormat = _b.inputFormat, displayFormat = _b.displayFormat, onChange = _b.onChange;
         onChange(resetValue);
         this.setState({
-            inputValue: (_a = normalizeDate(resetValue, valueFormat || format)) === null || _a === void 0 ? void 0 : _a.format(displayFormat || inputFormat || '')
+            inputValue: (_a = normalizeDate(resetValue, valueFormat || format)) === null || _a === void 0 ? void 0 : _a.format(displayFormat || inputFormat || ''),
+            isModified: false
         });
     };
-    DatePicker.prototype.handleChange = function (value) {
-        var _a = this.props, onChange = _a.onChange, format = _a.format, valueFormat = _a.valueFormat, minDate = _a.minDate, maxDate = _a.maxDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, closeOnSelect = _a.closeOnSelect, utc = _a.utc; _a.viewMode;
-        var _b = this.state, curDateFormat = _b.curDateFormat, curTimeFormat = _b.curTimeFormat;
-        if (!moment.isMoment(value)) {
+    /**
+     * 如果为日期时间选择器，则单独处理时间选择事件，点击确认的时候才触发onChange
+     */
+    DatePicker.prototype.handleConfirm = function () {
+        var _a = this.props, onChange = _a.onChange, format = _a.format, valueFormat = _a.valueFormat, minDate = _a.minDate, maxDate = _a.maxDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, utc = _a.utc;
+        var value = this.state.value;
+        var isConfirmMode = this.isConfirmMode();
+        if (!isConfirmMode || !value) {
             return;
         }
         if (minDate && value && value.isBefore(minDate, 'second')) {
@@ -407,15 +427,65 @@ var DatePicker = /** @class */ (function (_super) {
         onChange(utc
             ? moment.utc(value).format(valueFormat || format)
             : value.format(valueFormat || format));
-        if (closeOnSelect && curDateFormat && !curTimeFormat) {
-            this.close();
-        }
         this.setState({
             inputValue: utc
                 ? moment.utc(value).format(displayFormat || inputFormat)
-                : value.format(displayFormat || inputFormat)
+                : value.format(displayFormat || inputFormat),
+            isOpened: false,
+            isModified: true
         });
     };
+    DatePicker.prototype.handleChange = function (value, viewMode) {
+        var _a = this.props, onChange = _a.onChange, format = _a.format, valueFormat = _a.valueFormat, minDate = _a.minDate, maxDate = _a.maxDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, closeOnSelect = _a.closeOnSelect, utc = _a.utc, defaultValue = _a.value;
+        var _b = this.state, curDateFormat = _b.curDateFormat, curTimeFormat = _b.curTimeFormat, isModified = _b.isModified;
+        var isConfirmMode = this.isConfirmMode();
+        if (!moment.isMoment(value)) {
+            return;
+        }
+        if (minDate && value && value.isBefore(minDate, 'second')) {
+            value = minDate;
+        }
+        else if (maxDate && value && value.isAfter(maxDate, 'second')) {
+            value = maxDate;
+        }
+        /** 首次选择且当前未绑定值，则默认使用当前时间 */
+        if (!defaultValue && !!curTimeFormat && !isModified) {
+            var now_1 = moment();
+            var timePart_1 = {
+                date: value.get('date'),
+                hour: value.get('hour'),
+                minute: value.get('minute'),
+                second: value.get('second'),
+                millisecond: value.get('millisecond')
+            };
+            Object.keys(timePart_1).forEach(function (unit) {
+                /** 首次选择时间，日期使用当前时间; 将未设置过的时间字段设置为当前值 */
+                if ((unit === 'date' && viewMode === 'time') ||
+                    (unit !== 'date' && timePart_1[unit] === 0)) {
+                    timePart_1[unit] = now_1.get(unit);
+                }
+            });
+            value.set(timePart_1);
+        }
+        var updatedValue = utc
+            ? moment.utc(value).format(valueFormat || format)
+            : value.format(valueFormat || format);
+        var updatedInputValue = utc
+            ? moment.utc(value).format(displayFormat || inputFormat)
+            : value.format(displayFormat || inputFormat);
+        if (isConfirmMode) {
+            this.setState({ value: value, inputValue: updatedInputValue });
+            this.inputValueCache = updatedInputValue;
+        }
+        else {
+            onChange(updatedValue);
+            if (closeOnSelect && curDateFormat && !curTimeFormat) {
+                this.close();
+            }
+            this.setState({ inputValue: updatedInputValue });
+        }
+        this.setState({ isModified: true });
+    };
     // 手动输入日期
     DatePicker.prototype.inputChange = function (e) {
         var _a = this.props, onChange = _a.onChange, inputFormat = _a.inputFormat, format = _a.format, displayFormat = _a.displayFormat, valueFormat = _a.valueFormat, utc = _a.utc, minDate = _a.minDate, maxDate = _a.maxDate;
@@ -427,9 +497,9 @@ var DatePicker = /** @class */ (function (_super) {
         else {
             // 将输入的格式转成正则匹配，比如 YYYY-MM-DD HH:mm:ss 改成 \d\d\d\d\-
             // 只有匹配成功才更新
-            var inputCheckRegex = string2regExp((displayFormat || inputFormat)
-                .replace(/[ymdhs]/gi, "".concat(string2regExp('\\d')))
-                .replace(/-/gi, "".concat(string2regExp('\\-'))));
+            var inputCheckRegex = new RegExp((valueFormat || inputFormat || displayFormat)
+                .replace(/[ymdhs]/gi, '\\d')
+                .replace(/-/gi, '\\-'));
             if (inputCheckRegex.test(value)) {
                 var newDate = moment(value, displayFormat || inputFormat);
                 var dateValue = utc
@@ -546,11 +616,19 @@ var DatePicker = /** @class */ (function (_super) {
     };
     DatePicker.prototype.render = function () {
         var _a;
-        var _b = this.props, ns = _b.classPrefix, cx = _b.classnames, className = _b.className, popoverClassName = _b.popoverClassName, value = _b.value, placeholder = _b.placeholder, disabled = _b.disabled, inputFormat = _b.inputFormat, displayFormat = _b.displayFormat; _b.dateFormat; _b.timeFormat; var viewMode = _b.viewMode, timeConstraints = _b.timeConstraints, popOverContainer = _b.popOverContainer, clearable = _b.clearable, shortcuts = _b.shortcuts; _b.utc; var isEndDate = _b.isEndDate, overlayPlacement = _b.overlayPlacement, locale = _b.locale, format = _b.format, valueFormat = _b.valueFormat, borderMode = _b.borderMode, embed = _b.embed, minDate = _b.minDate, mobileUI = _b.mobileUI, maxDate = _b.maxDate, schedules = _b.schedules, largeMode = _b.largeMode, scheduleClassNames = _b.scheduleClassNames, todayActiveStyle = _b.todayActiveStyle, onScheduleClick = _b.onScheduleClick, mobileCalendarMode = _b.mobileCalendarMode, label = _b.label, env = _b.env;
+        var _b = this.props, ns = _b.classPrefix, cx = _b.classnames, className = _b.className, popoverClassName = _b.popoverClassName, value = _b.value, placeholder = _b.placeholder, disabled = _b.disabled, inputFormat = _b.inputFormat, displayFormat = _b.displayFormat; _b.dateFormat; _b.timeFormat; var viewMode = _b.viewMode, timeConstraints = _b.timeConstraints, popOverContainer = _b.popOverContainer, clearable = _b.clearable, shortcuts = _b.shortcuts; _b.utc; var isEndDate = _b.isEndDate, overlayPlacement = _b.overlayPlacement, locale = _b.locale, format = _b.format, valueFormat = _b.valueFormat, borderMode = _b.borderMode, embed = _b.embed, minDate = _b.minDate, mobileUI = _b.mobileUI, maxDate = _b.maxDate, schedules = _b.schedules, largeMode = _b.largeMode, scheduleClassNames = _b.scheduleClassNames, todayActiveStyle = _b.todayActiveStyle, onScheduleClick = _b.onScheduleClick, mobileCalendarMode = _b.mobileCalendarMode, label = _b.label, env = _b.env, onClick = _b.onClick, onMouseEnter = _b.onMouseEnter, onMouseLeave = _b.onMouseLeave; _b.closeOnSelect;
         var __ = this.props.translate;
-        var _c = this.state, curTimeFormat = _c.curTimeFormat, curDateFormat = _c.curDateFormat;
-        var isOpened = this.state.isOpened;
+        var _c = this.state, curTimeFormat = _c.curTimeFormat, curDateFormat = _c.curDateFormat, isOpened = _c.isOpened;
+        var isConfirmMode = this.isConfirmMode();
         var date = this.state.value;
+        var isConfirmBtnDisbaled = false;
+        if (isConfirmMode) {
+            var lastModifiedValue = normalizeDate(value, valueFormat || format);
+            isConfirmBtnDisbaled =
+                date && lastModifiedValue
+                    ? moment(date).isSame(lastModifiedValue, 'second')
+                    : date === lastModifiedValue;
+        }
         var calendarMobile = (React__default.createElement(CalendarMobile, { isDatePicker: true, timeFormat: curTimeFormat, displayForamt: displayFormat || inputFormat, startDate: date, defaultDate: date, minDate: minDate, maxDate: maxDate, dateFormat: curDateFormat, embed: embed, viewMode: viewMode, close: this.close, confirm: this.handleChange, footerExtra: this.renderShortCuts(shortcuts), showViewMode: viewMode === 'quarters' || viewMode === 'months' ? 'years' : 'months', timeConstraints: timeConstraints, isEndDate: isEndDate }));
         var CalendarMobileTitle = (React__default.createElement("div", { className: "".concat(ns, "CalendarMobile-title") }, label && typeof label === 'string' ? label : __('Calendar.datepicker')));
         var useCalendarMobile = mobileUI && ['days', 'months', 'quarters'].indexOf(viewMode) > -1;
@@ -578,7 +656,7 @@ var DatePicker = /** @class */ (function (_super) {
                 }, className) },
                 React__default.createElement(Calendar, { value: date, onChange: this.handleChange, requiredConfirm: false, dateFormat: curDateFormat, timeFormat: curTimeFormat, isValidDate: this.checkIsValidDate, viewMode: viewMode, timeConstraints: timeConstraints, input: false, onClose: this.close, locale: locale, minDate: minDate, maxDate: maxDate, 
                     // utc={utc}
-                    schedules: schedulesData, env: env, largeMode: largeMode, todayActiveStyle: todayActiveStyle, onScheduleClick: onScheduleClick, embed: embed, mobileUI: mobileUI, isEndDate: isEndDate })));
+                    schedules: schedulesData, env: env, largeMode: largeMode, todayActiveStyle: todayActiveStyle, onScheduleClick: onScheduleClick, embed: embed, mobileUI: mobileUI, isEndDate: isEndDate, onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave })));
         }
         return (React__default.createElement("div", { tabIndex: 0, onKeyPress: this.handleKeyPress, onFocus: this.handleFocus, onBlur: this.handleBlur, className: cx("DatePicker", (_a = {
                     'is-disabled': disabled,
@@ -599,9 +677,12 @@ var DatePicker = /** @class */ (function (_super) {
             !mobileUI && isOpened ? (React__default.createElement(Overlay, { target: this.getTarget, container: popOverContainer || this.getParent, rootClose: false, placement: overlayPlacement, show: true },
                 React__default.createElement(PopOver, { classPrefix: ns, className: cx("DatePicker-popover", popoverClassName), onHide: this.close, overlay: true, onClick: this.handlePopOverClick },
                     this.renderShortCuts(shortcuts),
-                    React__default.createElement(Calendar, { value: date, onChange: this.handleChange, requiredConfirm: viewMode === 'time', dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkIsValidDate, viewMode: viewMode, timeConstraints: timeConstraints, input: false, onClose: this.close, locale: locale, minDate: minDate, maxDate: maxDate, mobileUI: mobileUI, isEndDate: isEndDate })))) : null,
+                    React__default.createElement(Calendar, { value: date, onChange: this.handleChange, requiredConfirm: viewMode === 'time', dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkIsValidDate, viewMode: viewMode, timeConstraints: timeConstraints, input: false, onClose: this.close, locale: locale, minDate: minDate, maxDate: maxDate, mobileUI: mobileUI, isEndDate: isEndDate, onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave }),
+                    isConfirmMode ? (React__default.createElement("div", { className: "".concat(ns, "DateRangePicker-actions") },
+                        React__default.createElement(Button, { size: "sm", onClick: this.close }, __('cancel')),
+                        React__default.createElement(Button, { level: "primary", size: "sm", disabled: isConfirmBtnDisbaled, className: cx('m-l-sm'), onClick: this.handleConfirm }, __('confirm')))) : null))) : null,
             mobileUI ? (mobileCalendarMode === 'calendar' && useCalendarMobile ? (React__default.createElement(PopUp, { isShow: isOpened, className: cx("".concat(ns, "CalendarMobile-pop")), onHide: this.close, header: CalendarMobileTitle }, calendarMobile)) : (React__default.createElement(PopUp, { className: cx("".concat(ns, "DatePicker-popup DatePicker-mobile")), container: popOverContainer, isShow: isOpened, showClose: false, onHide: this.handleClick },
-                React__default.createElement(Calendar, { value: date, onChange: this.handleChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkIsValidDate, viewMode: viewMode, timeConstraints: timeConstraints, input: false, onClose: this.close, locale: locale, minDate: minDate, maxDate: maxDate, mobileUI: mobileUI })))) : null));
+                React__default.createElement(Calendar, { value: date, onChange: this.handleChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkIsValidDate, viewMode: viewMode, timeConstraints: timeConstraints, input: false, onClose: this.close, locale: locale, minDate: minDate, maxDate: maxDate, mobileUI: mobileUI, onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave })))) : null));
     };
     DatePicker.defaultProps = {
         viewMode: 'days',
@@ -616,6 +697,12 @@ var DatePicker = /** @class */ (function (_super) {
             'bg-secondary'
         ]
     };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], DatePicker.prototype, "handleConfirm", null);
     return DatePicker;
 }(React__default.Component));
 var DatePicker$1 = themeable(localeable(DatePicker));

package/esm/components/DateRangePicker.d.ts

@@ -9,7 +9,7 @@ import moment, { unitOfTime } from 'moment';
 import { ShortCuts } from './DatePicker';
 import type { Moment } from 'moment';
 import type { PlainObject, ThemeProps, LocaleProps } from 'amis-core';
-import type { ViewMode } from './calendar/Calendar';
+import type { ViewMode, ChangeEventViewMode } from './calendar/Calendar';
 export interface DateRangePickerProps extends ThemeProps, LocaleProps {
     className?: string;
     popoverClassName?: string;
@@ -143,19 +143,21 @@ export declare class DateRangePicker extends React.Component<DateRangePickerProp
         type: 'start' | 'end';
         originValue?: moment.Moment;
         timeFormat?: string;
-        subControlViewMode?: 'time';
+        subControlViewMode?: ChangeEventViewMode;
+        /** 自动初始化绑定值，用于首次选择且当前未绑定值，默认使用当前时间 */
+        autoInitDefaultValue?: boolean;
     }): moment.Moment;
     handleDateChange(newValue: moment.Moment): void;
     /**
      * @param {Moment} newValue 当前选择的日期时间值
      * @param {ViewMode=} subControlViewMode 子选择控件的类型，可选参数（'time'），用于区分datetime选择器的触发控件
      */
-    handleStartDateChange(newValue: moment.Moment, subControlViewMode?: Extract<ViewMode, 'time'>): void;
+    handleStartDateChange(newValue: moment.Moment, subControlViewMode?: ChangeEventViewMode): void;
     /**
      * @param {Moment} newValue 当前选择的日期时间值
      * @param {string=} subControlViewMode 子选择控件的类型的类型，可选参数（'time'），用于区分datetime选择器的触发控件
      */
-    handelEndDateChange(newValue: moment.Moment, subControlViewMode?: Extract<ViewMode, 'time'>): void;
+    handelEndDateChange(newValue: moment.Moment, subControlViewMode?: ChangeEventViewMode): void;
     startInputChange(e: React.ChangeEvent<HTMLInputElement>): void;
     endInputChange(e: React.ChangeEvent<HTMLInputElement>): void;
     getEndDateByDuration(newValue: moment.Moment): moment.Moment;
@@ -417,7 +419,9 @@ declare const _default: {
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }): {
             ref: any;
-            childRef(ref: any): void;
+            childRef(ref: any): void; /**
+             * @deprecated 3.1.0后废弃，用shortcuts替代
+             */
             getWrappedInstance(): any;
             render(): React.JSX.Element;
             context: unknown;
@@ -464,7 +468,7 @@ declare const _default: {
             refs: {
                 [key: string]: React.ReactInstance;
             };
-            componentDidMount?(): void; /** 结束时间 */
+            componentDidMount?(): void;
             shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "classnames" | "classPrefix" | "type" | "data" | "embed" | "label" | "style" | "className" | "theme" | "mobileUI" | "value" | "disabled" | "onFocus" | "onBlur" | "onChange" | "viewMode" | "popoverClassName" | "displayFormat" | "timeFormat" | "valueFormat" | "minDate" | "maxDate" | "minDateRaw" | "maxDateRaw" | "utc" | "dateFormat" | "popOverContainer" | "borderMode" | "onRef" | "minDuration" | "maxDuration" | "animation" | "transform"> & {
                 clearable?: boolean | undefined;
                 inputFormat?: string | undefined;
@@ -630,7 +634,9 @@ declare const _default: {
         translate?: ((str: string, ...args: any[]) => string) | undefined;
     }): {
         ref: any;
-        childRef(ref: any): void;
+        childRef(ref: any): void; /**
+         * @deprecated 3.1.0后废弃，用shortcuts替代
+         */
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
@@ -677,7 +683,7 @@ declare const _default: {
         refs: {
             [key: string]: React.ReactInstance;
         };
-        componentDidMount?(): void; /** 结束时间 */
+        componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "classnames" | "classPrefix" | "type" | "data" | "embed" | "label" | "style" | "className" | "theme" | "mobileUI" | "value" | "disabled" | "onFocus" | "onBlur" | "onChange" | "viewMode" | "popoverClassName" | "displayFormat" | "timeFormat" | "valueFormat" | "minDate" | "maxDate" | "minDateRaw" | "maxDateRaw" | "utc" | "dateFormat" | "popOverContainer" | "borderMode" | "onRef" | "minDuration" | "maxDuration" | "animation" | "transform"> & {
             clearable?: boolean | undefined;
             inputFormat?: string | undefined;
@@ -843,7 +849,9 @@ declare const _default: {
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }): {
             ref: any;
-            childRef(ref: any): void;
+            childRef(ref: any): void; /**
+             * @deprecated 3.1.0后废弃，用shortcuts替代
+             */
             getWrappedInstance(): any;
             render(): React.JSX.Element;
             context: unknown;
@@ -890,7 +898,7 @@ declare const _default: {
             refs: {
                 [key: string]: React.ReactInstance;
             };
-            componentDidMount?(): void; /** 结束时间 */
+            componentDidMount?(): void;
             shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "classnames" | "classPrefix" | "type" | "data" | "embed" | "label" | "style" | "className" | "theme" | "mobileUI" | "value" | "disabled" | "onFocus" | "onBlur" | "onChange" | "viewMode" | "popoverClassName" | "displayFormat" | "timeFormat" | "valueFormat" | "minDate" | "maxDate" | "minDateRaw" | "maxDateRaw" | "utc" | "dateFormat" | "popOverContainer" | "borderMode" | "onRef" | "minDuration" | "maxDuration" | "animation" | "transform"> & {
                 clearable?: boolean | undefined;
                 inputFormat?: string | undefined;

package/esm/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -656,16 +656,42 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (options === void 0) { options = { type: 'start' }; }
         var _a = options || {
             type: 'start'
-        }, type = _a.type, originValue = _a.originValue, timeFormat = _a.timeFormat, subControlViewMode = _a.subControlViewMode;
+        }, type = _a.type, originValue = _a.originValue, timeFormat = _a.timeFormat, subControlViewMode = _a.subControlViewMode, autoInitDefaultValue = _a.autoInitDefaultValue;
         var value = date.clone();
         var _b = this.props, transform = _b.transform, data = _b.data;
-        var transformFn = transform && typeof transform === 'string'
-            ? str2function(transform, 'value', 'config', 'props', 'data', 'moment')
-            : transform;
+        var _c = this.state, startDate = _c.startDate, endDate = _c.endDate;
+        /** 此时为点选后的值初始化设置，不应该被内部转化逻辑和transformFn限制 */
+        if (autoInitDefaultValue === true) {
+            var now_1 = moment();
+            /** 如果已经设置了结束时间且当前时间已经超出了结束时间，则开始时间不能超过结束时间 */
+            if (!startDate && endDate && type === 'start' && now_1.isAfter(endDate)) {
+                value = endDate.clone();
+                return value;
+            }
+            var timePart_1 = {
+                date: value.get('date'),
+                hour: value.get('hour'),
+                minute: value.get('minute'),
+                second: value.get('second'),
+                millisecond: value.get('millisecond')
+            };
+            Object.keys(timePart_1).forEach(function (unit) {
+                /** 首次选择时间，日期使用当前时间; 将未设置过的时间字段设置为当前值 */
+                if ((unit === 'date' && subControlViewMode === 'time') ||
+                    (unit !== 'date' && timePart_1[unit] === 0)) {
+                    timePart_1[unit] = now_1.get(unit);
+                }
+            });
+            value.set(timePart_1);
+            return value;
+        }
         /** 日期时间选择器组件支持用户选择时间，如果用户手动选择了时间，则不需要走默认处理 */
         if (subControlViewMode && subControlViewMode === 'time') {
             return value;
         }
+        var transformFn = transform && typeof transform === 'string'
+            ? str2function(transform, 'value', 'config', 'props', 'data', 'moment')
+            : transform;
         // 没有初始值
         if (!originValue) {
             value = value[type === 'start' ? 'startOf' : 'endOf']('day');
@@ -704,8 +730,8 @@ var DateRangePicker = /** @class */ (function (_super) {
      * @param {ViewMode=} subControlViewMode 子选择控件的类型，可选参数（'time'），用于区分datetime选择器的触发控件
      */
     DateRangePicker.prototype.handleStartDateChange = function (newValue, subControlViewMode) {
-        var _a = this.props, minDate = _a.minDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type;
-        var _b = this.state, startDate = _b.startDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
+        var _a = this.props, minDate = _a.minDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type; _a.value;
+        var _b = this.state, startDate = _b.startDate, oldStartDate = _b.oldStartDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
         if (minDate && newValue.isBefore(minDate)) {
             newValue = minDate;
         }
@@ -713,7 +739,8 @@ var DateRangePicker = /** @class */ (function (_super) {
             type: 'start',
             originValue: startDate || minDate,
             timeFormat: timeFormat,
-            subControlViewMode: subControlViewMode
+            subControlViewMode: subControlViewMode,
+            autoInitDefaultValue: !!timeFormat && newValue && (!oldStartDate || !startDate)
         });
         var newState = {
             startDate: date,
@@ -735,15 +762,16 @@ var DateRangePicker = /** @class */ (function (_super) {
      */
     DateRangePicker.prototype.handelEndDateChange = function (newValue, subControlViewMode) {
         var _this = this;
-        var _a = this.props, embed = _a.embed, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type;
-        var _b = this.state; _b.startDate; var endDate = _b.endDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
+        var _a = this.props, embed = _a.embed, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type; _a.value;
+        var _b = this.state; _b.startDate; var endDate = _b.endDate, oldEndDate = _b.oldEndDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
         newValue = this.getEndDateByDuration(newValue);
         var editState = endDateOpenedFirst ? 'start' : 'end';
         var date = this.filterDate(newValue, {
             type: 'end',
             originValue: endDate,
             timeFormat: timeFormat,
-            subControlViewMode: subControlViewMode
+            subControlViewMode: subControlViewMode,
+            autoInitDefaultValue: !!timeFormat && newValue && (!oldEndDate || !endDate)
         });
         this.setState({
             endDate: date,

package/esm/components/DndContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,6 +11,7 @@ import { Icon } from './icons.js';
 import cx from 'classnames';
 import { addModal, current, removeModal } from './ModalManager.js';
 import { getScrollbarWidth, autobind, themeable } from 'amis-core';
+import { getContainerWithFullscreen } from './Modal.js';
 
 /**
  * @file Drawer
@@ -194,7 +195,7 @@ var Drawer = /** @class */ (function (_super) {
         var _this = this;
         var _a = this.props, ns = _a.classPrefix, className = _a.className, children = _a.children, container = _a.container, show = _a.show, showCloseButton = _a.showCloseButton, position = _a.position, size = _a.size, onHide = _a.onHide, disabled = _a.disabled, overlay = _a.overlay, bodyClassName = _a.bodyClassName, resizable = _a.resizable, drawerClassName = _a.drawerClassName, drawerMaskClassName = _a.drawerMaskClassName;
         var bodyStyle = this.getDrawerStyle();
-        return (React__default.createElement(Portal, { container: container },
+        return (React__default.createElement(Portal, { container: getContainerWithFullscreen(container) },
             React__default.createElement(Transition, { mountOnEnter: true, unmountOnExit: true, appear: true, in: show, timeout: 500, onEnter: this.handleEnter, onExited: this.handleExited, onEntered: this.handleEntered }, function (status) {
                 var _a;
                 if (status === ENTERING) {