amis-core 3.6.4 → 6.1.0

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,6 +26,7 @@ require('../utils/filter.js');
 var api = require('../utils/api.js');
 var LazyComponent = require('../components/LazyComponent.js');
 var mobxStateTree = require('mobx-state-tree');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
 require('../utils/DataSchema.js');
@@ -42,13 +43,13 @@ require('../utils/image.js');
 require('lodash/isPlainObject');
 require('lodash/isEqual');
 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/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');
@@ -80,6 +81,8 @@ var Form = /** @class */ (function (_super) {
             trailing: true,
             leading: false
         });
+        // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
+        _this.flushing = false;
         _this.onInit = _this.onInit.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
         _this.handleQuery = _this.handleQuery.bind(_this);
@@ -392,22 +395,27 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.isValidated = function () {
         return this.props.store.validated;
     };
-    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors) {
+    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
         if (toastErrors === void 0) { toastErrors = true; }
+        if (skipFlush === void 0) { skipFlush = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, store, dispatchEvent, data, messages, __, result;
             return tslib.__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'
-                                    ? __(tpl.filter(messages.validateFailed, store.data))
-                                    : undefined)];
+                        if (!!skipFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
                     case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2: return [4 /*yield*/, store.validate(this.hooks['validate'] || [], forceValidate, throwErrors, toastErrors === false
+                            ? ''
+                            : typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                ? __(tpl.filter(messages.validateFailed, store.data))
+                                : undefined)];
+                    case 3:
                         result = _b.sent();
                         dispatchEvent(result ? 'validateSucc' : 'validateError', data);
                         return [2 /*return*/, result];
@@ -434,20 +442,55 @@ var Form = /** @class */ (function (_super) {
         this.flush();
         store.setValues(value, undefined, replace);
     };
-    Form.prototype.submit = function (fn, throwErrors) {
+    Form.prototype.submit = function (fn, throwErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
-        var _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        this.flush();
-        var validateErrCb = function () { return dispatchEvent('validateError', data); };
-        return store.submit(fn, this.hooks['validate'] || [], typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
-            ? __(tpl.filter(messages.validateFailed, store.data))
-            : undefined, validateErrCb, throwErrors);
+        if (skipFlush === void 0) { skipFlush = false; }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, store, messages, __, dispatchEvent, data, validateErrCb;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        if (!!skipFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        validateErrCb = function () { return dispatchEvent('validateError', data); };
+                        return [2 /*return*/, store.submit(fn, this.hooks['validate'] || [], typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                ? __(tpl.filter(messages.validateFailed, store.data))
+                                : undefined, validateErrCb, throwErrors)];
+                }
+            });
+        });
     };
-    // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
     Form.prototype.flush = function () {
-        var hooks = this.hooks['flush'] || [];
-        hooks.forEach(function (fn) { return fn(); });
-        this.lazyEmitChange.flush();
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var hooks;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, , 3, 4]);
+                        if (this.flushing) {
+                            return [2 /*return*/];
+                        }
+                        this.flushing = true;
+                        hooks = this.hooks['flush'] || [];
+                        return [4 /*yield*/, Promise.all(hooks.map(function (fn) { return fn(); }))];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.lazyEmitChange.flush()];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        this.flushing = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
     };
     Form.prototype.reset = function () {
         var _a = this.props, store = _a.store, onReset = _a.onReset;
@@ -519,11 +562,17 @@ var Form = /** @class */ (function (_super) {
                             onChange && onChange.apply(null, changeProps);
                         }
                         store.clearRestError();
-                        (submit || (submitOnChange && store.inited)) &&
-                            this.handleAction(undefined, {
-                                type: 'submit'
-                            }, store.data);
-                        return [2 /*return*/];
+                        if (!(submit || (submitOnChange && store.inited))) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.handleAction(undefined, {
+                                type: 'submit',
+                                // 如果这里不跳过，会相互依赖死循环，flush 会 让 emiteChange 立即执行
+                                // handleAction 里面又会调用 flush
+                                skipFormFlush: true
+                            }, store.data)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3: return [2 /*return*/];
                 }
             });
         });
