Skip to content

Commit

Permalink
optimize(projects): optimize code
Browse files Browse the repository at this point in the history
  • Loading branch information
Ohh-889 committed Sep 5, 2024
1 parent 132fa6f commit 6ce4f26
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 310 deletions.
13 changes: 7 additions & 6 deletions src/layouts/base-layout/MenuUtil.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { ElegantConstRoute } from '@elegant-router/types';
import type { MenuItemType, SubMenuType } from 'antd/es/menu/interface';

import { $t } from '@/locales';

Expand All @@ -9,11 +8,11 @@ import { $t } from '@/locales';
* @param routes Auth routes
*/
export function getGlobalMenusByAuthRoutes(routes: ElegantConstRoute[]) {
const menus: SubMenuType[] = [];
const menus: App.Global.Menu[] = [];

routes.forEach(route => {
if (!route.meta?.hideInMenu) {
const menu = getGlobalMenuByBaseRoute(route) as SubMenuType;
const menu = getGlobalMenuByBaseRoute(route);

if (route.children?.some(child => !child.meta?.hideInMenu)) {
menu.children = getGlobalMenusByAuthRoutes(route.children) || [];
Expand All @@ -31,12 +30,12 @@ export function getGlobalMenusByAuthRoutes(routes: ElegantConstRoute[]) {
*
* @param route
*/
export function getGlobalMenuByBaseRoute(route: ElegantConstRoute): MenuItemType {
export function getGlobalMenuByBaseRoute(route: ElegantConstRoute): App.Global.Menu {
const { name } = route;
const { title, i18nKey, icon = import.meta.env.VITE_MENU_ICON, localIcon } = route.meta ?? {};

const label = i18nKey ? $t(i18nKey) : title;
const menu: MenuItemType = {
const menu: App.Global.Menu = {
key: name,
label: <BeyondHiding title={label} />,
icon: (
Expand All @@ -54,10 +53,12 @@ export function getGlobalMenuByBaseRoute(route: ElegantConstRoute): MenuItemType

export function getActiveFirstLevelMenuKey(route: App.Global.TabRoute) {
const { hideInMenu, activeMenu } = route.meta;
const name = route.name as string;
const name = route.name;

const routeName = (hideInMenu ? activeMenu : name) || name;

if (!routeName) return '';

const [firstLevelRouteName] = routeName.split('_');

return firstLevelRouteName;
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/context/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { createContext } from 'react';
import type { SubMenuType } from 'antd/es/menu/interface';

export interface MixMenuContextProps {
activeFirstLevelMenuKey: string;
setActiveFirstLevelMenuKey: (key: string) => void;
firstLevelMenu: App.Global.Menu[];
allMenus: SubMenuType[];
allMenus: App.Global.Menu[];
childLevelMenus: App.Global.Menu[];
isActiveFirstLevelMenuHasChildren: boolean;
}
Expand Down
130 changes: 0 additions & 130 deletions src/layouts/modules/global-menu/BaseMenu.tsx

This file was deleted.

20 changes: 0 additions & 20 deletions src/layouts/modules/global-menu/HorizontalMixMenu.tsx

This file was deleted.

85 changes: 0 additions & 85 deletions src/layouts/modules/global-menu/VerticalMixMenu.tsx

This file was deleted.

Loading

0 comments on commit 6ce4f26

Please # to comment.