youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-06 02:18:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox

Browse Source 
# Conflicts:
#	api/controllers/console/app/app.py
#	web/eslint-suppressions.json
#	web/eslint.config.mjs
This commit is contained in:
yyh
2026-02-06 14:40:44 +08:00
parent 44fd58853c e988266f53
commit 871ec3b0ca
177 changed files with 886 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/datasets/create-from-pipeline/header.tsx
View File

@ -19,7 +19,7 @@ const Header = () => {
variant="secondary-accent"
className="size-9 rounded-full p-0"
>
<RiArrowLeftLine className="size-5 " />
<RiArrowLeftLine className="size-5" />
</Button>
</Link>
</div>

2
web/app/components/datasets/create/step-one/upgrade-card.tsx
View File

@ -15,7 +15,7 @@ const UpgradeCard: FC = () => {
}, [setShowPricingModal])
return (
<div className="flex items-center justify-between rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg py-3 pl-4 pr-3.5 shadow-xs backdrop-blur-[5px] ">
<div className="flex items-center justify-between rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg py-3 pl-4 pr-3.5 shadow-xs backdrop-blur-[5px]">
<div>
<div className="title-md-semi-bold bg-[linear-gradient(92deg,_var(--components-input-border-active-prompt-1,_#0BA5EC)_0%,_var(--components-input-border-active-prompt-2,_#155AEF)_99.21%)] bg-clip-text text-transparent">{t('upgrade.uploadMultipleFiles.title', { ns: 'billing' })}</div>
<div className="system-xs-regular text-text-tertiary">{t('upgrade.uploadMultipleFiles.description', { ns: 'billing' })}</div>

2
web/app/components/datasets/create/website/firecrawl/options.tsx
View File

@ -32,7 +32,7 @@ const Options: FC<Props> = ({
}
}, [payload, onChange])
return (
<div className={cn(className, ' space-y-2')}>
<div className={cn(className, 'space-y-2')}>
<CheckboxWithLabel
label={t(`${I18N_PREFIX}.crawlSubPage`, { ns: 'datasetCreation' })}
isChecked={payload.crawl_sub_pages}

2
web/app/components/datasets/create/website/jina-reader/options.tsx
View File

@ -32,7 +32,7 @@ const Options: FC<Props> = ({
}
}, [payload, onChange])
return (
<div className={cn(className, ' space-y-2')}>
<div className={cn(className, 'space-y-2')}>
<CheckboxWithLabel
label={t(`${I18N_PREFIX}.crawlSubPage`, { ns: 'datasetCreation' })}
isChecked={payload.crawl_sub_pages}

2
web/app/components/datasets/create/website/watercrawl/options.tsx
View File

@ -32,7 +32,7 @@ const Options: FC<Props> = ({
}
}, [payload, onChange])
return (
<div className={cn(className, ' space-y-2')}>
<div className={cn(className, 'space-y-2')}>
<CheckboxWithLabel
label={t(`${I18N_PREFIX}.crawlSubPage`, { ns: 'datasetCreation' })}
isChecked={payload.crawl_sub_pages}

1
web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/error-message.tsx
View File

@ -14,7 +14,6 @@ const ErrorMessage = ({
errorMsg,
}: ErrorMessageProps) => {
return (
// eslint-disable-next-line tailwindcss/migration-from-tailwind-2
<div className={cn(
'flex gap-x-0.5 rounded-xl border-[0.5px] border-components-panel-border bg-opacity-40 bg-toast-error-bg p-2 shadow-xs shadow-shadow-shadow-3',
className,

2
web/app/components/datasets/documents/create-from-pipeline/left-header.tsx
View File

@ -41,7 +41,7 @@ const LeftHeader = ({
variant="secondary-accent"
className="absolute -left-11 top-3.5 size-9 rounded-full p-0"
>
<RiArrowLeftLine className="size-5 " />
<RiArrowLeftLine className="size-5" />
</Button>
</Link>
)}

2
web/app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx
View File

@ -22,7 +22,7 @@ const WebsitePreview = ({
<div className="flex grow flex-col gap-y-1">
<div className="system-2xs-semibold-uppercase">{t('addDocuments.stepOne.preview', { ns: 'datasetPipeline' })}</div>
<div className="title-md-semi-bold text-tex-primary">{currentWebsite.title}</div>
<div className="system-xs-medium flex gap-x-1 text-text-tertiary">
<div className="system-xs-medium flex gap-x-1 text-text-tertiary">
<RiGlobalLine className="size-3.5" />
<span className="uppercase" title={currentWebsite.source_url}>{currentWebsite.source_url}</span>
<span>·</span>

2
web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx
View File

@ -204,7 +204,7 @@ const CSVUploader: FC<Props> = ({
/>
<div ref={dropRef}>
{!file && (
<div className={cn('flex h-20 items-center rounded-xl border border-dashed border-components-panel-border bg-components-panel-bg-blur text-sm font-normal', dragging && 'border border-divider-subtle bg-components-panel-on-panel-item-bg-hover')}>
<div className={cn('flex h-20 items-center rounded-xl border border-dashed border-components-panel-border bg-components-panel-bg-blur text-sm font-normal', dragging && 'border border-divider-subtle bg-components-panel-on-panel-item-bg-hover')}>
<div className="flex w-full items-center justify-center space-x-2">
<CSVIcon className="shrink-0" />
<div className="text-text-secondary">

2
web/app/components/datasets/documents/detail/settings/pipeline-settings/left-header.tsx
View File

@ -34,7 +34,7 @@ const LeftHeader = ({
onClick={navigateBack}
aria-label={t('operation.back', { ns: 'common' })}
>
<RiArrowLeftLine className="size-5 " />
<RiArrowLeftLine className="size-5" />
</Button>
<Effect className="left-8 top-[-34px] opacity-20" />
</div>

2
web/app/components/datasets/hit-testing/components/child-chunks-item.tsx
View File

@ -20,7 +20,7 @@ const ChildChunks: FC<Props> = ({
className={!isShowAll ? 'line-clamp-2 break-all' : ''}
>
<div className="relative top-[-2px] inline-flex items-center">
<div className="system-2xs-semibold-uppercase flex h-[20.5px] items-center bg-state-accent-solid px-1 text-text-primary-on-surface">
<div className="system-2xs-semibold-uppercase flex h-[20.5px] items-center bg-state-accent-solid px-1 text-text-primary-on-surface">
C-
{position}
</div>

6
web/app/components/datasets/hit-testing/components/records.tsx
View File

@ -47,11 +47,11 @@ const Records = ({
return (
<div className="grow overflow-y-auto">
<table className="w-full border-collapse border-0 text-[13px] leading-4 text-text-secondary ">
<thead className="sticky top-0 h-7 text-xs font-medium uppercase leading-7 text-text-tertiary backdrop-blur-[5px]">
<table className="w-full border-collapse border-0 text-[13px] leading-4 text-text-secondary">
<thead className="sticky top-0 h-7 text-xs font-medium uppercase leading-7 text-text-tertiary backdrop-blur-[5px]">
<tr>
<td className="rounded-l-lg bg-background-section-burn pl-3">{t('table.header.queryContent', { ns: 'datasetHitTesting' })}</td>
<td className="w-[128px] bg-background-section-burn pl-3">{t('table.header.source', { ns: 'datasetHitTesting' })}</td>
<td className="w-[128px] bg-background-section-burn pl-3">{t('table.header.source', { ns: 'datasetHitTesting' })}</td>
<td className="w-48 rounded-r-lg bg-background-section-burn pl-3">
<div
className="flex cursor-pointer items-center"

2
web/app/components/datasets/metadata/edit-metadata-batch/edit-row.tsx
View File

@ -49,7 +49,7 @@ const EditMetadatabatchItem: FC<Props> = ({
className={
cn(
'cursor-pointer rounded-md p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive',
isDeleted && 'cursor-default bg-state-destructive-hover text-text-destructive',
isDeleted && 'cursor-default bg-state-destructive-hover text-text-destructive',
)
}
onClick={() => onRemove(payload.id)}

2
web/app/components/datasets/metadata/edit-metadata-batch/input-has-set-multiple-value.tsx
View File

@ -22,7 +22,7 @@ const InputHasSetMultipleValue: FC<Props> = ({
{!readOnly && (
<div className="cursor-pointer rounded-[4px] p-px text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary">
<RiCloseLine
className="size-3.5 "
className="size-3.5"
onClick={onClear}
/>
</div>

2
web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx
View File

@ -75,7 +75,7 @@ const Item: FC<ItemProps> = ({
>
<div
className={cn(
'flex h-8 items-center justify-between px-2',
'flex h-8 items-center justify-between px-2',
disabled && 'opacity-30', // not include border and bg
)}
>

4
web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx
View File

@ -47,7 +47,7 @@ const SelectMetadata: FC<Props> = ({
return (
<div
key={item.id}
className="mx-1 flex h-6 cursor-pointer items-center justify-between rounded-md px-3 hover:bg-state-base-hover"
className="mx-1 flex h-6 cursor-pointer items-center justify-between rounded-md px-3 hover:bg-state-base-hover"
onClick={() => onSelect({
id: item.id,
name: item.name,
@ -70,7 +70,7 @@ const SelectMetadata: FC<Props> = ({
<RiAddLine className="size-3.5" />
<div className="system-sm-medium">{t(`${i18nPrefix}.newAction`, { ns: 'dataset' })}</div>
</div>
<div className="flex h-6 items-center text-text-secondary ">
<div className="flex h-6 items-center text-text-secondary">
<div className="mr-[3px] h-3 w-px bg-divider-regular"></div>
<div className="flex h-full cursor-pointer items-center rounded-md px-1.5 hover:bg-state-base-hover" onClick={onManage}>
<div className="system-sm-medium mr-1">{t(`${i18nPrefix}.manageAction`, { ns: 'dataset' })}</div>

4
web/app/components/datasets/metadata/metadata-document/info-group.tsx
View File

@ -85,7 +85,7 @@ const InfoGroup: FC<Props> = ({
onSave={data => onAdd?.(data)}
onManage={handleMangeMetadata}
/>
{list.length > 0 && <Divider className="my-3 " bgStyle="gradient" />}
{list.length > 0 && <Divider className="my-3" bgStyle="gradient" />}
</div>
)}
{list.map((item, i) => (
@ -99,7 +99,7 @@ const InfoGroup: FC<Props> = ({
value={item.value}
onChange={value => onChange?.({ ...item, value })}
/>
<div className="shrink-0 cursor-pointer rounded-md p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive">
<div className="shrink-0 cursor-pointer rounded-md p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive">
<RiDeleteBinLine className="size-4" onClick={() => onDelete?.(item)} />
</div>
</div>