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

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.9
+ * amis-core v6.14.0-beta.0
  * Copyright 2018-2025 fex
  */
 
@@ -18,9 +18,9 @@ var tpl = require('../utils/tpl.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
-var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
 var api = require('../utils/api.js');
@@ -81,6 +81,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
     itemsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.string), []),
     inited: false,
     validated: false,
+    validatedAt: 0,
     validating: false,
     multiple: false,
     delimiter: ',',
@@ -419,6 +420,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
                         }
                     }
                     self.validating = false;
+                    self.validatedAt = Date.now();
                     return [2 /*return*/, self.valid];
             }
         });

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.9
+ * amis-core v6.14.0-beta.0
  * Copyright 2018-2025 fex
  */
 
@@ -265,7 +265,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             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,
+                    top === null || top === void 0 ? void 0 : top.downStream,
                     dataMapping.dataMapping(mappingData, data)
                 ]);
                 var clonedAction = tslib.__assign(tslib.__assign({}, self.action), { dialog: tslib.__assign({}, self.action.dialog) });
@@ -302,7 +302,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             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,
+                    top === null || top === void 0 ? void 0 : top.downStream,
                     dataMapping.dataMapping(mappingData, data)
                 ]);
                 var clonedAction = tslib.__assign(tslib.__assign({}, self.action), { drawer: tslib.__assign({}, self.action.drawer) });

package/lib/store/index.js

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

package/lib/store/list.js

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

package/lib/store/manager.js

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

package/lib/store/modal.d.ts

@@ -34,8 +34,10 @@ export declare const ModalStore: import("mobx-state-tree").IModelType<{
 } & {
     form: import("mobx-state-tree").IType<any, any, any>;
     entered: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     resizeCoord: import("mobx-state-tree").IType<number | undefined, number, number>;
     schema: import("mobx-state-tree").IType<any, any, any>;
+    isFullscreen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -83,12 +85,15 @@ export declare const ModalStore: import("mobx-state-tree").IModelType<{
     checkRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
 } & {
     readonly formData: object;
+    readonly inDragging: boolean;
 } & {
     setEntered(value: boolean): void;
+    setDragging(value: boolean): void;
     setFormData(obj: any): void;
     reset(): void;
     setResizeCoord(value: number): void;
     setSchema(schema: any): void;
+    setFullScreen(isFullscreen?: boolean): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IModalStore = Instance<typeof ModalStore>;
 export type SModalStore = SnapshotIn<typeof ModalStore>;

package/lib/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
  */
 
@@ -16,13 +16,18 @@ var ModalStore = service.ServiceStore.named('ModalStore')
     .props({
     form: mobxStateTree.types.frozen(),
     entered: false,
+    dragging: false,
     resizeCoord: 0,
-    schema: mobxStateTree.types.frozen()
+    schema: mobxStateTree.types.frozen(),
+    isFullscreen: false
 })
     .views(function (self) {
     return {
         get formData() {
             return object.createObject(self.data, self.form);
+        },
+        get inDragging() {
+            return self.dragging;
         }
     };
 })
@@ -31,6 +36,9 @@ var ModalStore = service.ServiceStore.named('ModalStore')
         setEntered: function (value) {
             self.entered = value;
         },
+        setDragging: function (value) {
+            self.dragging = value;
+        },
         setFormData: function (obj) {
             self.form = obj;
         },
@@ -47,6 +55,10 @@ var ModalStore = service.ServiceStore.named('ModalStore')
                 return;
             }
             self.schema = schema;
+        },
+        setFullScreen: function (isFullscreen) {
+            if (isFullscreen === void 0) { isFullscreen = false; }
+            self.isFullscreen = isFullscreen;
         }
     };
 });

package/lib/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/lib/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/lib/store/root.d.ts

@@ -91,8 +91,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>;
@@ -106,7 +107,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/lib/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.9
+ * amis-core v6.14.0-beta.0
  * Copyright 2018-2025 fex
  */
 
