瀏覽代碼

fix: update htmlContent type and wrap button in div for manualClose (#16716)

tags/1.2.0
Wu Tianwei 7 月之前
父節點
當前提交
6a0f1dad7f
沒有連結到貢獻者的電子郵件帳戶。

+ 3
- 3
web/app/components/base/popover/index.tsx 查看文件



type IPopover = { type IPopover = {
className?: string className?: string
htmlContent: React.ReactNode<HtmlContentProps>
htmlContent: React.ReactNode
popupClassName?: string popupClassName?: string
trigger?: 'click' | 'hover' trigger?: 'click' | 'hover'
position?: 'bottom' | 'br' | 'bl' position?: 'bottom' | 'br' | 'bl'
> >
{({ close }) => ( {({ close }) => (
<div <div
className={cn('w-fit min-w-[130px] overflow-hidden rounded-lg bg-components-panel-bg shadow-lg ring-1 ring-black ring-opacity-5', popupClassName)}
className={cn('w-fit min-w-[130px] overflow-hidden rounded-lg bg-components-panel-bg shadow-lg ring-1 ring-black/5', popupClassName)}
{...(trigger !== 'hover' {...(trigger !== 'hover'
? {} ? {}
: { : {
}) })
} }
> >
{cloneElement(htmlContent as React.ReactNode<HtmlContentProps>, {
{cloneElement(htmlContent as React.ReactElement, {
onClose: () => onMouseLeave(open), onClose: () => onMouseLeave(open),
...(manualClose ...(manualClose
? { ? {

+ 10
- 7
web/app/components/datasets/documents/detail/segment-add/index.tsx 查看文件

manualClose manualClose
trigger='click' trigger='click'
htmlContent={ htmlContent={
<button
type='button'
className='system-md-regular flex w-full items-center rounded-lg px-2 py-1.5 text-text-secondary'
onClick={showBatchModal}
>
{t('datasetDocuments.list.action.batchAdd')}
</button>
// need to wrapper the button with div when manualClose is true
<div className='w-full p-1'>
<button
type='button'
className='system-md-regular flex w-full items-center rounded-lg px-2 py-1.5 text-text-secondary'
onClick={showBatchModal}
>
{t('datasetDocuments.list.action.batchAdd')}
</button>
</div>
} }
btnElement={ btnElement={
<div className='flex items-center justify-center' > <div className='flex items-center justify-center' >

Loading…
取消
儲存