amis-core 3.1.1 → 3.3.0

package/esm/renderers/Item.d.ts

@@ -4,7 +4,7 @@ import hoistNonReactStatic from 'hoist-non-react-statics';
 import { IFormItemStore, IFormStore } from '../store/form';
 import { RendererProps, TestFunc, RendererConfig } from '../factory';
 import { FormHorizontal, FormSchemaBase } from './Form';
-import { BaseApiObject, BaseSchemaWithoutType, ClassName, Schema } from '../types';
+import { ActionObject, BaseApiObject, BaseSchemaWithoutType, ClassName, Schema } from '../types';
 export type LabelAlign = 'right' | 'left';
 export interface FormBaseControl extends BaseSchemaWithoutType {
     /**
@@ -31,6 +31,10 @@ export interface FormBaseControl extends BaseSchemaWithoutType {
      * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
      */
     name?: string;
+    /**
+     * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+     */
+    extraName?: string;
     /**
      * 显示一个小图标, 鼠标放上去的时候显示提示内容
      */
@@ -444,8 +448,9 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
             label: any;
         })[];
     } | undefined;
-    hanldeSubmit(values: any): void;
-    hanldeClose(): void;
+    handleSubmit(values: any): void;
+    handleAction(e: React.UIEvent<any>, action: ActionObject, data: object): void;
+    handleClose(): void;
     handleOpenDialog(schema: Schema, data: any): Promise<unknown>;
     handleDialogConfirm([values]: Array<any>): void;
     handleDialogClose(confirmed?: boolean): void;