@@ -574,8 +623,12 @@ var Form = /** @class */ (function (_super) {
                 switch (_f.label) {
                     case 0:
                         _c = this.props, store = _c.store, onSubmit = _c.onSubmit, api$1 = _c.api, asyncApi = _c.asyncApi, finishedField = _c.finishedField, checkInterval = _c.checkInterval, _d = _c.messages, saveSuccess = _d.saveSuccess, saveFailed = _d.saveFailed, resetAfterSubmit = _c.resetAfterSubmit, clearAfterSubmit = _c.clearAfterSubmit, onAction = _c.onAction, onSaved = _c.onSaved, onReset = _c.onReset, onFinished = _c.onFinished, onFailed = _c.onFailed, redirect = _c.redirect, reload = _c.reload, target = _c.target, env = _c.env, onChange = _c.onChange, clearPersistDataAfterSubmit = _c.clearPersistDataAfterSubmit, trimValues = _c.trimValues, dispatchEvent = _c.dispatchEvent, __ = _c.translate;
-                        // 做动作之前，先把数据同步一下。
-                        this.flush();
+                        if (!!action.skipFormFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
+                    case 1:
+                        _f.sent();
+                        _f.label = 2;
+                    case 2:
                         if (trimValues) {
                             store.trimValues();
                         }
@@ -583,7 +636,7 @@ var Form = /** @class */ (function (_super) {
                         if (data === this.props.data) {
                             data = store.data;
                         }
-                        if (!(Array.isArray(action.required) && action.required.length)) return [3 /*break*/, 4];
+                        if (!(Array.isArray(action.required) && action.required.length)) return [3 /*break*/, 6];
                         /** 如果是按钮指定了required，则校验前先清空一下遗留的校验报错 */
                         store.clearErrors();
                         fields = action.required.map(function (item) { return ({
@@ -591,31 +644,31 @@ var Form = /** @class */ (function (_super) {
                             rules: { isRequired: true }
                         }); });
                         return [4 /*yield*/, store.validateFields(fields)];
-                    case 1:
+                    case 3:
                         validationRes = _f.sent();
-                        if (!!validationRes) return [3 /*break*/, 3];
+                        if (!!validationRes) return [3 /*break*/, 5];
                         return [4 /*yield*/, dispatchEvent('validateError', this.props.data)];
-                    case 2:
+                    case 4:
                         dispatcher = _f.sent();
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             env.notify('error', __('Form.validateFailed'));
                         }
                         /** 抛异常是为了在dialog中catch这个错误，避免弹窗直接关闭 */
                         return [2 /*return*/, Promise.reject(__('Form.validateFailed'))];
-                    case 3:
+                    case 5:
                         /** 重置validated状态，保证submit时触发表单中的校验项 */
                         store.clearErrors();
-                        _f.label = 4;
-                    case 4:
+                        _f.label = 6;
+                    case 6:
                         if (!(action.type === 'submit' ||
                             action.actionType === 'submit' ||
                             action.actionType === 'confirm' ||
                             action.actionType === 'reset-and-submit' ||
-                            action.actionType === 'clear-and-submit')) return [3 /*break*/, 6];
+                            action.actionType === 'clear-and-submit')) return [3 /*break*/, 8];
                         _e = this.props, dispatchEvent_1 = _e.dispatchEvent, onEvent = _e.onEvent;
                         submitEvent = (_b = (_a = onEvent === null || onEvent === void 0 ? void 0 : onEvent.submit) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.length;
                         return [4 /*yield*/, dispatchEvent_1('submit', this.props.data)];
-                    case 5:
+                    case 7:
                         dispatcher = _f.sent();
                         if ((dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) || submitEvent) {
                             return [2 /*return*/];
@@ -627,119 +680,132 @@ var Form = /** @class */ (function (_super) {
                         else if (action.actionType === 'clear-and-submit') {
                             store.clear(this.handleReset(action));
                         }
-                        return [2 /*return*/, this.submit(function (values) {
+                        return [2 /*return*/, this.submit(function (values) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                var result, finnalAsyncApi_1;
                                 var _a;
-                                if (onSubmit && onSubmit(values, action) === false) {
-                                    return Promise.resolve(false);
-                                }
-                                // 走到这里代表校验成功了
-                                dispatchEvent_1('validateSucc', _this.props.data);
-                                if (target) {
-                                    _this.submitToTarget(Scoped.filterTarget(target, values), values);
-                                    /** 可能配置页面跳转事件，页面路由变化导致persistKey不一致，无法清除持久化数据，所以提交成功事件之前先清理一下 */
-                                    clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                    dispatchEvent_1('submitSucc', object.createObject(_this.props.data, values));
-                                }
-                                else if (action.actionType === 'reload') {
-                                    action.target &&
-                                        _this.reloadTarget(Scoped.filterTarget(action.target, values), values);
-                                }
-                                else if (action.actionType === 'dialog') {
-                                    store.openDialog(data, undefined, action.callback, delegate || _this.context);
-                                }
-                                else if (action.actionType === 'drawer') {
-                                    store.openDrawer(data);
-                                }
-                                else if (api.isEffectiveApi(action.api || api$1, values)) {
-                                    var finnalAsyncApi_1 = action.asyncApi || asyncApi;
-                                    api.isEffectiveApi(finnalAsyncApi_1, store.data) &&
-                                        store.updateData((_a = {},
-                                            _a[finishedField || 'finished'] = false,
-                                            _a));
-                                    return store
-                                        .saveRemote(action.api || api$1, values, {
-                                        successMessage: typeof saveSuccess === 'string'
-                                            ? tpl.filter(saveSuccess, store.data)
-                                            : undefined,
-                                        errorMessage: typeof saveFailed === 'string'
-                                            ? tpl.filter(saveFailed, store.data)
-                                            : undefined,
-                                        onSuccess: function (result) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                                            var dispatcher, cbResult;
-                                            var _this = this;
-                                            return tslib.__generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0:
-                                                        clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                                        return [4 /*yield*/, dispatchEvent_1('submitSucc', object.createObject(this.props.data, { result: result }))];
-                                                    case 1:
-                                                        dispatcher = _a.sent();
-                                                        if (!api.isEffectiveApi(finnalAsyncApi_1, store.data) ||
-                                                            store.data[finishedField || 'finished']) {
-                                                            return [2 /*return*/, {
-                                                                    cbResult: null,
-                                                                    dispatcher: dispatcher
-                                                                }];
-                                                        }
-                                                        cbResult = helper.until(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval).then(function (value) {
-                                                            // 派发asyncApiFinished事件
-                                                            dispatchEvent_1('asyncApiFinished', store.data);
+                                var _this = this;
+                                return tslib.__generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            if (!onSubmit) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, onSubmit(values, action)];
+                                        case 1:
+                                            result = _b.sent();
+                                            if (result === false) {
+                                                return [2 /*return*/, Promise.resolve(false)];
+                                            }
+                                            _b.label = 2;
+                                        case 2:
+                                            // 走到这里代表校验成功了
+                                            dispatchEvent_1('validateSucc', this.props.data);
+                                            if (target) {
+                                                this.submitToTarget(Scoped.filterTarget(target, values), values);
+                                                /** 可能配置页面跳转事件，页面路由变化导致persistKey不一致，无法清除持久化数据，所以提交成功事件之前先清理一下 */
+                                                clearPersistDataAfterSubmit && store.clearLocalPersistData();
+                                                dispatchEvent_1('submitSucc', object.createObject(this.props.data, values));
+                                            }
+                                            else if (action.actionType === 'reload') {
+                                                action.target &&
+                                                    this.reloadTarget(Scoped.filterTarget(action.target, values), values);
+                                            }
+                                            else if (action.actionType === 'dialog') {
+                                                store.openDialog(data, undefined, action.callback, delegate || this.context);
+                                            }
+                                            else if (action.actionType === 'drawer') {
+                                                store.openDrawer(data);
+                                            }
+                                            else if (api.isEffectiveApi(action.api || api$1, values)) {
+                                                finnalAsyncApi_1 = action.asyncApi || asyncApi;
+                                                api.isEffectiveApi(finnalAsyncApi_1, store.data) &&
+                                                    store.updateData((_a = {},
+                                                        _a[finishedField || 'finished'] = false,
+                                                        _a));
+                                                return [2 /*return*/, store
+                                                        .saveRemote(action.api || api$1, values, {
+                                                        successMessage: typeof saveSuccess === 'string'
+                                                            ? tpl.filter(saveSuccess, store.data)
+                                                            : undefined,
+                                                        errorMessage: typeof saveFailed === 'string'
+                                                            ? tpl.filter(saveFailed, store.data)
+                                                            : undefined,
+                                                        onSuccess: function (result) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                                            var dispatcher, cbResult;
+                                                            var _this = this;
+                                                            return tslib.__generator(this, function (_a) {
+                                                                switch (_a.label) {
+                                                                    case 0:
+                                                                        clearPersistDataAfterSubmit && store.clearLocalPersistData();
+                                                                        return [4 /*yield*/, dispatchEvent_1('submitSucc', object.createObject(this.props.data, { result: result }))];
+                                                                    case 1:
+                                                                        dispatcher = _a.sent();
+                                                                        if (!api.isEffectiveApi(finnalAsyncApi_1, store.data) ||
+                                                                            store.data[finishedField || 'finished']) {
+                                                                            return [2 /*return*/, {
+                                                                                    cbResult: null,
+                                                                                    dispatcher: dispatcher
+                                                                                }];
+                                                                        }
+                                                                        cbResult = helper.until(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval).then(function (value) {
+                                                                            // 派发asyncApiFinished事件
+                                                                            dispatchEvent_1('asyncApiFinished', store.data);
+                                                                        });
+                                                                        return [2 /*return*/, {
+                                                                                cbResult: cbResult,
+                                                                                dispatcher: dispatcher
+                                                                            }];
+                                                                }
+                                                            });
+                                                        }); },
+                                                        onFailed: function (result) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                                            var dispatcher;
+                                                            return tslib.__generator(this, function (_a) {
+                                                                switch (_a.label) {
+                                                                    case 0: return [4 /*yield*/, dispatchEvent_1('submitFail', object.createObject(this.props.data, { error: result }))];
+                                                                    case 1:
+                                                                        dispatcher = _a.sent();
+                                                                        return [2 /*return*/, {
+                                                                                dispatcher: dispatcher
+                                                                            }];
+                                                                }
+                                                            });
+                                                        }); }
+                                                    })
+                                                        .then(function (response) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                                        var feedback, confirmed;
+                                                        return tslib.__generator(this, function (_a) {
+                                                            switch (_a.label) {
+                                                                case 0:
+                                                                    onSaved && onSaved(values, response);
+                                                                    feedback = action.feedback || this.props.feedback;
+                                                                    if (!(feedback && helper.isVisible(feedback, store.data))) return [3 /*break*/, 2];
+                                                                    return [4 /*yield*/, this.openFeedback(feedback, store.data)];
+                                                                case 1:
+                                                                    confirmed = _a.sent();
+                                                                    // 如果 feedback 配置了，取消就跳过原有逻辑。
+                                                                    if (feedback.skipRestOnCancel && !confirmed) {
+                                                                        throw new helper.SkipOperation();
+                                                                    }
+                                                                    else if (feedback.skipRestOnConfirm && confirmed) {
+                                                                        throw new helper.SkipOperation();
+                                                                    }
+                                                                    _a.label = 2;
+                                                                case 2: return [2 /*return*/, object.injectObjectChain(store.data, {
+                                                                        __payload: values,
+                                                                        __response: response
+                                                                    })];
+                                                            }
                                                         });
-                                                        return [2 /*return*/, {
-                                                                cbResult: cbResult,
-                                                                dispatcher: dispatcher
-                                                            }];
-                                                }
-                                            });
-                                        }); },
-                                        onFailed: function (result) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                                            var dispatcher;
-                                            return tslib.__generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, dispatchEvent_1('submitFail', object.createObject(this.props.data, { error: result }))];
-                                                    case 1:
-                                                        dispatcher = _a.sent();
-                                                        return [2 /*return*/, {
-                                                                dispatcher: dispatcher
-                                                            }];
-                                                }
-                                            });
-                                        }); }
-                                    })
-                                        .then(function (response) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                                        var feedback, confirmed;
-                                        return tslib.__generator(this, function (_a) {
-                                            switch (_a.label) {
-                                                case 0:
-                                                    onSaved && onSaved(values, response);
-                                                    feedback = action.feedback || this.props.feedback;
-                                                    if (!(feedback && helper.isVisible(feedback, store.data))) return [3 /*break*/, 2];
-                                                    return [4 /*yield*/, this.openFeedback(feedback, store.data)];
-                                                case 1:
-                                                    confirmed = _a.sent();
-                                                    // 如果 feedback 配置了，取消就跳过原有逻辑。
-                                                    if (feedback.skipRestOnCancel && !confirmed) {
-                                                        throw new helper.SkipOperation();
-                                                    }
-                                                    else if (feedback.skipRestOnConfirm && confirmed) {
-                                                        throw new helper.SkipOperation();
-                                                    }
-                                                    _a.label = 2;
-                                                case 2: return [2 /*return*/, object.injectObjectChain(store.data, {
-                                                        __payload: values,
-                                                        __response: response
-                                                    })];
+                                                    }); })];
                                             }
-                                        });
-                                    }); });
-                                }
-                                else {
-                                    clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                    // type为submit，但是没有配api以及target时，只派发事件
-                                    dispatchEvent_1('submitSucc', object.createObject(_this.props.data, values));
-                                }
-                                return Promise.resolve(null);
-                            }, throwErrors)
+                                            else {
+                                                clearPersistDataAfterSubmit && store.clearLocalPersistData();
+                                                // type为submit，但是没有配api以及target时，只派发事件
+                                                dispatchEvent_1('submitSucc', object.createObject(this.props.data, values));
+                                            }
+                                            return [2 /*return*/, Promise.resolve(null)];
+                                    }
+                                });
+                            }); }, throwErrors, true)
                                 .then(function (values) {
                                 // 有可能 onSubmit return false 了，那么后面的就不应该再执行了。
                                 if (values === false) {
@@ -767,7 +833,7 @@ var Form = /** @class */ (function (_super) {
                                     throw reason;
                                 }
                             })];
-                    case 6:
+                    case 8:
                         if (action.type === 'reset' || action.actionType === 'reset') {
                             store.setCurrentAction(action);
                             store.reset(onReset);
@@ -778,7 +844,7 @@ var Form = /** @class */ (function (_super) {
                         }
                         else if (action.actionType === 'validate') {
                             store.setCurrentAction(action);
-                            return [2 /*return*/, this.validate(true, throwErrors)];
+                            return [2 /*return*/, this.validate(true, throwErrors, true, true)];
                         }
                         else if (action.actionType === 'dialog') {
                             store.setCurrentAction(action);
@@ -854,8 +920,8 @@ var Form = /** @class */ (function (_super) {
                             // 不识别的丢给上层去处理。
                             return [2 /*return*/, onAction(e, action, data, throwErrors, delegate || this.context)];
                         }
-                        _f.label = 7;
-                    case 7: return [2 /*return*/];
+                        _f.label = 9;
+                    case 9: return [2 /*return*/];
                 }
             });
         });

package/lib/renderers/Item.d.ts

@@ -361,6 +361,7 @@ export interface FormItemProps extends RendererProps {
     };
     error?: string;
     showErrorMsg?: boolean;
+    testid?: string;
 }
 export type FormControlProps = RendererProps & {
     onOpenDialog: (schema: Schema, data: any) => Promise<any>;