amis-core 3.1.1 → 3.2.0

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -195,7 +195,7 @@ var Form = /** @class */ (function (_super) {
                     case 0:
                         _b = this.props, data = _b.data, store = _b.store, dispatchEvent = _b.dispatchEvent;
                         if (store.fetching) {
-                            return [2 /*return*/];
+                            return [2 /*return*/, value];
                         }
                         // 派发init事件，参数为初始化数据
                         return [4 /*yield*/, dispatchEvent('inited', object.createObject(data, tslib.__assign(tslib.__assign({}, value === null || value === void 0 ? void 0 : value.data), { responseData: (_a = value === null || value === void 0 ? void 0 : value.data) !== null && _a !== void 0 ? _a : {}, responseStatus: store.error ? 1 : 0, responseMsg: store.msg })))];
@@ -317,7 +317,8 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.initInterval = function (value) {
         var _a = this.props, interval = _a.interval, silentPolling = _a.silentPolling, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, data = _a.data;
         clearTimeout(this.timer);
-        interval &&
+        (value === null || value === void 0 ? void 0 : value.ok) &&
+            interval &&
             this.mounted &&
             (!stopAutoRefreshWhen || !tpl.evalExpression(stopAutoRefreshWhen, data)) &&
             (this.timer = setTimeout(silentPolling ? this.silentReload : this.reload, Math.max(interval, 1000)));
@@ -564,7 +565,7 @@ var Form = /** @class */ (function (_super) {
                                         _this.reloadTarget(Scoped.filterTarget(action.target, values), values);
                                 }
                                 else if (action.actionType === 'dialog') {
-                                    store.openDialog(data);
+                                    store.openDialog(data, undefined, action.callback);
                                 }
                                 else if (action.actionType === 'drawer') {
                                     store.openDrawer(data);
@@ -691,7 +692,7 @@ var Form = /** @class */ (function (_super) {
                         }
                         else if (action.actionType === 'dialog') {
                             store.setCurrentAction(action);
-                            store.openDialog(data);
+                            store.openDialog(data, undefined, action.callback);
                         }
                         else if (action.actionType === 'drawer') {
                             store.setCurrentAction(action);
@@ -764,12 +765,21 @@ var Form = /** @class */ (function (_super) {
         });
     };
     Form.prototype.handleQuery = function (query) {
-        var _a, _b;
         if (this.props.initApi) {
+            // 如果是分页动作，则看接口里面有没有用，没用则  return false
+            // 让组件自己去排序
+            if ((query === null || query === void 0 ? void 0 : query.hasOwnProperty('orderBy')) &&
+                !api.isApiOutdated(this.props.initApi, this.props.initApi, this.props.store.data, object.createObject(this.props.store.data, query))) {
+                return false;
+            }
             this.receive(query);
+            return;
+        }
+        if (this.props.onQuery) {
+            return this.props.onQuery(query);
         }
         else {
-            (_b = (_a = this.props).onQuery) === null || _b === void 0 ? void 0 : _b.call(_a, query);
+            return false;
         }
     };
     Form.prototype.handleDialogConfirm = function (values, action, ctx, targets) {

package/lib/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 {
     /**
@@ -444,8 +444,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 +461,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;
@@ -527,12 +508,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -547,12 +531,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
@@ -569,12 +556,15 @@ 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; /**
                  * 当配置为水平布局的时候，用来配置具体的左右分配。
                  */
-                addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
                 id: import("mobx-state-tree").ISimpleType<string>;
@@ -589,12 +579,15 @@ 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; /**
                  * 当配置为水平布局的时候，用来配置具体的左右分配。
                  */
-                addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         };
@@ -618,12 +611,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -638,12 +634,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         removeStore(store: {
@@ -659,12 +658,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -679,12 +681,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -707,12 +712,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -727,12 +735,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
@@ -749,12 +760,15 @@ 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; /**
                  * 当配置为水平布局的时候，用来配置具体的左右分配。
                  */
-                addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
                 id: import("mobx-state-tree").ISimpleType<string>;
@@ -769,12 +783,15 @@ 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; /**
                  * 当配置为水平布局的时候，用来配置具体的左右分配。
                  */
-                addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         };
@@ -798,12 +815,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -818,12 +838,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         removeStore(store: {
@@ -839,12 +862,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -859,12 +885,15 @@ 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; /**
              * 当配置为水平布局的时候，用来配置具体的左右分配。
              */
-            addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -282,8 +282,9 @@ var FormItemWrap = /** @class */ (function (_super) {
             return (React__default["default"].createElement(Overlay["default"], { container: popOverContainer || this.target, target: function () { return _this.target; }, placement: position || 'left-bottom-left-top', show: true },
                 React__default["default"].createElement(PopOver["default"], { 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 {
@@ -291,15 +292,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
         });
@@ -486,6 +492,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 && helper.isMobile();
             description = description || desc;
             return (React__default["default"].createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--normal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
@@ -512,38 +519,71 @@ var FormItemWrap = /** @class */ (function (_super) {
                                         : undefined
                             })
                             : 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__default["default"].createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React__default["default"].createElement("li", { key: key }, msg)); }))) : null,
-                renderDescription !== false && description
-                    ? render('description', description, {
-                        className: cx("Form-description", descriptionClassName)
-                    })
-                    : null));
+                mobileUI ? (React__default["default"].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: 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__default["default"].createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React__default["default"].createElement("li", { key: key }, msg)); }))) : null,
+                    renderDescription !== false && description
+                        ? render('description', description, {
+                            className: cx("Form-description", descriptionClassName)
+                        })
+                        : null)) : (React__default["default"].createElement(React__default["default"].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: 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__default["default"].createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React__default["default"].createElement("li", { key: key }, msg)); }))) : null,
+                    renderDescription !== false && description
+                        ? render('description', description, {
+                            className: cx("Form-description", descriptionClassName)
+                        })
+                        : null))));
         },
         inline: function (props, renderControl) {
             var _a;
@@ -690,13 +730,19 @@ var FormItemWrap = /** @class */ (function (_super) {
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
-    ], FormItemWrap.prototype, "hanldeSubmit", null);
+    ], FormItemWrap.prototype, "handleSubmit", null);
+    tslib.__decorate([
+        helper.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], FormItemWrap.prototype, "handleAction", null);
     tslib.__decorate([
         helper.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
-    ], FormItemWrap.prototype, "hanldeClose", null);
+    ], FormItemWrap.prototype, "handleClose", null);
     tslib.__decorate([
         helper.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Options.js

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

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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