fix: 修复接口及表单报错依然执行倒计时问题 Closes #10264 (#10340)

吴多益 · web-flow · commit 7761c682ea8c · 2024-05-31T12:13:10.000+08:00
diff --git a/packages/amis/src/renderers/Action.tsx b/packages/amis/src/renderers/Action.tsx
@@ -1009,7 +1009,7 @@ export class ActionRenderer extends React.Component<ActionRendererProps> {
         }
 
         // 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认
-        onAction(
+        await onAction(
           e,
           {...action, ignoreConfirm: !!hasOnEvent},
           mergedData,
@@ -1032,7 +1032,14 @@ export class ActionRenderer extends React.Component<ActionRendererProps> {
         return;
       }
 
-      onAction(e, action, mergedData, undefined, undefined, rendererEvent);
+      await onAction(
+        e,
+        action,
+        mergedData,
+        undefined,
+        undefined,
+        rendererEvent
+      );
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1009,7 +1009,7 @@ export class ActionRenderer extends React.Component<ActionRendererProps> {`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`	`1011`	`// 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认`
`1012`		`- onAction(`
	`1012`	`+ await onAction(`
`1013`	`1013`	`e,`
`1014`	`1014`	`{...action, ignoreConfirm: !!hasOnEvent},`
`1015`	`1015`	`mergedData,`
`@@ -1032,7 +1032,14 @@ export class ActionRenderer extends React.Component<ActionRendererProps> {`
`1032`	`1032`	`return;`
`1033`	`1033`	`}`
`1034`	`1034`
`1035`		`- onAction(e, action, mergedData, undefined, undefined, rendererEvent);`
	`1035`	`+ await onAction(`
	`1036`	`+ e,`
	`1037`	`+ action,`
	`1038`	`+ mergedData,`
	`1039`	`+ undefined,`
	`1040`	`+ undefined,`
	`1041`	`+ rendererEvent`
	`1042`	`+ );`
`1036`	`1043`	`}`
`1037`	`1044`	`}`
`1038`	`1045`