amis-core 6.13.0-beta.9 → 6.14.0-beta.0

package/esm/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.9
+ * amis-core v6.14.0-beta.0
  * Copyright 2018-2025 fex
  */
 
@@ -12,13 +12,18 @@ var ModalStore = ServiceStore.named('ModalStore')
     .props({
     form: types.frozen(),
     entered: false,
+    dragging: false,
     resizeCoord: 0,
-    schema: types.frozen()
+    schema: types.frozen(),
+    isFullscreen: false
 })
     .views(function (self) {
     return {
         get formData() {
             return createObject(self.data, self.form);
+        },
+        get inDragging() {
+            return self.dragging;
         }
     };
 })
@@ -27,6 +32,9 @@ var ModalStore = ServiceStore.named('ModalStore')
         setEntered: function (value) {
             self.entered = value;
         },
+        setDragging: function (value) {
+            self.dragging = value;
+        },
         setFormData: function (obj) {
             self.form = obj;
         },
@@ -43,6 +51,10 @@ var ModalStore = ServiceStore.named('ModalStore')
                 return;
             }
             self.schema = schema;
+        },
+        setFullScreen: function (isFullscreen) {
+            if (isFullscreen === void 0) { isFullscreen = false; }
+            self.isFullscreen = isFullscreen;
         }
     };
 });

package/esm/store/node.js

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

package/esm/store/pagination.js

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

package/esm/store/root.d.ts

