amis 1.9.1-beta.25 → 1.9.1-beta.28

package/lib/renderers/Form/index.js

@@ -418,265 +418,269 @@ var Form = /** @class */ (function (_super) {
         }, this.props.store.data);
     };
     Form.prototype.handleAction = function (e, action, data, throwErrors, delegate) {
-        var _this = this;
         if (throwErrors === void 0) { throwErrors = false; }
-        var _a = this.props, store = _a.store, onSubmit = _a.onSubmit, api = _a.api, asyncApi = _a.asyncApi, finishedField = _a.finishedField, checkInterval = _a.checkInterval, _b = _a.messages, saveSuccess = _b.saveSuccess, saveFailed = _b.saveFailed, resetAfterSubmit = _a.resetAfterSubmit, clearAfterSubmit = _a.clearAfterSubmit, onAction = _a.onAction, onSaved = _a.onSaved, onReset = _a.onReset, onFinished = _a.onFinished, onFailed = _a.onFailed, redirect = _a.redirect, reload = _a.reload, target = _a.target, env = _a.env, onChange = _a.onChange, clearPersistDataAfterSubmit = _a.clearPersistDataAfterSubmit, trimValues = _a.trimValues, dispatchEvent = _a.dispatchEvent, __ = _a.translate;
-        // 做动作之前，先把数据同步一下。
-        this.flush();
-        if (trimValues) {
-            store.trimValues();
-        }
-        // 如果 data 就是当前层，则 flush 一下。
-        if (data === this.props.data) {
-            data = store.data;
-        }
-        if (Array.isArray(action.required) && action.required.length) {
-            store.clearErrors(); // 如果是按钮指定了required，则校验前先清空一下遗留的校验报错
-            var fields = action.required.map(function (item) { return ({
-                name: item,
-                rules: { isRequired: true }
-            }); });
-            return store.validateFields(fields).then(function (result) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                var dispatcher;
-                return (0, tslib_1.__generator)(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!!result) return [3 /*break*/, 2];
-                            return [4 /*yield*/, dispatchEvent('validateError', this.props.data)];
-                        case 1:
-                            dispatcher = _a.sent();
-                            if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
-                                env.notify('error', __('Form.validateFailed'));
+        return (0, tslib_1.__awaiter)(this, void 0, Promise, function () {
+            var _a, store, onSubmit, api, asyncApi, finishedField, checkInterval, _b, saveSuccess, saveFailed, resetAfterSubmit, clearAfterSubmit, onAction, onSaved, onReset, onFinished, onFailed, redirect, reload, target, env, onChange, clearPersistDataAfterSubmit, trimValues, dispatchEvent, __, fields, validationRes, dispatcher;
+            var _this = this;
+            return (0, tslib_1.__generator)(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _a = this.props, store = _a.store, onSubmit = _a.onSubmit, api = _a.api, asyncApi = _a.asyncApi, finishedField = _a.finishedField, checkInterval = _a.checkInterval, _b = _a.messages, saveSuccess = _b.saveSuccess, saveFailed = _b.saveFailed, resetAfterSubmit = _a.resetAfterSubmit, clearAfterSubmit = _a.clearAfterSubmit, onAction = _a.onAction, onSaved = _a.onSaved, onReset = _a.onReset, onFinished = _a.onFinished, onFailed = _a.onFailed, redirect = _a.redirect, reload = _a.reload, target = _a.target, env = _a.env, onChange = _a.onChange, clearPersistDataAfterSubmit = _a.clearPersistDataAfterSubmit, trimValues = _a.trimValues, dispatchEvent = _a.dispatchEvent, __ = _a.translate;
+                        // 做动作之前，先把数据同步一下。
+                        this.flush();
+                        if (trimValues) {
+                            store.trimValues();
+                        }
+                        // 如果 data 就是当前层，则 flush 一下。
+                        if (data === this.props.data) {
+                            data = store.data;
+                        }
+                        if (!(Array.isArray(action.required) && action.required.length)) return [3 /*break*/, 4];
+                        store.clearErrors(); // 如果是按钮指定了required，则校验前先清空一下遗留的校验报错
+                        fields = action.required.map(function (item) { return ({
+                            name: item,
+                            rules: { isRequired: true }
+                        }); });
+                        return [4 /*yield*/, store.validateFields(fields)];
+                    case 1:
+                        validationRes = _c.sent();
+                        if (!!validationRes) return [3 /*break*/, 3];
+                        return [4 /*yield*/, dispatchEvent('validateError', this.props.data)];
+                    case 2:
+                        dispatcher = _c.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:
+                        /** 重置validated状态，保证submit时触发表单中的校验项 */
+                        store.clearErrors();
+                        _c.label = 4;
+                    case 4:
+                        if (action.type === 'submit' ||
+                            action.actionType === 'submit' ||
+                            action.actionType === 'confirm' ||
+                            action.actionType === 'reset-and-submit' ||
+                            action.actionType === 'clear-and-submit') {
+                            store.setCurrentAction(action);
+                            if (action.actionType === 'reset-and-submit') {
+                                store.reset(onReset);
                             }
-                            /** 抛异常是为了在dialog中catch这个错误，避免弹窗直接关闭 */
-                            return [2 /*return*/, Promise.reject(__('Form.validateFailed'))];
-                        case 2:
-                            dispatchEvent('validateSucc', this.props.data);
-                            this.handleAction(e, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, action), { required: undefined }), data, throwErrors, delegate);
-                            return [2 /*return*/];
-                    }
-                });
-            }); });
-        }
-        if (action.type === 'submit' ||
-            action.actionType === 'submit' ||
-            action.actionType === 'confirm' ||
-            action.actionType === 'reset-and-submit' ||
-            action.actionType === 'clear-and-submit') {
-            store.setCurrentAction(action);
-            if (action.actionType === 'reset-and-submit') {
-                store.reset(onReset);
-            }
-            else if (action.actionType === 'clear-and-submit') {
-                store.clear(onReset);
-            }
-            return this.submit(function (values) {
-                var _a;
-                if (onSubmit && onSubmit(values, action) === false) {
-                    return Promise.resolve(false);
-                }
-                // 走到这里代表校验成功了
-                dispatchEvent('validateSucc', _this.props.data);
-                if (target) {
-                    _this.submitToTarget(target, values);
-                    dispatchEvent('submitSucc', (0, helper_1.createObject)(_this.props.data, values));
-                }
-                else if (action.actionType === 'reload') {
-                    action.target && _this.reloadTarget(action.target, values);
-                }
-                else if (action.actionType === 'dialog') {
-                    store.openDialog(data);
-                }
-                else if (action.actionType === 'drawer') {
-                    store.openDrawer(data);
-                }
-                else if ((0, api_1.isEffectiveApi)(action.api || api, values)) {
-                    var finnalAsyncApi_1 = action.asyncApi || asyncApi;
-                    (0, api_1.isEffectiveApi)(finnalAsyncApi_1, store.data) &&
-                        store.updateData((_a = {},
-                            _a[finishedField || 'finished'] = false,
-                            _a));
-                    return store
-                        .saveRemote(action.api || api, values, {
-                        successMessage: saveSuccess,
-                        errorMessage: saveFailed,
-                        onSuccess: function (result) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                            var dispatcher, cbResult;
-                            var _this = this;
-                            return (0, tslib_1.__generator)(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, dispatchEvent('submitSucc', (0, helper_1.createObject)(this.props.data, { result: result }))];
-                                    case 1:
-                                        dispatcher = _a.sent();
-                                        if (!(0, api_1.isEffectiveApi)(finnalAsyncApi_1, store.data) ||
-                                            store.data[finishedField || 'finished']) {
-                                            return [2 /*return*/, {
-                                                    cbResult: null,
-                                                    dispatcher: dispatcher
-                                                }];
-                                        }
-                                        cbResult = (0, helper_1.until)(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval);
-                                        return [2 /*return*/, {
-                                                cbResult: cbResult,
-                                                dispatcher: dispatcher
-                                            }];
-                                }
-                            });
-                        }); },
-                        onFailed: function (result) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                            var dispatcher;
-                            return (0, tslib_1.__generator)(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, dispatchEvent('submitFail', (0, helper_1.createObject)(this.props.data, { error: result }))];
-                                    case 1:
-                                        dispatcher = _a.sent();
-                                        return [2 /*return*/, {
-                                                dispatcher: dispatcher
-                                            }];
-                                }
-                            });
-                        }); }
-                    })
-                        .then(function (response) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                        var feedback, confirmed;
-                        return (0, tslib_1.__generator)(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    onSaved && onSaved(values, response);
-                                    feedback = action.feedback || this.props.feedback;
-                                    if (!(feedback && (0, helper_1.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_1.SkipOperation();
+                            else if (action.actionType === 'clear-and-submit') {
+                                store.clear(onReset);
+                            }
+                            return [2 /*return*/, this.submit(function (values) {
+                                    var _a;
+                                    if (onSubmit && onSubmit(values, action) === false) {
+                                        return Promise.resolve(false);
+                                    }
+                                    // 走到这里代表校验成功了
+                                    dispatchEvent('validateSucc', _this.props.data);
+                                    if (target) {
+                                        _this.submitToTarget(target, values);
+                                        dispatchEvent('submitSucc', (0, helper_1.createObject)(_this.props.data, values));
+                                    }
+                                    else if (action.actionType === 'reload') {
+                                        action.target && _this.reloadTarget(action.target, values);
+                                    }
+                                    else if (action.actionType === 'dialog') {
+                                        store.openDialog(data);
+                                    }
+                                    else if (action.actionType === 'drawer') {
+                                        store.openDrawer(data);
+                                    }
+                                    else if ((0, api_1.isEffectiveApi)(action.api || api, values)) {
+                                        var finnalAsyncApi_1 = action.asyncApi || asyncApi;
+                                        (0, api_1.isEffectiveApi)(finnalAsyncApi_1, store.data) &&
+                                            store.updateData((_a = {},
+                                                _a[finishedField || 'finished'] = false,
+                                                _a));
+                                        return store
+                                            .saveRemote(action.api || api, values, {
+                                            successMessage: saveSuccess,
+                                            errorMessage: saveFailed,
+                                            onSuccess: function (result) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+                                                var dispatcher, cbResult;
+                                                var _this = this;
+                                                return (0, tslib_1.__generator)(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0: return [4 /*yield*/, dispatchEvent('submitSucc', (0, helper_1.createObject)(this.props.data, { result: result }))];
+                                                        case 1:
+                                                            dispatcher = _a.sent();
+                                                            if (!(0, api_1.isEffectiveApi)(finnalAsyncApi_1, store.data) ||
+                                                                store.data[finishedField || 'finished']) {
+                                                                return [2 /*return*/, {
+                                                                        cbResult: null,
+                                                                        dispatcher: dispatcher
+                                                                    }];
+                                                            }
+                                                            cbResult = (0, helper_1.until)(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval);
+                                                            return [2 /*return*/, {
+                                                                    cbResult: cbResult,
+                                                                    dispatcher: dispatcher
+                                                                }];
+                                                    }
+                                                });
+                                            }); },
+                                            onFailed: function (result) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+                                                var dispatcher;
+                                                return (0, tslib_1.__generator)(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0: return [4 /*yield*/, dispatchEvent('submitFail', (0, helper_1.createObject)(this.props.data, { error: result }))];
+                                                        case 1:
+                                                            dispatcher = _a.sent();
+                                                            return [2 /*return*/, {
+                                                                    dispatcher: dispatcher
+                                                                }];
+                                                    }
+                                                });
+                                            }); }
+                                        })
+                                            .then(function (response) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+                                            var feedback, confirmed;
+                                            return (0, tslib_1.__generator)(this, function (_a) {
+                                                switch (_a.label) {
+                                                    case 0:
+                                                        onSaved && onSaved(values, response);
+                                                        feedback = action.feedback || this.props.feedback;
+                                                        if (!(feedback && (0, helper_1.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_1.SkipOperation();
+                                                        }
+                                                        else if (feedback.skipRestOnConfirm && confirmed) {
+                                                            throw new helper_1.SkipOperation();
+                                                        }
+                                                        _a.label = 2;
+                                                    case 2: return [2 /*return*/];
+                                                }
+                                            });
+                                        }); });
                                     }
-                                    else if (feedback.skipRestOnConfirm && confirmed) {
-                                        throw new helper_1.SkipOperation();
+                                    else {
+                                        // type为submit，但是没有配api以及target时，只派发事件
+                                        dispatchEvent('submitSucc', (0, helper_1.createObject)(_this.props.data, values));
                                     }
-                                    _a.label = 2;
-                                case 2: return [2 /*return*/];
+                                    return Promise.resolve(null);
+                                })
+                                    .then(function (values) {
+                                    // 有可能 onSubmit return false 了，那么后面的就不应该再执行了。
+                                    if (values === false) {
+                                        return store.data;
+                                    }
+                                    if (onFinished && onFinished(values, action) === false) {
+                                        return values;
+                                    }
+                                    resetAfterSubmit && store.reset(onReset);
+                                    clearAfterSubmit && store.clear(onReset);
+                                    clearPersistDataAfterSubmit && store.clearLocalPersistData();
+                                    if (action.redirect || redirect) {
+                                        var finalRedirect = (0, tpl_1.filter)(action.redirect || redirect, store.data);
+                                        finalRedirect && env.jumpTo(finalRedirect, action);
+                                    }
+                                    else if (action.reload || reload) {
+                                        _this.reloadTarget(action.reload || reload, store.data);
+                                    }
+                                    action.close && _this.closeTarget(action.close);
+                                    return values;
+                                })
+                                    .catch(function (reason) {
+                                    if (reason instanceof helper_1.SkipOperation) {
+                                        return;
+                                    }
+                                    onFailed && onFailed(reason, store.errors);
+                                    if (throwErrors) {
+                                        throw reason;
+                                    }
+                                })];
+                        }
+                        else if (action.type === 'reset' || action.actionType === 'reset') {
+                            store.setCurrentAction(action);
+                            store.reset(onReset);
+                        }
+                        else if (action.actionType === 'clear') {
+                            store.setCurrentAction(action);
+                            store.clear(onReset);
+                        }
+                        else if (action.actionType === 'validate') {
+                            store.setCurrentAction(action);
+                            this.validate(true);
+                        }
+                        else if (action.actionType === 'dialog') {
+                            store.setCurrentAction(action);
+                            store.openDialog(data);
+                        }
+                        else if (action.actionType === 'drawer') {
+                            store.setCurrentAction(action);
+                            store.openDrawer(data);
+                        }
+                        else if (action.actionType === 'ajax') {
+                            store.setCurrentAction(action);
+                            if (!(0, api_1.isEffectiveApi)(action.api)) {
+                                return [2 /*return*/, env.alert(__("\u5F53 actionType \u4E3A ajax \u65F6\uFF0C\u8BF7\u8BBE\u7F6E api \u5C5E\u6027"))];
                             }
-                        });
-                    }); });
-                }
-                else {
-                    // type为submit，但是没有配api以及target时，只派发事件
-                    dispatchEvent('submitSucc', (0, helper_1.createObject)(_this.props.data, values));
-                }
-                return Promise.resolve(null);
-            })
-                .then(function (values) {
-                // 有可能 onSubmit return false 了，那么后面的就不应该再执行了。
-                if (values === false) {
-                    return store.data;
-                }
-                if (onFinished && onFinished(values, action) === false) {
-                    return values;
-                }
-                resetAfterSubmit && store.reset(onReset);
-                clearAfterSubmit && store.clear(onReset);
-                clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                if (action.redirect || redirect) {
-                    var finalRedirect = (0, tpl_1.filter)(action.redirect || redirect, store.data);
-                    finalRedirect && env.jumpTo(finalRedirect, action);
-                }
-                else if (action.reload || reload) {
-                    _this.reloadTarget(action.reload || reload, store.data);
-                }
-                action.close && _this.closeTarget(action.close);
-                return values;
-            })
-                .catch(function (reason) {
-                if (reason instanceof helper_1.SkipOperation) {
-                    return;
-                }
-                onFailed && onFailed(reason, store.errors);
-                if (throwErrors) {
-                    throw reason;
-                }
-            });
-        }
-        else if (action.type === 'reset' || action.actionType === 'reset') {
-            store.setCurrentAction(action);
-            store.reset(onReset);
-        }
-        else if (action.actionType === 'clear') {
-            store.setCurrentAction(action);
-            store.clear(onReset);
-        }
-        else if (action.actionType === 'validate') {
-            store.setCurrentAction(action);
-            this.validate(true);
-        }
-        else if (action.actionType === 'dialog') {
-            store.setCurrentAction(action);
-            store.openDialog(data);
-        }
-        else if (action.actionType === 'drawer') {
-            store.setCurrentAction(action);
-            store.openDrawer(data);
-        }
-        else if (action.actionType === 'ajax') {
-            store.setCurrentAction(action);
-            if (!(0, api_1.isEffectiveApi)(action.api)) {
-                return env.alert(__("\u5F53 actionType \u4E3A ajax \u65F6\uFF0C\u8BF7\u8BBE\u7F6E api \u5C5E\u6027"));
-            }
-            return store
-                .saveRemote(action.api, data, {
-                successMessage: __((action.messages && action.messages.success) || saveSuccess),
-                errorMessage: __((action.messages && action.messages.failed) || saveFailed)
-            })
-                .then(function (response) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                var redirect;
-                return (0, tslib_1.__generator)(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            response &&
-                                onChange &&
-                                onChange(store.data, (0, helper_1.difference)(store.data, store.pristine), this.props);
-                            if (!store.validated) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.validate(true)];
-                        case 1:
-                            _a.sent();
-                            _a.label = 2;
-                        case 2:
-                            if (!(action.feedback && (0, helper_1.isVisible)(action.feedback, store.data))) return [3 /*break*/, 4];
-                            return [4 /*yield*/, this.openFeedback(action.feedback, store.data)];
-                        case 3:
-                            _a.sent();
-                            _a.label = 4;
-                        case 4:
-                            redirect = action.redirect && (0, tpl_1.filter)(action.redirect, store.data);
-                            redirect && env.jumpTo(redirect, action);
-                            action.reload && this.reloadTarget(action.reload, store.data);
-                            action.close && this.closeTarget(action.close);
-                            return [2 /*return*/];
-                    }
-                });
-            }); })
-                .catch(function (e) {
-                onFailed && onFailed(e, store.errors);
-                if (throwErrors || action.countDown) {
-                    throw e;
+                            return [2 /*return*/, store
+                                    .saveRemote(action.api, data, {
+                                    successMessage: __((action.messages && action.messages.success) || saveSuccess),
+                                    errorMessage: __((action.messages && action.messages.failed) || saveFailed)
+                                })
+                                    .then(function (response) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+                                    var redirect;
+                                    return (0, tslib_1.__generator)(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                response &&
+                                                    onChange &&
+                                                    onChange(store.data, (0, helper_1.difference)(store.data, store.pristine), this.props);
+                                                if (!store.validated) return [3 /*break*/, 2];
+                                                return [4 /*yield*/, this.validate(true)];
+                                            case 1:
+                                                _a.sent();
+                                                _a.label = 2;
+                                            case 2:
+                                                if (!(action.feedback && (0, helper_1.isVisible)(action.feedback, store.data))) return [3 /*break*/, 4];
+                                                return [4 /*yield*/, this.openFeedback(action.feedback, store.data)];
+                                            case 3:
+                                                _a.sent();
+                                                _a.label = 4;
+                                            case 4:
+                                                redirect = action.redirect && (0, tpl_1.filter)(action.redirect, store.data);
+                                                redirect && env.jumpTo(redirect, action);
+                                                action.reload && this.reloadTarget(action.reload, store.data);
+                                                action.close && this.closeTarget(action.close);
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); })
+                                    .catch(function (e) {
+                                    onFailed && onFailed(e, store.errors);
+                                    if (throwErrors || action.countDown) {
+                                        throw e;
+                                    }
+                                })];
+                        }
+                        else if (action.actionType === 'reload') {
+                            store.setCurrentAction(action);
+                            if (action.target) {
+                                this.reloadTarget(action.target, data);
+                            }
+                            else {
+                                this.receive(data);
+                            }
+                            // action.target && this.reloadTarget(action.target, data);
+                        }
+                        else if (onAction) {
+                            // 不识别的丢给上层去处理。
+                            return [2 /*return*/, onAction(e, action, data, throwErrors, delegate || this.context)];
+                        }
+                        return [2 /*return*/];
                 }
             });
-        }
-        else if (action.actionType === 'reload') {
-            store.setCurrentAction(action);
-            if (action.target) {
-                this.reloadTarget(action.target, data);
-            }
-            else {
-                this.receive(data);
-            }
-            // action.target && this.reloadTarget(action.target, data);
-        }
-        else if (onAction) {
-            // 不识别的丢给上层去处理。
-            return onAction(e, action, data, throwErrors, delegate || this.context);
-        }
+        });
     };
     Form.prototype.handleQuery = function (query) {
         var _a, _b;