amis-core 6.13.0-beta.1 → 6.13.0-beta.2

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 
@@ -12,8 +12,6 @@ var React = require('react');
 var hoistNonReactStatic = require('hoist-non-react-statics');
 var mobx = require('mobx');
 var mobxStateTree = require('mobx-state-tree');
-var globalVar = require('../globalVar.js');
-var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 var factory = require('../factory.js');
 var helper = require('../utils/helper.js');
 var mobxReact = require('mobx-react');
@@ -1091,20 +1089,7 @@ function asFormItem(config) {
 }
 function registerFormItem(config) {
     var Control = asFormItem(config)(config.component);
-    return factory.registerRenderer(tslib.__assign(tslib.__assign({}, config), { weight: typeof config.weight !== 'undefined' ? config.weight : -100, component: Control, isFormItem: true, onGlobalVarChanged: function (instance, schema, data) {
-            var _a, _b, _c;
-            if (((_a = config.onGlobalVarChanged) === null || _a === void 0 ? void 0 : _a.apply(this, arguments)) === false) {
-                return false;
-            }
-            if (globalVar.isGlobalVarExpression(schema.source)) {
-                (_c = (_b = instance.props).reloadOptions) === null || _c === void 0 ? void 0 : _c.call(_b);
-            }
-            // 目前表单项的全局变量更新要靠这个方式
-            if (globalVar.isGlobalVarExpression(schema.value)) {
-                instance.props.onChange(resolveVariableAndFilter.resolveVariableAndFilter(schema.value, data, '| raw'));
-                return false;
-            }
-        } }));
+    return factory.registerRenderer(tslib.__assign(tslib.__assign({}, config), { weight: typeof config.weight !== 'undefined' ? config.weight : -100, component: Control, isFormItem: true }));
 }
 function FormItem(config) {
     return function (component) {

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/app.d.ts

@@ -54,6 +54,8 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("../types").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/combo.d.ts

@@ -2212,6 +2212,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
@@ -2277,6 +2279,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
     } & {
         setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+        temporaryUpdateGlobalVars(globalVar: any): void;
+        unDoTemporaryUpdateGlobalVars(): void;
         reset(): void;
         updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
         changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
@@ -7776,6 +7780,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
     } & {
         setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+        temporaryUpdateGlobalVars(globalVar: any): void;
+        unDoTemporaryUpdateGlobalVars(): void;
         reset(): void;
         updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
         changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/crud.d.ts

@@ -79,6 +79,8 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("../types").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/form.d.ts

@@ -58,8 +58,9 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
     readonly pristineDiff: any;
 } & {
     setTopStore(value: any): void;
-    /** 获取InputGroup的子元素 */
     initData(data?: object, skipSetPristine?: boolean, changeReason?: DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: DataChangeReason | undefined): void;

package/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 
@@ -660,7 +660,8 @@ var FormStore = service.ServiceStore.named('FormStore')
     function reset(cb, resetData) {
         if (resetData === void 0) { resetData = true; }
         if (resetData) {
-            self.data = self.pristine;
+            // 父级的数据可能已经被修改，__super不应该被修改
+            self.data = object.createObject(self.data.__super, self.pristine);
         }
         // 值可能变了，重新验证一次。
         self.validated = false;

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/iRenderer.d.ts

@@ -39,6 +39,8 @@ export declare const iRendererStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: DataChangeReason): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object, replace?: boolean, concatFields?: string | string[], changeReason?: DataChangeReason): void;
     changeValue(name: string, value: any, changePristine?: boolean, force?: boolean, otherModifier?: ((data: Object) => void) | undefined, changeReason?: DataChangeReason): void;

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 
@@ -58,6 +58,11 @@ require('../utils/validations.js');
 require('../utils/resolveCondition.js');
 require('mobx');
 require('../utils/Animation.js');
+var findLastIndex = require('lodash/findLastIndex');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var findLastIndex__default = /*#__PURE__*/_interopDefaultLegacy(findLastIndex);
 
 var iRendererStore = node.StoreNode.named('iRendererStore')
     .props({
@@ -124,6 +129,22 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             self.data = data;
             self.upStreamData = data;
         },
+        // 临时更新全局变量
+        temporaryUpdateGlobalVars: function (globalVar) {
+            var chain = object.extractObjectChain(self.data).filter(function (item) { return !item.hasOwnProperty('__isTempGlobalLayer'); });
+            var idx = findLastIndex__default["default"](chain, function (item) {
+                return item.hasOwnProperty('global') || item.hasOwnProperty('globalState');
+            });
+            if (idx !== -1) {
+                chain.splice(idx + 1, 0, tslib.__assign(tslib.__assign({}, globalVar), { __isTempGlobalLayer: true }));
+            }
+            self.data = object.createObjectFromChain(chain);
+        },
+        // 撤销临时更新全局变量
+        unDoTemporaryUpdateGlobalVars: function () {
+            var chain = object.extractObjectChain(self.data).filter(function (item) { return !item.hasOwnProperty('__isTempGlobalLayer'); });
+            self.data = object.createObjectFromChain(chain);
+        },
         reset: function () {
             self.data = self.pristine;
         },

package/lib/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/list.d.ts

@@ -113,6 +113,8 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;

package/lib/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/modal.d.ts

@@ -52,6 +52,8 @@ export declare const ModalStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;

package/lib/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/pagination.d.ts

@@ -44,6 +44,8 @@ export declare const PaginationStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;

package/lib/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/root.d.ts

@@ -36,6 +36,7 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     runtimeErrorStack: import("mobx-state-tree").IType<any, any, any>;
     query: import("mobx-state-tree").IType<any, any, any>;
     ready: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    globalVarTempStates: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IMapType<import("mobx-state-tree").IType<GlobalVariableState, GlobalVariableState, GlobalVariableState>>, [undefined]>;
     globalVarStates: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IMapType<import("mobx-state-tree").IType<GlobalVariableState, GlobalVariableState, GlobalVariableState>>, [undefined]>;
 }, {
     readonly parentStore: any;
@@ -55,6 +56,8 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
@@ -85,6 +88,7 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     globalVars: GlobalVariableItemFull[];
     globalData: any;
 } & {
+    readonly nextGlobalData: any;
     readonly downStream: any;
 } & {
     updateContext(context: any): void;
@@ -99,6 +103,8 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     setRuntimeError(error: any, errorStack: any): void;
     updateLocation(location?: any, parseFn?: Function): void;
     init: (schema: any) => Promise<any>;
+    syncGlobalVarStates: () => void;
+    addSyncGlobalVarStatePendingTask: (fn: (callback: () => void) => void, callback?: () => void) => void;
     afterDestroy(): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IRootStore = Instance<typeof RootStore>;

package/lib/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 
@@ -68,6 +68,11 @@ var RootStore = service.ServiceStore.named('RootStore')
     runtimeErrorStack: mobxStateTree.types.frozen(),
     query: mobxStateTree.types.frozen(),
     ready: false,
+    // 临时变更，等 react 完成一轮渲染后，将临时变更切成正式变更
+    // 主要是为了让可能需要重新渲染的部分组件可以实现 this.props.data 和 prevProps.data 不一致
+    // 因为很多组件内部会 diff this.props.data 和 prevProps.data 来决定是否更新的逻辑
+    globalVarTempStates: mobxStateTree.types.optional(mobxStateTree.types.map(mobxStateTree.types.frozen()), {}),
+    // 正式变更
     globalVarStates: mobxStateTree.types.optional(mobxStateTree.types.map(mobxStateTree.types.frozen()), {})
 })
     .volatile(function (self) {
@@ -81,6 +86,41 @@ var RootStore = service.ServiceStore.named('RootStore')
     };
 })
     .views(function (self) { return ({
+    get nextGlobalData() {
+        var globalData = {};
+        var globalState = {};
+        if (self.globalVarTempStates.size) {
+            var touched_1 = false;
+            var saved_1 = true;
+            var errors_1 = {};
+            var initialized_1 = true;
+            self.globalVarTempStates.forEach(function (state, key) {
+                globalData[key] = state.value;
+                touched_1 = touched_1 || state.touched;
+                if (!state.saved) {
+                    saved_1 = false;
+                }
+                if (state.errorMessages.length) {
+                    errors_1[key] = state.errorMessages;
+                }
+                if (!state.initialized) {
+                    initialized_1 = false;
+                }
+            });
+            globalState = {
+                fields: self.globalVarTempStates.toJSON(),
+                initialized: initialized_1,
+                touched: touched_1,
+                saved: saved_1,
+                errors: errors_1,
+                valid: !Object.keys(errors_1).length
+            };
+        }
+        return object.createObject(self.context, {
+            global: globalData,
+            globalState: globalState
+        });
+    },
     get downStream() {
         var result = self.data;
         if (self.context || self.query || self.globalVarStates.size) {
@@ -89,32 +129,32 @@ var RootStore = service.ServiceStore.named('RootStore')
             // 对应的是全局变量的值和全局变量的状态
             if (self.globalVarStates.size) {
                 var globalData_1 = {};
-                var touched_1 = false;
-                var saved_1 = true;
-                var errors_1 = {};
-                var initialized_1 = true;
+                var touched_2 = false;
+                var saved_2 = true;
+                var errors_2 = {};
+                var initialized_2 = true;
                 self.globalVarStates.forEach(function (state, key) {
                     globalData_1[key] = state.value;
-                    touched_1 = touched_1 || state.touched;
+                    touched_2 = touched_2 || state.touched;
                     if (!state.saved) {
-                        saved_1 = false;
+                        saved_2 = false;
                     }
                     if (state.errorMessages.length) {
-                        errors_1[key] = state.errorMessages;
+                        errors_2[key] = state.errorMessages;
                     }
                     if (!state.initialized) {
-                        initialized_1 = false;
+                        initialized_2 = false;
                     }
                 });
                 // 保存全局变量的值和状态
                 Object.assign(self.globalData.global, globalData_1);
                 Object.assign(self.globalData.globalState, {
                     fields: self.globalVarStates.toJSON(),
-                    initialized: initialized_1,
-                    touched: touched_1,
-                    saved: saved_1,
-                    errors: errors_1,
-                    valid: !Object.keys(errors_1).length
+                    initialized: initialized_2,
+                    touched: touched_2,
+                    saved: saved_2,
+                    errors: errors_2,
+                    valid: !Object.keys(errors_2).length
                 });
                 // self.globalData 一直都是那个对象，这样组件里面始终拿到的都是最新的
                 chain.unshift(self.globalData);
@@ -212,7 +252,7 @@ var RootStore = service.ServiceStore.named('RootStore')
                         return [4 /*yield*/, getGlobalVarData(item, context, getter)];
                     case 1:
                         _a.sent();
-                        state = self.globalVarStates.get(item.key);
+                        state = self.globalVarTempStates.get(item.key);
                         updateState(item.key, {
                             initialized: true,
                             pristine: state.value
@@ -286,7 +326,7 @@ var RootStore = service.ServiceStore.named('RootStore')
                             if (!variables.some(function (item) { return item.key === key; })) {
                                 return "continue";
                             }
-                            var state = self.globalVarStates.get(key);
+                            var state = self.globalVarTempStates.get(key);
                             if (state) {
                                 updateState(key, {
                                     value: data[key],
@@ -329,7 +369,7 @@ var RootStore = service.ServiceStore.named('RootStore')
                         bulkGetters = [];
                         itemsNotInitialized = [];
                         _loop_3 = function (item) {
-                            var state = self.globalVarStates.get(item.key);
+                            var state = self.globalVarTempStates.get(item.key);
                             if (state === null || state === void 0 ? void 0 : state.initialized) {
                                 return "continue";
                             }
@@ -393,8 +433,9 @@ var RootStore = service.ServiceStore.named('RootStore')
                     // 初始化全局变量
                     _b.globalVars = _c.sent();
                     removeVars.forEach(function (item) {
-                        self.globalVarStates.delete(item.key);
+                        self.globalVarTempStates.delete(item.key);
                     });
+                    syncGlobalVarStates();
                     return [2 /*return*/];
             }
         });
@@ -405,7 +446,7 @@ var RootStore = service.ServiceStore.named('RootStore')
     };
     // 如果对应变量是个对象，那么可以通过这个扩充变量的值
     var modifyGlobalVarValue = function (key, options) {
-        var state = self.globalVarStates.get(key);
+        var state = self.globalVarTempStates.get(key);
         if (!state) {
             return;
         }
@@ -500,7 +541,7 @@ var RootStore = service.ServiceStore.named('RootStore')
                         bulkSetters = [];
                         values = {};
                         _loop_4 = function (varItem) {
-                            var state = self.globalVarStates.get(varItem.key);
+                            var state = self.globalVarTempStates.get(varItem.key);
                             if (!(state === null || state === void 0 ? void 0 : state.touched)) {
                                 return "continue";
                             }
@@ -566,6 +607,26 @@ var RootStore = service.ServiceStore.named('RootStore')
         trailing: true,
         leading: false
     });
+    function syncGlobalVarStates() {
+        self.globalVarStates.clear();
+        self.globalVarTempStates.forEach(function (state, key) {
+            self.globalVarStates.set(key, tslib.__assign({}, state));
+        });
+    }
+    var pendingCount = 0;
+    var callbacks = [];
+    function addSyncGlobalVarStatePendingTask(fn, callback) {
+        pendingCount++;
+        callback && callbacks.push(callback);
+        fn(function () {
+            pendingCount--;
+            if (pendingCount === 0) {
+                callbacks.forEach(function (callback) { return callback(); });
+                callbacks = [];
+                self.syncGlobalVarStates();
+            }
+        });
+    }
     return {
         updateContext: function (context) {
             // 因为 context 不是受控属性，直接共用引用好了
@@ -573,9 +634,9 @@ var RootStore = service.ServiceStore.named('RootStore')
             Object.assign(self.context, context);
         },
         updateGlobalVarState: function (key, state) {
-            var origin = self.globalVarStates.get(key);
+            var origin = self.globalVarTempStates.get(key);
             var newState = tslib.__assign(tslib.__assign({}, (origin || globalVar.createGlobalVarState())), state);
-            self.globalVarStates.set(key, newState);
+            self.globalVarTempStates.set(key, newState);
         },
         setGlobalVars: setGlobalVars,
         updateGlobalVarValue: updateGlobalVarValue,
@@ -592,6 +653,8 @@ var RootStore = service.ServiceStore.named('RootStore')
             }
         },
         init: init,
+        syncGlobalVarStates: syncGlobalVarStates,
+        addSyncGlobalVarStatePendingTask: addSyncGlobalVarStatePendingTask,
         afterDestroy: function () {
             lazySaveGlobalVarValues.flush();
         }

package/lib/store/service.d.ts

@@ -48,6 +48,8 @@ export declare const ServiceStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("../types").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;

package/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/status.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.2
  * Copyright 2018-2025 fex
  */
 

package/lib/store/table.d.ts

@@ -317,6 +317,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     lazyRenderAfter: import("mobx-state-tree").IType<number | undefined, number, number>;
     tableLayout: import("mobx-state-tree").IType<string | undefined, string, string>;
     theadHeight: import("mobx-state-tree").IType<number | undefined, number, number>;
+    persistKey: import("mobx-state-tree").IType<string | undefined, string, string>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -335,6 +336,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
@@ -475,6 +478,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         } & {
             setTopStore(value: any): void;
             initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+            temporaryUpdateGlobalVars(globalVar: any): void;
+            unDoTemporaryUpdateGlobalVars(): void;
             reset(): void;
             updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
@@ -5974,6 +5979,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         } & {
             setTopStore(value: any): void;
             initData(data?: object, skipSetPristine?: boolean, changeReason?: import("..").DataChangeReason | undefined): void;
+            temporaryUpdateGlobalVars(globalVar: any): void;
+            unDoTemporaryUpdateGlobalVars(): void;
             reset(): void;
             updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("..").DataChangeReason | undefined): void;
             changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("..").DataChangeReason | undefined): void;