amis-ui 2.8.0 → 3.0.0

package/lib/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -933,7 +933,9 @@ var DateRangePicker = /** @class */ (function (_super) {
                 : minDate || startDate;
         // 在 dateTimeRange 的场景下，如果选择了开始时间的时间点不为 0，比如 2020-10-1 10:10，这时 currentDate 传入的当天值是 2020-10-1 00:00，这个值在起始时间后面，导致没法再选这一天了，所以在这时需要先通过将时间都转成 00 再比较
         if (minDate &&
-            currentDate.startOf('day').isBefore(minDate.startOf('day'), precision)) {
+            currentDate
+                .startOf('day')
+                .isBefore(minDate.clone().startOf('day'), precision)) {
             return false;
         }
         else if (maxDate && currentDate.isAfter(maxDate, precision)) {
@@ -970,12 +972,14 @@ var DateRangePicker = /** @class */ (function (_super) {
             React__default["default"].createElement("span", null, currentDate.date())));
     };
     DateRangePicker.prototype.renderMonth = function (props, month, year, date) {
-        var m = moment__default["default"]();
-        var currentDate = m.year(year).month(month);
+        var currentDate = props.viewDate.year(year).month(month);
         var _a = this.state, startDate = _a.startDate, endDate = _a.endDate;
-        var localMoment = m.localeData().monthsShort(m.month(month));
+        var __ = this.props.translate;
+        var monthStr = currentDate.format(__('MMM'));
         var strLength = 3;
-        var monthStrFixedLength = localMoment.substring(0, strLength);
+        // Because some months are up to 5 characters long, we want to
+        // use a fixed string length for consistency
+        var monthStrFixedLength = monthStr.substring(0, strLength);
         if (startDate &&
             endDate &&
             currentDate.isBetween(startDate, endDate, 'month', '[]')) {
@@ -983,7 +987,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         }
         var _b = this.getDisabledElementProps(currentDate, 'month'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
-        return (React__default["default"].createElement("td", tslib.__assign({}, props, others),
+        return (React__default["default"].createElement("td", tslib.__assign({}, omit__default["default"](props, 'viewDate'), others),
             React__default["default"].createElement("span", null, monthStrFixedLength)));
     };
     DateRangePicker.prototype.renderQuarter = function (props, quarter, year) {

package/lib/components/DndContainer.d.ts

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

package/lib/components/DndContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Drawer.d.ts

@@ -25,6 +25,7 @@ export interface DrawerProps {
     classPrefix: string;
     resizable?: boolean;
     classnames: ClassNamesFn;
+    children?: React.ReactNode | Array<React.ReactNode>;
     onExited?: () => void;
     onEntered?: () => void;
 }
@@ -58,33 +59,91 @@ export declare class Drawer extends React.Component<DrawerProps, DrawerState> {
     render(): JSX.Element;
 }
 declare const _default: {
-    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+        showCloseButton?: boolean | undefined;
+        size?: any;
+        overlay?: boolean | undefined;
+        container?: any;
+        position?: DrawerPosition | undefined;
+    } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        context: unknown;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            position?: DrawerPosition | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | 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>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            position?: DrawerPosition | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            position?: DrawerPosition | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, 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>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            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" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            position?: DrawerPosition | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & Partial<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "showCloseButton" | "size" | "overlay" | "container" | "position">> & Partial<Pick<Pick<DrawerProps, "showCloseButton" | "size" | "overlay" | "container" | "position">, never>> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            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" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            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" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            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" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable"> & {
+            showCloseButton?: boolean | undefined;
+            size?: any;
+            overlay?: boolean | undefined;
+            container?: any;
+            position?: DrawerPosition | undefined;
+        } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -212,7 +212,7 @@ var Drawer = /** @class */ (function (_super) {
                     overlay ? (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "Drawer-overlay"), fadeStyles[status]) })) : null,
                     React__default["default"].createElement("div", { ref: _this.contentRef, style: bodyStyle, className: cx__default["default"]("".concat(ns, "Drawer-content"), bodyClassName, fadeStyles[status]) },
                         show && showCloseButton ? (React__default["default"].createElement("a", { onClick: disabled ? undefined : onHide, className: "".concat(ns, "Drawer-close") },
-                            React__default["default"].createElement(icons.Icon, { icon: "close", className: "icon" }))) : null,
+                            React__default["default"].createElement(icons.Icon, { icon: "close", className: "icon", iconContent: "Drawer-close" }))) : null,
                         status === Transition.EXITED ? null : children,
                         resizable ? _this.renderResizeCtrl() : null)));
             })));