fix/build

This commit is contained in:
tangly1024.com
2023-03-27 18:41:03 +08:00
parent c4f0bbddb1
commit 4241203ec9
11 changed files with 19 additions and 19 deletions

View File

@@ -36,8 +36,8 @@ export const Nav = (props) => {
<nav className="w-full bg-white md:pt-0 px-6 relative z-20 border-t border-b border-gray-light dark:border-hexo-black-gray dark:bg-black">
<div className="container mx-auto max-w-4xl md:flex justify-between items-center text-sm md:text-md md:justify-start">
<ul className="w-full text-center md:text-left flex flex-wrap justify-center items-stretch md:justify-start md:items-start">
{/* {links.map(link => <NormalMenuItem key={link.id} link={link}/>)} */}
{links.map(link => <MenuItemDrop key={link.id} link={link} />)}
{/* {links.map(link => <NormalMenuItem key={link?.id} link={link}/>)} */}
{links.map(link => <MenuItemDrop key={link?.id} link={link} />)}
</ul>
{/* <div className="w-full md:w-1/3 text-center md:text-right"> */}
{/* <!-- extra links --> */}

View File

@@ -31,10 +31,10 @@ export const MenuList = (props) => {
return (<>
<nav id='nav-pc' className='hidden md:block font-sans text-sm z-20'>
{links?.map(link => <MenuItemDrop key={link.id} link={link} />)}
{links?.map(link => <MenuItemDrop key={link?.id} link={link} />)}
</nav>
<nav id='nav-mobile' className='block md:hidden font-sans text-sm z-20 pb-1'>
{links?.map(link => <MenuItemCollapse key={link.id} link={link} onHeightChange={props.onHeightChange}/>)}
{links?.map(link => <MenuItemCollapse key={link?.id} link={link} onHeightChange={props.onHeightChange}/>)}
</nav>
</>

View File

@@ -30,8 +30,8 @@ export const MenuListSide = (props) => {
return (
<nav>
{/* {links.map(link => <MenuItemNormal key={link.id} link={link} />)} */}
{links?.map(link => <MenuItemCollapse key={link.id} link={link} />)}
{/* {links.map(link => <MenuItemNormal key={link?.id} link={link} />)} */}
{links?.map(link => <MenuItemCollapse key={link?.id} link={link} />)}
</nav>
)
}

View File

@@ -31,7 +31,7 @@ export const MenuListTop = (props) => {
return (<>
<nav id='nav-mobile' className='leading-8 justify-center font-light w-full flex'>
{links?.map(link => link && link.show && <MenuItemDrop key={link.id} link={link} />)}
{links?.map(link => link && link.show && <MenuItemDrop key={link?.id} link={link} />)}
</nav>
</>)
}

View File

@@ -30,8 +30,8 @@ export const MenuListSide = (props) => {
return (
<nav>
{/* {links.map(link => <MenuItemNormal key={link.id} link={link} />)} */}
{links?.map(link => <MenuItemCollapse key={link.id} link={link} />)}
{/* {links.map(link => <MenuItemNormal key={link?.id} link={link} />)} */}
{links?.map(link => <MenuItemCollapse key={link?.id} link={link} />)}
</nav>
)
}

View File

@@ -30,7 +30,7 @@ export const MenuListTop = (props) => {
return (
<nav id='nav' className='leading-8 flex justify-center font-light w-full'>
{links?.map(link => <MenuItemDrop key={link.id} link={link}/>)}
{links?.map(link => <MenuItemDrop key={link?.id} link={link}/>)}
</nav>
)
}

View File

@@ -31,8 +31,8 @@ export const MenuBarMobile = (props) => {
return (
<nav id='nav' className=' text-md'>
{/* {links.map(link => <NormalMenu key={link.id} link={link}/>)} */}
{links?.map(link => <MenuItemCollapse onHeightChange={props.onHeightChange} key={link.id} link={link}/>)}
{/* {links.map(link => <NormalMenu key={link?.id} link={link}/>)} */}
{links?.map(link => <MenuItemCollapse onHeightChange={props.onHeightChange} key={link?.id} link={link}/>)}
</nav>
)

View File

@@ -66,7 +66,7 @@ export default function TopNavBar(props) {
{/* 桌面端顶部菜单 */}
<div className='hidden md:flex'>
{links && links?.map(link => <MenuItemDrop key={link.id} link={link}/>)}
{links && links?.map(link => <MenuItemDrop key={link?.id} link={link}/>)}
</div>
</div>
</div>

View File

@@ -35,12 +35,12 @@ export const MenuList = (props) => {
<>
{/* 大屏模式菜单 */}
<nav id='nav' className='hidden md:block leading-8 text-gray-500 dark:text-gray-400 font-sans'>
{links.map(link => link && link.show && <MenuItemDrop key={link.id} link={link} />)}
{links.map(link => link && link.show && <MenuItemDrop key={link?.id} link={link} />)}
</nav>
{/* 移动端菜单 */}
<div id='nav-menu-mobile' className='block md:hidden my-auto justify-start bg-white'>
{links?.map(link => link && link.show && <MenuItemCollapse onHeightChange={props.onHeightChange} key={link.id} link={link} />)}
{links?.map(link => link && link.show && <MenuItemCollapse onHeightChange={props.onHeightChange} key={link?.id} link={link} />)}
</div>
</>
)

View File

@@ -104,12 +104,12 @@ const NavBar = props => {
return (
<div className="flex-shrink-0">
<ul className=" hidden md:flex flex-row">
{links?.map(link => <MenuItemDrop key={link.id} link={link} />)}
{links?.map(link => <MenuItemDrop key={link?.id} link={link} />)}
</ul>
<div className='md:hidden'><i onClick={toggleOpen} className='fas fa-bars cursor-pointer px-5 block md:hidden'></i>
<Collapse collapseRef={collapseRef} isOpen={isOpen} type='vertical' className='fixed top-16 right-6'>
<div className='dark:border-black bg-white dark:bg-black rounded border p-2 text-sm'>
{links?.map(link => <MenuItemCollapse key={link.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
{links?.map(link => <MenuItemCollapse key={link?.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
</div>
</Collapse>
</div>

View File

@@ -51,7 +51,7 @@ export const MenuList = ({ customNav, customMenu }) => {
return (<>
{/* 大屏模式菜单 */}
<div id='nav-menu-pc' className='hidden md:flex my-auto'>
{links?.map(link => <MenuItemDrop key={link.id} link={link} />)}
{links?.map(link => <MenuItemDrop key={link?.id} link={link} />)}
</div>
{/* 移动端小屏菜单 */}
<div id='nav-menu-mobile' className='flex md:hidden my-auto justify-start'>
@@ -62,7 +62,7 @@ export const MenuList = ({ customNav, customMenu }) => {
<Collapse collapseRef={collapseRef} className='absolute w-full top-12 left-0' isOpen={isOpen}>
<div id='menu-wrap' className='bg-white dark:border-hexo-black-gray border'>
{links?.map(link => <MenuItemCollapse key={link.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
{links?.map(link => <MenuItemCollapse key={link?.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
</div>
</Collapse>
</div>