diff --git a/src/components/Menu/Menu.vue b/src/components/Menu/Menu.vue index cfbf402..2763cf0 100644 --- a/src/components/Menu/Menu.vue +++ b/src/components/Menu/Menu.vue @@ -156,7 +156,6 @@ export default defineComponent({ } } - return { openKeys, selectedKeys, diff --git a/src/components/Menu/RenderLevelMenu.vue b/src/components/Menu/RenderLevelMenu.vue index 74cd4e7..be92576 100644 --- a/src/components/Menu/RenderLevelMenu.vue +++ b/src/components/Menu/RenderLevelMenu.vue @@ -53,7 +53,7 @@ export default defineComponent({ }, path() { // only for level menu, set isLevelMenu = true - return getItemPath(this.item, true, this.permissions) + return getItemPath(this.item, this.permissions, true) }, }, data () { diff --git a/src/components/Menu/RenderSubMenu.vue b/src/components/Menu/RenderSubMenu.vue index 7e8edbc..587c80b 100644 --- a/src/components/Menu/RenderSubMenu.vue +++ b/src/components/Menu/RenderSubMenu.vue @@ -18,7 +18,7 @@ {{ menuTitle }} - {{ menuTitle }} + {{ menuTitle }}
diff --git a/src/utils/menu.js b/src/utils/menu.js index f8d58ec..fa3cc6f 100644 --- a/src/utils/menu.js +++ b/src/utils/menu.js @@ -1,9 +1,10 @@ -export const getItemPath = (item, isLevelMenu, permissions) => { +export const getItemPath = (item, permissions, isLevelMenu) => { if (item.hasOwnProperty('children')) { const children = permissions ? item.children.filter(mItem=>permissions[mItem.id] && permissions[mItem.id].show === true) : item.children; + if (children.length >= 1) { if (item.link_to === "noActionSubTop" || isLevelMenu) { - return getItemPath(children[0]); + return getItemPath(children[0], permissions, isLevelMenu); } else { return item.id; }