@@ -11,27 +11,27 @@ var tslib = require('tslib');
 var mobxStateTree = require('mobx-state-tree');
 var helper = require('../utils/helper.js');
 var service = require('./service.js');
+require('amis-formula');
+require('moment');
+var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
+require('@rc-component/mini-decimal');
+var isPlainObject = require('lodash/isPlainObject');
+require('../utils/filter.js');
 require('../utils/api.js');
 require('file-saver');
 require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-var object = require('../utils/object.js');
-require('../utils/memoryParse.js');
-require('amis-formula');
-var isPlainObject = require('lodash/isPlainObject');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
-require('moment');
 require('../utils/debug.js');
 require('../utils/dom.js');
 require('../utils/errors.js');
 require('../utils/tpl.js');
-require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
-require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');
@@ -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');
 
@@ -125,47 +125,43 @@ var RootStore = service.ServiceStore.named('RootStore')
         return object.createObjectFromChain(chain);
     },
     get downStream() {
-        var result = self.data;
-        if (self.context || self.query) {
-            var chain = object.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, tslib.__assign(tslib.__assign({}, self.query), { __query: self.query }));
-            result = object.createObjectFromChain(chain);
-        }
-        return result;
+        var chain = object.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, tslib.__assign(tslib.__assign({}, self.query), { __query: self.query }));
+        return object.createObjectFromChain(chain);
     }
 }); })
     .actions(function (self) {
@@ -422,17 +418,18 @@ var RootStore = service.ServiceStore.named('RootStore')
     }
     // 设置全局变量,返回一个Promise
     var setGlobalVars = mobxStateTree.flow(function setGlobalVars(vars) {
-        var _a, newVars, updateVars, removeVars, _b;
-        return tslib.__generator(this, function (_c) {
-            switch (_c.label) {
+        var _a, newVars, updateVars, removeVars, globalVars;
+        return tslib.__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 (!mobxStateTree.isAlive(self)) {
+                        return [2 /*return*/];
+                    }
+                    self.globalVars = globalVars;
                     removeVars.forEach(function (item) {
                         self.globalVarTempStates.delete(item.key);
                     });
@@ -613,6 +610,8 @@ var RootStore = service.ServiceStore.named('RootStore')
         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);
@@ -629,11 +628,40 @@ var RootStore = service.ServiceStore.named('RootStore')
             if (pendingCount === 0) {
                 callbacks.forEach(function (callback) { return callback(); });
                 callbacks = [];
-                self.syncGlobalVarStates();
+                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 {
+        updateContextBySetter: function (context) {
+            this.updateContext(context);
+            self.data = object.cloneObject(self.data);
+        },
         updateContext: function (context, isInit) {
             // 因为 context 不是受控属性，直接共用引用好了
             // 否则还会触发孩子节点的重新渲染
@@ -641,9 +669,22 @@ var RootStore = service.ServiceStore.named('RootStore')
             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 = context.__page;
-                    self.context.appVariables = context.appVariables;
+                    self.context.__page = __page;
+                    self.context.appVariables = appVariables;
                 }
                 self.legacyGlobalTempContext.__page = __page;
                 self.legacyGlobalTempContext.appVariables = appVariables;
@@ -671,7 +712,15 @@ 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.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.9
+ * amis-core v6.14.0-beta.0
  * Copyright 2018-2025 fex
  */
 
@@ -16,25 +16,25 @@ var api = require('../utils/api.js');
 var replaceText = require('../utils/replaceText.js');
 var concatData = require('../utils/concatData.js');
 var envOverwrite = require('../envOverwrite.js');
+require('amis-formula');
+require('moment');
+var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
+require('@rc-component/mini-decimal');
+require('lodash/isPlainObject');
+require('../utils/filter.js');
 require('file-saver');
 require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-require('../utils/memoryParse.js');
-require('amis-formula');
-require('lodash/isPlainObject');
-var object = require('../utils/object.js');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
-require('moment');
 require('../utils/debug.js');
 require('../utils/dom.js');
 var tpl = require('../utils/tpl.js');
-require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
-require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');

package/lib/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
  */