amis-ui 6.2.2 → 6.4.0

package/lib/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -955,7 +955,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (!shortcuts) {
             return null;
         }
-        var _a = this.props, ns = _a.classPrefix, format = _a.format, valueFormat = _a.valueFormat, data = _a.data;
+        var _a = this.props, ns = _a.classPrefix, format = _a.format, valueFormat = _a.valueFormat, data = _a.data, __ = _a.translate, testIdBuilder = _a.testIdBuilder;
         var shortcutArr;
         if (typeof shortcuts === 'string') {
             shortcutArr = shortcuts.split(',');
@@ -963,7 +963,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         else {
             shortcutArr = shortcuts;
         }
-        var __ = this.props.translate;
+        var TIDBuilder = testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('shortcut');
         return (_J$X_("ul", { className: "".concat(ns, "DateRangePicker-rangers") }, shortcutArr.map(function (item, index) {
             if (!item) {
                 return null;
@@ -1013,7 +1013,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             }
             if (Object.keys(shortcut).length) {
                 return (_J$X_("li", { className: "".concat(ns, "DateRangePicker-ranger"), onClick: function () { return _this.selectShortcut(shortcut); }, key: index },
-                    _J$X_("a", null, __(shortcut.label))));
+                    _J$X_("a", tslib.__assign({}, TIDBuilder === null || TIDBuilder === void 0 ? void 0 : TIDBuilder.getChild(shortcut.key).getTestId()), __(shortcut.label))));
             }
             else {
                 return null;
@@ -1034,13 +1034,11 @@ var DateRangePicker = /** @class */ (function (_super) {
         onChange('');
     };
     // 重置
-    DateRangePicker.prototype.reset = function () {
-        var _a = this.props, resetValue = _a.resetValue, onChange = _a.onChange, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, data = _a.data;
-        if (!resetValue) {
-            return;
-        }
-        var _b = DateRangePicker.unFormatValue(resetValue, valueFormat || format, joinValues, delimiter, data), startDate = _b.startDate, endDate = _b.endDate;
-        onChange(resetValue);
+    DateRangePicker.prototype.reset = function (resetValue) {
+        var _a = this.props, onChange = _a.onChange, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, data = _a.data;
+        var tmpResetValue = resetValue !== null && resetValue !== void 0 ? resetValue : this.props.resetValue;
+        var _b = DateRangePicker.unFormatValue(tmpResetValue, valueFormat || format, joinValues, delimiter, data), startDate = _b.startDate, endDate = _b.endDate;
+        onChange === null || onChange === void 0 ? void 0 : onChange(tmpResetValue);
         this.setState({
             startInputValue: startDate === null || startDate === void 0 ? void 0 : startDate.format(displayFormat || inputFormat),
             endInputValue: endDate === null || endDate === void 0 ? void 0 : endDate.format(displayFormat || inputFormat)
@@ -1109,7 +1107,9 @@ var DateRangePicker = /** @class */ (function (_super) {
         return true;
     };
     DateRangePicker.prototype.renderDay = function (props, currentDate) {
-        var _a = this.state, startDate = _a.startDate, endDate = _a.endDate;
+        var _a;
+        var _b = this.state, startDate = _b.startDate, endDate = _b.endDate;
+        var testIdBuilder = this.props.testIdBuilder;
         if (startDate &&
             endDate &&
             currentDate.isBetween(startDate, endDate, 'day', '[]')) {
@@ -1125,15 +1125,15 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (endDate && currentDate.isSame(endDate, 'day')) {
             props.className += ' rdtActive rdtEnd';
         }
-        var _b = this.getDisabledElementProps(currentDate, 'day'), className = _b.className, others = tslib.__rest(_b, ["className"]);
+        var _c = this.getDisabledElementProps(currentDate, 'day'), className = _c.className, others = tslib.__rest(_c, ["className"]);
         props.className += className;
         return (_J$X_("td", tslib.__assign({}, omit__default["default"](props, ['todayActiveStyle']), others),
-            _J$X_("span", null, currentDate.date())));
+            _J$X_("span", tslib.__assign({}, (_a = testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key)) === null || _a === void 0 ? void 0 : _a.getTestId()), currentDate.date())));
     };
     DateRangePicker.prototype.renderMonth = function (props, month, year, date) {
         var currentDate = props.viewDate.year(year).month(month);
         var _a = this.state, startDate = _a.startDate, endDate = _a.endDate;
-        var __ = this.props.translate;
+        var _b = this.props, __ = _b.translate, testIdBuilder = _b.testIdBuilder;
         var monthStr = currentDate.format(__('MMM'));
         var strLength = 3;
         // Because some months are up to 5 characters long, we want to
@@ -1154,14 +1154,15 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (endDate && currentDate.isSame(endDate, 'month')) {
             props.className += ' rdtActive rdtEnd';
         }
-        var _b = this.getDisabledElementProps(currentDate, 'month'), className = _b.className, others = tslib.__rest(_b, ["className"]);
+        var _c = this.getDisabledElementProps(currentDate, 'month'), className = _c.className, others = tslib.__rest(_c, ["className"]);
         props.className += className;
         return (_J$X_("td", tslib.__assign({}, omit__default["default"](props, 'viewDate'), others),
-            _J$X_("span", null, monthStrFixedLength)));
+            _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key).getTestId()), monthStrFixedLength)));
     };
     DateRangePicker.prototype.renderQuarter = function (props, quarter, year) {
         var currentDate = moment__default["default"]().year(year).quarter(quarter);
         var _a = this.state, startDate = _a.startDate, endDate = _a.endDate;
+        var testIdBuilder = this.props.testIdBuilder;
         if (startDate &&
             endDate &&
             currentDate.isBetween(startDate, endDate, 'quarter', '[]')) {
@@ -1180,13 +1181,14 @@ var DateRangePicker = /** @class */ (function (_super) {
         var _b = this.getDisabledElementProps(currentDate, 'quarter'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (_J$X_("td", tslib.__assign({}, props, others),
-            _J$X_("span", null,
+            _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key).getTestId()),
                 "Q",
                 quarter)));
     };
     DateRangePicker.prototype.renderYear = function (props, year) {
         var currentDate = moment__default["default"]().year(year);
         var _a = this.state, startDate = _a.startDate, endDate = _a.endDate;
+        var testIdBuilder = this.props.testIdBuilder;
         if (startDate &&
             endDate &&
             currentDate.isBetween(startDate, endDate, 'year', '[]')) {
@@ -1205,11 +1207,11 @@ var DateRangePicker = /** @class */ (function (_super) {
         var _b = this.getDisabledElementProps(currentDate, 'year'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (_J$X_("td", tslib.__assign({}, props, others),
-            _J$X_("span", null, year)));
+            _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key).getTestId()), year)));
     };
     DateRangePicker.prototype.renderCalendar = function () {
         var _this = this;
-        var _a = this.props, ns = _a.classPrefix, cx = _a.classnames, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, ranges = _a.ranges, shortcuts = _a.shortcuts, locale = _a.locale, embed = _a.embed, type = _a.type, _b = _a.viewMode, viewMode = _b === void 0 ? 'days' : _b, label = _a.label, mobileUI = _a.mobileUI;
+        var _a = this.props, ns = _a.classPrefix, cx = _a.classnames, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, ranges = _a.ranges, shortcuts = _a.shortcuts, locale = _a.locale, embed = _a.embed, type = _a.type, _b = _a.viewMode, viewMode = _b === void 0 ? 'days' : _b, label = _a.label, mobileUI = _a.mobileUI, testIdBuilder = _a.testIdBuilder;
         var __ = this.props.translate;
         var _c = this.state, startDate = _c.startDate, endDate = _c.endDate, editState = _c.editState, curDateFormat = _c.curDateFormat, curTimeFormat = _c.curTimeFormat;
         var isDateTimeRange = type === 'input-datetime-range';
@@ -1245,7 +1247,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                         ? this.handleStartDateChange
                         : viewMode === 'time'
                             ? this.handleTimeStartChange
-                            : this.handleDateChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkStartIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u5F00\u59CB\u65F6\u95F4", embed: embed, status: "start" })),
+                            : this.handleDateChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkStartIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u5F00\u59CB\u65F6\u95F4", embed: embed, status: "start", testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('calendar-start') })),
                 (!isTimeRange ||
                     (editState === 'end' && !embed) ||
                     (mobileUI && isTimeRange)) && (_J$X_(Calendar["default"], { className: "".concat(ns, "DateRangePicker-end"), value: endDate, onChange: isDateTimeRange
@@ -1254,7 +1256,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                             ? this.handleTimeEndChange
                             : this.handleDateChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, viewDate: isDateTimeRange ? this.currentMonth : this.nextMonth, 
                     // isEndDate
-                    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: embed, status: "end" }))),
+                    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: embed, status: "end", testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('calendar-end') }))),
             embed || mobileUI ? null : (_J$X_("div", { key: "button", className: "".concat(ns, "DateRangePicker-actions") },
                 _J$X_(Button["default"], { size: "sm", onClick: function () { return _this.close(); } }, __('cancel')),
                 _J$X_(Button["default"], { level: "primary", size: "sm", className: cx('m-l-sm'), disabled: isConfirmBtnDisbaled, onClick: this.confirm }, __('confirm'))))));
@@ -1320,14 +1322,25 @@ var DateRangePicker = /** @class */ (function (_super) {
                 width: cursorWidth
             } }));
     };
+    DateRangePicker.prototype.getDefaultDate = function () {
+        var _a;
+        var _b = this.props, value = _b.value, data = _b.data, valueFormat = _b.valueFormat, format = _b.format, delimiter = _b.delimiter;
+        if (value) {
+            var startDate = amisCore.filterDate(Array.isArray(value)
+                ? value[0] || value[1]
+                : (_a = String(value).split(delimiter)) === null || _a === void 0 ? void 0 : _a[0], data, valueFormat || format);
+            return startDate;
+        }
+        return undefined;
+    };
     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, displayFormat = _b.displayFormat; _b.joinValues; _b.delimiter; var clearable = _b.clearable, disabled = _b.disabled, embed = _b.embed, overlayPlacement = _b.overlayPlacement, borderMode = _b.borderMode, mobileUI = _b.mobileUI; _b.timeFormat; var minDate = _b.minDate, maxDate = _b.maxDate, minDuration = _b.minDuration, maxDuration = _b.maxDuration; _b.dateFormat; var _c = _b.viewMode, viewMode = _c === void 0 ? 'days' : _c, ranges = _b.ranges, shortcuts = _b.shortcuts, label = _b.label, animation = _b.animation;
+        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, popOverContainerSelector = _b.popOverContainerSelector, inputFormat = _b.inputFormat, displayFormat = _b.displayFormat; _b.joinValues; _b.delimiter; var clearable = _b.clearable, disabled = _b.disabled, embed = _b.embed, overlayPlacement = _b.overlayPlacement, borderMode = _b.borderMode, mobileUI = _b.mobileUI; _b.timeFormat; var minDate = _b.minDate, maxDate = _b.maxDate, minDuration = _b.minDuration, maxDuration = _b.maxDuration; _b.dateFormat; var _c = _b.viewMode, viewMode = _c === void 0 ? 'days' : _c, ranges = _b.ranges, shortcuts = _b.shortcuts, label = _b.label, animation = _b.animation, testIdBuilder = _b.testIdBuilder, locale = _b.locale;
         var useCalendarMobile = mobileUI && ['days', 'months', 'quarters'].indexOf(viewMode) > -1;
         var _d = this.state, isOpened = _d.isOpened, isFocused = _d.isFocused, startDate = _d.startDate, endDate = _d.endDate, curDateFormat = _d.curDateFormat, curTimeFormat = _d.curTimeFormat;
         var __ = this.props.translate;
-        var calendarMobile = (_J$X_(CalendarMobile["default"], { timeFormat: curTimeFormat, displayForamt: displayFormat || inputFormat, startDate: startDate, endDate: endDate, minDate: minDate, maxDate: maxDate, minDuration: minDuration, maxDuration: maxDuration, dateFormat: curDateFormat, embed: embed, viewMode: viewMode, close: this.close, confirm: this.confirm, onChange: this.handleMobileChange, footerExtra: this.renderShortcuts(ranges || shortcuts), showViewMode: viewMode === 'quarters' || viewMode === 'months' ? 'years' : 'months' }));
+        var calendarMobile = (_J$X_(CalendarMobile["default"], { popOverContainer: popOverContainer, timeFormat: curTimeFormat, displayForamt: displayFormat || inputFormat, defaultDate: this.getDefaultDate(), startDate: startDate, endDate: endDate, minDate: minDate, maxDate: maxDate, minDuration: minDuration, maxDuration: maxDuration, dateFormat: curDateFormat, embed: embed, viewMode: viewMode, close: this.close, confirm: this.confirm, onChange: this.handleMobileChange, footerExtra: this.renderShortcuts(ranges || shortcuts), locale: locale, showViewMode: viewMode === 'quarters' || viewMode === 'months' ? 'years' : 'months' }));
         if (embed) {
             return (_J$X_("div", { className: cx("".concat(ns, "DateRangeCalendar"), {
                     'is-mobile': mobileUI
@@ -1347,12 +1360,12 @@ var DateRangePicker = /** @class */ (function (_super) {
                 _a), className), ref: this.dom },
             _J$X_(Input["default"], { className: cx('DateRangePicker-input', {
                     isActive: !useAnimation && this.state.editState === 'start' && isOpened
-                }), onChange: this.startInputChange, onClick: this.openStart, ref: this.startInputRef, placeholder: __(startPlaceholder), autoComplete: "off", value: this.state.startInputValue || '', disabled: disabled, readOnly: mobileUI }),
+                }), onChange: this.startInputChange, onClick: this.openStart, ref: this.startInputRef, placeholder: __(startPlaceholder), autoComplete: "off", value: this.state.startInputValue || '', disabled: disabled, readOnly: mobileUI, testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('start') }),
             _J$X_("span", { className: cx('DateRangePicker-input-separator'), ref: this.separatorRef },
                 _J$X_("span", { className: cx('DateRangePicker-input-separator-line') })),
             _J$X_(Input["default"], { className: cx('DateRangePicker-input', {
                     isActive: !useAnimation && this.state.editState === 'end' && isOpened
-                }), onChange: this.endInputChange, onClick: this.openEnd, ref: this.endInputRef, placeholder: __(endPlaceholder), autoComplete: "off", value: this.state.endInputValue || '', disabled: disabled, readOnly: mobileUI }),
+                }), onChange: this.endInputChange, onClick: this.openEnd, ref: this.endInputRef, placeholder: __(endPlaceholder), autoComplete: "off", value: this.state.endInputValue || '', disabled: disabled, readOnly: mobileUI, testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('end') }),
             useAnimation ? this.renderActiveCursor() : null,
             clearable && !disabled && value ? (_J$X_("a", { className: "".concat(ns, "DateRangePicker-clear"), onClick: this.clearValue },
                 _J$X_(icons.Icon, { icon: "input-clear", className: "icon" }))) : null,
