amis-core 3.4.3 → 3.5.0

package/lib/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -34,26 +34,26 @@ function CustomStyle (props) {
         };
     }, [id]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (themeCss && id) {
-            styleHelper.insertCustomStyle(themeCss, classNames, id, defaultData, env === null || env === void 0 ? void 0 : env.customStyleClassPrefix, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+            styleHelper.insertCustomStyle(themeCss, classNames, id, defaultData, env === null || env === void 0 ? void 0 : env.customStyleClassPrefix, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
         }
         return function () {
-            var _a;
+            var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                styleHelper.removeCustomStyle('', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+                styleHelper.removeCustomStyle('', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
             }
         };
     }, [themeCss, id]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (wrapperCustomStyle && id) {
-            styleHelper.insertEditCustomStyle(wrapperCustomStyle, id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+            styleHelper.insertEditCustomStyle(wrapperCustomStyle, id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
         }
         return function () {
-            var _a;
+            var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+                styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
             }
         };
     }, [wrapperCustomStyle, id]);

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/env.d.ts

@@ -52,8 +52,16 @@ export interface RendererEnv {
     copy?: (contents: string, format?: any) => void;
     getModalContainer?: () => HTMLElement;
     theme: ThemeInstance;
-    affixOffsetTop: number;
-    affixOffsetBottom: number;
+    /**
+     * @deprecated
+     * 请通过外层设置 `--affix-offset-top` css 变量设置
+     */
+    affixOffsetTop?: number;
+    /**
+     * @deprecated
+     * 请通过外层设置 `--affix-offset-bottom` css 变量设置
+     */
+    affixOffsetBottom?: number;
     richTextToken: string;
     loadRenderer: (schema: Schema, path: string, reRender: Function) => Promise<React.ElementType> | React.ElementType | JSX.Element | void;
     loadChartExtends?: () => void | Promise<void>;
@@ -78,7 +86,7 @@ export interface RendererEnv {
     /**
      * 文本替换的黑名单，因为属性太多了所以改成黑名单的 flags
      */
-    replaceTextIgnoreKeys?: String[];
+    replaceTextIgnoreKeys?: String[] | ((key: string, value: any, object: any) => boolean);
     /**
      * 解析url参数
      */

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -102,8 +102,6 @@ function loadRenderer(schema, path) {
 }
 var defaultOptions = {
     session: 'global',
-    affixOffsetTop: 0,
-    affixOffsetBottom: 0,
     richTextToken: '',
     useMobileUI: true,
     enableAMISDebug: (_b = (_a = window.enableAMISDebug) !== null && _a !== void 0 ? _a : location.search.indexOf('amisDebug=1') !== -1) !== null && _b !== void 0 ? _b : false,

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -132,7 +132,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '3.4.3';
+var version = '3.5.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -256,6 +256,7 @@ exports.ownerDocument = dom.ownerDocument;
 exports.renderTextByKeyword = dom.renderTextByKeyword;
 exports.ServerError = errors.ServerError;
 exports.escapeHtml = escapeHtml.escapeHtml;
+exports.filterClassNameObject = filterSchema.filterClassNameObject;
 exports.getExprProperties = filterSchema.getExprProperties;
 exports.formatDuration = formatDuration.formatDuration;
 exports.FormulaExec = formula.FormulaExec;
@@ -281,6 +282,7 @@ exports.chainEvents = helper.chainEvents;
 exports.chainFunctions = helper.chainFunctions;
 exports.changedEffect = helper.changedEffect;
 exports.convertArrayValueToMoment = helper.convertArrayValueToMoment;
+exports.countTree = helper.countTree;
 exports.detectPropValueChanged = helper.detectPropValueChanged;
 exports.difference = helper.difference;
 exports.differenceFromAll = helper.differenceFromAll;
@@ -337,6 +339,7 @@ exports.normalizeNodePath = helper.normalizeNodePath;
 exports.object2formData = helper.object2formData;
 exports.omitControls = helper.omitControls;
 exports.padArr = helper.padArr;
+exports.parsePrimitiveQueryString = helper.parsePrimitiveQueryString;
 exports.parseQuery = helper.parseQuery;
 exports.pickEventsProps = helper.pickEventsProps;
 exports.preventDefault = helper.preventDefault;
@@ -346,6 +349,7 @@ exports.qsstringify = helper.qsstringify;
 exports.range = helper.range;
 exports.removeHTMLTag = helper.removeHTMLTag;
 exports.repeatCount = helper.repeatCount;
+exports.replaceUrlParams = helper.replaceUrlParams;
 exports.rmUndefined = helper.rmUndefined;
 exports.someTree = helper.someTree;
 exports.sortArray = helper.sortArray;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -722,7 +722,7 @@ var Form = /** @class */ (function (_super) {
                                 clearPersistDataAfterSubmit && store.clearLocalPersistData();
                                 if (action.redirect || redirect) {
                                     var finalRedirect = tpl.filter(action.redirect || redirect, store.data);
-                                    finalRedirect && env.jumpTo(finalRedirect, action);
+                                    finalRedirect && env.jumpTo(finalRedirect, action, store.data);
                                 }
                                 else if (action.reload || reload) {
                                     _this.reloadTarget(Scoped.filterTarget(action.reload || reload, store.data), store.data);
@@ -794,7 +794,7 @@ var Form = /** @class */ (function (_super) {
                                                 _a.label = 4;
                                             case 4:
                                                 redirect = action.redirect && tpl.filter(action.redirect, store.data);
-                                                redirect && env.jumpTo(redirect, action);
+                                                redirect && env.jumpTo(redirect, action, store.data);
                                                 action.reload &&
                                                     this.reloadTarget(Scoped.filterTarget(action.reload, store.data), store.data);
                                                 action.close && this.closeTarget(action.close);

package/lib/renderers/Item.d.ts

@@ -461,7 +461,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     static layoutRenderers: {
         [propsName: string]: (props: FormItemProps, renderControl: () => JSX.Element | null) => JSX.Element;
     };
-    render(): JSX.Element | null;
+    render(): React.JSX.Element | null;
 }
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {
@@ -618,9 +618,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>; /**
-         * 验证失败的提示信息
-         */
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         removeStore(store: {
             id: string;
             path: string;
@@ -784,9 +782,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>; /**
-         * 验证失败的提示信息
-         */
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         removeStore(store: {
             id: string;
             path: string;

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -14,7 +14,6 @@ var mobx = require('mobx');
 var factory = require('../factory.js');
 var helper = require('../utils/helper.js');
 var mobxReact = require('mobx-react');
-var tpl = require('../utils/tpl.js');
 var WithStore = require('../WithStore.js');
 var wrapControl = require('./wrapControl.js');
 var debounce = require('lodash/debounce');
@@ -31,6 +30,7 @@ require('amis-formula');
 require('../utils/debug.js');
 require('../utils/dom.js');
 require('../utils/errors.js');
+require('../utils/tpl.js');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
 require('lodash/isObject');
@@ -407,7 +407,7 @@ var FormItemWrap = /** @class */ (function (_super) {
     FormItemWrap.layoutRenderers = {
         horizontal: function (props, renderControl) {
             var _a, _b, _c;
-            var className = props.className, style = props.style, cx = props.classnames, description = props.description, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, desc = props.desc, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, id = props.id, wrapperCustomStyle = props.wrapperCustomStyle, themeCss = props.themeCss;
+            var className = props.className, style = props.style, cx = props.classnames, description = props.description, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, desc = props.desc, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, id = props.id, wrapperCustomStyle = props.wrapperCustomStyle, themeCss = props.themeCss;
             // 强制不渲染 label 的话
             if (renderLabel === false) {
                 label = label === false ? false : '';
@@ -433,9 +433,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         _b['Form-label-noLabel'] = label === '',
                         _b), getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                     _J$X_("span", null,
-                        label
-                            ? render('label', typeof label === 'string' ? tpl.filter(label, data) : label)
-                            : null,
+                        label ? render('label', label) : null,
                         required && (label || labelRemark) ? (_J$X_("span", { className: cx("Form-star") }, "*")) : null,
                         labelRemark
                             ? render('label-remark', {
@@ -484,7 +482,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         },
         normal: function (props, renderControl) {
             var _a;
-            var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, themeCss = props.themeCss, wrapperCustomStyle = props.wrapperCustomStyle, id = props.id;
+            var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, themeCss = props.themeCss, wrapperCustomStyle = props.wrapperCustomStyle, id = props.id;
             description = description || desc;
             return (_J$X_("div", { "data-role": "form-item", className: cx("Form-item Form-item--normal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
@@ -493,9 +491,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
                 label && renderLabel !== false ? (_J$X_("label", { className: cx("Form-label", getItemLabelClassName(props)) },
                     _J$X_("span", null,
-                        label
-                            ? render('label', typeof label === 'string' ? tpl.filter(label, data) : label)
-                            : null,
+                        label ? render('label', label) : null,
                         required && (label || labelRemark) ? (_J$X_("span", { className: cx("Form-star") }, "*")) : null,
                         labelRemark
                             ? render('label-remark', {
@@ -571,7 +567,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         },
         inline: function (props, renderControl) {
             var _a;
-            var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, remark = props.remark, labelRemark = props.labelRemark, env = props.env, hint = props.hint, renderLabel = props.renderLabel, renderDescription = props.renderDescription, data = props.data, showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, themeCss = props.themeCss, wrapperCustomStyle = props.wrapperCustomStyle, id = props.id;
+            var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, remark = props.remark, labelRemark = props.labelRemark, env = props.env, hint = props.hint, renderLabel = props.renderLabel, renderDescription = props.renderDescription; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, themeCss = props.themeCss, wrapperCustomStyle = props.wrapperCustomStyle, id = props.id;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             description = description || desc;
             return (_J$X_("div", { "data-role": "form-item", className: cx("Form-item Form-item--inline", isStatic && staticClassName ? staticClassName : className, (_a = {
@@ -581,9 +577,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
                 label && renderLabel !== false ? (_J$X_("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                     _J$X_("span", null,
-                        label
-                            ? render('label', typeof label === 'string' ? tpl.filter(label, data) : label)
-                            : label,
+                        label ? render('label', label) : label,
                         required && (label || labelRemark) ? (_J$X_("span", { className: cx("Form-star") }, "*")) : null,
                         labelRemark
                             ? render('label-remark', {
@@ -629,7 +623,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         },
         row: function (props, renderControl) {
             var _a;
-            var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, wrapperCustomStyle = props.wrapperCustomStyle, themeCss = props.themeCss, id = props.id;
+            var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, wrapperCustomStyle = props.wrapperCustomStyle, themeCss = props.themeCss, id = props.id;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             description = description || desc;
             return (_J$X_("div", { "data-role": "form-item", className: cx("Form-item Form-item--row", isStatic && staticClassName ? staticClassName : className, (_a = {
@@ -640,7 +634,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                 _J$X_("div", { className: cx('Form-rowInner') },
                     label && renderLabel !== false ? (_J$X_("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                         _J$X_("span", null,
-                            render('label', typeof label === 'string' ? tpl.filter(label, data) : label),
+                            render('label', label),
                             required && (label || labelRemark) ? (_J$X_("span", { className: cx("Form-star") }, "*")) : null,
                             labelRemark
                                 ? render('label-remark', {

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -27,6 +27,7 @@ var api = require('../utils/api.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
 require('amis-formula');
+var tokenize = require('../utils/tokenize.js');
 require('lodash/isPlainObject');
 var getVariable = require('../utils/getVariable.js');
 require('../utils/DataSchema.js');
@@ -82,7 +83,7 @@ function wrapControl(ComposedComponent) {
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, name = _d.name, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName; _d.multiple; var delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
+                var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName; _d.multiple; var delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -91,6 +92,13 @@ function wrapControl(ComposedComponent) {
                 _this.handleBlur = _this.handleBlur.bind(_this);
                 _this.validate = _this.validate.bind(_this);
                 _this.flushChange = _this.flushChange.bind(_this);
+                _this.renderChild = _this.renderChild.bind(_this);
+                var name = _this.props.$schema.name;
+                // 如果 name 是表达式
+                // 扩充 each 用法
+                if (formula.isExpression(name)) {
+                    name = tokenize.tokenize(name, data);
+                }
                 if (!name) {
                     // 一般情况下这些表单项都是需要 name 的，提示一下
                     if (typeof type === 'string' &&
@@ -180,7 +188,7 @@ function wrapControl(ComposedComponent) {
             }
             class_1.prototype.componentDidMount = function () {
                 var _this = this;
-                var _a = this.props; _a.store; _a.formStore; var _b = _a.$schema, name = _b.name, validate = _b.validate, addHook = _a.addHook;
+                var _a = this.props; _a.store; _a.formStore; var validate = _a.$schema.validate, addHook = _a.addHook;
                 // 提交前先把之前的 lazyEmit 执行一下。
                 this.hook3 = function () {
                     _this.lazyEmitChange.flush();
@@ -191,7 +199,7 @@ function wrapControl(ComposedComponent) {
                     var finalValidate_1 = helper.promisify(validate.bind(this.control));
                     this.hook2 = function () {
                         formItem.clearError('control:valdiate');
-                        return finalValidate_1(_this.props.data, _this.getValue(), name).then(function (ret) {
+                        return finalValidate_1(_this.props.data, _this.getValue(), formItem.name).then(function (ret) {
                             if ((typeof ret === 'string' || Array.isArray(ret)) && ret) {
                                 formItem.addError(ret, 'control:valdiate');
                             }
@@ -330,7 +338,7 @@ function wrapControl(ComposedComponent) {
             };
             class_1.prototype.controlRef = function (control) {
                 var _this = this;
-                var _a = this.props, addHook = _a.addHook, removeHook = _a.removeHook; _a.formStore; var name = _a.$schema.name;
+                var _a = this.props, addHook = _a.addHook, removeHook = _a.removeHook; _a.formStore;
                 // 因为 control 有可能被 n 层 hoc 包裹。
                 while (control && control.getWrappedInstance) {
                     control = control.getWrappedInstance();
@@ -340,9 +348,8 @@ function wrapControl(ComposedComponent) {
                     var validate_1 = helper.promisify(control.validate.bind(control));
                     this.hook = function () {
                         formItem_1.clearError('component:valdiate');
-                        return validate_1(_this.props.data, _this.getValue(), name).then(function (ret) {
-                            if ((typeof ret === 'string' || Array.isArray(ret)) &&
-                                ret) {
+                        return validate_1(_this.props.data, _this.getValue(), formItem_1.name).then(function (ret) {
+                            if ((typeof ret === 'string' || Array.isArray(ret)) && ret) {
                                 formItem_1.setError(ret, 'component:valdiate');
                             }
                         });
@@ -450,7 +457,7 @@ function wrapControl(ComposedComponent) {
             };
             class_1.prototype.emitChange = function (submitOnChange) {
                 if (submitOnChange === void 0) { submitOnChange = this.props.$schema.submitOnChange; }
-                var _a = this.props, form = _a.formStore, onChange = _a.onChange, _b = _a.$schema, name = _b.name, id = _b.id, label = _b.label, type = _b.type, onFormItemChange = _b.onChange; _b.maxLength; _b.minLength; var data = _a.data, env = _a.env; _a.validateOnChange; _a.formSubmited;
+                var _a = this.props, form = _a.formStore, onChange = _a.onChange, _b = _a.$schema, id = _b.id, label = _b.label, type = _b.type, onFormItemChange = _b.onChange; _b.maxLength; _b.minLength; var data = _a.data, env = _a.env; _a.validateOnChange; _a.formSubmited;
                 if (!this.model) {
                     return;
                 }
@@ -470,7 +477,7 @@ function wrapControl(ComposedComponent) {
                         eventType: 'formItemChange',
                         eventData: {
                             id: id,
-                            name: name,
+                            name: model.name,
                             label: label,
                             type: type,
                             value: value
@@ -487,11 +494,11 @@ function wrapControl(ComposedComponent) {
                 }
                 if (model.extraName) {
                     var values = model.splitExtraValue(value);
-                    onChange === null || onChange === void 0 ? void 0 : onChange(values[0], name);
+                    onChange === null || onChange === void 0 ? void 0 : onChange(values[0], model.name);
                     onChange === null || onChange === void 0 ? void 0 : onChange(values[1], model.extraName, submitOnChange === true);
                 }
                 else {
-                    onChange === null || onChange === void 0 ? void 0 : onChange(value, name, submitOnChange === true);
+                    onChange === null || onChange === void 0 ? void 0 : onChange(value, model.name, submitOnChange === true);
                 }
                 this.checkValidate();
             };
@@ -507,17 +514,17 @@ function wrapControl(ComposedComponent) {
                     return;
                 }
                 var model = this.model;
-                var _a = this.props; _a.formStore; var name = _a.name, pipeOut = _a.$schema.pipeOut, onChange = _a.onChange, oldValue = _a.value, data = _a.data;
+                var _a = this.props; _a.formStore; var pipeOut = _a.$schema.pipeOut, onChange = _a.onChange, oldValue = _a.value, data = _a.data;
                 if (pipeOut) {
                     value = api.callStrFunction.call(this, pipeOut, ['value', 'oldValue', 'data'], value, oldValue, data);
                 }
                 if (model.extraName) {
                     var values = model.splitExtraValue(value);
-                    onChange === null || onChange === void 0 ? void 0 : onChange(values[0], name, false, true);
+                    onChange === null || onChange === void 0 ? void 0 : onChange(values[0], model.name, false, true);
                     onChange === null || onChange === void 0 ? void 0 : onChange(values[1], model.extraName, false, true);
                 }
                 else {
-                    onChange === null || onChange === void 0 ? void 0 : onChange(value, name, false, true);
+                    onChange === null || onChange === void 0 ? void 0 : onChange(value, model.name, false, true);
                 }
             };
             class_1.prototype.getValue = function () {
@@ -531,8 +538,8 @@ function wrapControl(ComposedComponent) {
             // 兼容老版本用法，新版本直接用 onChange 就可以。
             class_1.prototype.setValue = function (value, key) {
                 var _a;
-                var _b = this.props, name = _b.$schema.name, onBulkChange = _b.onBulkChange;
-                if (!key || key === name) {
+                var onBulkChange = this.props.onBulkChange;
+                if (!key || (this.model && key === this.model.name)) {
                     this.handleChange(value);
                 }
                 else {
@@ -542,9 +549,17 @@ function wrapControl(ComposedComponent) {
                             _a));
                 }
             };
+            class_1.prototype.renderChild = function (region, node, subProps) {
+                if (subProps === void 0) { subProps = {}; }
+                var _a = this.props, render = _a.render, data = _a.data, store = _a.store;
+                var model = this.model;
+                return render(region, node, tslib.__assign({ data: model
+                        ? model.getMergedData(data || (store === null || store === void 0 ? void 0 : store.data))
+                        : data || (store === null || store === void 0 ? void 0 : store.data) }, subProps));
+            };
             class_1.prototype.render = function () {
-                var _a, _b;
-                var _c = this.props, controlWidth = _c.controlWidth, disabled = _c.disabled, formMode = _c.formMode, control = _c.$schema, store = _c.store, data = _c.data, invisible = _c.invisible, defaultStatic = _c.defaultStatic;
+                var _a, _b, _c;
+                var _d = this.props, controlWidth = _d.controlWidth, disabled = _d.disabled, formMode = _d.formMode, control = _d.$schema, store = _d.store, data = _d.data, invisible = _d.invisible, defaultStatic = _d.defaultStatic;
                 if (invisible) {
                     return null;
                 }
@@ -557,7 +572,10 @@ function wrapControl(ComposedComponent) {
                     formItem: this.model,
                     formMode: control.mode || formMode,
                     ref: this.controlRef,
-                    data: data || (store === null || store === void 0 ? void 0 : store.data),
+                    data: model
+                        ? model.getMergedData(data || (store === null || store === void 0 ? void 0 : store.data))
+                        : data || (store === null || store === void 0 ? void 0 : store.data),
+                    name: (_c = model === null || model === void 0 ? void 0 : model.name) !== null && _c !== void 0 ? _c : control.name,
                     value: value,
                     changeMotivation: model === null || model === void 0 ? void 0 : model.changeMotivation,
                     defaultValue: control.value,
@@ -569,7 +587,8 @@ function wrapControl(ComposedComponent) {
                     prinstine: model ? model.prinstine : undefined,
                     setPrinstineValue: this.setPrinstineValue,
                     onValidate: this.validate,
-                    onFlushChange: this.flushChange
+                    onFlushChange: this.flushChange,
+                    render: this.renderChild // 如果覆盖，那么用的就是 form 上的 render，这个里面用到的 data 是比较旧的。
                     // !没了这个， tree 里的 options 渲染会出问题
                     // todo 理论上不应该影响，待确认
                     // _filteredOptions: this.model?.filteredOptions