From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
index 7289ddf..c4febee 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
@@ -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