@@ -460,30 +465,10 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
 }
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {
-    new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
-        render(): React.JSX.Element;
-        context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">>;
-        state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): boolean;
-        componentWillUnmount?(): void;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
-    };
-    new (props: Omit<any, "rootStore">, context: any): {
+    new (props: Omit<any, "rootStore">): {
+        ref: any;
+        getWrappedInstance(): any;
+        refFn(ref: any): void;
         render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
@@ -511,7 +496,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         storeType: string;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
         readonly fetcher: any;
-        readonly notify: any;
+        readonly notify: any; /**
+         * 只读条件
+         */
         readonly isCancel: (value: any) => boolean;
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
@@ -527,11 +514,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -547,11 +535,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -569,11 +558,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
+                /**
+                 * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+                 */
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void; /**
-                 * 当配置为水平布局的时候，用来配置具体的左右分配。
-                 */
+                dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -589,11 +579,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
+                /**
+                 * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+                 */
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void; /**
-                 * 当配置为水平布局的时候，用来配置具体的左右分配。
-                 */
+                dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -618,11 +609,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -638,11 +630,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -659,11 +652,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -679,11 +673,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
@@ -691,7 +686,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     }, {
         readonly fetcher: any;
-        readonly notify: any;
+        readonly notify: any; /**
+         * 只读条件
+         */
         readonly isCancel: (value: any) => boolean;
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
@@ -707,11 +704,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -727,11 +725,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -749,11 +748,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
+                /**
+                 * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+                 */
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void; /**
-                 * 当配置为水平布局的时候，用来配置具体的左右分配。
-                 */
+                dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -769,11 +769,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
+                /**
+                 * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+                 */
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void; /**
-                 * 当配置为水平布局的时候，用来配置具体的左右分配。
-                 */
+                dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -798,11 +799,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -818,11 +820,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -839,11 +842,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -859,11 +863,12 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
+            /**
+             * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
+             */
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void; /**
-             * 当配置为水平布局的时候，用来配置具体的左右分配。
-             */
+            dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -33,8 +33,8 @@ import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
 import { getVariable } from '../utils/getVariable.js';
-import 'lodash';
 import '../utils/image.js';
+import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
@@ -272,8 +272,9 @@ var FormItemWrap = /** @class */ (function (_super) {
             return (React.createElement(Overlay, { container: popOverContainer || this.target, target: function () { return _this.target; }, placement: position || 'left-bottom-left-top', show: true },
                 React.createElement(PopOver, { classPrefix: ns, className: cx("".concat(ns, "auto-fill-popOver"), popOverClassName), style: {
                         minWidth: this.target ? this.target.offsetWidth : undefined
-                    }, offset: offset, onHide: this.hanldeClose, overlay: true }, render('popOver-auto-fill-form', form, {
-                    onSubmit: this.hanldeSubmit
+                    }, offset: offset, onHide: this.handleClose, overlay: true }, render('popOver-auto-fill-form', form, {
+                    onAction: this.handleAction,
+                    onSubmit: this.handleSubmit
                 }))));
         }
         else {
@@ -281,15 +282,20 @@ var FormItemWrap = /** @class */ (function (_super) {
         }
     };
     // 参照录入popOver提交
-    FormItemWrap.prototype.hanldeSubmit = function (values) {
+    FormItemWrap.prototype.handleSubmit = function (values) {
         var _a = this.props; _a.onBulkChange; var autoFill = _a.autoFill;
         if (!autoFill || (autoFill && !(autoFill === null || autoFill === void 0 ? void 0 : autoFill.hasOwnProperty('api')))) {
             return;
         }
         this.updateAutoFillData(values.selectedItems);
-        this.hanldeClose();
+        this.handleClose();
     };
-    FormItemWrap.prototype.hanldeClose = function () {
+    FormItemWrap.prototype.handleAction = function (e, action, data) {
+        if (action.actionType === 'cancel') {
+            this.handleClose();
+        }
+    };
+    FormItemWrap.prototype.handleClose = function () {
         this.setState({
             isOpened: false
         });
@@ -427,11 +433,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                                 tooltip: labelRemark,
                                 useMobileUI: useMobileUI,
                                 className: cx("Form-labelRemark"),
-                                container: props.popOverContainer
-                                    ? props.popOverContainer
-                                    : env && env.getModalContainer
-                                        ? env.getModalContainer
-                                        : undefined
+                                container: props.popOverContainer || env.getModalContainer
                             })
                             : null))) : null,
                 React.createElement("div", { className: cx("Form-value", (_c = {},
@@ -451,11 +453,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                             tooltip: remark,
                             className: cx("Form-remark"),
                             useMobileUI: useMobileUI,
-                            container: props.popOverContainer
-                                ? props.popOverContainer
-                                : env && env.getModalContainer
-                                    ? env.getModalContainer
-                                    : undefined
+                            container: props.popOverContainer || env.getModalContainer
                         })
                         : null,
                     hint && model && model.isFocused
@@ -476,6 +474,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         normal: function (props, renderControl) {
             var _a;
             var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName;
+            var mobileUI = useMobileUI && isMobile();
             description = description || desc;
             return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--normal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
@@ -495,45 +494,70 @@ var FormItemWrap = /** @class */ (function (_super) {
                                 tooltip: labelRemark,
                                 className: cx("Form-lableRemark"),
                                 useMobileUI: useMobileUI,
-                                container: props.popOverContainer
-                                    ? props.popOverContainer
-                                    : env && env.getModalContainer
-                                        ? env.getModalContainer
-                                        : undefined
+                                container: props.popOverContainer || env.getModalContainer
                             })
                             : null))) : null,
-                renderControl(),
-                caption
-                    ? render('caption', caption, {
-                        className: cx("Form-caption", captionClassName)
-                    })
-                    : null,
-                remark
-                    ? render('remark', {
-                        type: 'remark',
-                        icon: remark.icon || 'warning-mark',
-                        className: cx("Form-remark"),
-                        tooltip: remark,
-                        useMobileUI: useMobileUI,
-                        container: env && env.getModalContainer
-                            ? env.getModalContainer
-                            : undefined
-                    })
-                    : null,
-                hint && model && model.isFocused
-                    ? render('hint', hint, {
-                        className: cx("Form-hint")
-                    })
-                    : null,
-                model &&
-                    !model.valid &&
-                    showErrorMsg !== false &&
-                    Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
-                renderDescription !== false && description
-                    ? render('description', description, {
-                        className: cx("Form-description", descriptionClassName)
-                    })
-                    : null));
+                mobileUI ? (React.createElement("div", { className: cx('Form-item-controlBox') },
+                    renderControl(),
+                    caption
+                        ? render('caption', caption, {
+                            className: cx("Form-caption", captionClassName)
+                        })
+                        : null,
+                    remark
+                        ? render('remark', {
+                            type: 'remark',
+                            icon: remark.icon || 'warning-mark',
+                            className: cx("Form-remark"),
+                            tooltip: remark,
+                            useMobileUI: useMobileUI,
+                            container: props.popOverContainer || env.getModalContainer
+                        })
+                        : null,
+                    hint && model && model.isFocused
+                        ? render('hint', hint, {
+                            className: cx("Form-hint")
+                        })
+                        : null,
+                    model &&
+                        !model.valid &&
+                        showErrorMsg !== false &&
+                        Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
+                    renderDescription !== false && description
+                        ? render('description', description, {
+                            className: cx("Form-description", descriptionClassName)
+                        })
+                        : null)) : (React.createElement(React.Fragment, null,
+                    renderControl(),
+                    caption
+                        ? render('caption', caption, {
+                            className: cx("Form-caption", captionClassName)
+                        })
+                        : null,
+                    remark
+                        ? render('remark', {
+                            type: 'remark',
+                            icon: remark.icon || 'warning-mark',
+                            className: cx("Form-remark"),
+                            tooltip: remark,
+                            useMobileUI: useMobileUI,
+                            container: props.popOverContainer || env.getModalContainer
+                        })
+                        : null,
+                    hint && model && model.isFocused
+                        ? render('hint', hint, {
+                            className: cx("Form-hint")
+                        })
+                        : null,
+                    model &&
+                        !model.valid &&
+                        showErrorMsg !== false &&
+                        Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
+                    renderDescription !== false && description
+                        ? render('description', description, {
+                            className: cx("Form-description", descriptionClassName)
+                        })
+                        : null))));
         },
         inline: function (props, renderControl) {
             var _a;
@@ -558,11 +582,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                                 tooltip: labelRemark,
                                 className: cx("Form-lableRemark"),
                                 useMobileUI: useMobileUI,
-                                container: props.popOverContainer
-                                    ? props.popOverContainer
-                                    : env && env.getModalContainer
-                                        ? env.getModalContainer
-                                        : undefined
+                                container: props.popOverContainer || env.getModalContainer
                             })
                             : null))) : null,
                 React.createElement("div", { className: cx("Form-value") },
@@ -579,11 +599,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                             className: cx("Form-remark"),
                             tooltip: remark,
                             useMobileUI: useMobileUI,
-                            container: props.popOverContainer
-                                ? props.popOverContainer
-                                : env && env.getModalContainer
-                                    ? env.getModalContainer
-                                    : undefined
+                            container: props.popOverContainer || env.getModalContainer
                         })
                         : null,
                     hint && model && model.isFocused
