Commit faf5c9fd7ea40c407419a5a5c473f9b0c32c2a53

Authored by 无木
1 parent d5d5c4b4

fix(app-search): exclude hidden items

修复菜单搜索组件可能会显示被隐藏的菜单的问题
CHANGELOG.zh_CN.md
1 ### 🐛 Bug Fixes 1 ### 🐛 Bug Fixes
2 2
3 - **Table** 修复滚动条样式问题 3 - **Table** 修复滚动条样式问题
  4 +- **AppSearch** 修复可能会搜索隐藏菜单的问题
4 - **其它** 修复菜单默认折叠的配置不起作用的问题 5 - **其它** 修复菜单默认折叠的配置不起作用的问题
5 6
6 ## 2.6.0(2021-07-04) 7 ## 2.6.0(2021-07-04)
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: [