@@ -92,8 +92,9 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     globalData: any;
 } & {
     readonly nextGlobalData: any;
-    readonly downStream: any;
+    readonly downStream: object;
 } & {
+    updateContextBySetter(context: any): void;
     updateContext(context: any, isInit?: boolean): void;
     updateGlobalVarState(key: string, state: Partial<GlobalVariableState>): void;
     setGlobalVars: (vars?: Array<GlobalVariableItem>) => Promise<any>;
@@ -107,7 +108,9 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     updateLocation(location?: any, parseFn?: Function): void;
     init: (schema: any) => Promise<any>;
     syncGlobalVarStates: () => void;
+    syncLegacyGlobalVarStates: () => void;
     addSyncGlobalVarStatePendingTask: (fn: (callback: () => void) => void, callback?: () => void) => void;
+    afterCreate(): void;
     afterDestroy(): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IRootStore = Instance<typeof RootStore>;

package/esm/store/root.js

@@ -1,34 +1,34 @@
 /**
- * amis-core v6.13.0-beta.9
+ * amis-core v6.14.0-beta.0
  * Copyright 2018-2025 fex
  */
 
 import { __assign, __generator, __rest, __values, __awaiter, __read } from 'tslib';
-import { types, flow } from 'mobx-state-tree';
+import { types, flow, isAlive, addDisposer } from 'mobx-state-tree';
 import { parseQuery, isObjectShallowModified } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
+import 'amis-formula';
+import 'moment';
+import { extractObjectChain, createObjectFromChain, cloneObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
+import '@rc-component/mini-decimal';
+import isPlainObject from 'lodash/isPlainObject';
+import '../utils/filter.js';
 import '../utils/api.js';
 import 'file-saver';
 import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
-import { extractObjectChain, createObjectFromChain, cloneObject } from '../utils/object.js';
-import '../utils/memoryParse.js';
-import 'amis-formula';
-import isPlainObject from 'lodash/isPlainObject';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
-import 'moment';
 import '../utils/debug.js';
 import 'react-dom';
 import '../utils/errors.js';
 import '../utils/tpl.js';
-import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import '@rc-component/mini-decimal';
 import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';
@@ -46,7 +46,7 @@ import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
 import '../utils/resolveCondition.js';
-import 'mobx';
+import { reaction } from 'mobx';
 import '../utils/Animation.js';
 import { createGlobalVarState, buildGlobalVariable } from '../globalVar.js';
 
@@ -113,47 +113,43 @@ var RootStore = ServiceStore.named('RootStore')
         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.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, __assign(__assign({}, self.query), { __query: self.query }));
-            result = createObjectFromChain(chain);
-        }
-        return result;
+        var chain = extractObjectChain(self.data);
+        // 数据链中添加 global 和 globalState
+        // 对应的是全局变量的值和全局变量的状态
+        var globalData = {};
+        var touched = false;
+        var saved = true;
+        var errors = {};
+        var initialized = true;
+        self.globalVarStates.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;
+            }
+        });
+        // 保存全局变量的值和状态
+        Object.assign(self.globalData.global, globalData);
+        Object.assign(self.globalData.globalState, {
+            fields: self.globalVarStates.toJSON(),
+            initialized: initialized,
+            touched: touched,
+            saved: saved,
+            errors: errors,
+            valid: !Object.keys(errors).length
+        });
+        // self.globalData 一直都是那个对象，这样组件里面始终拿到的都是最新的
+        chain.unshift(self.globalData);
+        self.context && chain.unshift(self.context);
+        self.query &&
+            chain.splice(chain.length - 1, 0, __assign(__assign({}, self.query), { __query: self.query }));
+        return createObjectFromChain(chain);
     }
 }); })
     .actions(function (self) {
@@ -410,17 +406,18 @@ var RootStore = ServiceStore.named('RootStore')
     }
     // 设置全局变量,返回一个Promise
     var setGlobalVars = flow(function setGlobalVars(vars) {
-        var _a, newVars, updateVars, removeVars, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var _a, newVars, updateVars, removeVars, globalVars;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     _a = diffVariables(vars || [], self.globalVars), newVars = _a.newVars, updateVars = _a.updateVars, removeVars = _a.removeVars;
-                    // 初始化全局变量
-                    _b = self;
                     return [4 /*yield*/, initializeGlobalVars(newVars, updateVars)];
                 case 1:
-                    // 初始化全局变量
-                    _b.globalVars = _c.sent();
+                    globalVars = _b.sent();
+                    if (!isAlive(self)) {
+                        return [2 /*return*/];
+                    }
+                    self.globalVars = globalVars;
                     removeVars.forEach(function (item) {
                         self.globalVarTempStates.delete(item.key);
                     });
@@ -601,6 +598,8 @@ var RootStore = ServiceStore.named('RootStore')
         self.globalVarTempStates.forEach(function (state, key) {
             self.globalVarStates.set(key, __assign({}, state));
         });
+    }
+    function syncLegacyGlobalVarStates() {
         if (self.legacyGlobalTempContext.__page !== self.context.__page ||
             self.legacyGlobalTempContext.appVariables !== self.context.appVariables) {
             Object.assign(self.context, self.legacyGlobalTempContext);
@@ -617,11 +616,40 @@ var RootStore = ServiceStore.named('RootStore')
             if (pendingCount === 0) {
                 callbacks.forEach(function (callback) { return callback(); });
                 callbacks = [];
-                self.syncGlobalVarStates();
+                if (isAlive(self)) {
+                    self.syncGlobalVarStates();
+                    self.syncLegacyGlobalVarStates();
+                }
+            }
+        });
+    }
+    function observeSet(obj, callback) {
+        if (!obj || obj.__observed) {
+            // 如果已经被观察过了，就不需要再观察了
+            return obj;
+        }
+        var timer = 0;
+        return new Proxy(__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 {
+        updateContextBySetter: function (context) {
+            this.updateContext(context);
+            self.data = cloneObject(self.data);
+        },
         updateContext: function (context, isInit) {
             // 因为 context 不是受控属性，直接共用引用好了
             // 否则还会触发孩子节点的重新渲染
@@ -629,9 +657,22 @@ var RootStore = ServiceStore.named('RootStore')
             var _a = context || {}, __page = _a.__page, appVariables = _a.appVariables, rest = __rest(_a, ["__page", "appVariables"]);
             // 对历史用法做兼容
             if (__page || appVariables) {
+                // 有部分用户直接在自定义动作脚本里面修改 __page 或者 appVariables 变量
+                // 奇怪的是之前的实现方式这种修改是会更新变更的
+                // 所以这里用 Proxy 来解决不更新的问题
+                __page = __page
+                    ? observeSet(__page, function (__page) {
+                        return self.updateContextBySetter(__assign(__assign({}, self.context), { __page: __page }));
+                    })
+                    : __page;
+                appVariables = appVariables
+                    ? observeSet(appVariables, function (appVariables) {
+                        return self.updateContextBySetter(__assign(__assign({}, self.context), { appVariables: appVariables }));
+                    })
+                    : appVariables;
                 if (isInit) {
-                    self.context.__page = context.__page;
-                    self.context.appVariables = context.appVariables;
+                    self.context.__page = __page;
+                    self.context.appVariables = appVariables;
                 }
                 self.legacyGlobalTempContext.__page = __page;
                 self.legacyGlobalTempContext.appVariables = appVariables;
@@ -659,7 +700,15 @@ var RootStore = ServiceStore.named('RootStore')
         },
         init: init,
         syncGlobalVarStates: syncGlobalVarStates,
+        syncLegacyGlobalVarStates: syncLegacyGlobalVarStates,
         addSyncGlobalVarStatePendingTask: addSyncGlobalVarStatePendingTask,
+        afterCreate: function () {
+            addDisposer(self, reaction(function () { return self.nextGlobalData; }, function () {
+                return self.addSyncGlobalVarStatePendingTask(function (callback) {
+                    return requestAnimationFrame(callback);
+                });
+            }));
+        },
         afterDestroy: function () {
             lazySaveGlobalVarValues.flush();
         }

package/esm/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.9
+ * amis-core v6.14.0-beta.0
  * Copyright 2018-2025 fex
  */
 
@@ -12,26 +12,26 @@ import { normalizeApiResponseData } from '../utils/api.js';
 import { replaceText } from '../utils/replaceText.js';
 import { concatData } from '../utils/concatData.js';
 import { envOverwrite } from '../envOverwrite.js';
+import 'amis-formula';
+import 'moment';
+import { isObject, extendObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
+import '@rc-component/mini-decimal';
+import 'lodash/isPlainObject';
+import '../utils/filter.js';
 import 'file-saver';
 import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
-import '../utils/memoryParse.js';
-import 'amis-formula';
-import 'lodash/isPlainObject';
-import { isObject, extendObject } from '../utils/object.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
-import 'moment';
 import '../utils/debug.js';
 import 'react-dom';
 import { filter } from '../utils/tpl.js';
-import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import '@rc-component/mini-decimal';
 import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';

package/esm/store/status.js

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