amis-core 6.0.0 → 6.1.0

package/esm/renderers/Item.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __read, __rest, __decorate, __metadata, __spreadArray } from 'tslib';
@@ -36,7 +36,6 @@ import 'lodash/isBoolean';
 import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
@@ -56,7 +55,7 @@ var getItemLabelClassName = function (props) {
     var staticLabelClassName = props.staticLabelClassName, labelClassName = props.labelClassName, id = props.id, themeCss = props.themeCss;
     return props.static && staticLabelClassName
         ? staticLabelClassName
-        : cx(labelClassName, setThemeClassName('labelClassName', id, themeCss, 'item'));
+        : cx(labelClassName, setThemeClassName(__assign(__assign({}, props), { name: 'labelClassName', id: id, themeCss: themeCss, extra: 'item' })));
 };
 var getItemInputClassName = function (props) {
     var staticInputClassName = props.staticInputClassName, inputClassName = props.inputClassName;
@@ -348,7 +347,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         typeof controlSize === 'string' &&
                         !!controlSize &&
                         controlSize !== 'full',
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName('wrapperCustomStyle', rest.id, rest.wrapperCustomStyle, 'item'), getItemInputClassName(this.props)) }));
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName(__assign(__assign({}, this.props), { name: 'wrapperCustomStyle', id: rest.id, themeCss: rest.wrapperCustomStyle, extra: 'item' })), getItemInputClassName(this.props)) }));
         }
         return null;
     };
@@ -371,7 +370,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     formStore: undefined
                 })
                 : null,
-            React.createElement(CustomStyle, { config: {
+            React.createElement(CustomStyle, __assign({}, this.props, { config: {
                     themeCss: themeCss || css,
                     classNames: [
                         {
@@ -383,7 +382,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     ],
                     wrapperCustomStyle: wrapperCustomStyle,
                     id: id && id + '-item'
-                }, env: env })));
+                }, env: env }))));
     };
     /**
      * 布局扩充点，可以自己扩充表单项的布局方式
@@ -407,7 +406,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     },
                     _a["is-error"] = model && !model.valid,
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName(__assign(__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 label !== false ? (React.createElement("label", { className: cx("Form-label", (_b = {},
                         _b["Form-itemColumn--".concat(typeof horizontal.leftFixed === 'string'
                             ? horizontal.leftFixed
@@ -460,7 +459,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null)));
         },
@@ -472,7 +471,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName(__assign(__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 label && renderLabel !== false ? (React.createElement("label", { className: cx("Form-label", getItemLabelClassName(props)) },
                     React.createElement("span", null,
                         label ? render('label', label) : null,
@@ -515,7 +514,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null)) : (React.createElement(React.Fragment, null,
                     renderControl(),
@@ -545,7 +544,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null))));
         },
@@ -558,7 +557,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName(__assign(__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 label && renderLabel !== false ? (React.createElement("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                     React.createElement("span", null,
                         label ? render('label', label) : label,
@@ -601,7 +600,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null)));
         },
@@ -614,7 +613,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, setThemeClassName(__assign(__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 React.createElement("div", { className: cx('Form-rowInner') },
                     label && renderLabel !== false ? (React.createElement("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                         React.createElement("span", null,
@@ -656,7 +655,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     Array.isArray(model.errors) ? (React.createElement("ul", { className: cx('Form-feedback') }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
                 description && renderDescription !== false
                     ? render('description', description, {
-                        className: cx("Form-description", descriptionClassName, setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                        className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                     })
                     : null));
         }

package/esm/renderers/Options.d.ts

@@ -126,6 +126,11 @@ export interface FormOptionsControl extends FormBaseControl {
     autoFill?: {
         [propName: string]: string;
     };
+    /**
+     * @default fillIfNotSet
+     * 初始化时是否把其他字段同步到表单内部。
+     */
+    initAutoFill?: boolean | 'fillIfNotSet';
 }
 export interface OptionsBasicConfig extends FormItemBasicConfig {
     autoLoadOptionsFromSource?: boolean;

package/esm/renderers/Options.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __spreadArray, __read, __decorate, __metadata } from 'tslib';
@@ -37,12 +37,12 @@ import 'lodash/isBoolean';
 import '../utils/image.js';
 import { keyToPath } from '../utils/keyToPath.js';
 import { resolveEventData } from '../utils/renderer-event.js';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
