Merge branch 'develop' into vite

2022-02-13 11:46:26 +01:00
parent f8d0a91776 55c2c2e555
commit 29cdb1a8e5
65 changed files with 1905 additions and 826 deletions
@@ -69,6 +69,7 @@
        } else {
            const customMenu = customMenuIframe.get(menu.label);
            if (customMenu !== undefined) {
+                activeSubMenu = menu;
                props = { url: customMenu.url, allowApi: customMenu.allowApi };
                activeComponent = CustomSubMenu;
            } else {