amis-core 6.6.0 → 6.7.0

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -470,7 +470,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         return null;
     };
     FormItemWrap.prototype.render = function () {
-        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, themeCss = _a.themeCss, id = _a.id, wrapperCustomStyle = _a.wrapperCustomStyle, env = _a.env;
+        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, themeCss = _a.themeCss, id = _a.id, wrapperCustomStyle = _a.wrapperCustomStyle, env = _a.env, cx = _a.classnames;
         var mode = this.props.mode || formMode;
         if (wrap === false || inputOnly) {
             return this.renderControl();
@@ -492,7 +492,13 @@ var FormItemWrap = /** @class */ (function (_super) {
                     themeCss: themeCss || css,
                     classNames: [
                         {
-                            key: 'labelClassName'
+                            key: 'labelClassName',
+                            weights: {
+                                default: {
+                                    suf: ".".concat(cx('Form-label')),
+                                    parent: ".".concat(cx('Form-item'))
+                                }
+                            }
                         },
                         {
                             key: 'descriptionClassName'
@@ -517,7 +523,8 @@ var FormItemWrap = /** @class */ (function (_super) {
             var horizontal = props.horizontal || props.formHorizontal || {};
             var left = helper.getWidthRate(horizontal.left);
             var right = helper.getWidthRate(horizontal.right);
-            var labelAlign = props.labelAlign || props.formLabelAlign;
+            var labelAlign = (props.labelAlign !== 'inherit' && props.labelAlign) ||
+                props.formLabelAlign;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             return (_J$X_("div", { "data-role": "form-item", className: cx("Form-item Form-item--horizontal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'Form-item--horizontal-justify': horizontal.justify
@@ -995,6 +1002,7 @@ function asFormItem(config) {
                 function class_1(props) {
                     var _this = _super.call(this, props) || this;
                     _this.refFn = _this.refFn.bind(_this);
+                    _this.getData = _this.getData.bind(_this);
                     var validations = props.validations, model = props.formItem;
                     // 组件注册的时候可能默认指定验证器类型
                     if (model && !validations && config.validations) {
@@ -1023,18 +1031,25 @@ function asFormItem(config) {
                 class_1.prototype.refFn = function (ref) {
                     this.ref = ref;
                 };
+                class_1.prototype.getData = function () {
+                    return this.props.data;
+                };
                 class_1.prototype.renderControl = function () {
                     var _a;
                     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 && ['xs', 'sm', 'md', 'lg', 'full'].includes(size)
-                        ? size
-                        : defaultSize;
+                    var isRuleSize = size && ['xs', 'sm', 'md', 'lg', 'full'].includes(size);
+                    var controlSize = isRuleSize ? 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: supportRef ? this.refFn : undefined, forwardedRef: supportRef ? undefined : this.refFn, formItem: model, className: cx("Form-control", (_a = {
+                        _J$X_(Control, tslib.__assign({}, rest, { 
+                            // 因为 formItem 内部可能不会更新到最新的 data，所以暴露个方法可以获取到最新的
+                            // 获取不到最新的因为做了限制，只有表单项目 name 关联的数值变化才更新
+                            getData: this.getData, 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, style: {
+                                width: !isRuleSize && size ? size : undefined
+                            }, 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.6.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/renderers/wrapControl.js

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

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]>;
+    pristineRaw: 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>;

package/lib/store/app.js

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

package/lib/store/combo.d.ts

@@ -167,7 +167,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -685,7 +685,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1063,6 +1063,7 @@ export declare const ComboStore: 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]>;
+    pristineRaw: 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>;
@@ -1236,7 +1237,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -1754,7 +1755,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2166,6 +2167,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         initedAt: number;
         updatedAt: number;
         pristine: any;
+        pristineRaw: any;
         upStreamData: any;
         action: any;
         dialogOpen: boolean;
@@ -2396,7 +2398,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2914,7 +2916,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3436,7 +3438,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3954,7 +3956,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4481,7 +4483,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4999,7 +5001,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5521,7 +5523,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6039,7 +6041,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6561,7 +6563,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7079,7 +7081,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7490,6 +7492,7 @@ export declare const ComboStore: 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]>;
+        pristineRaw: 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>;
@@ -7722,7 +7725,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8240,7 +8243,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8762,7 +8765,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9280,7 +9283,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9807,7 +9810,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10325,7 +10328,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10847,7 +10850,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11365,7 +11368,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11887,7 +11890,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -12405,7 +12408,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closeDialog: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;

package/lib/store/combo.js

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

package/lib/store/crud.d.ts

@@ -27,6 +27,7 @@ export declare const CRUDStore: 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]>;
+    pristineRaw: 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>;

package/lib/store/crud.js

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

package/lib/store/form.d.ts

@@ -15,6 +15,7 @@ export declare const FormStore: 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]>;
+    pristineRaw: 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>;
@@ -247,7 +248,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -765,7 +766,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1288,7 +1289,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1806,7 +1807,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -2333,7 +2334,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -2851,7 +2852,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -3373,7 +3374,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -3891,7 +3892,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -4413,7 +4414,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -4931,7 +4932,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closeDialog: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;

package/lib/store/form.js

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

package/lib/store/formItem.js

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

package/lib/store/iRenderer.d.ts

@@ -13,6 +13,7 @@ export declare const iRendererStore: 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]>;
+    pristineRaw: 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>;

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -64,6 +64,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
     initedAt: 0,
     updatedAt: 0,
     pristine: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
+    pristineRaw: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
     upStreamData: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
     action: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     dialogOpen: false,
@@ -82,7 +83,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
     get pristineDiff() {
         var data = {};
         Object.keys(self.pristine).forEach(function (key) {
-            if (self.pristine[key] !== self.upStreamData[key]) {
+            if (self.pristine[key] !== self.pristineRaw[key]) {
                 data[key] = self.pristine[key];
             }
         });
@@ -105,7 +106,10 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             if (self.data.__tag) {
                 data = object.injectObjectChain(data, self.data.__tag);
             }
-            !skipSetPristine && (self.pristine = data);
+            if (!skipSetPristine) {
+                self.pristine = data;
+                self.pristineRaw = data;
+            }
             self.data = data;
             self.upStreamData = data;
         },

package/lib/store/index.js

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

package/lib/store/list.d.ts

@@ -34,6 +34,7 @@ export declare const ListStore: 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]>;
+    pristineRaw: 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>;

package/lib/store/list.js

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

package/lib/store/manager.js

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

package/lib/store/modal.d.ts

@@ -12,6 +12,7 @@ export declare const ModalStore: 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]>;
+    pristineRaw: 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>;