@@ -80,6 +80,7 @@ function registerOptionsControl(config) {
             _this = _super.call(this, props) || this;
             _this.toDispose = [];
             _this.mounted = false;
+            _this.initedFilled = false;
             var initFetch = props.initFetch, formItem = props.formItem, source = props.source, data = props.data, setPrinstineValue = props.setPrinstineValue, defaultValue = props.defaultValue, multiple = props.multiple, joinValues = props.joinValues, extractValue = props.extractValue, addHook = props.addHook, formInited = props.formInited, valueField = props.valueField, options = props.options, value = props.value, defaultCheckAll = props.defaultCheckAll;
             if (formItem) {
                 formItem.setOptions(normalizeOptions(options, undefined, valueField), _this.changeOptionValue, data);
@@ -88,12 +89,20 @@ function registerOptionsControl(config) {
                     return JSON.stringify(formItem.getSelectedOptions(formItem.tmpValue));
                 }, function () {
                     return _this.mounted &&
+                        _this.initedFilled &&
                         _this.syncAutoFill(formItem.getSelectedOptions(formItem.tmpValue));
                 }));
-                if (options &&
-                    formItem.tmpValue &&
-                    formItem.getSelectedOptions(formItem.tmpValue).length) {
-                    _this.syncAutoFill(formItem.getSelectedOptions(formItem.tmpValue));
+                if (formInited || !addHook) {
+                    _this.initedFilled = true;
+                    _this.props.initAutoFill !== false &&
+                        _this.syncAutoFill(formItem.getSelectedOptions(formItem.tmpValue), _this.props.initAutoFill === 'fillIfNotSet');
+                }
+                else if (addHook) {
+                    addHook(function () {
+                        _this.initedFilled = true;
+                        _this.props.initAutoFill !== false &&
+                            _this.syncAutoFill(formItem.getSelectedOptions(formItem.tmpValue), _this.props.initAutoFill === 'fillIfNotSet');
+                    }, 'init');
                 }
                 // 默认全选。这里会和默认值\回填值逻辑冲突，所以如果有配置source则不执行默认全选
                 if (multiple &&
@@ -225,7 +234,8 @@ function registerOptionsControl(config) {
                 onChange === null || onChange === void 0 ? void 0 : onChange(resetValue !== null && resetValue !== void 0 ? resetValue : '');
             }
         };
-        FormOptionsItem.prototype.syncAutoFill = function (selectedOptions) {
+        FormOptionsItem.prototype.syncAutoFill = function (selectedOptions, skipIfExits) {
+            if (skipIfExits === void 0) { skipIfExits = false; }
             var _a = this.props, autoFill = _a.autoFill, multiple = _a.multiple, onBulkChange = _a.onBulkChange, data = _a.data;
             var formItem = this.props.formItem;
             // 参照录入｜自动填充
@@ -247,11 +257,18 @@ function registerOptionsControl(config) {
                 var result_1 = __assign({}, toSync_1);
                 Object.keys(autoFill).forEach(function (key) {
                     var keys = keyToPath(key);
+                    var value = getVariable(toSync_1, key);
+                    if (skipIfExits) {
+                        var originValue = getVariable(data, key);
+                        if (typeof originValue !== 'undefined') {
+                            value = originValue;
+                        }
+                    }
+                    setVariable(result_1, key, value);
                     // 如果左边的 key 是一个路径
                     // 这里不希望直接把原始对象都给覆盖没了
                     // 而是保留原始的对象，只修改指定的属性
                     if (keys.length > 1 && isPlainObject(tmpData_1[keys[0]])) {
-                        var value = getVariable(toSync_1, key);
                         // 存在情况：依次更新同一子路径的多个key，eg: a.b.c1 和 a.b.c2，所以需要同步更新data
                         setVariable(tmpData_1, key, value);
                         result_1[keys[0]] = tmpData_1[keys[0]];
@@ -919,7 +936,7 @@ function registerOptionsControl(config) {
                     : [], nodePath: nodePathArray, loading: formItem ? formItem.loading : false, setLoading: this.setLoading, setOptions: this.setOptions, syncOptions: this.syncOptions, reloadOptions: this.reload, deferLoad: this.deferLoad, leftDeferLoad: this.leftDeferLoad, expandTreeOptions: this.expandTreeOptions, creatable: creatable !== false && isEffectiveApi(addApi) ? true : creatable, editable: editable || (editable !== false && isEffectiveApi(editApi)), removable: removable || (removable !== false && isEffectiveApi(deleteApi)), onAdd: this.handleOptionAdd, onEdit: this.handleOptionEdit, onDelete: this.handleOptionDelete })));
         };
         FormOptionsItem.displayName = "OptionsControl(".concat(config.type, ")");
-        FormOptionsItem.defaultProps = __assign({ delimiter: ',', labelField: 'label', valueField: 'value', joinValues: true, extractValue: false, multiple: false, placeholder: 'Select.placeholder', resetValue: '', deleteConfirmText: 'deleteConfirm' }, Control.defaultProps);
+        FormOptionsItem.defaultProps = __assign({ delimiter: ',', labelField: 'label', valueField: 'value', joinValues: true, extractValue: false, multiple: false, placeholder: 'Select.placeholder', resetValue: '', deleteConfirmText: 'deleteConfirm', initAutoFill: 'fillIfNotSet' }, Control.defaultProps);
         FormOptionsItem.propsList = Control.propsList
             ? __spreadArray([], __read(Control.propsList), false) : [];
         FormOptionsItem.ComposedComponent = Control;

package/esm/renderers/Placeholder.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends } from 'tslib';

package/esm/renderers/builtin.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { Placeholder } from './Placeholder.js';

package/esm/renderers/register.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';

package/esm/renderers/wrapControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign, __awaiter, __generator } from 'tslib';
@@ -9,7 +9,7 @@ import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
 import { ComboStore } from '../store/combo.js';
 import { guid, promisify, changedEffect } from '../utils/helper.js';
-import { isExpression, FormulaExec, replaceExpression, isNeedFormula } from '../utils/formula.js';
+import { isExpression, isNeedFormula, FormulaExec, replaceExpression } from '../utils/formula.js';
 import { ScopedContext } from '../Scoped.js';
 import { FormItemStore } from '../store/formItem.js';
 import { isAlive } from 'mobx-state-tree';
@@ -37,12 +37,12 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import '../utils/image.js';
 import '../actions/Action.js';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
@@ -110,26 +110,7 @@ function wrapControl(ComposedComponent) {
                     model.setIsControlled(true);
                 }
                 else {
-                    var isExp = isExpression(value);
-                    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');
-                    }
+                    _this.setInitialValue(value);
                 }
                 if (onChange &&
                     value !== undefined &&
@@ -167,9 +148,7 @@ function wrapControl(ComposedComponent) {
                 var _this = this;
                 var _a = this.props; _a.store; _a.formStore; var validate = _a.$schema.validate, addHook = _a.addHook;
                 // 提交前先把之前的 lazyEmit 执行一下。
-                this.hook3 = function () {
-                    _this.lazyEmitChange.flush();
-                };
+                this.hook3 = function () { return _this.lazyEmitChange.flush(); };
                 addHook === null || addHook === void 0 ? void 0 : addHook(this.hook3, 'flush');
                 var formItem = this.model;
                 if (formItem && validate) {
@@ -186,6 +165,7 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.componentDidUpdate = function (prevProps) {
+                var _this = this;
                 var _a, _b, _c;
                 var props = this.props;
                 var model = this.model;
@@ -193,6 +173,7 @@ function wrapControl(ComposedComponent) {
                     return;
                 }
                 changedEffect([
+                    'name',
                     'id',
                     'validations',
                     'validationErrors',
@@ -219,6 +200,9 @@ function wrapControl(ComposedComponent) {
                     model.config(__assign(__assign({}, changes), { 
                         // todo 优化后面两个
                         isValueSchemaExp: isExpression(props.$schema.value), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
+                    if (changes.hasOwnProperty('name')) {
+                        _this.setInitialValue(_this.props.$schema.value);
+                    }
                 });
                 if (props.required !== prevProps.required) {
                     model.config({
@@ -294,6 +278,30 @@ function wrapControl(ComposedComponent) {
                 (_g = this.reaction) === null || _g === void 0 ? void 0 : _g.call(this);
                 this.disposeModel();
             };
+            class_1.prototype.setInitialValue = function (value) {
+                var model = this.model;
+                var _a = this.props, form = _a.formStore, data = _a.data;
+                var isExp = isExpression(value);
+                if (isExp) {
+                    model.changeTmpValue(FormulaExec['formula'](value, data), // 对组件默认值进行运算
+                    'formulaChanged');
+                }
+                else {
+                    var initialValue = model.extraName
+                        ? [
+                            getVariable(data, model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                            getVariable(data, model.extraName, form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                        ]
+                        : getVariable(data, 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');
+                }
+            };
             class_1.prototype.disposeModel = function () {
                 var _a;
                 var _b = this.props, form = _b.formStore, formItem = _b.formItem, rootStore = _b.rootStore;
@@ -506,10 +514,10 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.getValue = function () {
-                var _a = this.props, data = _a.formStore, control = _a.$schema;
+                var _a = this.props, formStore = _a.formStore, data = _a.data, control = _a.$schema;
                 var value = this.model ? this.model.tmpValue : control.value;
                 if (control.pipeIn) {
-                    value = callStrFunction.call(this, control.pipeIn, ['value', 'data'], value, data);
+                    value = callStrFunction.call(this, control.pipeIn, ['value', 'store', 'data'], value, formStore, data);
                 }
                 return value;
             };

package/esm/store/app.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';
@@ -30,12 +30,12 @@ import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';