opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-29 04:26:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/parent-child-retrieval' of https://github.com/langgenius/dify into feat/parent-child-retrieval

Browse Source
This commit is contained in:
twwu 2024-12-12 17:14:44 +08:00
commit a8254c29c5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/datasets/common/document-picker/preview-document-picker.tsx
View File

@ -54,7 +54,7 @@ const PreviewDocumentPicker: FC<Props> = ({
<FileIcon name={name} extension={extension} size='md' /> <FileIcon name={name} extension={extension} size='md' />
<div className='flex flex-col items-start ml-1'> <div className='flex flex-col items-start ml-1'>
<div className='flex items-center space-x-0.5'> <div className='flex items-center space-x-0.5'>
<span className={cn('system-md-semibold')}> {name || '--'}</span> <span className={cn('system-md-semibold max-w-[200px] overflow-clip')}> {name || '--'}</span>
<ArrowIcon className={'h-[18px] w-[18px] text-text-primary'} /> <ArrowIcon className={'h-[18px] w-[18px] text-text-primary'} />
</div> </div>
</div> </div>

12
web/app/components/datasets/create/step-two/index.tsx
View File

@ -584,14 +584,16 @@ const StepTwo = ({
<div className={s.label}>{t('datasetCreation.stepTwo.segmentation')}</div> <div className={s.label}>{t('datasetCreation.stepTwo.segmentation')}</div>
<div className='max-w-[640px]'> <div className='max-w-[640px]'>
<div className='space-y-4'> <div className='space-y-4'>
{(!datasetId || [ChuckingMode.text, ChuckingMode.qa].includes(docForm)) {(!datasetId || [ChuckingMode.text, ChuckingMode.qa].includes(currentDataset!.doc_form))
&& <OptionCard && <OptionCard
title={t('datasetCreation.stepTwo.general')} title={t('datasetCreation.stepTwo.general')}
icon={<Image src={SettingCog} alt={t('datasetCreation.stepTwo.general')} />} icon={<Image src={SettingCog} alt={t('datasetCreation.stepTwo.general')} />}
activeHeaderClassName='bg-gradient-to-r from-[#EFF0F9] to-[#F9FAFB]' activeHeaderClassName='bg-gradient-to-r from-[#EFF0F9] to-[#F9FAFB]'
description={t('datasetCreation.stepTwo.generalTip')} description={t('datasetCreation.stepTwo.generalTip')}
isActive={ isActive={
[ChuckingMode.text, ChuckingMode.qa].includes(docForm) [ChuckingMode.text, ChuckingMode.qa].includes(
datasetId ? currentDataset!.doc_form : docForm,
)
} }
onSwitched={() => onSwitched={() =>
handleChangeDocform(ChuckingMode.text) handleChangeDocform(ChuckingMode.text)
@ -685,14 +687,16 @@ const StepTwo = ({
</div> </div>
</OptionCard>} </OptionCard>}
{ {
(!datasetId || docForm === ChuckingMode.parentChild) (!datasetId || currentDataset!.doc_form === ChuckingMode.parentChild)
&& <OptionCard && <OptionCard
title={t('datasetCreation.stepTwo.parentChild')} title={t('datasetCreation.stepTwo.parentChild')}
icon={<Image src={FamilyMod} alt={t('datasetCreation.stepTwo.parentChild')} />} icon={<Image src={FamilyMod} alt={t('datasetCreation.stepTwo.parentChild')} />}
effectImg={OrangeEffect.src} effectImg={OrangeEffect.src}
activeHeaderClassName='bg-gradient-to-r from-[#F9F1EE] to-[#F9FAFB]' activeHeaderClassName='bg-gradient-to-r from-[#F9F1EE] to-[#F9FAFB]'
description={t('datasetCreation.stepTwo.parentChildTip')} description={t('datasetCreation.stepTwo.parentChildTip')}
isActive={docForm === ChuckingMode.parentChild} isActive={
datasetId ? currentDataset!.doc_form === ChuckingMode.parentChild : docForm === ChuckingMode.parentChild
}
onSwitched={() => handleChangeDocform(ChuckingMode.parentChild)} onSwitched={() => handleChangeDocform(ChuckingMode.parentChild)}
actions={ actions={
<> <>