amis-core 3.4.3 → 3.5.0

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,6 +23,7 @@ import { callStrFunction } from '../utils/api.js';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
 import 'amis-formula';
+import { tokenize } from '../utils/tokenize.js';
 import 'lodash/isPlainObject';
 import { getVariable } from '../utils/getVariable.js';
 import '../utils/DataSchema.js';
@@ -64,7 +65,7 @@ function wrapControl(ComposedComponent) {
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem = _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 = _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);
@@ -73,6 +74,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 (isExpression(name)) {
+                    name = tokenize(name, data);
+                }
                 if (!name) {
                     // 一般情况下这些表单项都是需要 name 的，提示一下
                     if (typeof type === 'string' &&
@@ -162,7 +170,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();
@@ -173,7 +181,7 @@ function wrapControl(ComposedComponent) {
                     var finalValidate_1 = 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');
                             }
@@ -312,7 +320,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();
@@ -322,9 +330,8 @@ function wrapControl(ComposedComponent) {
                     var validate_1 = 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');
                             }
                         });
@@ -432,7 +439,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;
                 }
@@ -452,7 +459,7 @@ function wrapControl(ComposedComponent) {
                         eventType: 'formItemChange',
                         eventData: {
                             id: id,
-                            name: name,
+                            name: model.name,
                             label: label,
                             type: type,
                             value: value
@@ -469,11 +476,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();
             };
@@ -489,17 +496,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 = 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 () {
@@ -513,8 +520,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 {
@@ -524,9 +531,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, __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;
                 }
@@ -539,7 +554,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,
@@ -551,7 +569,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

package/esm/store/app.js

@@ -1,11 +1,11 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
 import { __assign } from 'tslib';
 import { types } from 'mobx-state-tree';
-import { mapTree, findTree, isVisible, guid } from '../utils/helper.js';
+import { mapTree, findTree, isVisible, guid, replaceUrlParams } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
 import '../utils/api.js';
 import '../utils/ColorScale.js';
@@ -157,7 +157,9 @@ var AppStore = ServiceStore.named('AppStore')
         var bcn = [];
         findTree(self.pages, function (item, index, level, paths) {
             if (item.id === page.id) {
-                bcn = paths.filter(function (item) { return item.path && item.label; });
+                bcn = paths
+                    .filter(function (item) { return item.path && item.label; })
+                    .map(function (item) { return (__assign(__assign({}, item), { path: replaceUrlParams(item.path, params) })); });
                 if (env.showFullBreadcrumbPath) {
                     bcn = paths.filter(function (item) { return item.label; });
                 }
@@ -186,7 +188,7 @@ var AppStore = ServiceStore.named('AppStore')
             self.fetchSchema(page.schemaApi, self.activePage, { method: 'get' });
         }
         else if (page.redirect) {
-            env.jumpTo(page.redirect);
+            env.jumpTo(page.redirect, undefined, self.data);
             return;
         }
         else if (page.rewrite) {