ngskcloud
/
gcgj-dify-1.7.0
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: deperacted menu active

Browse Source
pull/13892/head
Joel 1 year ago
parent fd5028da5b
commit 2649f9f56f
2 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File

38
web/app/components/base/select/locale.tsx
Unescape Escape View File

@ -44,17 +44,15 @@ export default function Select({
<div className="px-1 py-1 "> <div className="px-1 py-1 ">
{items.map((item) => { {items.map((item) => {
return <MenuItem key={item.value}> return <MenuItem key={item.value}>
{({ active }) => ( <button
<button className={cn('data-[active]:bg-gray-100', 'group flex w-full items-center rounded-lg px-3 py-2 text-sm text-gray-700')}
className={cn(active && 'bg-gray-100', 'group flex w-full items-center rounded-lg px-3 py-2 text-sm text-gray-700')} onClick={(evt) => {
onClick={(evt) => { evt.preventDefault()
evt.preventDefault() onChange && onChange(item.value)
onChange && onChange(item.value) }}
}} >
> {item.name}
{item.name} </button>
</button>
)}
</MenuItem> </MenuItem>
})} })}
@ -94,16 +92,14 @@ export function InputSelect({
<div className="px-1 py-1 "> <div className="px-1 py-1 ">
{items.map((item) => { {items.map((item) => {
return <MenuItem key={item.value}> return <MenuItem key={item.value}>
{({ active }) => ( <button
<button className={'data-[active]:bg-gray-100 group flex w-full items-center rounded-md px-2 py-2 text-sm'}
className={`${active ? 'bg-gray-100' : ''} group flex w-full items-center rounded-md px-2 py-2 text-sm`} onClick={() => {
onClick={() => { onChange && onChange(item.value)
onChange && onChange(item.value) }}
}} >
> {item.name}
{item.name} </button>
</button>
)}
</MenuItem> </MenuItem>
})} })}

54
web/app/components/header/account-dropdown/index.tsx
Unescape Escape View File

@ -100,60 +100,60 @@ export default function AppSelector({ isMobile }: IAppSelector) {
</MenuItem> </MenuItem>
<div className="px-1 py-1"> <div className="px-1 py-1">
<MenuItem> <MenuItem>
{({ active }) => <Link <Link
className={classNames(itemClassName, 'group justify-between', className={classNames(itemClassName, 'group justify-between',
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} )}
href='/account' href='/account'
target='_self' rel='noopener noreferrer'> target='_self' rel='noopener noreferrer'>
<div>{t('common.account.account')}</div> <div>{t('common.account.account')}</div>
<ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' /> <ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' />
</Link>} </Link>
</MenuItem> </MenuItem>
<MenuItem> <MenuItem>
{({ active }) => <div className={classNames(itemClassName, <div className={classNames(itemClassName,
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} onClick={() => setShowAccountSettingModal({ payload: 'members' })}> )} onClick={() => setShowAccountSettingModal({ payload: 'members' })}>
<div>{t('common.userProfile.settings')}</div> <div>{t('common.userProfile.settings')}</div>
</div>} </div>
</MenuItem> </MenuItem>
{canEmailSupport && <MenuItem> {canEmailSupport && <MenuItem>
{({ active }) => <a <a
className={classNames(itemClassName, 'group justify-between', className={classNames(itemClassName, 'group justify-between',
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} )}
href={mailToSupport(userProfile.email, plan.type, langeniusVersionInfo.current_version)} href={mailToSupport(userProfile.email, plan.type, langeniusVersionInfo.current_version)}
target='_blank' rel='noopener noreferrer'> target='_blank' rel='noopener noreferrer'>
<div>{t('common.userProfile.emailSupport')}</div> <div>{t('common.userProfile.emailSupport')}</div>
<ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' /> <ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' />
</a>} </a>
</MenuItem>} </MenuItem>}
<MenuItem> <MenuItem>
{({ active }) => <Link <Link
className={classNames(itemClassName, 'group justify-between', className={classNames(itemClassName, 'group justify-between',
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} )}
href='https://github.com/langgenius/dify/discussions/categories/feedbacks' href='https://github.com/langgenius/dify/discussions/categories/feedbacks'
target='_blank' rel='noopener noreferrer'> target='_blank' rel='noopener noreferrer'>
<div>{t('common.userProfile.communityFeedback')}</div> <div>{t('common.userProfile.communityFeedback')}</div>
<ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' /> <ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' />
</Link>} </Link>
</MenuItem> </MenuItem>
<MenuItem> <MenuItem>
{({ active }) => <Link <Link
className={classNames(itemClassName, 'group justify-between', className={classNames(itemClassName, 'group justify-between',
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} )}
href='https://discord.gg/5AEfbxcd9k' href='https://discord.gg/5AEfbxcd9k'
target='_blank' rel='noopener noreferrer'> target='_blank' rel='noopener noreferrer'>
<div>{t('common.userProfile.community')}</div> <div>{t('common.userProfile.community')}</div>
<ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' /> <ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' />
</Link>} </Link>
</MenuItem> </MenuItem>
<MenuItem> <MenuItem>
{({ active }) => <Link <Link
className={classNames(itemClassName, 'group justify-between', className={classNames(itemClassName, 'group justify-between',
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} )}
href={ href={
locale !== LanguagesSupported[1] ? 'https://docs.dify.ai/' : `https://docs.dify.ai/v/${locale.toLowerCase()}/` locale !== LanguagesSupported[1] ? 'https://docs.dify.ai/' : `https://docs.dify.ai/v/${locale.toLowerCase()}/`
@ -161,46 +161,46 @@ export default function AppSelector({ isMobile }: IAppSelector) {
target='_blank' rel='noopener noreferrer'> target='_blank' rel='noopener noreferrer'>
<div>{t('common.userProfile.helpCenter')}</div> <div>{t('common.userProfile.helpCenter')}</div>
<ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' /> <ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' />
</Link>} </Link>
</MenuItem> </MenuItem>
<MenuItem> <MenuItem>
{({ active }) => <Link <Link
className={classNames(itemClassName, 'group justify-between', className={classNames(itemClassName, 'group justify-between',
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} )}
href='https://roadmap.dify.ai' href='https://roadmap.dify.ai'
target='_blank' rel='noopener noreferrer'> target='_blank' rel='noopener noreferrer'>
<div>{t('common.userProfile.roadmap')}</div> <div>{t('common.userProfile.roadmap')}</div>
<ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' /> <ArrowUpRight className='hidden w-[14px] h-[14px] text-text-tertiary group-hover:flex' />
</Link>} </Link>
</MenuItem> </MenuItem>
{ {
document?.body?.getAttribute('data-public-site-about') !== 'hide' && ( document?.body?.getAttribute('data-public-site-about') !== 'hide' && (
<MenuItem> <MenuItem>
{({ active }) => <div className={classNames(itemClassName, 'justify-between', <div className={classNames(itemClassName, 'justify-between',
active && 'bg-state-base-hover', 'data-[active]:bg-state-base-hover',
)} onClick={() => setAboutVisible(true)}> )} onClick={() => setAboutVisible(true)}>
<div>{t('common.userProfile.about')}</div> <div>{t('common.userProfile.about')}</div>
<div className='flex items-center'> <div className='flex items-center'>
<div className='mr-2 system-xs-regular text-text-tertiary'>{langeniusVersionInfo.current_version}</div> <div className='mr-2 system-xs-regular text-text-tertiary'>{langeniusVersionInfo.current_version}</div>
<Indicator color={langeniusVersionInfo.current_version === langeniusVersionInfo.latest_version ? 'green' : 'orange'} /> <Indicator color={langeniusVersionInfo.current_version === langeniusVersionInfo.latest_version ? 'green' : 'orange'} />
</div> </div>
</div>} </div>
</MenuItem> </MenuItem>
) )
} }
</div> </div>
<MenuItem> <MenuItem>
{({ active }) => <div className='p-1' onClick={() => handleLogout()}> <div className='p-1' onClick={() => handleLogout()}>
<div <div
className={ className={
classNames('flex items-center justify-between h-9 px-3 rounded-lg cursor-pointer group hover:bg-state-base-hover', classNames('flex items-center justify-between h-9 px-3 rounded-lg cursor-pointer group hover:bg-state-base-hover',
active && 'bg-state-base-hover')} 'data-[active]:bg-state-base-hover')}
> >
<div className='system-md-regular text-text-secondary'>{t('common.userProfile.logout')}</div> <div className='system-md-regular text-text-secondary'>{t('common.userProfile.logout')}</div>
<RiLogoutBoxRLine className='hidden w-4 h-4 text-text-tertiary group-hover:flex' /> <RiLogoutBoxRLine className='hidden w-4 h-4 text-text-tertiary group-hover:flex' />
</div> </div>
</div>} </div>
</MenuItem> </MenuItem>
</MenuItems> </MenuItems>
</Transition> </Transition>

Write Preview
Loading…
Cancel
Save