amis-core 6.4.1 → 6.6.0

package/lib/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/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -39,6 +39,7 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
+require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');
@@ -724,8 +725,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 (_J$X_("div", { "data-role": "form-item", className: cx("Form-item Form-item--row", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
                     },
@@ -775,6 +776,66 @@ var FormItemWrap = /** @class */ (function (_super) {
                         className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__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 (_J$X_("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, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
+                _J$X_("div", { className: cx('Form-flexInner', labelAlign && "Form-flexInner--label-".concat(labelAlign)) },
+                    label && renderLabel !== false ? (_J$X_("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null
+                            ? { width: labelAlign === 'top' ? '100%' : labelWidth }
+                            : undefined },
+                        _J$X_("span", null,
+                            render('label', label),
+                            required && (label || labelRemark) ? (_J$X_("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,
+                    _J$X_("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) ? (_J$X_("ul", { className: cx('Form-feedback') }, model.errors.map(function (msg, key) { return (_J$X_("li", { key: key }, msg)); }))) : null,
+                        description && renderDescription !== false
+                            ? render('description', description, {
+                                className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
+                            })
+                            : null))));
         }
     };
     tslib.__decorate([
@@ -897,12 +958,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__default["default"].Component);
+        var supportRef = Control.prototype instanceof React__default["default"].Component ||
+            Control.$$typeof === Symbol.for('react.forward_ref');
         // 兼容老的 FormItem 用法。
         if (config.validate && !Control.prototype.validate) {
             var fn_1 = config.validate;
@@ -961,11 +1028,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 = tslib.__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 (_J$X_(React__default["default"].Fragment, null,
-                        _J$X_(Control, tslib.__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 = {
+                        _J$X_(Control, tslib.__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/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -18,6 +18,7 @@ require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
 var isPureVariable = require('../utils/isPureVariable.js');
+require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
@@ -106,21 +107,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 tslib.__awaiter(_this, void 0, void 0, function () {
+                        return tslib.__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 tslib.__awaiter(_this, void 0, void 0, function () {
+                        return tslib.__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/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -46,6 +46,7 @@ require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('react-dom');
 require('../utils/SimpleMap.js');
+require('@rc-component/mini-decimal');
 require('lodash/mapValues');
 require('lodash/camelCase');
 require('lodash/cloneDeep');
@@ -350,6 +351,11 @@ function wrapControl(ComposedComponent) {
                 while (control && control.getWrappedInstance) {
                     control = control.getWrappedInstance();
                 }
+                if (control && !control.props) {
+                    Object.defineProperty(control, 'props', {
+                        get: function () { return _this.props; }
+                    });
+                }
                 if (control && control.validate && this.model) {
                     var formItem_1 = this.model;
                     var validate_1 = helper.promisify(control.validate.bind(control));
@@ -473,14 +479,18 @@ function wrapControl(ComposedComponent) {
                 }
                 var model = this.model;
                 var value = this.model.tmpValue;
-                var oldValue = model.extraName
-                    ? [
-                        getVariable.getVariable(data, model.name, false),
-                        getVariable.getVariable(data, model.extraName, false)
-                    ]
-                    : getVariable.getVariable(data, model.name, false);
-                if (model.extraName ? isEqual__default["default"](oldValue, value) : oldValue === value) {
-                    return;
+                var oldValue = undefined;
+                // 受控的因为没有记录上一次 props 下发的 value，所以不做比较
+                if (!model.isControlled) {
+                    oldValue = model.extraName
+                        ? [
+                            getVariable.getVariable(data, model.name, false),
+                            getVariable.getVariable(data, model.extraName, false)
+                        ]
+                        : getVariable.getVariable(data, model.name, false);
+                    if (model.extraName ? isEqual__default["default"](oldValue, value) : oldValue === value) {
+                        return;
+                    }
                 }
                 if (type !== 'input-password') {
                     env === null || env === void 0 ? void 0 : env.tracker({

package/lib/store/app.d.ts

@@ -14,6 +14,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     initedAt: import("mobx-state-tree").IType<number | undefined, number, number>;
     updatedAt: import("mobx-state-tree").IType<number | undefined, number, number>;
     pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    upStreamData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     action: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     dialogOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dialogData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -48,6 +49,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
 } & {
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
+    readonly pristineDiff: any;
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -29,6 +29,7 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
+require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');