fix:crud不对table下发onEvent，避免事件重复监听&button二次确认问题 (#4595)

baidu · Jun 10, 2022 · 7b9182b · 7b9182b
1 parent 077e4f2
commit 7b9182b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/renderers/Action.tsx b/src/renderers/Action.tsx
@@ -913,25 +913,36 @@ export class ActionRenderer extends React.Component<ActionRendererProps> {
       mergedData = createObject(data, action.args);
     }
 
-    // 触发渲染器事件
-    const rendererEvent = await dispatchEvent(
-      e as React.MouseEvent<any> | string,
-      mergedData
-    );
-
-    // 阻止原有动作执行
-    if (rendererEvent?.prevented) {
-      return;
-    }
-
     if (!ignoreConfirm && action.confirmText && env.confirm) {
       let confirmed = await env.confirm(filter(action.confirmText, mergedData));
       if (confirmed) {
+        // 触发渲染器事件
+        const rendererEvent = await dispatchEvent(
+          e as React.MouseEvent<any> | string,
+          mergedData
+        );
+
+        // 阻止原有动作执行
+        if (rendererEvent?.prevented) {
+          return;
+        }
+
         await onAction(e, action, mergedData);
       } else if (action.countDown) {
         throw new Error('cancel');
       }
     } else {
+      // 触发渲染器事件
+      const rendererEvent = await dispatchEvent(
+        e as React.MouseEvent<any> | string,
+        mergedData
+      );
+
+      // 阻止原有动作执行
+      if (rendererEvent?.prevented) {
+        return;
+      }
+
       await onAction(e, action, mergedData);
     }
   }

diff --git a/src/renderers/CRUD.tsx b/src/renderers/CRUD.tsx
@@ -2067,6 +2067,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       autoGenerateFilter,
       onSelect,
       autoFillHeight,
+      onEvent,
       ...rest
     } = this.props;