amis-core 6.4.1 → 6.6.0

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -67,13 +67,13 @@ export { string2regExp } from './utils/string2regExp.js';
 export { buildStyle } from './utils/style.js';
 export { memoParse, tokenize } from './utils/tokenize.js';
 export { register } from './utils/tpl-builtin.js';
-export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './utils/tpl.js';
+export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalExpressionWithConditionBuilderAsync, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './utils/tpl.js';
 export { uncontrollable } from './utils/uncontrollable.js';
 export { addRule, str2rules, validate, validateMessages, validateObject, validations } from './utils/validations.js';
 export { toNumber } from './utils/toNumber.js';
 export { decodeEntity } from './utils/decodeEntity.js';
 export { addStyle, findOrCreateStyle, formatInputThemeCss, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertEditCustomStyle, insertStyle, removeCustomStyle, setThemeClassName, valueMap as styleMap, valueMap } from './utils/style-helper.js';
-export { getConditionComputers, registerConditionComputer, resolveCondition, setConditionComputeErrorHandler } from './utils/resolveCondition.js';
+export { getConditionComputers, registerConditionComputer, resolveCondition, resolveConditionAsync, setConditionComputeErrorHandler } from './utils/resolveCondition.js';
 export { arraySlice } from './utils/arraySlice.js';
 export { isIntegerInRange, numberFormatter, safeAdd, safeSub } from './utils/math.js';
 export { default as animation } from './utils/Animation.js';
@@ -148,7 +148,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '6.4.1';
+var version = '6.6.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import moment from 'moment';
 import 'amis-formula';
 import 'lodash/isPlainObject';
 import { resolveVariable } from './utils/resolveVariable.js';
+import '@rc-component/mini-decimal';
 import './utils/filter.js';
 
 var defaultLocale = 'zh-CN';

package/esm/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/Form.d.ts

