From 3b5fb07c3d8340feab01c09af8ab973a497b5e02 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 07 九月 2021 13:49:53 +0800
Subject: [PATCH] Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev
---
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
index cd21d81..c4febee 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,5 +1,5 @@
<template>
- <div v-if="!item.hidden" class="menu-wrapper">
+ <div v-if="!item.hidden">
<template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
<el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
@@ -56,6 +56,9 @@
},
methods: {
hasOneShowingChild(children = [], parent) {
+ if (!children) {
+ children = [];
+ }
const showingChildren = children.filter(item => {
if (item.hidden) {
return false
--
Gitblit v1.9.3