amis-core 3.5.2 → 3.5.3

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -49,7 +49,7 @@ import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
 import '../utils/resolveCondition.js';
-import 'mobx';
+import { reaction } from 'mobx';
 import '../utils/Animation.js';
 
 var Form = /** @class */ (function (_super) {
@@ -57,6 +57,7 @@ var Form = /** @class */ (function (_super) {
     function Form(props) {
         var _this = _super.call(this, props) || this;
         _this.hooks = {};
+        _this.toDispose = [];
         _this.shouldLoadInitApi = false;
         _this.lazyEmitChange = debounce(_this.emitChange.bind(_this), 250, {
             trailing: true,
@@ -105,11 +106,12 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.componentDidMount = function () {
         var _this = this;
         var _a, _b;
-        var _c = this.props, initApi = _c.initApi, initFetch = _c.initFetch, initFetchOn = _c.initFetchOn, initAsyncApi = _c.initAsyncApi, initFinishedField = _c.initFinishedField, initCheckInterval = _c.initCheckInterval, store = _c.store, _d = _c.messages, fetchSuccess = _d.fetchSuccess, fetchFailed = _d.fetchFailed, onValidate = _c.onValidate, promptPageLeave = _c.promptPageLeave, env = _c.env, rules = _c.rules;
+        var _c = this.props, initApi = _c.initApi, initFetch = _c.initFetch, initFetchOn = _c.initFetchOn, initAsyncApi = _c.initAsyncApi, initFinishedField = _c.initFinishedField, initCheckInterval = _c.initCheckInterval, store = _c.store, _d = _c.messages, fetchSuccess = _d.fetchSuccess, fetchFailed = _d.fetchFailed, onValidate = _c.onValidate, onValidChange = _c.onValidChange, promptPageLeave = _c.promptPageLeave, env = _c.env;
+        var rules = this.getNormalizedRules();
         this.mounted = true;
         if (onValidate) {
             var finalValidate_1 = promisify(onValidate);
-            this.disposeOnValidate = this.addHook(function () { return __awaiter(_this, void 0, void 0, function () {
+            this.toDispose.push(this.addHook(function () { return __awaiter(_this, void 0, void 0, function () {
                 var result;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -139,10 +141,14 @@ var Form = /** @class */ (function (_super) {
                             return [2 /*return*/];
                     }
                 });
-            }); });
+            }); }));
         }
-        if (Array.isArray(rules) && rules.length) {
-            this.disposeRulesValidate = this.addHook(function () {
+        // 表单校验结果发生变化时，触发 onValidChange
+        if (onValidChange) {
+            this.toDispose.push(reaction(function () { return store.valid; }, function (valid) { return onValidChange(valid, _this.props); }));
+        }
+        if (rules.length) {
+            this.toDispose.push(this.addHook(function () {
                 if (!store.valid) {
                     return;
                 }
@@ -150,7 +156,7 @@ var Form = /** @class */ (function (_super) {
                     return !evalExpression(item.rule, store.data) &&
                         store.addRestError(item.message, item.name);
                 });
-            });
+            }));
         }
         if (isEffectiveApi(initApi, store.data, initFetch, initFetchOn)) {
             store
@@ -198,11 +204,23 @@ var Form = /** @class */ (function (_super) {
         // this.lazyHandleChange.flush();
         this.lazyEmitChange.cancel();
         this.asyncCancel && this.asyncCancel();
-        this.disposeOnValidate && this.disposeOnValidate();
-        this.disposeRulesValidate && this.disposeRulesValidate();
+        this.toDispose.forEach(function (fn) { return fn(); });
+        this.toDispose = [];
         window.removeEventListener('beforeunload', this.beforePageUnload);
         (_a = this.unBlockRouting) === null || _a === void 0 ? void 0 : _a.call(this);
     };
+    /** 获取表单联合校验的规则 */
+    Form.prototype.getNormalizedRules = function () {
+        var _a = this.props, rules = _a.rules, __ = _a.translate;
+        if (!Array.isArray(rules) || rules.length < 1) {
+            return [];
+        }
+        return rules
+            .map(function (item) { return (__assign(__assign({}, item), (!item.message || typeof item.message !== 'string'
+            ? { message: __('Form.rules.message') }
+            : {}))); })
+            .filter(function (item) { return item.rule && typeof item.rule === 'string'; });
+    };
     Form.prototype.dispatchInited = function (value) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
@@ -350,22 +368,27 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.isValidated = function () {
         return this.props.store.validated;
     };
-    Form.prototype.validate = function (forceValidate, throwErrors) {
+    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors) {
         if (throwErrors === void 0) { throwErrors = false; }
-        var _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data, messages = _a.messages, __ = _a.translate;
-        this.flush();
-        return store
-            .validate(this.hooks['validate'] || [], forceValidate, throwErrors, typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
-            ? __(filter(messages.validateFailed, store.data))
-            : undefined)
-            .then(function (result) {
-            if (result) {
-                dispatchEvent('validateSucc', data);
-            }
-            else {
-                dispatchEvent('validateError', data);
-            }
-            return result;
+        if (toastErrors === void 0) { toastErrors = true; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, store, dispatchEvent, data, messages, __, result;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data, messages = _a.messages, __ = _a.translate;
+                        this.flush();
+                        return [4 /*yield*/, store.validate(this.hooks['validate'] || [], forceValidate, throwErrors, toastErrors === false
+                                ? ''
+                                : typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                    ? __(filter(messages.validateFailed, store.data))
+                                    : undefined)];
+                    case 1:
+                        result = _b.sent();
+                        dispatchEvent(result ? 'validateSucc' : 'validateError', data);
+                        return [2 /*return*/, result];
+                }
+            });
         });
     };
     Form.prototype.setErrors = function (errors, tag) {
@@ -1140,6 +1163,8 @@ var Form = /** @class */ (function (_super) {
         'onChange',
         'onFailed',
         'onFinished',
+        'onValidate',
+        'onValidChange',
         'onSaved',
         'canAccessSuperData',
         'lazyChange',

package/esm/renderers/Item.js

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

package/esm/renderers/Options.d.ts

@@ -136,7 +136,7 @@ export interface OptionsControlProps extends FormControlProps, Omit<FormOptionsC
     selectedOptions: Array<Option>;
     setOptions: (value: Array<any>, skipNormalize?: boolean) => void;
     setLoading: (value: boolean) => void;
-    reloadOptions: (setError?: boolean) => void;
+    reloadOptions: (setError?: boolean, isInit?: boolean, data?: Record<string, any>) => void;
     deferLoad: (option: Option) => void;
     leftDeferLoad: (option: Option, leftOptions: Option) => void;
     expandTreeOptions: (nodePathArr: any[]) => void;

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -157,7 +157,7 @@ function registerOptionsControl(config) {
                     var prevOptions = resolveVariableAndFilter(prevProps.source, prevProps.data, '| raw');
                     var options = resolveVariableAndFilter(props.source, props.data, '| raw');
                     if (prevOptions !== options) {
-                        formItem.setOptions(normalizeOptions(options || [], undefined, props.valueField || 'value'), this.changeOptionValue, props.data);
+                        formItem.loadOptionsFromDataScope(props.source, props.data, this.changeOptionValue);
                         this.normalizeValue();
                     }
                 }
@@ -403,12 +403,13 @@ function registerOptionsControl(config) {
         FormOptionsItem.prototype.reload = function () {
             return this.reloadOptions();
         };
-        FormOptionsItem.prototype.reloadOptions = function (setError, isInit) {
+        FormOptionsItem.prototype.reloadOptions = function (setError, isInit, data) {
             if (isInit === void 0) { isInit = false; }
-            var _a = this.props, source = _a.source, formItem = _a.formItem, data = _a.data, onChange = _a.onChange, setPrinstineValue = _a.setPrinstineValue, valueField = _a.valueField;
+            if (data === void 0) { data = this.props.data; }
+            var _a = this.props, source = _a.source, formItem = _a.formItem, onChange = _a.onChange, setPrinstineValue = _a.setPrinstineValue; _a.valueField;
             if (formItem && isPureVariable(source)) {
                 isAlive(formItem) &&
-                    formItem.setOptions(normalizeOptions(resolveVariableAndFilter(source, data, '| raw') || [], undefined, valueField), this.changeOptionValue, data);
+                    formItem.loadOptionsFromDataScope(source, data, this.changeOptionValue);
                 return;
             }
             else if (!formItem || !isEffectiveApi(source, data)) {
@@ -834,7 +835,7 @@ function registerOptionsControl(config) {
         __decorate([
             autobind,
             __metadata("design:type", Function),
-            __metadata("design:paramtypes", [Boolean, Object]),
+            __metadata("design:paramtypes", [Boolean, Object, Object]),
             __metadata("design:returntype", void 0)
         ], FormOptionsItem.prototype, "reloadOptions", null);
         __decorate([

package/esm/renderers/Placeholder.js

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

package/esm/renderers/builtin.js

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

package/esm/renderers/register.js

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

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -7,7 +7,6 @@ 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, changedEffect } from '../utils/helper.js';
 import { isExpression, FormulaExec, replaceExpression, isNeedFormula } from '../utils/formula.js';
@@ -58,14 +57,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, 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;
+                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, colIndex = _b.colIndex, rowIndex = _b.rowIndex, _c = _b.$schema, 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, pagination = _c.pagination;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -82,11 +81,6 @@ function wrapControl(ComposedComponent) {
                     name = tokenize(name, data);
                 }
                 if (!name) {
-                    // 一般情况下这些表单项都是需要 name 的，提示一下
-                    if (typeof type === 'string' &&
-                        ((_a = getRendererByName(type)) === null || _a === void 0 ? void 0 : _a.isFormItem)) {
-                        console.warn('name is required', _this.props.$schema);
-                    }
                     return _this;
                 }
                 var propValue = _this.props.value;
@@ -102,10 +96,10 @@ 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: 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 }));
+                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, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
-                    ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === ComboStore.name) {
+                    ((_a = form === null || form === void 0 ? void 0 : form.parentStore) === null || _a === void 0 ? void 0 : _a.storeType) === ComboStore.name) {
                     var combo = form.parentStore;
                     combo.bindUniuqueItem(model);
                 }
@@ -218,7 +212,8 @@ function wrapControl(ComposedComponent) {
                     'minLength',
                     'maxLength',
                     'label',
-                    'extraName'
+                    'extraName',
+                    'pagination'
                 ], prevProps.$schema, props.$schema, function (changes) {
                     model.config(__assign(__assign({}, changes), { 
                         // todo 优化后面两个

package/esm/store/app.js

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