@@ -623,11 +639,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                                     tooltip: labelRemark,
                                     className: cx("Form-lableRemark"),
                                     useMobileUI: useMobileUI,
-                                    container: props.popOverContainer
-                                        ? props.popOverContainer
-                                        : env && env.getModalContainer
-                                            ? env.getModalContainer
-                                            : undefined
+                                    container: props.popOverContainer || env.getModalContainer
                                 })
                                 : null))) : null,
                     renderControl(),
@@ -642,9 +654,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                             icon: remark.icon || 'warning-mark',
                             className: cx("Form-remark"),
                             tooltip: remark,
-                            container: env && env.getModalContainer
-                                ? env.getModalContainer
-                                : undefined
+                            container: props.popOverContainer || env.getModalContainer
                         })
                         : null),
                 hint && model && model.isFocused
@@ -680,13 +690,19 @@ var FormItemWrap = /** @class */ (function (_super) {
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
-    ], FormItemWrap.prototype, "hanldeSubmit", null);
+    ], FormItemWrap.prototype, "handleSubmit", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object, Object, Object]),
+        __metadata("design:returntype", void 0)
+    ], FormItemWrap.prototype, "handleAction", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
-    ], FormItemWrap.prototype, "hanldeClose", null);
+    ], FormItemWrap.prototype, "handleClose", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -34,7 +34,6 @@ import 'classnames';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import '../utils/image.js';
 import { keyToPath } from '../utils/keyToPath.js';
 import { resolveEventData } from '../utils/renderer-event.js';

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */