amis 2.2.0 → 2.3.0

package/esm/_virtual/MiniDecimal.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/_virtual/classCallCheck.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/_virtual/createClass.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/_virtual/interopRequireDefault.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/_virtual/numberUtil.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/_virtual/supportUtil.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/compat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/node_modules/@babel/runtime/helpers/classCallCheck.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/node_modules/@babel/runtime/helpers/createClass.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/node_modules/@babel/runtime/helpers/interopRequireDefault.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/node_modules/rc-input-number/lib/utils/MiniDecimal.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/node_modules/rc-input-number/lib/utils/numberUtil.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/node_modules/rc-input-number/lib/utils/supportUtil.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/preset.js

@@ -1,10 +1,10 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
-import { extendDefaultEnv, render, addRootWrapper, LazyComponent } from 'amis-core';
-import { alert, confirm, toast, setRenderSchemaFn, ImageGallery, Spinner } from 'amis-ui';
+import { extendDefaultEnv, render, addRootWrapper, themeable, LazyComponent } from 'amis-core';
+import { alert, confirm, toast, setRenderSchemaFn, ImageGallery } from 'amis-ui';
 import React from 'react';
 
 extendDefaultEnv({
@@ -37,4 +37,9 @@ addRootWrapper(function (props) {
     var env = props.env, children = props.children;
     return (React.createElement(ImageGallery, { modalContainer: env.getModalContainer }, children));
 });
-LazyComponent.defaultProps.placeholder = React.createElement(Spinner, null);
+var SimpleSpinner = themeable(function (props) {
+    var cx = props.classnames;
+    return (React.createElement("div", { "data-testid": "spinner", className: cx("Spinner", 'in', props.className) },
+        React.createElement("div", { className: cx("Spinner-icon", 'Spinner-icon--default', props.spinnerClassName) })));
+});
+LazyComponent.defaultProps.placeholder = React.createElement(SimpleSpinner, null);

package/esm/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Alert.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/CRUD.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { qsparse, getPropValue, anyChanged, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, isVisible, str2function, qsstringify, isEffectiveApi, evalExpression, extendObject, getExprProperties, getVariable, ScopedContext, Renderer, CRUDStore } from 'amis-core';
+import { parseQuery, getPropValue, anyChanged, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, isVisible, str2function, qsparse, qsstringify, isEffectiveApi, evalExpression, extendObject, getExprProperties, getVariable, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import { Select, Button, Icon, Html } from 'amis-ui';
 import pick from 'lodash/pick';
 import { findDOMNode } from 'react-dom';
@@ -41,10 +41,10 @@ var CRUD = /** @class */ (function (_super) {
         var location = props.location, store = props.store, pageField = props.pageField, perPageField = props.perPageField, syncLocation = props.syncLocation; props.loadDataOnce;
         _this.mounted = true;
         if (syncLocation && location && (location.query || location.search)) {
-            store.updateQuery(qsparse(location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(location), undefined, pageField, perPageField);
         }
         else if (syncLocation && !location && window.location.search) {
-            store.updateQuery(qsparse(window.location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(window.location), undefined, pageField, perPageField);
         }
         _this.props.store.setFilterTogglable(!!_this.props.filterTogglable, _this.props.filterDefaultVisible);
         // 如果有 api，data 里面先写个 空数组，面得继承外层的 items
@@ -97,7 +97,7 @@ var CRUD = /** @class */ (function (_super) {
             prevProps.location &&
             prevProps.location.search !== props.location.search) {
             // 同步地址栏，那么直接检测 query 是否变了，变了就重新拉数据
-            store.updateQuery(qsparse(props.location.search.substring(1)), undefined, props.pageField, props.perPageField);
+            store.updateQuery(parseQuery(props.location), undefined, props.pageField, props.perPageField);
             dataInvalid = !!(props.api && isObjectShallowModified(store.query, this.lastQuery, false));
         }
         if (dataInvalid) ;
@@ -693,7 +693,7 @@ var CRUD = /** @class */ (function (_super) {
                 else {
                     oldUnselectedItems_1.push(item);
                 }
-                ~idx2 && oldItems_1.splice(idx2, 1);
+                !~idx && ~idx2 && oldItems_1.splice(idx2, 1);
             });
             newItems = oldItems_1;
             newUnSelectedItems = oldUnselectedItems_1;

package/esm/renderers/CRUD2.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { qsparse, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsstringify, createObject, isEffectiveApi, evalExpression, extendObject, filter, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
+import { parseQuery, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsparse, qsstringify, createObject, isEffectiveApi, evalExpression, extendObject, filter, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import pick from 'lodash/pick';
 import { findDOMNode } from 'react-dom';
 import findIndex from 'lodash/findIndex';
@@ -20,10 +20,10 @@ var CRUD2 = /** @class */ (function (_super) {
         var location = props.location, store = props.store, syncLocation = props.syncLocation, pageField = props.pageField, perPageField = props.perPageField;
         _this.mounted = true;
         if (syncLocation && location && (location.query || location.search)) {
-            store.updateQuery(qsparse(location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(location), undefined, pageField, perPageField);
         }
         else if (syncLocation && !location && window.location.search) {
-            store.updateQuery(qsparse(window.location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(window.location), undefined, pageField, perPageField);
         }
         // 如果有 api，data 里面先写个 空数组，面得继承外层的 items
         // 比如 crud 打开一个弹框，里面也是个 crud，默认一开始其实显示
@@ -74,7 +74,7 @@ var CRUD2 = /** @class */ (function (_super) {
             prevProps.location &&
             prevProps.location.search !== props.location.search) {
             // 同步地址栏，那么直接检测 query 是否变了，变了就重新拉数据
-            store.updateQuery(qsparse(props.location.search.substring(1)), undefined, props.pageField, props.perPageField);
+            store.updateQuery(parseQuery(props.location), undefined, props.pageField, props.perPageField);
             dataInvalid = !!(props.api && isObjectShallowModified(store.query, this.lastQuery, false));
         }
         if (dataInvalid) ;
@@ -428,7 +428,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 else {
                     oldUnselectedItems_1.push(item);
                 }
-                ~idx2 && oldItems_1.splice(idx2, 1);
+                !~idx && ~idx2 && oldItems_1.splice(idx2, 1);
             });
             newItems = oldItems_1;
             newUnSelectedItems = oldUnselectedItems_1;

package/esm/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Code.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Collapse.d.ts

@@ -77,6 +77,7 @@ export interface CollapseProps extends RendererProps, Omit<CollapseSchema, 'type
     children?: JSX.Element | ((props?: any) => JSX.Element);
 }
 export default class Collapse extends React.Component<CollapseProps, {}> {
+    static propsList: Array<string>;
     render(): JSX.Element;
 }
 export declare class CollapseRenderer extends Collapse {

package/esm/renderers/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -29,6 +29,17 @@ var Collapse = /** @class */ (function (_super) {
                     ? render('body', body)
                     : null, onCollapse: onCollapse }));
     };
+    Collapse.propsList = [
+        'collapsable',
+        'collapsed',
+        'collapseTitle',
+        'showArrow',
+        'headerPosition',
+        'bodyClassName',
+        'headingClassName',
+        'collapseHeader',
+        'size'
+    ];
     return Collapse;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Color.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Date.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Dialog.d.ts

@@ -748,21 +748,21 @@ export default class Dialog extends React.Component<DialogProps> {
                     };
                     displayName: string;
                     contextType: React.Context<string>;
-                    ComposedComponent: React.ComponentType<({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                    ComposedComponent: React.ComponentType<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                         className?: string | undefined;
                         showCloseButton?: boolean | undefined;
                         onClose?: (() => void) | undefined;
                         children?: React.ReactNode;
                         forwardedRef?: any;
                     } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
-                } & import("hoist-non-react-statics").NonReactStatics<({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                     className?: string | undefined;
                     showCloseButton?: boolean | undefined;
                     onClose?: (() => void) | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
                 } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
-                    ComposedComponent: ({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                    ComposedComponent: ({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                         className?: string | undefined;
                         showCloseButton?: boolean | undefined;
                         onClose?: (() => void) | undefined;
@@ -891,21 +891,21 @@ export default class Dialog extends React.Component<DialogProps> {
                 };
                 displayName: string;
                 contextType: React.Context<string>;
-                ComposedComponent: React.ComponentType<({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                ComposedComponent: React.ComponentType<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                     className?: string | undefined;
                     showCloseButton?: boolean | undefined;
                     onClose?: (() => void) | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
                 } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
-            } & import("hoist-non-react-statics").NonReactStatics<({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+            } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                 className?: string | undefined;
                 showCloseButton?: boolean | undefined;
                 onClose?: (() => void) | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
             } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
-                ComposedComponent: ({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                ComposedComponent: ({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                     className?: string | undefined;
                     showCloseButton?: boolean | undefined;
                     onClose?: (() => void) | undefined;
@@ -1034,21 +1034,21 @@ export default class Dialog extends React.Component<DialogProps> {
                     };
                     displayName: string;
                     contextType: React.Context<string>;
-                    ComposedComponent: React.ComponentType<({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                    ComposedComponent: React.ComponentType<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                         className?: string | undefined;
                         showCloseButton?: boolean | undefined;
                         onClose?: (() => void) | undefined;
                         children?: React.ReactNode;
                         forwardedRef?: any;
                     } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
-                } & import("hoist-non-react-statics").NonReactStatics<({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                     className?: string | undefined;
                     showCloseButton?: boolean | undefined;
                     onClose?: (() => void) | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
                 } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
-                    ComposedComponent: ({ classnames, className, showCloseButton, onClose, children, classPrefix, translate, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
+                    ComposedComponent: ({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: import("amis-core").ThemeProps & import("amis-core").LocaleProps & {
                         className?: string | undefined;
                         showCloseButton?: boolean | undefined;
                         onClose?: (() => void) | undefined;
@@ -1128,17 +1128,17 @@ export default class Dialog extends React.Component<DialogProps> {
                 };
                 displayName: string;
                 contextType: React.Context<string>;
-                ComposedComponent: React.ComponentType<({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+                ComposedComponent: React.ComponentType<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                     className?: string | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
                 } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
-            } & import("hoist-non-react-statics").NonReactStatics<({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+            } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                 className?: string | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
             } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
-                ComposedComponent: ({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+                ComposedComponent: ({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                     className?: string | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
@@ -1215,17 +1215,17 @@ export default class Dialog extends React.Component<DialogProps> {
                 };
                 displayName: string;
                 contextType: React.Context<string>;
-                ComposedComponent: React.ComponentType<({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+                ComposedComponent: React.ComponentType<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                     className?: string | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
                 } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
-            } & import("hoist-non-react-statics").NonReactStatics<({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+            } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                 className?: string | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
             } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
-                ComposedComponent: ({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+                ComposedComponent: ({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                     className?: string | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
@@ -1302,17 +1302,17 @@ export default class Dialog extends React.Component<DialogProps> {
                 };
                 displayName: string;
                 contextType: React.Context<string>;
-                ComposedComponent: React.ComponentType<({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+                ComposedComponent: React.ComponentType<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                     className?: string | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;
                 } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
-            } & import("hoist-non-react-statics").NonReactStatics<({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+            } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                 className?: string | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
             } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
-                ComposedComponent: ({ classnames, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
+                ComposedComponent: ({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: import("amis-core").ThemeProps & {
                     className?: string | undefined;
                     children?: React.ReactNode;
                     forwardedRef?: any;

package/esm/renderers/Dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Divider.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -275,9 +275,7 @@ var Drawer = /** @class */ (function (_super) {
         var store = this.props.store;
         var _a = __assign(__assign({}, this.props), store.schema), className = _a.className, size = _a.size, closeOnEsc = _a.closeOnEsc, position = _a.position, title = _a.title, render = _a.render, header = _a.header, body = _a.body, bodyClassName = _a.bodyClassName, headerClassName = _a.headerClassName, show = _a.show, showCloseButton = _a.showCloseButton, width = _a.width, height = _a.height, wrapperComponent = _a.wrapperComponent, env = _a.env, resizable = _a.resizable, overlay = _a.overlay, closeOnOutside = _a.closeOnOutside, ns = _a.classPrefix, cx = _a.classnames, drawerContainer = _a.drawerContainer;
         var Container = wrapperComponent || Drawer$1;
-        return (React.createElement(Container, { resizable: resizable, classPrefix: ns, className: className, size: size, onHide: this.handleSelfClose, disabled: store.loading, show: show, showCloseButton: showCloseButton, width: width, height: height, position: position, overlay: overlay, onEntered: this.handleEntered, onExited: this.handleExited, closeOnEsc: closeOnEsc, closeOnOutside: !store.drawerOpen &&
-                !store.dialogOpen &&
-                (closeOnOutside || !showCloseButton), container: drawerContainer
+        return (React.createElement(Container, { resizable: resizable, classPrefix: ns, className: className, size: size, onHide: this.handleSelfClose, disabled: store.loading, show: show, showCloseButton: showCloseButton, width: width, height: height, position: position, overlay: overlay, onEntered: this.handleEntered, onExited: this.handleExited, closeOnEsc: closeOnEsc, closeOnOutside: !store.drawerOpen && !store.dialogOpen && closeOnOutside, container: drawerContainer
                 ? drawerContainer
                 : env && env.getModalContainer
                     ? env.getModalContainer

package/esm/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */