Merge pull request #11282 from allenve/fix-globalEvent-bug

fix: 全局事件动作避免死锁
baidu · Nov 28, 2024 · 311bb4d · 311bb4d
2 parents ad360a3 + b12a976
commit 311bb4d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/amis-core/src/utils/renderer-event.ts b/packages/amis-core/src/utils/renderer-event.ts
@@ -225,8 +225,12 @@ export const bindGlobalEventForRenderer = (renderer: any) => {
           scoped: renderer?.context,
           data
         });
+        // 过滤掉当前的广播事件，避免循环广播
+        const actions = listener.actions.filter(
+          a => !(a.actionType === 'broadcast' && a.eventName === eventName)
+        );
 
-        runActions(listener.actions, renderer, rendererEvent);
+        runActions(actions, renderer, rendererEvent);
       };
     }
     return () => {

diff --git a/packages/amis-editor/src/renderer/event-control/action-config-panel.tsx b/packages/amis-editor/src/renderer/event-control/action-config-panel.tsx
@@ -46,7 +46,7 @@ export default class ActionConfigPanel extends React.Component<RendererProps> {
     } else {
       const __originActionSchema = data.__actionSchema;
       schema = isFunction(__originActionSchema)
-        ? __originActionSchema(manager)
+        ? __originActionSchema(manager, data)
         : __originActionSchema;
     }
 

diff --git a/...mis-editor/src/renderer/event-control/actionsPanelPlugins/otherActionsPanel/broadcast.tsx b/...mis-editor/src/renderer/event-control/actionsPanelPlugins/otherActionsPanel/broadcast.tsx
@@ -20,7 +20,7 @@ registerActionPanel('broadcast', {
       </div>
     );
   },
-  schema: (manager: EditorManager) => {
+  schema: (manager: EditorManager, data: any) => {
     const globalEvents =
       manager.config?.actionOptions?.globalEventGetter?.(manager) || [];
     return {
@@ -34,7 +34,8 @@ registerActionPanel('broadcast', {
           options: globalEvents.map(item => ({
             label: item.label,
             value: item.name,
-            mapping: item.mapping
+            mapping: item.mapping,
+            disabled: item.name === data.eventKey
           })),
           size: 'lg',
           mode: 'horizontal',