Skip to content

Commit

Permalink
menu bug fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
munkh-altai committed Sep 1, 2023
1 parent e6976e9 commit 199c533
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/components/Menu/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ export default defineComponent({
}
}
return {
openKeys,
selectedKeys,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Menu/RenderLevelMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Menu/RenderSubMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<span>{{ menuTitle }}</span>
</NuxtLink>
<NuxtLink :to="`/admin/p/${item.id}`" v-else>
<span>{{ menuTitle }}</span>
<span>{{ menuTitle }} </span>
</NuxtLink>
</a-menu-item>
<div v-else-if="!hasItems && item.link_to === 'divider' && mode === 'inline'" class="p-4 text-slate-500">
Expand Down
5 changes: 3 additions & 2 deletions src/utils/menu.js
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down

0 comments on commit 199c533

Please sign in to comment.