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

package/lib/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -53,7 +53,7 @@ require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');
 require('../utils/resolveCondition.js');
-require('mobx');
+var mobx = require('mobx');
 require('../utils/Animation.js');
 var globalVar = require('../globalVar.js');
 
@@ -68,11 +68,17 @@ 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) {
     return {
         context: {},
+        legacyGlobalTempContext: {},
         globalVars: [],
         globalData: {
             global: {},
@@ -81,45 +87,80 @@ var RootStore = service.ServiceStore.named('RootStore')
     };
 })
     .views(function (self) { return ({
+    get nextGlobalData() {
+        var globalData = {};
+        var globalState = {};
+        var chain = object.extractObjectChain(self.data);
+        var touched = false;
+        var saved = true;
+        var errors = {};
+        var initialized = true;
+        self.globalVarTempStates.forEach(function (state, key) {
+            globalData[key] = state.value;
+            touched = touched || state.touched;
+            if (!state.saved) {
+                saved = false;
+            }
+            if (state.errorMessages.length) {
+                errors[key] = state.errorMessages;
+            }
+            if (!state.initialized) {
+                initialized = false;
+            }
+        });
+        globalState = {
+            fields: self.globalVarTempStates.toJSON(),
+            initialized: initialized,
+            touched: touched,
+            saved: saved,
+            errors: errors,
+            valid: !Object.keys(errors).length
+        };
+        chain.unshift({
+            global: globalData,
+            globalState: globalState
+        });
+        chain.unshift(self.legacyGlobalTempContext);
+        chain.unshift(self.context);
+        return object.createObjectFromChain(chain);
+    },
     get downStream() {
         var result = self.data;
-        if (self.context || self.query || self.globalVarStates.size) {
+        if (self.context || self.query) {
             var chain = object.extractObjectChain(result);
             // 数据链中添加 global 和 globalState
             // 对应的是全局变量的值和全局变量的状态
-            if (self.globalVarStates.size) {
-                var globalData_1 = {};
-                var touched_1 = false;
-                var saved_1 = true;
-                var errors_1 = {};
-                var initialized_1 = true;
-                self.globalVarStates.forEach(function (state, key) {
-                    globalData_1[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;
-                    }
-                });
-                // 保存全局变量的值和状态
-                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
-                });
-                // self.globalData 一直都是那个对象，这样组件里面始终拿到的都是最新的
-                chain.unshift(self.globalData);
-            }
-            self.context && chain.unshift(self.context);
+            var globalData_1 = {};
+            var touched_1 = false;
+            var saved_1 = true;
+            var errors_1 = {};
+            var initialized_1 = true;
+            self.globalVarStates.forEach(function (state, key) {
+                globalData_1[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;
+                }
+            });
+            // 保存全局变量的值和状态
+            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
+            });
+            // self.globalData 一直都是那个对象，这样组件里面始终拿到的都是最新的
+            chain.unshift(self.globalData);
+            chain.unshift(self.context);
             self.query &&
                 chain.splice(chain.length - 1, 0, tslib.__assign(tslib.__assign({}, self.query), { __query: self.query }));
             result = object.createObjectFromChain(chain);
@@ -212,7 +253,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 +327,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 +370,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 +434,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 +447,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 +542,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,16 +608,96 @@ 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));
+        });
+    }
+    function syncLegacyGlobalVarStates() {
+        if (self.legacyGlobalTempContext.__page !== self.context.__page ||
+            self.legacyGlobalTempContext.appVariables !== self.context.appVariables) {
+            Object.assign(self.context, self.legacyGlobalTempContext);
+            self.data = object.cloneObject(self.data);
+        }
+    }
+    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 = [];
+                if (mobxStateTree.isAlive(self)) {
+                    self.syncGlobalVarStates();
+                    self.syncLegacyGlobalVarStates();
+                }
+            }
+        });
+    }
+    function observeSet(obj, callback) {
+        if (!obj || obj.__observed) {
+            // 如果已经被观察过了，就不需要再观察了
+            return obj;
+        }
+        var timer = 0;
+        return new Proxy(tslib.__assign({}, obj), {
+            get: function (target, prop) {
+                if (prop === '__observed') {
+                    return true;
+                }
+                return Reflect.get(target, prop);
+            },
+            set: function (target, prop, value) {
+                Reflect.set(target, prop, value);
+                cancelAnimationFrame(timer);
+                timer = requestAnimationFrame(function () { return callback(target); });
+                console.warn("Don't modify the context directly.");
+                return true;
+            }
+        });
+    }
     return {
-        updateContext: function (context) {
+        updateContextBySetter: function (context) {
+            this.updateContext(context);
+            self.data = object.cloneObject(self.data);
+        },
+        updateContext: function (context, isInit) {
             // 因为 context 不是受控属性，直接共用引用好了
             // 否则还会触发孩子节点的重新渲染
-            Object.assign(self.context, context);
+            if (isInit === void 0) { isInit = false; }
+            var _a = context || {}, __page = _a.__page, appVariables = _a.appVariables, rest = tslib.__rest(_a, ["__page", "appVariables"]);
+            // 对历史用法做兼容
+            if (__page || appVariables) {
+                // 有部分用户直接在自定义动作脚本里面修改 __page 或者 appVariables 变量
+                // 奇怪的是之前的实现方式这种修改是会更新变更的
+                // 所以这里用 Proxy 来解决不更新的问题
+                __page = __page
+                    ? observeSet(__page, function (__page) {
+                        return self.updateContextBySetter(tslib.__assign(tslib.__assign({}, self.context), { __page: __page }));
+                    })
+                    : __page;
+                appVariables = appVariables
+                    ? observeSet(appVariables, function (appVariables) {
+                        return self.updateContextBySetter(tslib.__assign(tslib.__assign({}, self.context), { appVariables: appVariables }));
+                    })
+                    : appVariables;
+                if (isInit) {
+                    self.context.__page = __page;
+                    self.context.appVariables = appVariables;
+                }
+                self.legacyGlobalTempContext.__page = __page;
+                self.legacyGlobalTempContext.appVariables = appVariables;
+            }
+            Object.assign(self.context, rest);
         },
         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 +714,16 @@ var RootStore = service.ServiceStore.named('RootStore')
             }
         },
         init: init,
+        syncGlobalVarStates: syncGlobalVarStates,
+        syncLegacyGlobalVarStates: syncLegacyGlobalVarStates,
+        addSyncGlobalVarStatePendingTask: addSyncGlobalVarStatePendingTask,
+        afterCreate: function () {
+            mobxStateTree.addDisposer(self, mobx.reaction(function () { return self.nextGlobalData; }, function () {
+                return self.addSyncGlobalVarStatePendingTask(function (callback) {
+                    return requestAnimationFrame(callback);
+                });
+            }));
+        },
         afterDestroy: function () {
             lazySaveGlobalVarValues.flush();
         }

package/lib/store/service.d.ts

@@ -16,8 +16,10 @@ export declare const ServiceStore: import("mobx-state-tree").IModelType<{
     pristineRaw: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     upStreamData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     action: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    dialogSchema: import("mobx-state-tree").IType<any, any, any>;
     dialogOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dialogData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    drawerSchema: import("mobx-state-tree").IType<any, any, any>;
     drawerOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     drawerData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
 } & {
@@ -48,6 +50,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.11
  * 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.11
  * Copyright 2018-2025 fex
  */