amis-core 6.2.2 → 6.3.0

package/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -472,7 +472,7 @@ var FormStore = service.ServiceStore.named('FormStore')
         });
     });
     var validate = mobxStateTree.flow(function validate(hooks, forceValidate, throwErrors, failedMessage, validateErrCb) {
-        var items, i, len, item, i, len, msg, dispatcher;
+        var items, i, len, item, i, len, msg, e_2, msg, dispatcher;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -516,42 +516,60 @@ var FormStore = service.ServiceStore.named('FormStore')
                     i++;
                     return [3 /*break*/, 1];
                 case 4:
+                    _a.trys.push([4, 9, , 10]);
                     if (!(hooks && hooks.length)) return [3 /*break*/, 8];
                     i = 0, len = hooks.length;
                     _a.label = 5;
                 case 5:
                     if (!(i < len)) return [3 /*break*/, 8];
-                    return [4 /*yield*/, hooks[i]()];
+                    return [4 /*yield*/, hooks[i](self.data)];
                 case 6:
-                    _a.sent();
+                    msg = _a.sent();
+                    if (typeof msg == 'string' && msg) {
+                        throw new Error(msg);
+                    }
+                    else if (msg === false) {
+                        // 不提示直接不通过校验
+                        throw new helper.ValidateError(failedMessage || self.__('Form.validateFailed'), self.errors);
+                    }
                     _a.label = 7;
                 case 7:
                     i++;
                     return [3 /*break*/, 5];
-                case 8:
-                    if (!!self.valid) return [3 /*break*/, 12];
+                case 8: return [3 /*break*/, 10];
+                case 9:
+                    e_2 = _a.sent();
+                    if (throwErrors) {
+                        throw e_2;
+                    }
+                    else {
+                        toastValidateError(e_2.message);
+                    }
+                    return [2 /*return*/, false];
+                case 10:
+                    if (!!self.valid) return [3 /*break*/, 14];
                     if (!(self.items.some(function (item) {
                         return item.errorData.some(function (e) { return e.tag !== 'remote'; });
                     }) ||
-                        self.restError.length)) return [3 /*break*/, 11];
+                        self.restError.length)) return [3 /*break*/, 13];
                     msg = failedMessage !== null && failedMessage !== void 0 ? failedMessage : self.__('Form.validateFailed');
                     dispatcher = validateErrCb && validateErrCb();
-                    if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.then)) return [3 /*break*/, 10];
+                    if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.then)) return [3 /*break*/, 12];
                     return [4 /*yield*/, dispatcher];
-                case 9:
+                case 11:
                     dispatcher = _a.sent();
-                    _a.label = 10;
-                case 10:
+                    _a.label = 12;
+                case 12:
                     if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                         msg && toastValidateError(msg);
                     }
-                    _a.label = 11;
-                case 11:
+                    _a.label = 13;
+                case 13:
                     if (throwErrors) {
                         throw new helper.ValidateError(failedMessage || self.__('Form.validateFailed'), self.errors);
                     }
-                    _a.label = 12;
-                case 12: return [2 /*return*/, self.valid];
+                    _a.label = 14;
+                case 14: return [2 /*return*/, self.valid];
             }
         });
     });

package/lib/store/formItem.d.ts

@@ -31,6 +31,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     itemId: import("mobx-state-tree").IType<string | undefined, string, string>;
     unsetValueOnInvisible: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     itemsRef: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+    inited: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     validated: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     validating: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     multiple: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
@@ -160,14 +161,17 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     getSubStore: () => any;
     reset: (keepErrors?: boolean) => void;
     resetValidationStatus: (tag?: string) => void;
-    openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
-    closeDialog: (result?: any) => void;
+    openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
+    closeDialog: (confirmed?: any, result?: any) => void;
     changeTmpValue: (value: any, changeReason?: 'initialValue' | 'formInited' | 'dataChanged' | 'formulaChanged' | 'controlled' | 'input' | 'defaultValue') => void;
     changeEmitedValue: (value: any) => void;
     addSubFormItem: (item: IFormItemStore) => void;
     removeSubFormItem: (item: IFormItemStore) => void;
     loadAutoUpdateData: (api: Api, data?: object, silent?: boolean) => Promise<Payload>;
     setIsControlled: (value: any) => void;
+    init: () => Promise<void>;
+    addInitHook(fn: (store: any) => any, weight?: number): () => void;
+    beforeDestroy: () => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IFormItemStore = Instance<typeof FormItemStore>;
 export type SFormItemStore = SnapshotIn<typeof FormItemStore>;

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -77,6 +77,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
     itemId: '',
     unsetValueOnInvisible: false,
     itemsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.string), []),
+    inited: false,
     validated: false,
     validating: false,
     multiple: false,
