diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index 3720062..5e82ea3 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -59,11 +59,9 @@ const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[]) const showingChildren = children.filter((item) => { if (item.hidden) { return false; - } else { - // Temp set(will be used if only has one showing child) - onlyOneChild.value = item; - return true; } + onlyOneChild.value = item; + return true; }); // When there is only one child router, the child router is displayed by default diff --git a/src/plugins/cache.ts b/src/plugins/cache.ts index cf43680..e5ceead 100644 --- a/src/plugins/cache.ts +++ b/src/plugins/cache.ts @@ -26,6 +26,7 @@ const sessionCache = { if (value != null) { return JSON.parse(value); } + return null; }, remove(key: string) { sessionStorage.removeItem(key); @@ -59,6 +60,7 @@ const localCache = { if (value != null) { return JSON.parse(value); } + return null; }, remove(key: string) { localStorage.removeItem(key); diff --git a/src/router/index.ts b/src/router/index.ts index 6c12791..c5b472f 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -189,9 +189,8 @@ const router = createRouter({ scrollBehavior(to, from, savedPosition) { if (savedPosition) { return savedPosition; - } else { - return { top: 0 }; } + return { top: 0 }; } });