amis-core 6.0.0 → 6.1.0

package/lib/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
  */
 
 'use strict';
@@ -43,13 +43,13 @@ require('../utils/icon.js');
 require('../utils/image.js');
 var keyToPath = require('../utils/keyToPath.js');
 var rendererEvent = require('../utils/renderer-event.js');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');
@@ -96,6 +96,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.normalizeOptions(options, undefined, valueField), _this.changeOptionValue, data);
@@ -104,12 +105,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 &&
@@ -241,7 +250,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;
             // 参照录入｜自动填充
@@ -263,11 +273,18 @@ function registerOptionsControl(config) {
                 var result_1 = tslib.__assign({}, toSync_1);
                 Object.keys(autoFill).forEach(function (key) {
                     var keys = keyToPath.keyToPath(key);
+                    var value = getVariable.getVariable(toSync_1, key);
+                    if (skipIfExits) {
+                        var originValue = getVariable.getVariable(data, key);
+                        if (typeof originValue !== 'undefined') {
+                            value = originValue;
+                        }
+                    }
+                    object.setVariable(result_1, key, value);
                     // 如果左边的 key 是一个路径
                     // 这里不希望直接把原始对象都给覆盖没了
                     // 而是保留原始的对象，只修改指定的属性
                     if (keys.length > 1 && isPlainObject__default["default"](tmpData_1[keys[0]])) {
-                        var value = getVariable.getVariable(toSync_1, key);
                         // 存在情况：依次更新同一子路径的多个key，eg: a.b.c1 和 a.b.c2，所以需要同步更新data
                         object.setVariable(tmpData_1, key, value);
                         result_1[keys[0]] = tmpData_1[keys[0]];
@@ -935,7 +952,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 && api.isEffectiveApi(addApi) ? true : creatable, editable: editable || (editable !== false && api.isEffectiveApi(editApi)), removable: removable || (removable !== false && api.isEffectiveApi(deleteApi)), onAdd: this.handleOptionAdd, onEdit: this.handleOptionEdit, onDelete: this.handleOptionDelete })));
         };
         FormOptionsItem.displayName = "OptionsControl(".concat(config.type, ")");
-        FormOptionsItem.defaultProps = tslib.__assign({ delimiter: ',', labelField: 'label', valueField: 'value', joinValues: true, extractValue: false, multiple: false, placeholder: 'Select.placeholder', resetValue: '', deleteConfirmText: 'deleteConfirm' }, Control.defaultProps);
+        FormOptionsItem.defaultProps = tslib.__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
             ? tslib.__spreadArray([], tslib.__read(Control.propsList), false) : [];
         FormOptionsItem.ComposedComponent = Control;

package/lib/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
  */
 
 'use strict';

package/lib/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
  */
 
 'use strict';

package/lib/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
  */
 
 'use strict';

package/lib/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
  */
 
 'use strict';
@@ -42,13 +42,13 @@ require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');
 require('../actions/Action.js');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/isObject');
 require('lodash/map');
 require('lodash/isEmpty');
@@ -128,26 +128,7 @@ function wrapControl(ComposedComponent) {
                     model.setIsControlled(true);
                 }
                 else {
-                    var isExp = formula.isExpression(value);
-                    if (isExp) {
-                        model.changeTmpValue(formula.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 : formula.replaceExpression(value), typeof initialValue !== 'undefined'
-                            ? 'initialValue'
-                            : 'defaultValue');
-                    }
+                    _this.setInitialValue(value);
                 }
                 if (onChange &&
                     value !== undefined &&
@@ -185,9 +166,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) {
@@ -204,6 +183,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;
@@ -211,6 +191,7 @@ function wrapControl(ComposedComponent) {
                     return;
                 }
                 helper.changedEffect([
+                    'name',
                     'id',
                     'validations',
                     'validationErrors',
@@ -237,6 +218,9 @@ function wrapControl(ComposedComponent) {
                     model.config(tslib.__assign(tslib.__assign({}, changes), { 
                         // todo 优化后面两个
                         isValueSchemaExp: formula.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({
@@ -312,6 +296,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 = formula.isExpression(value);
+                if (isExp) {
+                    model.changeTmpValue(formula.FormulaExec['formula'](value, data), // 对组件默认值进行运算
+                    'formulaChanged');
+                }
+                else {
+                    var initialValue = model.extraName
+                        ? [
+                            getVariable.getVariable(data, model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                            getVariable.getVariable(data, model.extraName, form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                        ]
+                        : getVariable.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 : formula.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;
@@ -524,10 +532,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 = api.callStrFunction.call(this, control.pipeIn, ['value', 'data'], value, data);
+                    value = api.callStrFunction.call(this, control.pipeIn, ['value', 'store', 'data'], value, formStore, data);
                 }
                 return value;
             };

package/lib/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
  */
 
 'use strict';
@@ -35,7 +35,6 @@ require('../utils/image.js');
 require('lodash/isEqual');
 require('../actions/Action.js');
 require('lodash/debounce');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react');
 require('react-overlays/useRootClose');
@@ -43,6 +42,7 @@ require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');