diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 6b9b3837..9b548a9c 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,6 +1,7 @@ ### 🐛 Bug Fixes - **Table** 修复滚动条样式问题 +- **AppSearch** 修复可能会搜索隐藏菜单的问题 - **其它** 修复菜单默认折叠的配置不起作用的问题 ## 2.6.0(2021-07-04) diff --git a/src/components/Application/src/search/useMenuSearch.ts b/src/components/Application/src/search/useMenuSearch.ts index df6f3957..c7441d9c 100644 --- a/src/components/Application/src/search/useMenuSearch.ts +++ b/src/components/Application/src/search/useMenuSearch.ts @@ -55,7 +55,7 @@ export function useMenuSearch(refs: Ref, scrollWrap: Ref, } const reg = createSearchReg(unref(keyword)); const filterMenu = filter(menuList, (item) => { - return reg.test(item.name); + return reg.test(item.name) && !item.hideMenu; }); searchResult.value = handlerSearchResult(filterMenu, reg); activeIndex.value = 0; @@ -64,8 +64,8 @@ export function useMenuSearch(refs: Ref, scrollWrap: Ref, function handlerSearchResult(filterMenu: Menu[], reg: RegExp, parent?: Menu) { const ret: SearchResult[] = []; filterMenu.forEach((item) => { - const { name, path, icon, children } = item; - if (reg.test(name) && !children?.length) { + const { name, path, icon, children, hideMenu } = item; + if (!hideMenu && reg.test(name) && !children?.length) { ret.push({ name: parent?.name ? `${parent.name} > ${name}` : name, path, diff --git a/src/router/routes/modules/demo/setup.ts b/src/router/routes/modules/demo/setup.ts index 39df1b11..cec2e298 100644 --- a/src/router/routes/modules/demo/setup.ts +++ b/src/router/routes/modules/demo/setup.ts @@ -11,7 +11,7 @@ const setup: AppRouteModule = { meta: { orderNo: 90000, hideChildrenInMenu: true, - icon: 'simple-icons:about-dot-me', + icon: 'whh:paintroll', title: t('routes.demo.setup.page'), }, children: [