amis-core 6.3.0 → 6.4.0

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -301,25 +301,27 @@ function wrapControl(ComposedComponent) {
                 var model = this.model;
                 var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
                 var isExp = formula.isExpression(value);
-                if (isExp) {
-                    model.changeTmpValue(formula.FormulaExec['formula'](value, data), // 对组件默认值进行运算
-                    'formulaChanged');
-                }
-                else {
-                    var initialValue = model.extraName
-                        ? [
-                            getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
-                            getVariable.getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
-                        ]
-                        : getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
-                    if (model.extraName &&
-                        initialValue.every(function (item) { return item === undefined; })) {
-                        initialValue = undefined;
-                    }
-                    model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : formula.replaceExpression(value), typeof initialValue !== 'undefined'
-                        ? 'initialValue'
+                var initialValue = model.extraName
+                    ? [
+                        getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                        getVariable.getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                    ]
+                    : getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
+                if (model.extraName &&
+                    initialValue.every(function (item) { return item === undefined; })) {
+                    initialValue = undefined;
+                }
+                if (typeof initialValue === 'undefined') {
+                    value = isExp
+                        ? formula.FormulaExec['formula'](value, data)
+                        : formula.replaceExpression(value);
+                }
+                model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : value, // 对组件默认值进行运算
+                typeof initialValue !== 'undefined'
+                    ? 'initialValue'
+                    : isExp
+                        ? 'formulaChanged'
                         : 'defaultValue');
-                }
             };
             class_1.prototype.disposeModel = function () {
                 var _a;
@@ -396,14 +398,15 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.validate = function () {
+                var _a, _b;
                 return tslib.__awaiter(this, void 0, void 0, function () {
-                    var _a, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, valid;
-                    return tslib.__generator(this, function (_b) {
-                        switch (_b.label) {
+                    var _c, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, valid;
+                    return tslib.__generator(this, function (_d) {
+                        switch (_d.label) {
                             case 0:
                                 if (!this.model)
                                     return [2 /*return*/];
-                                _a = this.props, form = _a.formStore, data = _a.data, formItemDispatchEvent = _a.formItemDispatchEvent;
+                                _c = this.props, form = _c.formStore, data = _c.data, formItemDispatchEvent = _c.formItemDispatchEvent;
                                 if (!(this.model.unique &&
                                     (form === null || form === void 0 ? void 0 : form.parentStore) &&
                                     form.parentStore.storeType === combo.ComboStore.name)) return [3 /*break*/, 2];
@@ -414,15 +417,16 @@ function wrapControl(ComposedComponent) {
                                 });
                                 return [4 /*yield*/, Promise.all(validPromises)];
                             case 1:
-                                result = _b.sent();
+                                result = _d.sent();
                                 return [3 /*break*/, 4];
                             case 2: return [4 /*yield*/, this.model.validate(data)];
                             case 3:
-                                result = [_b.sent()];
-                                _b.label = 4;
+                                result = [_d.sent()];
+                                _d.label = 4;
                             case 4:
                                 valid = !result.some(function (item) { return item === false; });
-                                formItemDispatchEvent === null || formItemDispatchEvent === void 0 ? void 0 : formItemDispatchEvent(valid ? 'formItemValidateSucc' : 'formItemValidateError', data);
+                                (_a = (formItemDispatchEvent !== null && formItemDispatchEvent !== void 0 ? formItemDispatchEvent : this.props.dispatchEvent)) === null || _a === void 0 ? void 0 : _a(valid ? 'formItemValidateSucc' : 'formItemValidateError', (_b = form === null || form === void 0 ? void 0 : form.data) !== null && _b !== void 0 ? _b : this.props.data // form里的一定是最新的数据
+                                );
                                 return [2 /*return*/, valid];
                         }
                     });

package/lib/store/app.js

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

package/lib/store/combo.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import { SnapshotIn, Instance } from 'mobx-state-tree';
 import type { IFormStore, IFormItemStore } from './form';
 export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
@@ -167,7 +166,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -685,7 +684,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1235,7 +1234,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -1753,7 +1752,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2392,7 +2391,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2910,7 +2909,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3432,7 +3431,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3950,7 +3949,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4477,7 +4476,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4995,7 +4994,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5517,7 +5516,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6035,7 +6034,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6557,7 +6556,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7075,7 +7074,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7716,7 +7715,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8234,7 +8233,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8756,7 +8755,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9274,7 +9273,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9801,7 +9800,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10319,7 +10318,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10841,7 +10840,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11359,7 +11358,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11881,7 +11880,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -12399,7 +12398,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;

package/lib/store/combo.js

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

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -31,9 +31,10 @@ var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 
 var ServerError = /** @class */ (function (_super) {
     tslib.__extends(ServerError, _super);
-    function ServerError() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function ServerError(msg, response) {
+        var _this = _super.call(this, msg) || this;
         _this.type = 'ServerError';
+        _this.response = response;
         return _this;
     }
     return ServerError;
@@ -404,7 +405,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                     timeout: json.msgTimeout
                                 }
                                 : undefined);
-                        throw new ServerError(self.msg);
+                        throw new ServerError(self.msg, json);
                     }
                     else {
                         self.updateMessage((_h = (_g = (_f = (_e = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _e === void 0 ? void 0 : _e.success) !== null && _f !== void 0 ? _f : json.msg) !== null && _g !== void 0 ? _g : options.successMessage) !== null && _h !== void 0 ? _h : json.defaultMsg);
@@ -416,13 +417,18 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                 }
                                 : undefined);
                     }
-                    return [2 /*return*/, json.data];
+                    // 补一个空对象是为了区别于被取消的请求
+                    // 请求被取消时会返回 undefined
+                    return [2 /*return*/, json.data || {}];
                 case 2:
                     e_3 = _j.sent();
-                    self.markSaving(false);
                     if (!mobxStateTree.isAlive(self) || self.disposed) {
                         return [2 /*return*/];
                     }
+                    self.markSaving(false);
+                    if (mobxStateTree.getEnv(self).isCancel(e_3)) {
+                        return [2 /*return*/];
+                    }
                     !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
                         e_3.type !== 'ServerError' &&
                         mobxStateTree.getEnv(self).notify('error', e_3.message);

package/lib/store/form.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import { Instance } from 'mobx-state-tree';
 import type { IFormItemStore } from './formItem';
 import { Api, fetchOptions, Payload } from '../types';
@@ -245,7 +244,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -763,7 +762,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1286,7 +1285,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1804,7 +1803,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -2331,7 +2330,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -2849,7 +2848,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -3371,7 +3370,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -3889,7 +3888,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -4411,7 +4410,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -4929,7 +4928,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" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;

package/lib/store/form.js

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

package/lib/store/formItem.js

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

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -91,6 +91,9 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             if (data === void 0) { data = {}; }
             if (skipSetPristine === void 0) { skipSetPristine = false; }
             self.initedAt = Date.now();
+            if (self.data.__tag) {
+                data = object.injectObjectChain(data, self.data.__tag);
+            }
             !skipSetPristine && (self.pristine = data);
             self.data = data;
         },
@@ -105,7 +108,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             var prev = self.data;
             var newData;
             if (tag) {
-                var proto = object.createObject(self.data.__super || null, tag);
+                var proto = object.createObject(self.data.__super || null, tslib.__assign(tslib.__assign({}, tag), { __tag: tag }));
                 newData = object.createObject(proto, tslib.__assign(tslib.__assign({}, (replace ? {} : self.data)), data));
             }
             else {

package/lib/store/index.js

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