From ced82abdcfdeb120690efc536cbac52078233e8a Mon Sep 17 00:00:00 2001 From: dingyongliang Date: Fri, 6 Sep 2024 10:46:27 +0800 Subject: [PATCH] * [bug#54793] fix contextmenu cant show. --- lib/zin/wg/mainnavbar/js/v1.js | 7 ++++--- lib/zin/wg/navbar/js/v1.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/zin/wg/mainnavbar/js/v1.js b/lib/zin/wg/mainnavbar/js/v1.js index 7cbdd386d0..63e4d9198e 100644 --- a/lib/zin/wg/mainnavbar/js/v1.js +++ b/lib/zin/wg/mainnavbar/js/v1.js @@ -181,14 +181,15 @@ $(document).on( ]; - zui.ContextMenu.show( + if(window.customNavbarContextMenu) window.customNavbarContextMenu.hide(); + window.customNavbarContextMenu = zui.ContextMenu.show( { - hideOthers: true, element: $item[0], placement: 'bottom-start', items: items, event: event, - onClickItem: (info) => info.event.preventDefault() + onClickItem: (info) => info.event.preventDefault(), + onHide: () => window.customNavbarContextMenu = null, } ); event.preventDefault(); diff --git a/lib/zin/wg/navbar/js/v1.js b/lib/zin/wg/navbar/js/v1.js index 4b82b31473..f8139b7ff0 100644 --- a/lib/zin/wg/navbar/js/v1.js +++ b/lib/zin/wg/navbar/js/v1.js @@ -220,14 +220,15 @@ $(document).on( } } ]; - zui.ContextMenu.show( + if(window.customNavbarContextMenu) window.customNavbarContextMenu.hide(); + window.customNavbarContextMenu = zui.ContextMenu.show( { - hideOthers: true, element: $item[0], placement: 'bottom-start', items: items, event: event, - onClickItem: (info) => info.event.preventDefault() + onClickItem: (info) => info.event.preventDefault(), + onHide: () => window.customNavbarContextMenu = null, } ); event.preventDefault();