Merge remote-tracking branch 'baidu/master'

This commit is contained in:
2betop 2020-04-22 19:32:14 +08:00
commit 7be7d22cc5

View File

@ -644,10 +644,13 @@ export default class Form extends React.Component<FormProps, object> {
// submit 也支持 feedback
if (action.feedback && isVisible(action.feedback, store.data)) {
await this.openFeedback(action.feedback, store.data);
const confirmed = await this.openFeedback(
action.feedback,
store.data
);
// 如果 feedback 配置了,取消就跳过原有逻辑。
if (action.feedback.skipRestOnCancel) {
if (action.feedback.skipRestOnCancel && !confirmed) {
throw new SkipOperation();
}
}