Commit faf5c9fd7ea40c407419a5a5c473f9b0c32c2a53
1 parent
d5d5c4b4
fix(app-search): exclude hidden items
修复菜单搜索组件可能会显示被隐藏的菜单的问题
Showing
3 changed files
with
5 additions
and
4 deletions
CHANGELOG.zh_CN.md
src/components/Application/src/search/useMenuSearch.ts
@@ -55,7 +55,7 @@ export function useMenuSearch(refs: Ref<HTMLElement[]>, scrollWrap: Ref<ElRef>, | @@ -55,7 +55,7 @@ export function useMenuSearch(refs: Ref<HTMLElement[]>, scrollWrap: Ref<ElRef>, | ||
55 | } | 55 | } |
56 | const reg = createSearchReg(unref(keyword)); | 56 | const reg = createSearchReg(unref(keyword)); |
57 | const filterMenu = filter(menuList, (item) => { | 57 | const filterMenu = filter(menuList, (item) => { |
58 | - return reg.test(item.name); | 58 | + return reg.test(item.name) && !item.hideMenu; |
59 | }); | 59 | }); |
60 | searchResult.value = handlerSearchResult(filterMenu, reg); | 60 | searchResult.value = handlerSearchResult(filterMenu, reg); |
61 | activeIndex.value = 0; | 61 | activeIndex.value = 0; |
@@ -64,8 +64,8 @@ export function useMenuSearch(refs: Ref<HTMLElement[]>, scrollWrap: Ref<ElRef>, | @@ -64,8 +64,8 @@ export function useMenuSearch(refs: Ref<HTMLElement[]>, scrollWrap: Ref<ElRef>, | ||
64 | function handlerSearchResult(filterMenu: Menu[], reg: RegExp, parent?: Menu) { | 64 | function handlerSearchResult(filterMenu: Menu[], reg: RegExp, parent?: Menu) { |
65 | const ret: SearchResult[] = []; | 65 | const ret: SearchResult[] = []; |
66 | filterMenu.forEach((item) => { | 66 | filterMenu.forEach((item) => { |
67 | - const { name, path, icon, children } = item; | ||
68 | - if (reg.test(name) && !children?.length) { | 67 | + const { name, path, icon, children, hideMenu } = item; |
68 | + if (!hideMenu && reg.test(name) && !children?.length) { | ||
69 | ret.push({ | 69 | ret.push({ |
70 | name: parent?.name ? `${parent.name} > ${name}` : name, | 70 | name: parent?.name ? `${parent.name} > ${name}` : name, |
71 | path, | 71 | path, |
src/router/routes/modules/demo/setup.ts
@@ -11,7 +11,7 @@ const setup: AppRouteModule = { | @@ -11,7 +11,7 @@ const setup: AppRouteModule = { | ||
11 | meta: { | 11 | meta: { |
12 | orderNo: 90000, | 12 | orderNo: 90000, |
13 | hideChildrenInMenu: true, | 13 | hideChildrenInMenu: true, |
14 | - icon: 'simple-icons:about-dot-me', | 14 | + icon: 'whh:paintroll', |
15 | title: t('routes.demo.setup.page'), | 15 | title: t('routes.demo.setup.page'), |
16 | }, | 16 | }, |
17 | children: [ | 17 | children: [ |