amis 2.8.0 → 2.9.0

package/lib/renderers/Dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -439,7 +439,8 @@ var Dialog = /** @class */ (function (_super) {
                 if ((action.type === 'submit' ||
                     action.actionType === 'submit' ||
                     action.actionType === 'confirm') &&
-                    action.close !== false) {
+                    action.close !== false &&
+                    !targets.some(function (item) { return item.props.closeDialogOnSubmit === false; })) {
                     onConfirm && onConfirm(values, rawAction || action, ctx, targets);
                 }
                 else if (action.close) {
@@ -560,7 +561,8 @@ var Dialog = /** @class */ (function (_super) {
                                         case 2:
                                             reidrect = action.redirect && amisCore.filter(action.redirect, store.data);
                                             reidrect && env.jumpTo(reidrect, action);
-                                            action.reload && this.reloadTarget(action.reload, store.data);
+                                            action.reload &&
+                                                this.reloadTarget(amisCore.filter(action.reload, store.data), store.data);
                                             if (action.close) {
                                                 this.handleSelfClose();
                                                 this.closeTarget(action.close);

package/lib/renderers/Divider.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -528,7 +528,8 @@ var Drawer = /** @class */ (function (_super) {
                                         case 2:
                                             redirect = action.redirect && amisCore.filter(action.redirect, store.data);
                                             redirect && env.jumpTo(redirect, action);
-                                            action.reload && this.reloadTarget(action.reload, store.data);
+                                            action.reload &&
+                                                this.reloadTarget(amisCore.filter(action.reload, store.data), store.data);
                                             if (action.close) {
                                                 this.handleSelfClose();
                                                 this.closeTarget(action.close);

package/lib/renderers/DropDownButton.d.ts

@@ -75,6 +75,7 @@ export interface DropdownButtonSchema extends BaseSchema {
      * 菜单 CSS 样式
      */
     menuClassName?: string;
+    overlayPlacement?: string;
 }
 export interface DropDownButtonProps extends RendererProps, Omit<DropdownButtonSchema, 'type' | 'className'> {
     disabledTip?: string | TooltipObject;
@@ -96,7 +97,7 @@ export interface DropDownButtonState {
 }
 export default class DropDownButton extends React.Component<DropDownButtonProps, DropDownButtonState> {
     state: DropDownButtonState;
-    static defaultProps: Pick<DropDownButtonProps, 'placement' | 'tooltipTrigger' | 'tooltipRootClose'>;
+    static defaultProps: Pick<DropDownButtonProps, 'placement' | 'tooltipTrigger' | 'tooltipRootClose' | 'overlayPlacement'>;
     target: any;
     timer: ReturnType<typeof setTimeout>;
     constructor(props: DropDownButtonProps);

package/lib/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -111,7 +111,7 @@ var DropDownButton = /** @class */ (function (_super) {
     DropDownButton.prototype.renderOuter = function () {
         var _this = this;
         var _a;
-        var _b = this.props; _b.render; var buttons = _b.buttons; _b.data; var popOverContainer = _b.popOverContainer, cx = _b.classnames, ns = _b.classPrefix, children = _b.children; _b.align; var closeOnClick = _b.closeOnClick, closeOnOutside = _b.closeOnOutside, menuClassName = _b.menuClassName;
+        var _b = this.props; _b.render; var buttons = _b.buttons; _b.data; var popOverContainer = _b.popOverContainer, cx = _b.classnames, ns = _b.classPrefix, children = _b.children; _b.align; var closeOnClick = _b.closeOnClick, closeOnOutside = _b.closeOnOutside, menuClassName = _b.menuClassName, overlayPlacement = _b.overlayPlacement;
         var body = (React__default["default"].createElement(amisCore.RootClose, { disabled: !this.state.isOpened, onRootClose: closeOnOutside !== false ? this.close : amisCore.noop }, function (ref) {
             return (React__default["default"].createElement("ul", { className: cx('DropDown-menu-root', 'DropDown-menu', menuClassName), onClick: closeOnClick ? _this.close : amisCore.noop, onMouseEnter: _this.keepOpen, ref: ref }, children
                 ? children
@@ -122,7 +122,7 @@ var DropDownButton = /** @class */ (function (_super) {
                     : null));
         }));
         if (popOverContainer) {
-            return (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, target: function () { return _this.target; }, show: true },
+            return (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, target: function () { return _this.target; }, placement: overlayPlacement, show: true },
                 React__default["default"].createElement(amisCore.PopOver, { overlay: true, onHide: this.close, classPrefix: ns, className: cx('DropDown-popover', menuClassName), style: { minWidth: (_a = this.target) === null || _a === void 0 ? void 0 : _a.offsetWidth } }, body)));
         }
         return body;
@@ -155,7 +155,8 @@ var DropDownButton = /** @class */ (function (_super) {
     DropDownButton.defaultProps = {
         placement: 'top',
         tooltipTrigger: ['hover', 'focus'],
-        tooltipRootClose: false
+        tooltipRootClose: false,
+        overlayPlacement: 'auto'
     };
     return DropDownButton;
 }(React__default["default"].Component));

package/lib/renderers/Each.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Flex.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -24,8 +24,9 @@ var Flex = /** @class */ (function (_super) {
         return _super.call(this, props) || this;
     }
     Flex.prototype.render = function () {
-        var _a = this.props, items = _a.items, direction = _a.direction, justify = _a.justify, alignItems = _a.alignItems, alignContent = _a.alignContent, style = _a.style, className = _a.className, render = _a.render, disabled = _a.disabled;
-        var flexStyle = tslib.__assign({ display: 'flex', flexDirection: direction, justifyContent: justify, alignItems: alignItems, alignContent: alignContent }, style);
+        var _a = this.props, items = _a.items, direction = _a.direction, justify = _a.justify, alignItems = _a.alignItems, alignContent = _a.alignContent, style = _a.style, className = _a.className, render = _a.render, disabled = _a.disabled, data = _a.data;
+        var styleVar = amisCore.buildStyle(style, data);
+        var flexStyle = tslib.__assign({ display: 'flex', flexDirection: direction, justifyContent: justify, alignItems: alignItems, alignContent: alignContent }, styleVar);
         return (React__default["default"].createElement("div", { style: flexStyle, className: className }, (Array.isArray(items) ? items : items ? [items] : []).map(function (item, key) {
             var _a;
             return render("flexItem/".concat(key), item, {

package/lib/renderers/Form/ButtonGroupSelect.d.ts

@@ -18,9 +18,7 @@ export default class ButtonGroupControl extends React.Component<ButtonGroupProps
     doAction(action: ActionObject, data: object, throwErrors: boolean): void;
     handleToggle(option: Option): void;
     reload(): void;
-    render(props?: Readonly<ButtonGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element;
+    render(props?: Readonly<ButtonGroupProps>): JSX.Element;
 }
 export declare class ButtonGroupControlRenderer extends ButtonGroupControl {
 }

package/lib/renderers/Form/ButtonGroupSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -57,6 +57,7 @@ var ButtonGroupControl = /** @class */ (function (_super) {
                     label: option[labelField || 'label'],
                     icon: option.icon,
                     size: option.size || size,
+                    badge: option.badge,
                     type: 'button',
                     block: block
                 }, {

package/lib/renderers/Form/ButtonToolbar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/ChartRadios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Combo.d.ts

@@ -217,9 +217,7 @@ export default class ComboControl extends React.Component<ComboProps> {
     resolveVariableProps(props: ComboProps, key: 'minLength' | 'maxLength'): number;
     doAction(action: ListenerAction, args: any): void;
     addItemValue(itemValue: any): void;
-    getValueAsArray(props?: Readonly<ComboProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): any;
+    getValueAsArray(props?: Readonly<ComboProps>): any;
     addItemWith(condition: ComboCondition): void;
     addItem(): Promise<void>;
     deleteItem(key: number): Promise<void>;

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/DiffEditor.d.ts

@@ -97,10 +97,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
             path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -139,10 +141,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         syncSuperStore?: boolean | undefined;
         data?: {
@@ -223,10 +227,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         } & {
             readonly loading: boolean;
         } & {
@@ -2000,10 +2006,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         } & {
             readonly loading: boolean;
         } & {
@@ -4578,12 +4586,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "row" | "normal" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;
@@ -4619,20 +4627,34 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
+        placeholder?: string | undefined;
+        $ref?: string | undefined;
+        disabledOn?: string | undefined;
+        hidden?: boolean | undefined;
+        hiddenOn?: string | undefined;
+        visible?: boolean | undefined;
+        visibleOn?: string | undefined;
+        id?: string | undefined;
+        static?: boolean | undefined;
+        staticOn?: string | undefined;
+        staticPlaceholder?: string | undefined;
+        staticClassName?: import("amis-core").SchemaClassName | undefined;
+        staticLabelClassName?: import("amis-core").SchemaClassName | undefined;
+        staticInputClassName?: import("amis-core").SchemaClassName | undefined;
+        staticSchema?: any;
+        label?: string | false | undefined;
         remark?: import("../Remark").SchemaRemark | undefined;
+        desc?: string | undefined;
+        mode?: "horizontal" | "inline" | "normal" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
+        labelClassName?: string | undefined;
+        inline?: boolean | undefined;
+        readOnly?: boolean | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;
         options?: any;
-        label?: string | false | undefined;
-        labelClassName?: string | undefined;
         submitOnChange?: boolean | undefined;
-        readOnly?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
-        desc?: string | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        inline?: boolean | undefined;
-        placeholder?: string | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -4705,20 +4727,6 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        $ref?: string | undefined;
-        disabledOn?: string | undefined;
-        hidden?: boolean | undefined;
-        hiddenOn?: string | undefined;
-        visible?: boolean | undefined;
-        visibleOn?: string | undefined;
-        id?: string | undefined;
-        static?: boolean | undefined;
-        staticOn?: string | undefined;
-        staticPlaceholder?: string | undefined;
-        staticClassName?: import("amis-core").SchemaClassName | undefined;
-        staticLabelClassName?: import("amis-core").SchemaClassName | undefined;
-        staticInputClassName?: import("amis-core").SchemaClassName | undefined;
-        staticSchema?: any;
         diffValue?: string | undefined;
         language?: string | undefined;
     };

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Editor.d.ts

@@ -84,7 +84,9 @@ export declare class EditorControlRenderer extends EditorControl {
         } & {
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[] | undefined): void;
-            dispose: (callback?: (() => void) | undefined) => void;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 是否展示全屏模式开关
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & {
@@ -96,10 +98,12 @@ export declare class EditorControlRenderer extends EditorControl {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
             path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -126,7 +130,9 @@ export declare class EditorControlRenderer extends EditorControl {
         } & {
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[] | undefined): void;
-            dispose: (callback?: (() => void) | undefined) => void;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 是否展示全屏模式开关
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & {
@@ -138,10 +144,12 @@ export declare class EditorControlRenderer extends EditorControl {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         syncSuperStore?: boolean | undefined;
         data?: {
@@ -220,10 +228,12 @@ export declare class EditorControlRenderer extends EditorControl {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         } & {
             readonly loading: boolean;
         } & {
@@ -1997,10 +2007,12 @@ export declare class EditorControlRenderer extends EditorControl {
             updateData(data?: object | undefined, tag?: object | undefined, replace?: boolean | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
             setCurrentAction(action: object): void;
-            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("amis-core").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("amis-core").IScopedContext | null;
+            getDrawerScoped(): import("amis-core").IScopedContext | null;
         } & {
             readonly loading: boolean;
         } & {
@@ -4575,12 +4587,12 @@ export declare class EditorControlRenderer extends EditorControl {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "row" | "normal" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Group.d.ts

@@ -44,14 +44,8 @@ export interface InputGroupProps extends RendererProps, Omit<GroupControlSchema,
 export declare class ControlGroupRenderer extends React.Component<InputGroupProps> {
     constructor(props: InputGroupProps);
     renderControl(control: any, index: any, otherProps?: any): JSX.Element | null;
-    renderVertical(props?: Readonly<InputGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element | null;
-    renderHorizontal(props?: Readonly<InputGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element | null;
-    renderInput(props?: Readonly<InputGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element | null;
+    renderVertical(props?: Readonly<InputGroupProps>): JSX.Element | null;
+    renderHorizontal(props?: Readonly<InputGroupProps>): JSX.Element | null;
+    renderInput(props?: Readonly<InputGroupProps>): JSX.Element | null;
     render(): JSX.Element | null;
 }

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/IconSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -54,7 +54,7 @@ var IconSelectControl = /** @class */ (function (_super) {
                 }
             }
         }
-        return findItem || null;
+        return findItem || { name: svg, id: '', svg: '' };
     };
     IconSelectControl.prototype.handleClick = function () {
         if (this.props.disabled) {

package/lib/renderers/Form/IconSelectStore.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */