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

Merge remote-tracking branch 'origin/main' into feat/model-plugins-implementing

Browse Source 
# Conflicts:
#	web/eslint-suppressions.json
This commit is contained in:
yyh
2026-03-11 14:23:04 +08:00
parent e51162af0c a6e8e43883
commit e0947a1ea8
16 changed files with 1851 additions and 3413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx
View File

@ -58,10 +58,10 @@ const KeyValueList: FC<Props> = ({
return (
<div className="overflow-hidden rounded-lg border border-divider-regular">
<div className={cn('system-xs-medium-uppercase flex h-7 items-center leading-7 text-text-tertiary')}>
<div className={cn('h-full border-r border-divider-regular pl-3', isSupportFile ? 'w-[140px]' : 'w-1/2')}>{t(`${i18nPrefix}.key`, { ns: 'workflow' })}</div>
{isSupportFile && <div className="h-full w-[70px] shrink-0 border-r border-divider-regular pl-3">{t(`${i18nPrefix}.type`, { ns: 'workflow' })}</div>}
<div className={cn('h-full items-center justify-between pl-3 pr-1', isSupportFile ? 'grow' : 'w-1/2')}>{t(`${i18nPrefix}.value`, { ns: 'workflow' })}</div>
<div className={cn('flex h-7 items-center leading-7 text-text-tertiary system-xs-medium-uppercase')}>
<div className={cn('flex h-full items-center border-r border-divider-regular pl-3', isSupportFile ? 'w-[140px]' : 'w-1/2')}>{t(`${i18nPrefix}.key`, { ns: 'workflow' })}</div>
{isSupportFile && <div className="flex h-full w-[70px] shrink-0 items-center border-r border-divider-regular pl-3">{t(`${i18nPrefix}.type`, { ns: 'workflow' })}</div>}
<div className={cn('flex h-full items-center justify-between pl-3 pr-1', isSupportFile ? 'grow' : 'w-1/2')}>{t(`${i18nPrefix}.value`, { ns: 'workflow' })}</div>
</div>
{
list.map((item, index) => (

13
web/app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx
View File

@ -96,7 +96,10 @@ const GenericTable: FC<GenericTableProps> = ({
})
// If the last configured row has content, append a trailing empty row
const lastHasContent = !isEmptyRow(data[data.length - 1])
const lastRow = data.at(-1)
if (!lastRow)
return rows
const lastHasContent = !isEmptyRow(lastRow)
if (lastHasContent)
rows.push({ row: { ...emptyRowData }, dataIndex: null, isVirtual: true })
@ -163,7 +166,7 @@ const GenericTable: FC<GenericTableProps> = ({
// Ghost/inline style: looks like plain text until focus/hover
'h-6 rounded-none border-0 bg-transparent px-0 py-0 shadow-none',
'hover:border-transparent hover:bg-transparent focus:border-transparent focus:bg-transparent',
'system-sm-regular text-text-secondary placeholder:text-text-quaternary',
'text-text-secondary system-sm-regular placeholder:text-text-quaternary',
)}
/>
)
@ -212,12 +215,12 @@ const GenericTable: FC<GenericTableProps> = ({
return (
<div className="rounded-lg border border-divider-regular">
{showHeader && (
<div className="system-xs-medium-uppercase flex h-7 items-center leading-7 text-text-tertiary">
<div className="flex h-7 items-center leading-7 text-text-tertiary system-xs-medium-uppercase">
{columns.map((column, index) => (
<div
key={column.key}
className={cn(
'h-full pl-3',
'flex h-full items-center pl-3',
column.width && column.width.startsWith('w-') ? 'shrink-0' : 'flex-1',
column.width,
// Add right border except for last column
@ -285,7 +288,7 @@ const GenericTable: FC<GenericTableProps> = ({
return (
<div className={className}>
<div className="mb-3 flex items-center justify-between">
<h4 className="system-sm-semibold-uppercase text-text-secondary">{title}</h4>
<h4 className="text-text-secondary system-sm-semibold-uppercase">{title}</h4>
</div>
{showPlaceholder