@@ -269,6 +270,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
     self.form;
     var dialogCallbacks = new SimpleMap.SimpleMap();
     var loadAutoUpdateCancel = null;
+    var initHooks = [];
     function config(_a) {
         var name = _a.name, extraName = _a.extraName, required = _a.required, unique = _a.unique; _a.value; var isValueSchemaExp = _a.isValueSchemaExp, rules = _a.rules, messages = _a.messages, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, labelField = _a.labelField, joinValues = _a.joinValues, extractValue = _a.extractValue, type = _a.type, id = _a.id, selectFirst = _a.selectFirst, autoFill = _a.autoFill, clearValueOnHidden = _a.clearValueOnHidden, validateApi = _a.validateApi, maxLength = _a.maxLength, minLength = _a.minLength, validateOnChange = _a.validateOnChange, label = _a.label, inputGroupControl = _a.inputGroupControl, pagination = _a.pagination;
         if (typeof rules === 'string') {
@@ -1010,12 +1012,12 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
         self.dialogOpen = true;
         callback && dialogCallbacks.set(self.dialogData, callback);
     }
-    function closeDialog(result) {
+    function closeDialog(confirmed, result) {
         var callback = dialogCallbacks.get(self.dialogData);
         self.dialogOpen = false;
         if (callback) {
             dialogCallbacks.delete(self.dialogData);
-            setTimeout(function () { return callback(result); }, 200);
+            setTimeout(function () { return callback(confirmed, result); }, 200);
         }
     }
     function changeTmpValue(value, changeReason // 默认值
@@ -1040,6 +1042,52 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
     function setIsControlled(value) {
         self.isControlled = !!value;
     }
+    var init = mobxStateTree.flow(function init() {
+        var hooks, hooks_1, hooks_1_1, hook, e_4_1;
+        var e_4, _a;
+        return tslib.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    hooks = initHooks.sort(function (a, b) { return (a.__weight || 0) - (b.__weight || 0); });
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, , 10, 11]);
+                    _b.label = 2;
+                case 2:
+                    _b.trys.push([2, 7, 8, 9]);
+                    hooks_1 = tslib.__values(hooks), hooks_1_1 = hooks_1.next();
+                    _b.label = 3;
+                case 3:
+                    if (!!hooks_1_1.done) return [3 /*break*/, 6];
+                    hook = hooks_1_1.value;
+                    return [4 /*yield*/, hook(self)];
+                case 4:
+                    _b.sent();
+                    _b.label = 5;
+                case 5:
+                    hooks_1_1 = hooks_1.next();
+                    return [3 /*break*/, 3];
+                case 6: return [3 /*break*/, 9];
+                case 7:
+                    e_4_1 = _b.sent();
+                    e_4 = { error: e_4_1 };
+                    return [3 /*break*/, 9];
+                case 8:
+                    try {
+                        if (hooks_1_1 && !hooks_1_1.done && (_a = hooks_1.return)) _a.call(hooks_1);
+                    }
+                    finally { if (e_4) throw e_4.error; }
+                    return [7 /*endfinally*/];
+                case 9: return [3 /*break*/, 11];
+                case 10:
+                    if (mobxStateTree.isAlive(self)) {
+                        self.inited = true;
+                    }
+                    return [7 /*endfinally*/];
+                case 11: return [2 /*return*/];
+            }
+        });
+    });
     return {
         focus: focus,
         blur: blur,
@@ -1068,7 +1116,22 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
         addSubFormItem: addSubFormItem,
         removeSubFormItem: removeSubFormItem,
         loadAutoUpdateData: loadAutoUpdateData,
-        setIsControlled: setIsControlled
+        setIsControlled: setIsControlled,
+        init: init,
+        addInitHook: function (fn, weight) {
+            if (weight === void 0) { weight = 0; }
+            fn = helper.promisify(fn);
+            initHooks.push(fn);
+            fn.__weight = weight;
+            return function () {
+                var idx = initHooks.indexOf(fn);
+                ~idx && initHooks.splice(idx, 1);
+            };
+        },
+        beforeDestroy: function () {
+            // 销毁
+            initHooks.splice(0, initHooks.length);
+        }
     };
 });
 

package/lib/store/iRenderer.d.ts

@@ -38,11 +38,11 @@ export declare const iRendererStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object, replace?: boolean, concatFields?: string | string[]): void;
     changeValue(name: string, value: any, changePristine?: boolean, force?: boolean, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined, scoped?: IScopedContext): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined, scoped?: IScopedContext): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: IScopedContext): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: IScopedContext): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): IScopedContext | null;
     getDrawerScoped(): IScopedContext | null;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -171,22 +171,33 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             }
             self.data = data;
         },
-        setCurrentAction: function (action) {
+        setCurrentAction: function (action, resolveDefinitions) {
+            // 处理 $ref
+            resolveDefinitions &&
+                ['dialog', 'drawer'].forEach(function (key) {
+                    var _a;
+                    var _b;
+                    if ((_b = action[key]) === null || _b === void 0 ? void 0 : _b.$ref) {
+                        action = tslib.__assign(tslib.__assign({}, action), (_a = {}, _a[key] = tslib.__assign(tslib.__assign({}, resolveDefinitions(action[key].$ref)), action[key]), _a));
+                    }
+                });
             self.action = action;
             self.dialogData = false;
             self.drawerOpen = false;
         },
         openDialog: function (ctx, additonal, callback, scoped) {
+            var _a, _b;
             var chain = object.extractObjectChain(ctx);
             chain.length === 1 && chain.unshift(self.data);
             if (additonal) {
                 chain.splice(chain.length - 1, 0, additonal);
             }
             var data = object.createObjectFromChain(chain);
-            if (self.action.dialog && self.action.dialog.data) {
+            var mappingData = (_a = self.action.data) !== null && _a !== void 0 ? _a : (_b = self.action.dialog) === null || _b === void 0 ? void 0 : _b.data;
+            if (mappingData) {
                 self.dialogData = object.createObjectFromChain([
                     top === null || top === void 0 ? void 0 : top.context,
-                    dataMapping.dataMapping(self.action.dialog.data, data)
+                    dataMapping.dataMapping(mappingData, data)
                 ]);
                 var clonedAction = tslib.__assign(tslib.__assign({}, self.action), { dialog: tslib.__assign({}, self.action.dialog) });
                 delete clonedAction.dialog.data;
@@ -199,26 +210,28 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             callback && dialogCallbacks.set(self.dialogData, callback);
             dialogScoped = scoped || null;
         },
-        closeDialog: function (result) {
+        closeDialog: function (confirmed, data) {
             var callback = dialogCallbacks.get(self.dialogData);
             self.dialogOpen = false;
             dialogScoped = null;
             if (callback) {
                 dialogCallbacks.delete(self.dialogData);
-                setTimeout(function () { return callback(result); }, 200);
+                setTimeout(function () { return callback(confirmed, data); }, 200);
             }
         },
         openDrawer: function (ctx, additonal, callback, scoped) {
+            var _a;
             var chain = object.extractObjectChain(ctx);
             chain.length === 1 && chain.unshift(self.data);
             if (additonal) {
                 chain.splice(chain.length - 1, 0, additonal);
             }
             var data = object.createObjectFromChain(chain);
-            if (self.action.drawer.data) {
+            var mappingData = (_a = self.action.data) !== null && _a !== void 0 ? _a : self.action.drawer.data;
+            if (mappingData) {
                 self.drawerData = object.createObjectFromChain([
                     top === null || top === void 0 ? void 0 : top.context,
-                    dataMapping.dataMapping(self.action.drawer.data, data)
+                    dataMapping.dataMapping(mappingData, data)
                 ]);
                 var clonedAction = tslib.__assign(tslib.__assign({}, self.action), { drawer: tslib.__assign({}, self.action.drawer) });
                 delete clonedAction.drawer.data;
@@ -233,13 +246,13 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             }
             drawerScoped = scoped || null;
         },
-        closeDrawer: function (result) {
+        closeDrawer: function (confirmed, data) {
             var callback = dialogCallbacks.get(self.drawerData);
             self.drawerOpen = false;
             drawerScoped = null;
             if (callback) {
                 dialogCallbacks.delete(self.drawerData);
-                setTimeout(function () { return callback(result); }, 200);
+                setTimeout(function () { return callback(confirmed, data); }, 200);
             }
         },
         getDialogScoped: function () {

package/lib/store/index.js

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

package/lib/store/list.d.ts

@@ -108,11 +108,11 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {

package/lib/store/list.js

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

package/lib/store/manager.js

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

package/lib/store/modal.d.ts

@@ -52,11 +52,11 @@ export declare const ModalStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {

package/lib/store/modal.js

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

package/lib/store/node.js

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

package/lib/store/pagination.d.ts

@@ -44,11 +44,11 @@ export declare const PaginationStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {

package/lib/store/pagination.js

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

package/lib/store/root.d.ts

@@ -51,11 +51,11 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {

package/lib/store/root.js

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

package/lib/store/service.d.ts

@@ -48,11 +48,11 @@ export declare const ServiceStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {

package/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -94,7 +94,7 @@ var ServiceStore = iRenderer.iRendererStore
         if (concatFields) {
             data = concatData.concatData(data, self.data, concatFields);
         }
-        var newData = object.extendObject(self.pristine, data, !replace);
+        var newData = object.extendObject(self.data, data, !replace);
         self.data = self.pristine = newData;
     }
     function updateMessage(msg, error) {

package/lib/store/status.js

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