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

package/esm/Root.d.ts

@@ -5,10 +5,13 @@ import { TranslateFn } from './locale';
 import { IRendererStore } from './store';
 import { SchemaNode } from './types';
 import { StatusScopedProps } from './StatusScoped';
+import { GlobalVariableItem } from './globalVar';
 export interface RootRenderProps {
+    globalVars?: Array<GlobalVariableItem>;
     location?: Location;
     theme?: string;
     data?: Record<string, any>;
+    context?: Record<string, any>;
     locale?: string;
     [propName: string]: any;
 }

package/esm/Root.js

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

package/esm/RootRenderer.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
-import { __extends, __assign, __awaiter, __generator, __spreadArray, __read, __rest, __decorate, __metadata } from 'tslib';
+import { __extends, __assign, __rest, __awaiter, __generator, __spreadArray, __read, __decorate, __metadata } from 'tslib';
 import { observer } from 'mobx-react';
 import React from 'react';
 import { filterTarget, ScopedContext } from './Scoped.js';
@@ -34,6 +34,7 @@ var RootRenderer = /** @class */ (function (_super) {
         _this.store.updateContext(props.context);
         _this.store.initData(props.data);
         _this.store.updateLocation(props.location, (_a = _this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
+        _this.store.setGlobalVars(props.globalVars);
         // 将数据里面的函数批量的绑定到 this 上
         bulkBindFunctions(_this, [
             'handleAction',
@@ -79,6 +80,10 @@ var RootRenderer = /** @class */ (function (_super) {
     RootRenderer.prototype.componentDidUpdate = function (prevProps) {
         var _a;
         var props = this.props;
+        // 更新全局变量
+        if (props.globalVars !== prevProps.globalVars) {
+            this.store.setGlobalVars(props.globalVars);
+        }
         if (props.location !== prevProps.location) {
             this.store.updateLocation(props.location, (_a = this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
         }
@@ -179,11 +184,12 @@ var RootRenderer = /** @class */ (function (_super) {
             });
         }
         else if (action.actionType === 'toast') {
-            (_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (item) {
-                env.notify(item.level || 'info', item.body
-                    ? render('body', item.body, __assign(__assign({}, _this.props), { data: ctx, context: store.context }))
-                    : '', __assign(__assign(__assign({}, action.toast), item), { title: item.title
-                        ? render('title', item.title, __assign(__assign({}, _this.props), { data: ctx, context: store.context }))
+            (_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (_a) {
+                var level = _a.level, body = _a.body, title = _a.title, item = __rest(_a, ["level", "body", "title"]);
+                env.notify(level || 'info', body
+                    ? render('body', body, __assign(__assign({}, _this.props), { data: ctx, context: store.context }))
+                    : '', __assign(__assign(__assign({}, action.toast), item), { title: title
+                        ? render('title', title, __assign(__assign({}, _this.props), { data: ctx, context: store.context }))
                         : null, mobileUI: mobileUI }));
             });
         }
@@ -359,7 +365,7 @@ var RootRenderer = /** @class */ (function (_super) {
             store.action.drawer)), { type: 'drawer' }), __assign(__assign({}, rest), { key: 'drawer', topStore: this.store, data: store.drawerData, context: store.context, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction }));
     };
     RootRenderer.prototype.render = function () {
-        var _a = this.props, pathPrefix = _a.pathPrefix, schema = _a.schema, render = _a.render, rest = __rest(_a, ["pathPrefix", "schema", "render"]);
+        var _a = this.props, pathPrefix = _a.pathPrefix, schema = _a.schema, render = _a.render; _a.globalVars; var rest = __rest(_a, ["pathPrefix", "schema", "render", "globalVars"]);
         var store = this.store;
         if (store.runtimeError) {
             return this.renderRuntimeError();

package/esm/SchemaRenderer.d.ts

@@ -19,6 +19,7 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     cRef: any;
     schema: any;
     path: string;
+    tmpData: any;
     toDispose: Array<() => any>;
     unbindEvent: (() => void) | undefined;
     unbindGlobalEvent: (() => void) | undefined;
@@ -26,6 +27,7 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     constructor(props: SchemaRendererProps);
     componentWillUnmount(): void;
     shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
+    handleGlobalVarChange(): void;
     resolveRenderer(props: SchemaRendererProps, force?: boolean): any;
     getWrappedInstance(): any;
     refFn(ref: any): void;

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -21,15 +21,17 @@ import { isAlive } from 'mobx-state-tree';
 import { reaction } from 'mobx';
 import 'amis-formula';
 import 'moment';
-import 'lodash/isPlainObject';
+import { cloneObject } from './utils/object.js';
 import './utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
+import 'lodash/isPlainObject';
 import './utils/filter.js';
 import { buildStyle } from './utils/style.js';
 import { isExpression } from './utils/formula.js';
 import { filter, evalExpression } from './utils/tpl.js';
 import Animations from './components/Animations.js';
+import { observeGlobalVars } from './globalVar.js';
 
 var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'type',
@@ -83,13 +85,16 @@ var SchemaRenderer = /** @class */ (function (_super) {
         _this.reRender = _this.reRender.bind(_this);
         _this.resolveRenderer(_this.props);
         _this.dispatchEvent = _this.dispatchEvent.bind(_this);
+        _this.handleGlobalVarChange = _this.handleGlobalVarChange.bind(_this);
+        var schema = props.schema;
         // 监听statusStore更新
         _this.toDispose.push(reaction(function () {
             var _a, _b, _c;
-            var id = filter(props.schema.id, props.data);
-            var name = filter(props.schema.name, props.data);
+            var id = filter(schema.id, props.data);
+            var name = filter(schema.name, props.data);
             return "".concat((_a = props.statusStore.visibleState[id]) !== null && _a !== void 0 ? _a : props.statusStore.visibleState[name]).concat((_b = props.statusStore.disableState[id]) !== null && _b !== void 0 ? _b : props.statusStore.disableState[name]).concat((_c = props.statusStore.staticState[id]) !== null && _c !== void 0 ? _c : props.statusStore.staticState[name]);
         }, function () { return _this.forceUpdate(); }));
+        _this.toDispose.push(observeGlobalVars(schema, props.topStore, _this.handleGlobalVarChange));
         return _this;
     }
     SchemaRenderer.prototype.componentWillUnmount = function () {
@@ -120,6 +125,20 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         return false;
     };
+    SchemaRenderer.prototype.handleGlobalVarChange = function () {
+        var _this = this;
+        var _a;
+        var handler = (_a = this.renderer) === null || _a === void 0 ? void 0 : _a.onGlobalVarChanged;
+        var newData = cloneObject(this.props.data);
+        // 如果渲染器自己做了实现，且返回 false，则不再继续往下执行
+        if ((handler === null || handler === void 0 ? void 0 : handler(this.cRef, this.props.schema, newData)) === false) {
+            return;
+        }
+        this.tmpData = newData;
+        this.forceUpdate(function () {
+            delete _this.tmpData;
+        });
+    };
     SchemaRenderer.prototype.resolveRenderer = function (props, force) {
         if (force === void 0) { force = false; }
         var schema = props.schema;
@@ -221,7 +240,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 ? false
                 : undefined)) !== null && _b !== void 0 ? _b : this.isStatic) !== null && _c !== void 0 ? _c : (_.staticOn
                 ? evalExpression(_.staticOn, rest.data)
-                : (_d = _.static) !== null && _d !== void 0 ? _d : rest.defaultStatic) }), subProps), { data: subProps.data || rest.data, env: env }));
+                : (_d = _.static) !== null && _d !== void 0 ? _d : rest.defaultStatic) }), subProps), { data: this.tmpData && subProps.data === this.props.data
+                ? this.tmpData
+                : subProps.data || rest.data, env: env }));
     };
     SchemaRenderer.prototype.reRender = function () {
         this.resolveRenderer(this.props, true);
@@ -231,7 +252,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         var e_1, _a;
         var _this = this;
         var _b, _c, _d, _e, _f, _g, _h;
-        var _j = this.props; _j.$path; var __ = _j.schema, rootStore = _j.rootStore, statusStore = _j.statusStore, render = _j.render, propKey = _j.key, rest = __rest(_j, ["$path", "schema", "rootStore", "statusStore", "render", "key"]);
+        var _j = this.props; _j.$path; var __ = _j.schema, rootStore = _j.rootStore, statusStore = _j.statusStore, render = _j.render, rest = __rest(_j, ["$path", "schema", "rootStore", "statusStore", "render"]);
         if (__ == null) {
             return null;
         }
@@ -281,12 +302,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
         else if (schema.component && isValidElementType(schema.component)) {
             var isSFC = !(schema.component.prototype instanceof React.Component);
             var defaultData_1 = schema.data, defaultValue_1 = schema.value, // render时的value改放defaultValue中
-            defaultActiveKey_1 = schema.activeKey, restSchema_1 = __rest(schema, ["data", "value", "activeKey"]);
+            defaultActiveKey_1 = schema.activeKey, propKey_1 = schema.key, restSchema_1 = __rest(schema, ["data", "value", "activeKey", "key"]);
             return rest.invisible
                 ? null
                 : React.createElement(schema.component, __assign(__assign(__assign(__assign({}, rest), restSchema_1), exprProps), { 
                     // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
-                    defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
+                    defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey_1, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
         }
         else if (Object.keys(schema).length === 0) {
             return null;
@@ -327,7 +348,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         var renderer = this.renderer;
         schema = filterSchema(schema, renderer, rest);
-        var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, restSchema = __rest(schema, ["data", "value", "activeKey"]);
+        var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, propKey = schema.key, restSchema = __rest(schema, ["data", "value", "activeKey", "key"]);
         var Component = renderer.component;
         var animationShow = true;
         // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
@@ -356,6 +377,8 @@ var SchemaRenderer = /** @class */ (function (_super) {
         var props = __assign(__assign(__assign(__assign(__assign(__assign({}, (_f = renderer.defaultProps) === null || _f === void 0 ? void 0 : _f.call(renderer, schema.type, schema)), theme.getRendererConfig(renderer.name)), restSchema), chainEvents(rest, restSchema)), exprProps), { 
             // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
             defaultData: (_g = restSchema.defaultData) !== null && _g !== void 0 ? _g : defaultData, defaultValue: (_h = restSchema.defaultValue) !== null && _h !== void 0 ? _h : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
+        // 用于全局变量刷新
+        props.data = this.tmpData || props.data;
         // style 支持公式
         if (schema.style) {
             props.style = buildStyle(schema.style, detectData);

package/esm/Scoped.js

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

package/esm/StatusScoped.js

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

package/esm/StyleManager.js

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

package/esm/WithRootStore.js

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

package/esm/WithStore.js

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

package/esm/actions/Action.js

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

package/esm/actions/AjaxAction.js

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

package/esm/actions/BreakAction.js

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

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -22,7 +22,7 @@ var CmptAction = /** @class */ (function () {
     CmptAction.prototype.run = function (action, renderer, event) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
         return __awaiter(this, void 0, void 0, function () {
-            var key, dataMergeMode, path, beforeSetData, res, component, msg, result, _8, dispatchEvent_1, data, valid, _9, e_1, result, e_2;
+            var key, dataMergeMode, path, topStore, beforeSetData, res, component, msg, result, _8, dispatchEvent_1, data, valid, _9, e_1, result, e_2;
             var _10, _11, _12, _13, _14, _15;
             return __generator(this, function (_16) {
                 switch (_16.label) {
@@ -31,6 +31,10 @@ var CmptAction = /** @class */ (function () {
                         dataMergeMode = action.dataMergeMode || 'merge';
                         path = (_a = action.args) === null || _a === void 0 ? void 0 : _a.path;
                         if (!(action.actionType === 'setValue' && path && typeof path === 'string')) return [3 /*break*/, 2];
+                        if (path.startsWith('global.')) {
+                            topStore = renderer.props.topStore;
+                            topStore === null || topStore === void 0 ? void 0 : topStore.updateGlobalVarValue(path.substring(7), action.args.value);
+                        }
                         beforeSetData = (_c = (_b = event === null || event === void 0 ? void 0 : event.context) === null || _b === void 0 ? void 0 : _b.env) === null || _c === void 0 ? void 0 : _c.beforeSetData;
                         if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];

package/esm/actions/ContinueAction.js

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

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

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

package/esm/actions/DialogAction.js

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

package/esm/actions/DrawerAction.js

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

package/esm/actions/EmailAction.js

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

package/esm/actions/EventAction.js

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

package/esm/actions/LinkAction.js

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

package/esm/actions/LoopAction.js

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

package/esm/actions/PageAction.js

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

package/esm/actions/ParallelAction.js

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

package/esm/actions/PrintAction.js

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

package/esm/actions/StatusAction.js

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

package/esm/actions/SwitchAction.js

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

package/esm/actions/ToastAction.js

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

package/esm/actions/WaitAction.js

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

package/esm/components/Animations.js

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

package/esm/components/CustomStyle.js

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

package/esm/components/ErrorBoundary.js

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

package/esm/components/LazyComponent.js

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

package/esm/components/Overlay.js

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

package/esm/components/PopOver.js

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

package/esm/env.js

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

package/esm/envOverwrite.js

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

package/esm/factory.d.ts

@@ -20,6 +20,7 @@ export interface RendererBasicConfig {
     defaultProps?: (type: string, schema: any) => any;
     shouldSyncSuperStore?: (store: any, props: any, prevProps: any) => boolean | undefined;
     storeExtendsData?: boolean | ((props: any) => boolean);
+    onGlobalVarChanged?: (instance: React.Component, schema: any, data: any) => void | boolean;
     weight?: number;
     isolateScope?: boolean;
     isFormItem?: boolean;

package/esm/factory.js

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