@@ -150,7 +150,7 @@ export interface FormSchemaBase {
     /**
      * 配置表单项默认的展示方式。
      */
-    mode?: 'normal' | 'inline' | 'horizontal';
+    mode?: 'normal' | 'inline' | 'horizontal' | 'flex';
     /**
      * 表单项显示为几列
      */

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -17,6 +17,7 @@ import { filterTarget, ScopedContext } from '../Scoped.js';
 import 'amis-formula';
 import 'moment';
 import { isObject, createObject, cloneObject, injectObjectChain } from '../utils/object.js';
+import '@rc-component/mini-decimal';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
 import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
@@ -536,7 +537,7 @@ var Form = /** @class */ (function (_super) {
             return;
         }
         store.changeValue(name, value, changePristine);
-        if (!changePristine) {
+        if (!changePristine || typeof value !== 'undefined') {
             (formLazyChange === false ? this.emitChange : this.lazyEmitChange)(submit);
         }
         if (store.persistData && store.inited) {
@@ -550,17 +551,17 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.emitChange = function (submit, emitedFromWatch) {
         if (emitedFromWatch === void 0) { emitedFromWatch = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, diff, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, originData, diff, changeProps, dispatcher;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _b.trys.push([0, , 4, 5]);
                         this.emitting = true;
-                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data, originData = _a.originData;
                         if (!isAlive(store)) {
                             return [2 /*return*/];
                         }
-                        diff = difference(store.data, store.pristine);
+                        diff = difference(store.data, originData !== null && originData !== void 0 ? originData : store.upStreamData);
                         if (emitedFromWatch &&
                             (!Object.keys(diff).length || isEqual(store.data, this.emittedData))) {
                             return [2 /*return*/];
@@ -1100,6 +1101,7 @@ var Form = /** @class */ (function (_super) {
         var _this = this;
         if (otherProps === void 0) { otherProps = {}; }
         children = children || [];
+        var cx = this.props.classnames;
         if (!Array.isArray(children)) {
             children = [children];
         }
@@ -1118,10 +1120,40 @@ var Form = /** @class */ (function (_super) {
             if (!children.length) {
                 return null;
             }
-            var cx_1 = this.props.classnames;
-            return (React.createElement("div", { className: cx_1('Form-row') }, children.map(function (control, key) {
+            return (React.createElement("div", { className: cx('Form-row') }, children.map(function (control, key) {
                 return ~['hidden', 'formula'].indexOf(control.type) ||
-                    control.mode === 'inline' ? (_this.renderChild(control, key, otherProps)) : (React.createElement("div", { key: key, className: cx_1("Form-col", control.columnClassName) }, _this.renderChild(control, '', __assign(__assign({}, otherProps), { mode: 'row' }))));
+                    control.mode === 'inline' ? (_this.renderChild(control, key, otherProps)) : (React.createElement("div", { key: key, className: cx("Form-col", control.columnClassName) }, _this.renderChild(control, '', __assign(__assign({}, otherProps), { mode: 'row' }))));
+            })));
+        }
+        if (this.props.mode === 'flex') {
+            var rows_1 = [];
+            children.forEach(function (child) {
+                if (typeof child.row === 'number') {
+                    if (rows_1[child.row]) {
+                        rows_1[child.row].push(child);
+                    }
+                    else {
+                        rows_1[child.row] = [child];
+                    }
+                }
+                else {
+                    // 没有 row 的，就单启一行
+                    rows_1.push([child]);
+                }
+            });
+            return (React.createElement(React.Fragment, null, rows_1.map(function (children, index) {
+                return (React.createElement("div", { className: cx('Form-flex'), role: "flex-row", key: index }, children.map(function (control, key) {
+                    var _a;
+                    var split = (_a = control.colSize) === null || _a === void 0 ? void 0 : _a.split('/');
+                    var colSize = (split === null || split === void 0 ? void 0 : split[0]) && (split === null || split === void 0 ? void 0 : split[1])
+                        ? (split[0] / split[1]) * 100 + '%'
+                        : control.colSize;
+                    return ~['hidden', 'formula'].indexOf(control.type) ? (_this.renderChild(control, key, otherProps)) : (React.createElement("div", { key: control.id || key, className: cx("Form-flex-col", control.columnClassName), style: {
+                            flex: colSize && !['1', 'auto'].includes(colSize)
+                                ? "0 0 ".concat(colSize)
+                                : ''
+                        }, role: "flex-col" }, _this.renderChild(control, '', __assign(__assign({}, otherProps), { mode: 'flex' }))));
+                })));
             })));
         }
         return children.map(function (control, key) {
@@ -1152,7 +1184,9 @@ var Form = /** @class */ (function (_super) {
             formSubmited: form.submited,
             formMode: mode,
             formHorizontal: horizontal,
-            formLabelAlign: labelAlign !== 'left' ? 'right' : labelAlign,
+            formLabelAlign: !labelAlign || !['left', 'right', 'top'].includes(labelAlign)
+                ? 'right'
+                : labelAlign,
             formLabelWidth: labelWidth,
             controlWidth: controlWidth,
             /**

package/esm/renderers/Item.d.ts

@@ -5,7 +5,7 @@ import { IFormItemStore, IFormStore } from '../store/form';
 import { RendererProps, TestFunc, RendererConfig } from '../factory';
 import { FormHorizontal, FormSchemaBase } from './Form';
 import { ActionObject, BaseApiObject, BaseSchemaWithoutType, ClassName, Schema } from '../types';
-export type LabelAlign = 'right' | 'left';
+export type LabelAlign = 'right' | 'left' | 'top' | 'inherit';
 export interface FormBaseControl extends BaseSchemaWithoutType {
     /**
      * 表单项大小
@@ -348,6 +348,7 @@ export interface FormBaseControl extends BaseSchemaWithoutType {
      * 初始化时是否把其他字段同步到表单内部。
      */
     initAutoFill?: boolean | 'fillIfNotSet';
+    row?: number;
 }
 export interface FormItemBasicConfig extends Partial<RendererConfig> {
     type?: string;
@@ -556,11 +557,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     contextType: React.Context<{
         storeType: string;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        readonly fetcher: any; /**
-         * 显示一个小图标, 鼠标放上去的时候显示提示内容, 这个小图标跟 label 在一起
-         */
+        readonly fetcher: any;
         readonly notify: any;
-        readonly isCancel: (value: any) => boolean;
+        readonly isCancel: (value: any) => boolean; /**
+         * 当修改完的时候是否提交表单。
+         */
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -575,9 +576,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -595,9 +594,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -617,9 +614,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
-                onChildStoreDispose(child: any): void; /**
-                 * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-                 */
+                onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
@@ -637,9 +632,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
-                onChildStoreDispose(child: any): void; /**
-                 * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-                 */
+                onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
@@ -666,9 +659,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -686,9 +677,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -707,9 +696,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -727,9 +714,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -738,11 +723,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     }, {
-        readonly fetcher: any; /**
-         * 显示一个小图标, 鼠标放上去的时候显示提示内容, 这个小图标跟 label 在一起
-         */
+        readonly fetcher: any;
         readonly notify: any;
-        readonly isCancel: (value: any) => boolean;
+        readonly isCancel: (value: any) => boolean; /**
+         * 当修改完的时候是否提交表单。
+         */
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -757,9 +742,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -777,9 +760,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -799,9 +780,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
-                onChildStoreDispose(child: any): void; /**
-                 * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-                 */
+                onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
@@ -819,9 +798,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 readonly hasChildren: boolean;
                 readonly children: any[];
             } & {
-                onChildStoreDispose(child: any): void; /**
-                 * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-                 */
+                onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
@@ -848,9 +825,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -868,9 +843,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -889,9 +862,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -909,9 +880,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             readonly hasChildren: boolean;
             readonly children: any[];
         } & {
-            onChildStoreDispose(child: any): void; /**
-             * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-             */
+            onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
@@ -920,9 +889,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {
-    ComposedComponent: any; /**
-     * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
-     */
+    ComposedComponent: any;
 } & {
     ComposedComponent: any;
 };

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -34,6 +34,7 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
+import '@rc-component/mini-decimal';
 import '../utils/image.js';
 import { keyToPath } from '../utils/keyToPath.js';
 import 'lodash/isEqual';
@@ -706,8 +707,8 @@ var FormItemWrap = /** @class */ (function (_super) {
         row: 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; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, wrapperCustomStyle = props.wrapperCustomStyle, themeCss = props.themeCss, id = props.id;
-            var labelWidth = props.labelWidth || props.formLabelWidth;
             description = description || desc;
+            var labelWidth = props.labelWidth || props.formLabelWidth;
             return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--row", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
                     },
@@ -757,6 +758,66 @@ var FormItemWrap = /** @class */ (function (_super) {
                         className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                     })
                     : null));
+        },
+        flex: 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; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, wrapperCustomStyle = props.wrapperCustomStyle, themeCss = props.themeCss, id = props.id;
+            var labelAlign = (props.labelAlign !== 'inherit' && props.labelAlign) ||
+                props.formLabelAlign;
+            var labelWidth = props.labelWidth || props.formLabelWidth;
+            description = description || desc;
+            return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--flex", isStatic && staticClassName ? staticClassName : className, (_a = {
+                        'is-error': model && !model.valid
+                    },
+                    _a["is-required"] = required,
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName(__assign(__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
+                React.createElement("div", { className: cx('Form-flexInner', labelAlign && "Form-flexInner--label-".concat(labelAlign)) },
+                    label && renderLabel !== false ? (React.createElement("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null
+                            ? { width: labelAlign === 'top' ? '100%' : labelWidth }
+                            : undefined },
+                        React.createElement("span", null,
+                            render('label', label),
+                            required && (label || labelRemark) ? (React.createElement("span", { className: cx("Form-star") }, "*")) : null,
+                            labelRemark
+                                ? render('label-remark', {
+                                    type: 'remark',
+                                    icon: labelRemark.icon || 'warning-mark',
+                                    tooltip: labelRemark,
+                                    className: cx("Form-lableRemark"),
+                                    mobileUI: mobileUI,
+                                    container: props.popOverContainer || env.getModalContainer
+                                })
+                                : null))) : null,
+                    React.createElement("div", { className: cx("Form-value") },
+                        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,
+                                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,
+                        description && renderDescription !== false
+                            ? render('description', description, {
+                                className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
+                            })
+                            : null))));
         }
     };
     __decorate([
@@ -879,12 +940,18 @@ var detectProps = [
     'displayMode',
     'revealPassword',
     'loading',
-    'themeCss'
+    'themeCss',
+    'formLabelAlign',
+    'formLabelWidth',
+    'formHorizontal',
+    'labelAlign',
+    'colSize'
 ];
 function asFormItem(config) {
     return function (Control) {
         var _a;
-        var isSFC = !(Control.prototype instanceof React.Component);
+        var supportRef = Control.prototype instanceof React.Component ||
+            Control.$$typeof === Symbol.for('react.forward_ref');
         // 兼容老的 FormItem 用法。
         if (config.validate && !Control.prototype.validate) {
             var fn_1 = config.validate;
@@ -943,11 +1010,13 @@ function asFormItem(config) {
                     var _b = this.props; 
                     // 这里解构，不可轻易删除，避免被rest传到子组件
                     _b.inputClassName; var model = _b.formItem, cx = _b.classnames; _b.children; var type = _b.type, size = _b.size, defaultSize = _b.defaultSize, mobileUI = _b.mobileUI, rest = __rest(_b, ["inputClassName", "formItem", "classnames", "children", "type", "size", "defaultSize", "mobileUI"]);
-                    var controlSize = size || defaultSize;
+                    var controlSize = size && ['xs', 'sm', 'md', 'lg', 'full'].includes(size)
+                        ? size
+                        : defaultSize;
                     //@ts-ignore
                     var isOpened = this.state.isOpened;
                     return (React.createElement(React.Fragment, null,
-                        React.createElement(Control, __assign({}, rest, { mobileUI: mobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, formItem: model, className: cx("Form-control", (_a = {
+                        React.createElement(Control, __assign({}, rest, { mobileUI: mobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: supportRef ? this.refFn : undefined, forwardedRef: supportRef ? undefined : this.refFn, formItem: model, className: cx("Form-control", (_a = {
                                     'is-inline': !!rest.inline && !mobileUI,
                                     'is-error': model && !model.valid,
                                     'is-full': size === 'full'

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ import 'amis-formula';
 import 'moment';
 import { createObject, setVariable } from '../utils/object.js';
 import { isPureVariable } from '../utils/isPureVariable.js';
+import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
 import 'lodash/isPlainObject';
 import '../utils/filter.js';
@@ -91,21 +92,47 @@ function registerOptionsControl(config) {
                 _this.defaultCheckAll();
             }
             var loadOptions = initFetch !== false;
+            var setInitValue = null;
             if (joinValues === false && defaultValue) {
-                var selectedOptions = extractValue
-                    ? formItem
-                        .getSelectedOptions(value)
-                        .map(function (selectedOption) {
-                        return selectedOption[valueField || 'value'];
-                    })
-                    : formItem.getSelectedOptions(value);
-                setPrinstineValue(multiple ? selectedOptions.concat() : selectedOptions[0]);
+                setInitValue = function () {
+                    var selectedOptions = extractValue
+                        ? formItem
+                            .getSelectedOptions(value)
+                            .map(function (selectedOption) {
+                            return selectedOption[valueField || 'value'];
+                        })
+                        : formItem.getSelectedOptions(value);
+                    setPrinstineValue(multiple ? selectedOptions.concat() : selectedOptions[0]);
+                };
             }
-            loadOptions &&
-                config.autoLoadOptionsFromSource !== false &&
+            if (loadOptions && config.autoLoadOptionsFromSource !== false) {
                 _this.toDispose.push(formInited || !addHook
-                    ? formItem.addInitHook(_this.reload)
-                    : addHook(_this.initOptions, 'init'));
+                    ? formItem.addInitHook(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.reload()];
+                                case 1:
+                                    _a.sent();
+                                    setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })
+                    : addHook(function (data) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.initOptions(data)];
+                                case 1:
+                                    _a.sent();
+                                    setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); }, 'init'));
+            }
+            else {
+                setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+            }
             return _this;
         }
         FormOptionsItem.prototype.componentDidMount = function () {

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */