amis-ui 3.4.0 → 3.4.1

package/esm/components/DateRangePicker.d.ts

@@ -8,6 +8,7 @@ import React from 'react';
 import moment, { unitOfTime } from 'moment';
 import { ShortCuts } from './DatePicker';
 import type { PlainObject, ThemeProps, LocaleProps } from 'amis-core';
+import type { ViewMode } from './calendar/Calendar';
 export interface DateRangePickerProps extends ThemeProps, LocaleProps {
     className?: string;
     popoverClassName?: string;
@@ -44,7 +45,7 @@ export interface DateRangePickerProps extends ThemeProps, LocaleProps {
     popOverContainer?: any;
     dateFormat?: string;
     embed?: boolean;
-    viewMode?: 'days' | 'months' | 'years' | 'time' | 'quarters';
+    viewMode?: ViewMode;
     borderMode?: 'full' | 'half' | 'none';
     onFocus?: Function;
     onBlur?: Function;
@@ -135,10 +136,23 @@ export declare class DateRangePicker extends React.Component<DateRangePickerProp
     handlePopOverClick(e: React.MouseEvent<any>): void;
     handleKeyPress(e: React.KeyboardEvent): void;
     confirm(): void;
-    filterDate(date: moment.Moment, originValue?: moment.Moment, timeFormat?: string, type?: 'start' | 'end'): moment.Moment;
+    filterDate(date: moment.Moment, options?: {
+        type: 'start' | 'end';
+        originValue?: moment.Moment;
+        timeFormat?: string;
+        subControlViewMode?: 'time';
+    }): moment.Moment;
     handleDateChange(newValue: moment.Moment): void;
-    handleStartDateChange(newValue: moment.Moment): void;
-    handelEndDateChange(newValue: moment.Moment): void;
+    /**
+     * @param {Moment} newValue 当前选择的日期时间值
+     * @param {ViewMode=} subControlViewMode 子选择控件的类型，可选参数（'time'），用于区分datetime选择器的触发控件
+     */
+    handleStartDateChange(newValue: moment.Moment, subControlViewMode?: Extract<ViewMode, 'time'>): void;
+    /**
+     * @param {Moment} newValue 当前选择的日期时间值
+     * @param {string=} subControlViewMode 子选择控件的类型的类型，可选参数（'time'），用于区分datetime选择器的触发控件
+     */
+    handelEndDateChange(newValue: moment.Moment, subControlViewMode?: Extract<ViewMode, 'time'>): void;
     startInputChange(e: React.ChangeEvent<HTMLInputElement>): void;
     endInputChange(e: React.ChangeEvent<HTMLInputElement>): void;
     getEndDateByDuration(newValue: moment.Moment): moment.Moment;
@@ -189,7 +203,7 @@ declare const _default: {
     } & {
         locale?: string | undefined;
         translate?: ((str: string, ...args: any[]) => string) | undefined;
-    }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+    }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
@@ -213,7 +227,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        }, keyof ThemeProps> & 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<Omit<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"> & {
             clearable?: boolean | undefined;
@@ -233,7 +247,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -257,7 +271,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<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"> & {
@@ -278,7 +292,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<Omit<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"> & {
             clearable?: boolean | undefined;
             inputFormat?: string | undefined;
@@ -297,7 +311,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
         componentWillReceiveProps?(nextProps: Readonly<Omit<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"> & {
@@ -318,7 +332,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
         UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<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"> & {
             clearable?: boolean | undefined;
             inputFormat?: string | undefined;
@@ -337,7 +351,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
         componentWillUpdate?(nextProps: Readonly<Omit<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"> & {
             clearable?: boolean | undefined;
             inputFormat?: string | undefined;
@@ -356,7 +370,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<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"> & {
             clearable?: boolean | undefined;
             inputFormat?: string | undefined;
@@ -375,7 +389,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/esm/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.4.0
+ * amis-ui v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -652,9 +652,16 @@ var DateRangePicker = /** @class */ (function (_super) {
             this.close(true);
         }
     };
-    DateRangePicker.prototype.filterDate = function (date, originValue, timeFormat, type) {
-        if (type === void 0) { type = 'start'; }
+    DateRangePicker.prototype.filterDate = function (date, options) {
+        if (options === void 0) { options = { type: 'start' }; }
+        var _a = options || {
+            type: 'start'
+        }, type = _a.type, originValue = _a.originValue, timeFormat = _a.timeFormat, subControlViewMode = _a.subControlViewMode;
         var value = date.clone();
+        /** 日期时间选择器组件支持用户选择时间，如果用户手动选择了时间，则不需要走默认处理 */
+        if (subControlViewMode && subControlViewMode === 'time') {
+            return value;
+        }
         // 没有初始值
         if (!originValue) {
             value = value[type === 'start' ? 'startOf' : 'endOf']('day');
@@ -685,13 +692,22 @@ var DateRangePicker = /** @class */ (function (_super) {
             this.handelEndDateChange(newValue);
         }
     };
-    DateRangePicker.prototype.handleStartDateChange = function (newValue) {
-        var _a = this.props, timeFormat = _a.timeFormat, minDate = _a.minDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type;
-        var _b = this.state, startDate = _b.startDate, endDateOpenedFirst = _b.endDateOpenedFirst;
+    /**
+     * @param {Moment} newValue 当前选择的日期时间值
+     * @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;
         if (minDate && newValue.isBefore(minDate)) {
             newValue = minDate;
         }
-        var date = this.filterDate(newValue, startDate || minDate, timeFormat, 'start');
+        var date = this.filterDate(newValue, {
+            type: 'start',
+            originValue: startDate || minDate,
+            timeFormat: timeFormat,
+            subControlViewMode: subControlViewMode
+        });
         var newState = {
             startDate: date,
             startInputValue: date.format(displayFormat || inputFormat)
@@ -706,13 +722,22 @@ var DateRangePicker = /** @class */ (function (_super) {
         }
         this.setState(newState);
     };
-    DateRangePicker.prototype.handelEndDateChange = function (newValue) {
+    /**
+     * @param {Moment} newValue 当前选择的日期时间值
+     * @param {string=} subControlViewMode 子选择控件的类型的类型，可选参数（'time'），用于区分datetime选择器的触发控件
+     */
+    DateRangePicker.prototype.handelEndDateChange = function (newValue, subControlViewMode) {
         var _this = this;
-        var _a = this.props, embed = _a.embed, timeFormat = _a.timeFormat, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type;
-        var _b = this.state; _b.startDate; var endDate = _b.endDate, endDateOpenedFirst = _b.endDateOpenedFirst;
+        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;
         newValue = this.getEndDateByDuration(newValue);
         var editState = endDateOpenedFirst ? 'start' : 'end';
-        var date = this.filterDate(newValue, endDate, timeFormat, 'end');
+        var date = this.filterDate(newValue, {
+            type: 'end',
+            originValue: endDate,
+            timeFormat: timeFormat,
+            subControlViewMode: subControlViewMode
+        });
         this.setState({
             endDate: date,
             endInputValue: date.format(displayFormat || inputFormat)

package/esm/components/DndContainer.d.ts

@@ -44,7 +44,7 @@ export interface DndContainerProps extends LocaleProps, ThemeProps {
     onStop?: (event: DraggableEvent, data: DraggableData) => void | false;
 }
 declare const _default: {
-    new (props: Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+    new (props: Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
         locale?: string | undefined;
         translate?: ((str: string, ...args: any[]) => string) | undefined;
     }): {
@@ -53,12 +53,12 @@ declare const _default: {
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        readonly props: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>;
@@ -67,35 +67,35 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        shouldComponentUpdate?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        componentDidUpdate?(prevProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        componentWillReceiveProps?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        componentWillUpdate?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, nextState: Readonly<{}>, nextContext: any): void;
@@ -103,31 +103,31 @@ declare const _default: {
     displayName: string;
     contextType: React.Context<string>;
     ComposedComponent: React.ComponentType<{
-        new (props: Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+        new (props: Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps): {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): React.JSX.Element;
             context: unknown;
-            setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
+            setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
+            readonly props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;
             };
             componentDidMount?(): void;
-            shouldComponentUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+            shouldComponentUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
             componentWillUnmount?(): void;
             componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-            getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-            componentDidUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+            getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
+            componentDidUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
             componentWillMount?(): void;
             UNSAFE_componentWillMount?(): void;
-            componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-            UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-            componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-            UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+            componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+            UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+            componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+            UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
         };
         displayName: string;
         contextType: React.Context<string>;
@@ -136,31 +136,31 @@ declare const _default: {
         ComposedComponent: React.FC<DndContainerProps>;
     }>;
 } & import("hoist-non-react-statics").NonReactStatics<{
-    new (props: Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
+        setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
+        readonly props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;
@@ -169,31 +169,31 @@ declare const _default: {
     ComposedComponent: React.FC<DndContainerProps>;
 }, {}> & {
     ComposedComponent: {
-        new (props: Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+        new (props: Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps): {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): React.JSX.Element;
             context: unknown;
-            setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
+            setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
+            readonly props: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;
             };
             componentDidMount?(): void;
-            shouldComponentUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+            shouldComponentUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
             componentWillUnmount?(): void;
             componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-            getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-            componentDidUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+            getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
+            componentDidUpdate?(prevProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
             componentWillMount?(): void;
             UNSAFE_componentWillMount?(): void;
-            componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-            UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-            componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-            UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+            componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+            UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+            componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+            UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<DndContainerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
         };
         displayName: string;
         contextType: React.Context<string>;

package/esm/components/DndContainer.js

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

package/esm/components/Drawer.d.ts

@@ -28,6 +28,8 @@ export interface DrawerProps {
     children?: React.ReactNode | Array<React.ReactNode>;
     onExited?: () => void;
     onEntered?: () => void;
+    drawerClassName?: string;
+    drawerMaskClassName?: string;
 }
 export interface DrawerState {
 }
@@ -60,91 +62,91 @@ 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" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
         container?: any;
         size?: any;
         showCloseButton?: boolean | undefined;
         overlay?: boolean | undefined;
         position?: DrawerPosition | undefined;
-    } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+    } & {} & 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" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        } & {} & 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" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>;
+        } & {} & 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" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        } & {} & 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" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        } & {} & 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" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered"> & {
+        } & {} & 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" | "closeOnEsc" | "show" | "disabled" | "bodyClassName" | "onHide" | "width" | "height" | "closeOnOutside" | "resizable" | "onExited" | "onEntered" | "drawerClassName" | "drawerMaskClassName"> & {
             container?: any;
             size?: any;
             showCloseButton?: boolean | undefined;
             overlay?: boolean | undefined;
             position?: DrawerPosition | undefined;
-        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/esm/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.4.0
+ * amis-ui v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -192,7 +192,7 @@ var Drawer = /** @class */ (function (_super) {
     };
     Drawer.prototype.render = function () {
         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;
+        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 },
             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) {
@@ -208,8 +208,8 @@ var Drawer = /** @class */ (function (_super) {
                         _a["".concat(ns, "Drawer--").concat(size)] = size,
                         _a["".concat(ns, "Drawer--noOverlay")] = !overlay,
                         _a), className) },
-                    overlay ? (React__default.createElement("div", { className: cx("".concat(ns, "Drawer-overlay"), fadeStyles[status]) })) : null,
-                    React__default.createElement("div", { ref: _this.contentRef, style: bodyStyle, className: cx("".concat(ns, "Drawer-content"), bodyClassName, fadeStyles[status]) },
+                    overlay ? (React__default.createElement("div", { className: cx("".concat(ns, "Drawer-overlay"), fadeStyles[status], drawerMaskClassName) })) : null,
+                    React__default.createElement("div", { ref: _this.contentRef, style: bodyStyle, className: cx("".concat(ns, "Drawer-content"), bodyClassName, fadeStyles[status], drawerClassName) },
                         show && showCloseButton ? (React__default.createElement("a", { onClick: disabled ? undefined : onHide, className: "".concat(ns, "Drawer-close") },
                             React__default.createElement(Icon, { icon: "close", className: "icon", iconContent: "Drawer-close" }))) : null,
                         status === EXITED ? null : children,