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

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -49,7 +49,9 @@ function HocStoreFactory(renderer) {
         var StoreFactory = /** @class */ (function (_super) {
             tslib.__extends(StoreFactory, _super);
             function StoreFactory(props, context) {
-                var _this = _super.call(this, props) || this;
+                var _this = this;
+                var _a;
+                _this = _super.call(this, props) || this;
                 var rootStore = context;
                 _this.renderChild = _this.renderChild.bind(_this);
                 _this.refFn = _this.refFn.bind(_this);
@@ -60,6 +62,7 @@ function HocStoreFactory(renderer) {
                     parentId: _this.props.store ? _this.props.store.id : ''
                 });
                 store.setTopStore(props.topStore);
+                (_a = props.storeRef) === null || _a === void 0 ? void 0 : _a.call(props, store);
                 _this.store = store;
                 var extendsData = typeof renderer.extendsData === 'function'
                     ? renderer.extendsData(props)
@@ -194,7 +197,7 @@ function HocStoreFactory(renderer) {
                 }
             };
             StoreFactory.prototype.componentWillUnmount = function () {
-                var _a;
+                var _a, _b, _c;
                 var rootStore = this.context;
                 var store = this.store;
                 (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -204,6 +207,7 @@ function HocStoreFactory(renderer) {
                 }
                 // @ts-ignore
                 delete this.store;
+                (_c = (_b = this.props).storeRef) === null || _c === void 0 ? void 0 : _c.call(_b, null);
             };
             StoreFactory.prototype.renderChild = function (region, node, subProps) {
                 if (subProps === void 0) { subProps = {}; }
@@ -212,7 +216,7 @@ function HocStoreFactory(renderer) {
             };
             StoreFactory.prototype.render = function () {
                 var _a;
-                var _b = this.props; _b.detectField; var rest = tslib.__rest(_b, ["detectField"]);
+                var _b = this.props; _b.detectField; _b.storeRef; var rest = tslib.__rest(_b, ["detectField", "storeRef"]);
                 if (this.state.hidden || this.state.visible === false) {
                     return null;
                 }

package/lib/actions/Action.js

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

package/lib/actions/AjaxAction.js

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

package/lib/actions/BreakAction.js

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

package/lib/actions/BroadcastAction.js

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

package/lib/actions/CmptAction.js

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

package/lib/actions/ContinueAction.js

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

package/lib/actions/CopyAction.js

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

package/lib/actions/CustomAction.js

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

package/lib/actions/DialogAction.js

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

package/lib/actions/DrawerAction.js

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

package/lib/actions/EmailAction.js

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

package/lib/actions/EventAction.js

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

package/lib/actions/LinkAction.js

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

package/lib/actions/LoopAction.js

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

package/lib/actions/PageAction.js

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

package/lib/actions/ParallelAction.js

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

package/lib/actions/PrintAction.js

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

package/lib/actions/StatusAction.js

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

package/lib/actions/SwitchAction.js

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

package/lib/actions/ToastAction.js

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

package/lib/actions/WaitAction.js

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

package/lib/components/Animations.js

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

package/lib/components/CustomStyle.js

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

package/lib/components/ErrorBoundary.js

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

package/lib/components/LazyComponent.js

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

package/lib/components/Overlay.js

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

package/lib/components/PopOver.js

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

package/lib/env.js

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

package/lib/envOverwrite.js

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

package/lib/factory.js

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

package/lib/globalVar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -10,6 +10,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var formula = require('./utils/formula.js');
 var mobx = require('mobx');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
+var isPlainObject = require('lodash/isPlainObject');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
 
 /**
  * 全局变量
@@ -81,6 +86,18 @@ function observeGlobalVars(schema, topStore, callback) {
                 value: value
             });
         }
+        else if (isPlainObject__default["default"](value) && !value.type) {
+            // 最多支持两层，多了可能就会有性能问题了
+            // 再多一层主要是为了支持某些 api 配置的是对象形式
+            Object.keys(value).forEach(function (k) {
+                if (isGlobalVarExpression(value[k])) {
+                    expressions.push({
+                        key: "".concat(key, ".").concat(k),
+                        value: value[k]
+                    });
+                }
+            });
+        }
         else if ([
             'items',
             'body',
@@ -115,7 +132,7 @@ function observeGlobalVars(schema, topStore, callback) {
     var unReaction = mobx.reaction(function () {
         return expressions
             .map(function (exp) {
-            return "".concat(exp.key, ":").concat(resolveVariableAndFilter.resolveVariableAndFilter(exp.value, topStore.downStream, '| json' // 如果用了复杂对象，要靠这个来比较
+            return "".concat(exp.key, ":").concat(resolveVariableAndFilter.resolveVariableAndFilter(exp.value, topStore.nextGlobalData, '| json' // 如果用了复杂对象，要靠这个来比较
             ));
         })
             .join(',');

package/lib/globalVarClientHandler.js

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

package/lib/globalVarDefaultValueHandler.js

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

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -145,10 +145,10 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.13.0-beta.1';
+var version = '6.13.0-beta.10';
 window.amisVersionInfo = {
-    version: '6.13.0-beta.1',
-    buildTime: '2025-04-11T07:00:52.412Z'
+    version: '6.13.0-beta.10',
+    buildTime: '2025-05-13T09:16:53.653Z'
 };
 function render(schema, _a, options, pathPrefix) {
     if (_a === void 0) { _a = {}; }
@@ -461,6 +461,8 @@ exports.scrollPosition = scrollPosition.scrollPosition;
 exports.SimpleMap = SimpleMap.SimpleMap;
 exports.string2regExp = string2regExp.string2regExp;
 exports.buildStyle = style.buildStyle;
+exports.mergeStyle = style.mergeStyle;
+exports.normalizeStyle = style.normalizeStyle;
 exports.memoParse = tokenize.memoParse;
 exports.tokenize = tokenize.tokenize;
 exports.register = tplBuiltin.register;

package/lib/locale.js

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

package/lib/polyfills.js

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

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -1289,16 +1289,14 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             }),
             padDom,
             restError && restError.length ? (_J$X_("ul", { className: cx('Form-restError', 'Form-feedback') }, restError.map(function (item, idx) { return (_J$X_("li", { key: idx }, item)); }))) : null,
-            render('modal', tslib.__assign(tslib.__assign({}, (store.action &&
-                store.action.dialog)), { type: 'dialog' }), {
+            render('modal', tslib.__assign(tslib.__assign({}, store.dialogSchema), { type: 'dialog' }), {
                 key: 'dialog',
                 data: store.dialogData,
                 onConfirm: this.handleDialogConfirm,
                 onClose: this.handleDialogClose,
                 show: store.dialogOpen
             }),
-            render('modal', tslib.__assign(tslib.__assign({}, (store.action &&
-                store.action.drawer)), { type: 'drawer' }), {
+            render('modal', tslib.__assign(tslib.__assign({}, store.drawerSchema), { type: 'drawer' }), {
                 key: 'drawer',
                 data: store.drawerData,
                 onConfirm: this.handleDrawerConfirm,

package/lib/renderers/Item.d.ts

@@ -609,7 +609,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     static layoutRenderers: {
         [propsName: string]: (props: FormItemProps, renderControl: () => JSX.Element | null) => JSX.Element;
     };
-    render(): React.JSX.Element | null;
+    render(): JSX.Element | null;
 }
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -12,8 +12,6 @@ var React = require('react');
 var hoistNonReactStatic = require('hoist-non-react-statics');
 var mobx = require('mobx');
 var mobxStateTree = require('mobx-state-tree');
-var globalVar = require('../globalVar.js');
-var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 var factory = require('../factory.js');
 var helper = require('../utils/helper.js');
 var mobxReact = require('mobx-react');
@@ -1091,20 +1089,7 @@ function asFormItem(config) {
 }
 function registerFormItem(config) {
     var Control = asFormItem(config)(config.component);
-    return factory.registerRenderer(tslib.__assign(tslib.__assign({}, config), { weight: typeof config.weight !== 'undefined' ? config.weight : -100, component: Control, isFormItem: true, onGlobalVarChanged: function (instance, schema, data) {
-            var _a, _b, _c;
-            if (((_a = config.onGlobalVarChanged) === null || _a === void 0 ? void 0 : _a.apply(this, arguments)) === false) {
-                return false;
-            }
-            if (globalVar.isGlobalVarExpression(schema.source)) {
-                (_c = (_b = instance.props).reloadOptions) === null || _c === void 0 ? void 0 : _c.call(_b);
-            }
-            // 目前表单项的全局变量更新要靠这个方式
-            if (globalVar.isGlobalVarExpression(schema.value)) {
-                instance.props.onChange(resolveVariableAndFilter.resolveVariableAndFilter(schema.value, data, '| raw'));
-                return false;
-            }
-        } }));
+    return factory.registerRenderer(tslib.__assign(tslib.__assign({}, config), { weight: typeof config.weight !== 'undefined' ? config.weight : -100, component: Control, isFormItem: true }));
 }
 function FormItem(config) {
     return function (component) {

package/lib/renderers/Options.js

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

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -74,6 +74,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 if (!name) {
                     return _this;
                 }
+                var valueIsExp = formula.isExpression(value);
                 var propValue = _this.props.value;
                 var model = rootStore.addStore({
                     id: helper.guid(),
@@ -90,8 +91,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     ? tslib.__assign(tslib.__assign({}, validations$1), validations.str2rules(config.validations)) : validations$1;
                 // @issue 打算干掉这个
                 formItem$1 === null || formItem$1 === void 0 ? void 0 : formItem$1.addSubFormItem(model);
-                model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value) &&
-                        value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
+                model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: valueIsExp && value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
                     ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
@@ -108,7 +108,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
                 if (onChange &&
                     value !== undefined &&
-                    model.tmpValue !== undefined) {
+                    model.tmpValue !== undefined &&
+                    // 要么是默认值起作用了
+                    // 要么是表达式起作用了
+                    // 只有这两种情况才会触发 onChange
+                    // 比如以下 case 就不应该触发
+                    // 关联到上下文数据了，同时设置了默认值，因为是上下文数据优先，这个时候就不应该触发 onChange，因为没变化
+                    (value === model.tmpValue || valueIsExp)) {
                     // 组件默认值支持表达式需要: 避免初始化时上下文中丢失组件默认值
                     if (model.extraName) {
                         var values = model.splitExtraValue(model.tmpValue);

package/lib/store/app.d.ts

@@ -17,8 +17,10 @@ export declare const AppStore: 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]>;
 } & {
@@ -54,6 +56,8 @@ export declare const AppStore: 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/app.js

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