@@ -1360,7 +1373,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                 _J$X_(icons.Icon, { icon: viewMode === 'time' ? 'clock' : 'date', className: "icon", iconContent: viewMode === 'time'
                         ? 'DatePicker-toggler-clock'
                         : 'DatePicker-toggler-date' })),
-            isOpened ? (mobileUI ? (_J$X_(PopUp["default"], { isShow: isOpened, container: popOverContainer, className: cx("".concat(ns, "CalendarMobile-pop"), "".concat(ns, "CalendarMobile-pop--").concat(viewMode)), onHide: this.close, header: CalendarMobileTitle, showClose: false }, useCalendarMobile ? calendarMobile : this.renderCalendar())) : (_J$X_(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 ? (mobileUI ? (_J$X_(PopUp["default"], { isShow: isOpened, container: popOverContainer, className: cx("".concat(ns, "CalendarMobile-pop"), "".concat(ns, "CalendarMobile-pop--").concat(viewMode)), onHide: this.close, header: CalendarMobileTitle, showClose: false }, useCalendarMobile ? calendarMobile : this.renderCalendar())) : (_J$X_(amisCore.Overlay, { target: function () { return _this.dom.current; }, onHide: this.close, container: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), containerSelector: popOverContainerSelector, rootClose: false, placement: overlayPlacement, show: true },
                 _J$X_(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/DndContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/Drawer.d.ts

@@ -62,90 +62,90 @@ export declare class Drawer extends React.Component<DrawerProps, DrawerState> {
     render(): React.JSX.Element;
 }
 declare const _default: {
-    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-        showCloseButton?: boolean | undefined;
+    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
         size?: any;
+        position?: DrawerPosition | undefined;
         overlay?: boolean | undefined;
         container?: any;
-        position?: DrawerPosition | undefined;
+        showCloseButton?: boolean | undefined;
     } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
+            showCloseButton?: boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
+        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
+            showCloseButton?: boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
+            showCloseButton?: boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             showCloseButton?: boolean | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
+            showCloseButton?: boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             showCloseButton?: boolean | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             showCloseButton?: boolean | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "disabled" | "onHide" | "closeOnEsc" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             showCloseButton?: boolean | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "resizable" | "width" | "height" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
+            position?: DrawerPosition | undefined;
             overlay?: boolean | undefined;
             container?: any;
-            position?: DrawerPosition | undefined;
+            showCloseButton?: boolean | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;

package/lib/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */