amis-core 6.13.0-beta.5 → 6.13.0-beta.7

package/esm/store/root.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.13.0-beta.5
+ * amis-core v6.13.0-beta.7
  * Copyright 2018-2025 fex
  */
 
-import { __assign, __generator, __values, __awaiter, __read } from 'tslib';
+import { __assign, __generator, __rest, __values, __awaiter, __read } from 'tslib';
 import { types, flow } from 'mobx-state-tree';
 import { parseQuery, isObjectShallowModified } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
@@ -13,7 +13,7 @@ import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
-import { createObject, extractObjectChain, createObjectFromChain } from '../utils/object.js';
+import { extractObjectChain, createObjectFromChain, cloneObject } from '../utils/object.js';
 import '../utils/memoryParse.js';
 import 'amis-formula';
 import isPlainObject from 'lodash/isPlainObject';
@@ -66,6 +66,7 @@ var RootStore = ServiceStore.named('RootStore')
     .volatile(function (self) {
     return {
         context: {},
+        legacyGlobalTempContext: {},
         globalVars: [],
         globalData: {
             global: {},
@@ -77,13 +78,53 @@ var RootStore = ServiceStore.named('RootStore')
     get nextGlobalData() {
         var globalData = {};
         var globalState = {};
-        if (self.globalVarTempStates.size) {
+        var chain = 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 createObjectFromChain(chain);
+    },
+    get downStream() {
+        var result = self.data;
+        if (self.context || self.query) {
+            var chain = extractObjectChain(result);
+            // 数据链中添加 global 和 globalState
+            // 对应的是全局变量的值和全局变量的状态
+            var globalData_1 = {};
             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;
+            self.globalVarStates.forEach(function (state, key) {
+                globalData_1[key] = state.value;
                 touched_1 = touched_1 || state.touched;
                 if (!state.saved) {
                     saved_1 = false;
@@ -95,59 +136,19 @@ var RootStore = ServiceStore.named('RootStore')
                     initialized_1 = false;
                 }
             });
-            globalState = {
-                fields: self.globalVarTempStates.toJSON(),
+            // 保存全局变量的值和状态
+            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
-            };
-        }
-        return createObject(self.context, {
-            global: globalData,
-            globalState: globalState
-        });
-    },
-    get downStream() {
-        var result = self.data;
-        if (self.context || self.query || self.globalVarStates.size) {
-            var chain = extractObjectChain(result);
-            // 数据链中添加 global 和 globalState
-            // 对应的是全局变量的值和全局变量的状态
-            if (self.globalVarStates.size) {
-                var globalData_1 = {};
-                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_2 = touched_2 || state.touched;
-                    if (!state.saved) {
-                        saved_2 = false;
-                    }
-                    if (state.errorMessages.length) {
-                        errors_2[key] = state.errorMessages;
-                    }
-                    if (!state.initialized) {
-                        initialized_2 = false;
-                    }
-                });
-                // 保存全局变量的值和状态
-                Object.assign(self.globalData.global, globalData_1);
-                Object.assign(self.globalData.globalState, {
-                    fields: self.globalVarStates.toJSON(),
-                    initialized: initialized_2,
-                    touched: touched_2,
-                    saved: saved_2,
-                    errors: errors_2,
-                    valid: !Object.keys(errors_2).length
-                });
-                // self.globalData 一直都是那个对象，这样组件里面始终拿到的都是最新的
-                chain.unshift(self.globalData);
-            }
-            self.context && chain.unshift(self.context);
+            });
+            // self.globalData 一直都是那个对象，这样组件里面始终拿到的都是最新的
+            chain.unshift(self.globalData);
+            chain.unshift(self.context);
             self.query &&
                 chain.splice(chain.length - 1, 0, __assign(__assign({}, self.query), { __query: self.query }));
             result = createObjectFromChain(chain);
@@ -600,6 +601,11 @@ var RootStore = ServiceStore.named('RootStore')
         self.globalVarTempStates.forEach(function (state, key) {
             self.globalVarStates.set(key, __assign({}, state));
         });
+        if (self.legacyGlobalTempContext.__page !== self.context.__page ||
+            self.legacyGlobalTempContext.appVariables !== self.context.appVariables) {
+            Object.assign(self.context, self.legacyGlobalTempContext);
+            self.data = cloneObject(self.data);
+        }
     }
     var pendingCount = 0;
     var callbacks = [];
@@ -616,10 +622,21 @@ var RootStore = ServiceStore.named('RootStore')
         });
     }
     return {
-        updateContext: function (context) {
+        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 = __rest(_a, ["__page", "appVariables"]);
+            // 对历史用法做兼容
+            if (__page || appVariables) {
+                if (isInit) {
+                    self.context.__page = context.__page;
+                    self.context.appVariables = context.appVariables;
+                }
+                self.legacyGlobalTempContext.__page = __page;
+                self.legacyGlobalTempContext.appVariables = appVariables;
+            }
+            Object.assign(self.context, rest);
         },
         updateGlobalVarState: function (key, state) {
             var origin = self.globalVarTempStates.get(key);

package/esm/store/service.js

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

package/esm/store/status.js

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