amis-core 3.4.0 → 3.4.1

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -43,6 +43,8 @@ import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/map';
+import 'lodash/isEmpty';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
@@ -123,7 +125,7 @@ function registerOptionsControl(config) {
             this.normalizeValue();
         };
         FormOptionsItem.prototype.shouldComponentUpdate = function (nextProps) {
-            var _a, _b;
+            var _a;
             if (config.strictMode === false || nextProps.strictMode === false) {
                 return true;
             }
@@ -133,10 +135,7 @@ function registerOptionsControl(config) {
             else if ((_a = nextProps.formItem) === null || _a === void 0 ? void 0 : _a.expressionsInOptions) {
                 return true;
             }
-            else if ((_b = nextProps.formItem) === null || _b === void 0 ? void 0 : _b.filteredOptions) {
-                return true;
-            }
-            if (anyChanged(detectProps, this.props, nextProps)) {
+            else if (anyChanged(detectProps, this.props, nextProps)) {
                 return true;
             }
             return false;
@@ -578,7 +577,8 @@ function registerOptionsControl(config) {
                         case 5:
                             payload = _f.sent();
                             if (!payload.ok) {
-                                env.notify('error', (_b = (_a = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (payload.msg || __('Options.createFailed')));
+                                !addApi.silent &&
+                                    env.notify('error', (_b = (_a = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (payload.msg || __('Options.createFailed')));
                                 result = null;
                             }
                             else {
@@ -589,7 +589,7 @@ function registerOptionsControl(config) {
                             e_1 = _f.sent();
                             result = null;
                             console.error(e_1);
-                            env.notify('error', e_1.message);
+                            !addApi.silent && env.notify('error', e_1.message);
                             return [3 /*break*/, 7];
                         case 7:
                             // 有 result 说明弹框点了确认。否则就是取消了。
@@ -684,7 +684,8 @@ function registerOptionsControl(config) {
                         case 5:
                             payload = _e.sent();
                             if (!payload.ok) {
-                                env.notify('error', (_b = (_a = editApi === null || editApi === void 0 ? void 0 : editApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (payload.msg || __('saveFailed')));
+                                !editApi.silent &&
+                                    env.notify('error', (_b = (_a = editApi === null || editApi === void 0 ? void 0 : editApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (payload.msg || __('saveFailed')));
                                 result = null;
                             }
                             else {
@@ -695,7 +696,7 @@ function registerOptionsControl(config) {
                             e_2 = _e.sent();
                             result = null;
                             console.error(e_2);
-                            env.notify('error', e_2.message);
+                            !editApi.silent && env.notify('error', e_2.message);
                             return [3 /*break*/, 7];
                         case 7:
                             // 没有结果，说明取消了。
@@ -763,7 +764,8 @@ function registerOptionsControl(config) {
                         case 6:
                             result = _e.sent();
                             if (!result.ok) {
-                                env.notify('error', (_b = (_a = deleteApi === null || deleteApi === void 0 ? void 0 : deleteApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (result.msg || __('deleteFailed')));
+                                !deleteApi.silent &&
+                                    env.notify('error', (_b = (_a = deleteApi === null || deleteApi === void 0 ? void 0 : deleteApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (result.msg || __('deleteFailed')));
                                 return [2 /*return*/];
                             }
                             _e.label = 7;
@@ -786,7 +788,7 @@ function registerOptionsControl(config) {
                         case 8:
                             e_3 = _e.sent();
                             console.error(e_3);
-                            env.notify('error', e_3.message);
+                            !deleteApi.silent && env.notify('error', e_3.message);
                             return [3 /*break*/, 9];
                         case 9: return [2 /*return*/];
                     }

package/esm/renderers/Placeholder.js

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

package/esm/renderers/builtin.js

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

package/esm/renderers/register.js

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

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -7,8 +7,9 @@ import { __extends, __assign, __awaiter, __generator } from 'tslib';
 import React from 'react';
 import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
+import { getRendererByName } from '../factory.js';
 import { ComboStore } from '../store/combo.js';
-import { guid, promisify, anyChanged } from '../utils/helper.js';
+import { guid, promisify, changedEffect } from '../utils/helper.js';
 import { isExpression, FormulaExec, replaceExpression, isNeedFormula } from '../utils/formula.js';
 import { ScopedContext } from '../Scoped.js';
 import { FormItemStore } from '../store/formItem.js';
@@ -42,6 +43,8 @@ import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/map';
+import 'lodash/isEmpty';
 import 'uncontrollable';
 import '../utils/validations.js';
 import '../utils/resolveCondition.js';
@@ -54,29 +57,26 @@ function wrapControl(ComposedComponent) {
             __extends(class_1, _super);
             function class_1(props) {
                 var _this = this;
-                var _a;
+                var _a, _b;
                 _this = _super.call(this, props) || this;
                 _this.value = undefined;
                 _this.lazyEmitChange = debounce(_this.emitChange.bind(_this), 250, {
                     trailing: true,
                     leading: false
                 });
-                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;
+                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;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
                 _this.setPrinstineValue = _this.setPrinstineValue.bind(_this);
                 _this.controlRef = _this.controlRef.bind(_this);
                 _this.handleBlur = _this.handleBlur.bind(_this);
+                _this.validate = _this.validate.bind(_this);
+                _this.flushChange = _this.flushChange.bind(_this);
                 if (!name) {
                     // 一般情况下这些表单项都是需要 name 的，提示一下
                     if (typeof type === 'string' &&
-                        (type.startsWith('input-') ||
-                            type.endsWith('select') ||
-                            type === 'switch' ||
-                            type === 'textarea' ||
-                            type === 'radios') &&
-                        type !== 'input-group') {
+                        ((_a = getRendererByName(type)) === null || _a === void 0 ? void 0 : _a.isFormItem)) {
                         console.warn('name is required', _this.props.$schema);
                     }
                     return _this;
@@ -87,21 +87,24 @@ function wrapControl(ComposedComponent) {
                     path: _this.props.$path,
                     storeType: FormItemStore.name,
                     parentId: store === null || store === void 0 ? void 0 : store.id,
-                    name: name
+                    name: name,
+                    colIndex: colIndex !== undefined ? colIndex : undefined,
+                    rowIndex: rowIndex !== undefined ? rowIndex : undefined
                 });
                 _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, extraName: extraName }));
+                model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.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) {
+                    ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === ComboStore.name) {
                     var combo = form.parentStore;
                     combo.bindUniuqueItem(model);
                 }
                 if (propValue !== undefined && propValue !== null) {
                     // 同步 value: 优先使用 props 中的 value
                     model.changeTmpValue(propValue, 'controlled');
+                    model.setIsControlled(true);
                 }
                 else {
                     var isExp = isExpression(value);
@@ -167,7 +170,7 @@ function wrapControl(ComposedComponent) {
                 addHook === null || addHook === void 0 ? void 0 : addHook(this.hook3, 'flush');
                 var formItem = this.model;
                 if (formItem && validate) {
-                    var finalValidate_1 = promisify(validate.bind(formItem));
+                    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) {
@@ -182,59 +185,44 @@ function wrapControl(ComposedComponent) {
             class_1.prototype.componentDidUpdate = function (prevProps) {
                 var _a, _b, _c;
                 var props = this.props;
-                props.formStore;
                 var model = this.model;
-                if (model &&
-                    anyChanged([
-                        'id',
-                        'validations',
-                        'validationErrors',
-                        'value',
-                        'defaultValue',
-                        'required',
-                        'unique',
-                        'multiple',
-                        'delimiter',
-                        'valueField',
-                        'labelField',
-                        'joinValues',
-                        'extractValue',
-                        'selectFirst',
-                        'autoFill',
-                        'clearValueOnHidden',
-                        'validateApi',
-                        'minLength',
-                        'maxLength',
-                        'label',
-                        'extraName'
-                    ], prevProps.$schema, props.$schema)) {
+                if (!model) {
+                    return;
+                }
+                changedEffect([
+                    'id',
+                    'validations',
+                    'validationErrors',
+                    'value',
+                    'defaultValue',
+                    'required',
+                    'unique',
+                    'multiple',
+                    'delimiter',
+                    'valueField',
+                    'labelField',
+                    'joinValues',
+                    'extractValue',
+                    'selectFirst',
+                    'autoFill',
+                    'clearValueOnHidden',
+                    'validateApi',
+                    'minLength',
+                    'maxLength',
+                    'label',
+                    'extraName'
+                ], prevProps.$schema, props.$schema, function (changes) {
+                    model.config(__assign(__assign({}, changes), { 
+                        // todo 优化后面两个
+                        isValueSchemaExp: isExpression(props.$schema.value), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
+                });
+                if (props.required !== prevProps.required) {
                     model.config({
-                        required: props.$schema.required,
-                        id: props.$schema.id,
-                        unique: props.$schema.unique,
-                        value: props.$schema.value,
-                        isValueSchemaExp: isExpression(props.$schema.value),
-                        rules: props.$schema.validations,
-                        multiple: props.$schema.multiple,
-                        delimiter: props.$schema.delimiter,
-                        valueField: props.$schema.valueField,
-                        labelField: props.$schema.labelField,
-                        joinValues: props.$schema.joinValues,
-                        extractValue: props.$schema.extractValue,
-                        messages: props.$schema.validationErrors,
-                        selectFirst: props.$schema.selectFirst,
-                        autoFill: props.$schema.autoFill,
-                        clearValueOnHidden: props.$schema.clearValueOnHidden,
-                        validateApi: props.$schema.validateApi,
-                        minLength: props.$schema.minLength,
-                        maxLength: props.$schema.maxLength,
-                        label: props.$schema.label,
-                        inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl,
-                        extraName: props.$schema.extraName
+                        required: props.required
                     });
                 }
                 // 此处需要同时考虑 defaultValue 和 value
-                if (model && typeof props.value !== 'undefined') {
+                if (typeof props.value !== 'undefined') {
                     // 渲染器中的 value 优先
                     if (!isEqual(props.value, prevProps.value) &&
                         !isEqual(props.value, model.tmpValue)) {
@@ -242,8 +230,7 @@ function wrapControl(ComposedComponent) {
                         model.changeTmpValue(props.value, 'controlled');
                     }
                 }
-                else if (model &&
-                    typeof props.defaultValue !== 'undefined' &&
+                else if (typeof props.defaultValue !== 'undefined' &&
                     isExpression(props.defaultValue) &&
                     (!isEqual(props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
@@ -264,7 +251,7 @@ function wrapControl(ComposedComponent) {
                         }
                     }
                 }
-                else if (model) {
+                else {
                     // value 非公式表达式时，name 值优先，若 defaultValue 主动变动时，则使用 defaultValue
                     if (
                     // 然后才是查看关联的 name 属性值是否变化
@@ -379,7 +366,7 @@ function wrapControl(ComposedComponent) {
             };
             class_1.prototype.validate = function () {
                 return __awaiter(this, void 0, void 0, function () {
-                    var _a, form, data, formItemDispatchEvent, result, combo, group, validPromises;
+                    var _a, form, data, formItemDispatchEvent, result, combo, group, validPromises, valid;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
@@ -403,19 +390,16 @@ function wrapControl(ComposedComponent) {
                                 result = [_b.sent()];
                                 _b.label = 4;
                             case 4:
-                                if (result && result.length) {
-                                    if (result.indexOf(false) > -1) {
-                                        formItemDispatchEvent('formItemValidateError', data);
-                                    }
-                                    else {
-                                        formItemDispatchEvent('formItemValidateSucc', data);
-                                    }
-                                }
-                                return [2 /*return*/];
+                                valid = !result.some(function (item) { return item === false; });
+                                formItemDispatchEvent === null || formItemDispatchEvent === void 0 ? void 0 : formItemDispatchEvent(valid ? 'formItemValidateSucc' : 'formItemValidateError', data);
+                                return [2 /*return*/, valid];
                         }
                     });
                 });
             };
+            class_1.prototype.flushChange = function () {
+                this.lazyEmitChange.flush();
+            };
             class_1.prototype.handleChange = function (value, submitOnChange, changeImmediately) {
                 if (submitOnChange === void 0) { submitOnChange = this.props.$schema.submitOnChange; }
                 if (changeImmediately === void 0) { changeImmediately = false; }
@@ -435,7 +419,7 @@ function wrapControl(ComposedComponent) {
                 }
                 if (pipeOut) {
                     var oldValue = this.model.value;
-                    value = callStrFunction(pipeOut, ['value', 'oldValue', 'data'], value, oldValue, data);
+                    value = callStrFunction.call(this, pipeOut, ['value', 'oldValue', 'data'], value, oldValue, data);
                 }
                 this.model.changeTmpValue(value, 'input');
                 if (changeImmediately || conrolChangeImmediately || !formInited) {
@@ -507,7 +491,7 @@ function wrapControl(ComposedComponent) {
                 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 = callStrFunction(pipeOut, ['value', 'oldValue', 'data'], value, oldValue, data);
+                    value = callStrFunction.call(this, pipeOut, ['value', 'oldValue', 'data'], value, oldValue, data);
                 }
                 if (model.extraName) {
                     var values = model.splitExtraValue(value);
@@ -522,7 +506,7 @@ function wrapControl(ComposedComponent) {
                 var _a = this.props, data = _a.formStore, control = _a.$schema;
                 var value = this.model ? this.model.tmpValue : control.value;
                 if (control.pipeIn) {
-                    value = callStrFunction(control.pipeIn, ['value', 'data'], value, data);
+                    value = callStrFunction.call(this, control.pipeIn, ['value', 'data'], value, data);
                 }
                 return value;
             };
@@ -551,7 +535,7 @@ function wrapControl(ComposedComponent) {
                 var injectedProps = {
                     defaultSize: controlWidth,
                     disabled: disabled !== null && disabled !== void 0 ? disabled : control.disabled,
-                    static: (_a = control.static) !== null && _a !== void 0 ? _a : defaultStatic,
+                    static: (_b = (_a = this.props.static) !== null && _a !== void 0 ? _a : control.static) !== null && _b !== void 0 ? _b : defaultStatic,
                     formItem: this.model,
                     formMode: control.mode || formMode,
                     ref: this.controlRef,
@@ -566,13 +550,19 @@ function wrapControl(ComposedComponent) {
                     getValue: this.getValue,
                     prinstine: model ? model.prinstine : undefined,
                     setPrinstineValue: this.setPrinstineValue,
+                    onValidate: this.validate,
+                    onFlushChange: this.flushChange
                     // !没了这个， tree 里的 options 渲染会出问题
-                    _filteredOptions: (_b = this.model) === null || _b === void 0 ? void 0 : _b.filteredOptions
+                    // todo 理论上不应该影响，待确认
+                    // _filteredOptions: this.model?.filteredOptions
                 };
                 return (React.createElement(ComposedComponent, __assign({}, this.props, injectedProps)));
             };
             return class_1;
         }(React.Component)),
+        _a.displayName = "WrapControl".concat(ComposedComponent.displayName || ComposedComponent.name
+            ? "(".concat(ComposedComponent.displayName || ComposedComponent.name, ")")
+            : ''),
         _a.contextType = ScopedContext,
         _a.defaultProps = {},
         _a))), ComposedComponent);

package/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -36,6 +36,8 @@ import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/map';
+import 'lodash/isEmpty';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';