amis-core 3.2.0 → 3.3.0

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,7 +9,7 @@ import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
 import { ComboStore } from '../store/combo.js';
 import { guid, promisify, anyChanged } from '../utils/helper.js';
-import { isExpression, FormulaExec, replaceExpression, isNeedFormula, isNowFormula } from '../utils/formula.js';
+import { isExpression, FormulaExec, replaceExpression, isNeedFormula } from '../utils/formula.js';
 import { ScopedContext } from '../Scoped.js';
 import { FormItemStore } from '../store/formItem.js';
 import { isAlive } from 'mobx-state-tree';
@@ -26,14 +26,14 @@ function wrapControl(ComposedComponent) {
             __extends(class_1, _super);
             function class_1(props) {
                 var _this = this;
-                var _a, _b;
+                var _a;
                 _this = _super.call(this, props) || this;
                 _this.value = undefined;
                 _this.lazyEmitChange = debounce(_this.emitChange.bind(_this), 250, {
                     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, _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; _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 _b = _this.props, form = _b.formStore, formItem = _b.formItem, rootStore = _b.rootStore, store = _b.store, onChange = _b.onChange, data = _b.data, inputGroupControl = _b.inputGroupControl, _c = _b.$schema, name = _c.name, id = _c.id, type = _c.type, required = _c.required, validations = _c.validations, validationErrors = _c.validationErrors, unique = _c.unique, value = _c.value, extraName = _c.extraName; _c.multiple; var delimiter = _c.delimiter, valueField = _c.valueField, labelField = _c.labelField, joinValues = _c.joinValues, extractValue = _c.extractValue, selectFirst = _c.selectFirst, autoFill = _c.autoFill, clearValueOnHidden = _c.clearValueOnHidden, validateApi = _c.validateApi, minLength = _c.minLength, maxLength = _c.maxLength, validateOnChange = _c.validateOnChange, label = _c.label;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -64,7 +64,7 @@ function wrapControl(ComposedComponent) {
                 _this.model = model;
                 // @issue 打算干掉这个
                 formItem === null || formItem === void 0 ? void 0 : formItem.addSubFormItem(model);
-                model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: required, unique: unique, value: value, isValueSchemaExp: isExpression(value), rules: validations, 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 }));
+                model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: required, unique: unique, value: value, isValueSchemaExp: isExpression(value), rules: validations, 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 }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
                     ((_a = form === null || form === void 0 ? void 0 : form.parentStore) === null || _a === void 0 ? void 0 : _a.storeType) === ComboStore.name) {
@@ -76,19 +76,39 @@ function wrapControl(ComposedComponent) {
                     model.changeTmpValue(propValue, 'controlled');
                 }
                 else {
-                    // 备注: 此处的 value 是 schema 中的 value（和props.defaultValue相同）
                     var isExp = isExpression(value);
-                    var curTmpValue = isExp
-                        ? FormulaExec['formula'](value, data) // 对组件默认值进行运算
-                        : (_b = store === null || store === void 0 ? void 0 : store.getValueByName(model.name)) !== null && _b !== void 0 ? _b : replaceExpression(value); // 优先使用公式表达式
-                    // 同步 value
-                    model.changeTmpValue(curTmpValue, isExp ? 'formulaChanged' : 'defaultValue');
+                    if (isExp) {
+                        model.changeTmpValue(FormulaExec['formula'](value, data), // 对组件默认值进行运算
+                        'formulaChanged');
+                    }
+                    else {
+                        var initialValue = model.extraName
+                            ? [
+                                store === null || store === void 0 ? void 0 : store.getValueByName(model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                                store === null || store === void 0 ? void 0 : store.getValueByName(model.extraName, form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                            ]
+                            : store === null || store === void 0 ? void 0 : store.getValueByName(model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData);
+                        if (model.extraName &&
+                            initialValue.every(function (item) { return item === undefined; })) {
+                            initialValue = undefined;
+                        }
+                        model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : replaceExpression(value), typeof initialValue !== 'undefined'
+                            ? 'initialValue'
+                            : 'defaultValue');
+                    }
                 }
                 if (onChange &&
                     value !== undefined &&
                     model.tmpValue !== undefined) {
                     // 组件默认值支持表达式需要: 避免初始化时上下文中丢失组件默认值
-                    onChange(model.tmpValue, model.name, false, true);
+                    if (model.extraName) {
+                        var values = model.splitExtraValue(model.tmpValue);
+                        onChange(values[0], model.name, false, true);
+                        onChange(values[1], model.extraName, false, true);
+                    }
+                    else {
+                        onChange(model.tmpValue, model.name, false, true);
+                    }
                 }
                 else if (onChange &&
                     typeof propValue === 'undefined' &&
@@ -98,7 +118,14 @@ function wrapControl(ComposedComponent) {
                     // 对应 issue 为 https://github.com/baidu/amis/issues/2674
                     (store === null || store === void 0 ? void 0 : store.storeType) !== TableStore.name) {
                     // 如果没有初始值，通过 onChange 设置过去
-                    onChange(model.tmpValue, model.name, false, true);
+                    if (model.extraName) {
+                        var values = model.splitExtraValue(model.tmpValue);
+                        onChange(values[0], model.name, false, true);
+                        onChange(values[1], model.extraName, false, true);
+                    }
+                    else {
+                        onChange(model.tmpValue, model.name, false, true);
+                    }
                 }
                 return _this;
             }
@@ -125,7 +152,7 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.componentDidUpdate = function (prevProps) {
-                var _a, _b;
+                var _a, _b, _c;
                 var props = this.props;
                 props.formStore;
                 var model = this.model;
@@ -150,7 +177,8 @@ function wrapControl(ComposedComponent) {
                         'validateApi',
                         'minLength',
                         'maxLength',
-                        'label'
+                        'label',
+                        'extraName'
                     ], prevProps.$schema, props.$schema)) {
                     model.config({
                         required: props.$schema.required,
@@ -173,7 +201,8 @@ function wrapControl(ComposedComponent) {
                         minLength: props.$schema.minLength,
                         maxLength: props.$schema.maxLength,
                         label: props.$schema.label,
-                        inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl
+                        inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl,
+                        extraName: props.$schema.extraName
                     });
                 }
                 // 此处需要同时考虑 defaultValue 和 value
@@ -187,31 +216,27 @@ function wrapControl(ComposedComponent) {
                 }
                 else if (model &&
                     typeof props.defaultValue !== 'undefined' &&
-                    isExpression(props.defaultValue)) {
-                    var nowFormulaChecked = false;
-                    // 渲染器中的 defaultValue 优先（备注: SchemaRenderer中会将 value 改成 defaultValue）
-                    if (!isEqual(props.defaultValue, prevProps.defaultValue) ||
+                    isExpression(props.defaultValue) &&
+                    (!isEqual(props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
-                            (isNeedFormula(props.defaultValue, props.data, prevProps.data) ||
-                                (nowFormulaChecked = isNowFormula(props.defaultValue))))) {
-                        var curResult = FormulaExec['formula'](props.defaultValue, props.data);
-                        var prevResult = FormulaExec['formula'](prevProps.defaultValue, prevProps.data);
-                        if (!isEqual(curResult, prevResult) &&
-                            !isEqual(curResult, model.tmpValue)) {
-                            // 识别上下文变动、自身数值变动、公式运算结果变动
-                            model.changeTmpValue(curResult, 'formulaChanged');
-                            (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, curResult, model.name, false);
+                            isNeedFormula(props.defaultValue, props.data, prevProps.data)))) {
+                    var curResult = FormulaExec['formula'](props.defaultValue, props.data);
+                    var prevResult = FormulaExec['formula'](prevProps.defaultValue, prevProps.data);
+                    if (!isEqual(curResult, prevResult) &&
+                        !isEqual(curResult, model.tmpValue)) {
+                        // 识别上下文变动、自身数值变动、公式运算结果变动
+                        model.changeTmpValue(curResult, 'formulaChanged');
+                        if (model.extraName) {
+                            var values = model.splitExtraValue(curResult);
+                            (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, values[0], model.name, false);
+                            (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, values[1], model.extraName, false);
                         }
-                        else if (nowFormulaChecked) {
-                            var nowData = props.data[model.name];
-                            // now 表达式，计算后的值永远相同
-                            model.changeTmpValue(nowData, 'formulaChanged');
-                            (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, nowData, model.name, false);
+                        else {
+                            (_c = props.onChange) === null || _c === void 0 ? void 0 : _c.call(props, curResult, model.name, false);
                         }
                     }
                 }
                 else if (model) {
-                    var valueByName = getVariable(props.data, model.name);
                     // value 非公式表达式时，name 值优先，若 defaultValue 主动变动时，则使用 defaultValue
                     if (
                     // 然后才是查看关联的 name 属性值是否变化
@@ -219,11 +244,19 @@ function wrapControl(ComposedComponent) {
                         (!model.emitedValue ||
                             isEqual(model.emitedValue, model.tmpValue))) {
                         model.changeEmitedValue(undefined);
-                        var prevValueByName = getVariable(props.data, model.name);
-                        if ((!isEqual(valueByName, prevValueByName) ||
-                            getVariable(props.data, model.name, false) !==
-                                getVariable(prevProps.data, model.name, false)) &&
-                            !isEqual(valueByName, model.tmpValue)) {
+                        var valueByName = model.extraName
+                            ? [
+                                getVariable(props.data, model.name, false),
+                                getVariable(props.data, model.extraName, false)
+                            ]
+                            : getVariable(props.data, model.name, false);
+                        if (!isEqual(valueByName, model.extraName
+                            ? model.splitExtraValue(model.tmpValue)
+                            : model.tmpValue) &&
+                            (!isEqual(model.extraName ? valueByName[0] : valueByName, getVariable(prevProps.data, model.name, false)) ||
+                                // extraName
+                                (model.extraName &&
+                                    !isEqual(valueByName[1], getVariable(prevProps.data, model.extraName, false))))) {
                             model.changeTmpValue(valueByName, props.formInited && !prevProps.formInited
                                 ? 'formInited'
                                 : 'dataChanged');
@@ -374,7 +407,7 @@ function wrapControl(ComposedComponent) {
                 }
                 if (pipeOut) {
                     var oldValue = this.model.value;
-                    value = pipeOut(value, oldValue, data);
+                    value = pipeOut.call(this, value, oldValue, data);
                 }
                 this.model.changeTmpValue(value, 'input');
                 if (changeImmediately || conrolChangeImmediately || !formInited) {
@@ -391,9 +424,15 @@ function wrapControl(ComposedComponent) {
                 if (!this.model) {
                     return;
                 }
+                var model = this.model;
                 var value = this.model.tmpValue;
-                var oldValue = getVariable(data, this.model.name, false);
-                if (oldValue === value) {
+                var oldValue = model.extraName
+                    ? [
+                        getVariable(data, model.name, false),
+                        getVariable(data, model.extraName, false)
+                    ]
+                    : getVariable(data, model.name, false);
+                if (model.extraName ? isEqual(oldValue, value) : oldValue === value) {
                     return;
                 }
                 if (type !== 'input-password') {
@@ -416,7 +455,14 @@ function wrapControl(ComposedComponent) {
                 if (!this.model) {
                     return;
                 }
-                onChange === null || onChange === void 0 ? void 0 : onChange(value, name, submitOnChange === true);
+                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[1], model.extraName, submitOnChange === true);
+                }
+                else {
+                    onChange === null || onChange === void 0 ? void 0 : onChange(value, name, submitOnChange === true);
+                }
                 this.checkValidate();
             };
             class_1.prototype.handleBlur = function (e) {
@@ -430,17 +476,25 @@ function wrapControl(ComposedComponent) {
                 if (!this.model) {
                     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;
                 if (pipeOut) {
-                    value = pipeOut(value, oldValue, data);
+                    value = pipeOut.call(this, 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[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, name, false, true);
             };
             class_1.prototype.getValue = function () {
                 var _a = this.props, data = _a.formStore, control = _a.$schema;
                 var value = this.model ? this.model.tmpValue : control.value;
                 if (control.pipeIn) {
-                    value = control.pipeIn(value, data);
+                    value = control.pipeIn.call(this, value, data);
                 }
                 return value;
             };

package/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -20,14 +20,14 @@ import 'moment';
 import '../utils/debug.js';
 import 'react-dom';
 import '../utils/errors.js';
-import '../utils/tpl.js';
+import { filter } from '../utils/tpl.js';
 import 'classnames';
 import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import '../utils/image.js';
+import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
 import 'lodash/cloneDeep';
@@ -67,7 +67,11 @@ var AppStore = ServiceStore.named('AppStore')
                     path: item.path,
                     children: item.children,
                     className: item.className,
-                    visible: visible
+                    visible: visible,
+                    badge: typeof item.badge === 'string'
+                        ? filter(item.badge, self.data)
+                        : item.badge,
+                    badgeClassName: filter(item.badgeClassName, self.data)
                 };
             });
         }