test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-04 21:08:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #6940 from 2betop/fix-form-submit-event

Browse Source 
fix: 修复 form submit 事件触发时机问题 Close: #6901
This commit is contained in:
hsm-lv 2023-05-22 10:51:46 +08:00 committed by GitHub
commit 0ef1446ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/amis-core/src/renderers/Form.tsx
View File

@ -1068,6 +1068,7 @@ export default class Form extends React.Component<FormProps, object> {
if (data === this.props.data) {
data = store.data;
}
if (Array.isArray(action.required) && action.required.length) {
/** 如果是按钮指定了required，则校验前先清空一下遗留的校验报错 */
store.clearErrors();
@ -1101,6 +1102,14 @@ export default class Form extends React.Component<FormProps, object> {
action.actionType === 'reset-and-submit' ||
action.actionType === 'clear-and-submit'
) {
// 配了submit事件的表示将提交逻辑全部托管给事件
const {dispatchEvent, onEvent} = this.props;
const submitEvent = onEvent?.submit?.actions?.length;
const dispatcher = await dispatchEvent('submit', this.props.data);
if (dispatcher?.prevented || submitEvent) {
return;
}
store.setCurrentAction(action);
if (action.actionType === 'reset-and-submit') {
@ -1891,13 +1900,6 @@ export class FormRenderer extends Form {
// return;
// }
// 配了submit事件的表示将提交逻辑全部托管给事件
const {dispatchEvent, onEvent} = this.props;
const submitEvent = onEvent?.submit?.actions?.length;
const dispatcher = await dispatchEvent('submit', this.props.data);
if (dispatcher?.prevented || submitEvent) {
return;
}
if (action.target && action.actionType !== 'reload') {
const scoped = this.context as IScopedContext;