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

4
web/app/components/workflow/panel/chat-variable-panel/components/object-value-item.tsx
View File

@ -96,7 +96,7 @@ const ObjectValueItem: FC<Props> = ({
{/* Key */}
<div className="w-[120px] border-r border-gray-200">
<input
className="system-xs-regular placeholder:system-xs-regular block h-7 w-full appearance-none px-2 text-text-secondary caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:bg-state-base-hover focus:bg-components-input-bg-active"
className="system-xs-regular placeholder:system-xs-regular block h-7 w-full appearance-none px-2 text-text-secondary caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:bg-state-base-hover focus:bg-components-input-bg-active"
placeholder={t('chatVariable.modal.objectKey', { ns: 'workflow' }) || ''}
value={list[index].key}
onChange={handleKeyChange(index)}
@ -115,7 +115,7 @@ const ObjectValueItem: FC<Props> = ({
{/* Value */}
<div className="relative w-[230px]">
<input
className="system-xs-regular placeholder:system-xs-regular block h-7 w-full appearance-none px-2 text-text-secondary caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:bg-state-base-hover focus:bg-components-input-bg-active"
className="system-xs-regular placeholder:system-xs-regular block h-7 w-full appearance-none px-2 text-text-secondary caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:bg-state-base-hover focus:bg-components-input-bg-active"
placeholder={t('chatVariable.modal.objectValue', { ns: 'workflow' }) || ''}
value={list[index].value}
onChange={handleValueChange(index)}

2
web/app/components/workflow/panel/version-history-panel/context-menu/menu-item.tsx
View File

@ -20,7 +20,7 @@ const MenuItem: FC<MenuItemProps> = ({
return (
<div
className={cn(
'flex cursor-pointer items-center justify-between rounded-lg px-2 py-1.5 ',
'flex cursor-pointer items-center justify-between rounded-lg px-2 py-1.5',
isDestructive ? 'hover:bg-state-destructive-hover' : 'hover:bg-state-base-hover',
)}
onClick={() => {

2
web/app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx
View File

@ -22,7 +22,7 @@ const DeleteConfirmModal: FC<DeleteConfirmModalProps> = ({
return (
<Modal className="p-0" isShow={isOpen} onClose={onClose}>
<div className="flex flex-col gap-y-2 p-6 pb-4 ">
<div className="flex flex-col gap-y-2 p-6 pb-4">
<div className="title-2xl-semi-bold text-text-primary">
{`${t('operation.delete', { ns: 'common' })} ${versionInfo.marked_name || t('versionHistory.defaultName', { ns: 'workflow' })}`}
</div>

2
web/app/components/workflow/panel/version-history-panel/filter/index.tsx
View File

@ -53,7 +53,7 @@ const Filter: FC<FilterProps> = ({
isFiltering ? 'bg-state-accent-active-alt' : 'hover:bg-state-base-hover',
)}
>
<RiFilter3Line className={cn('h-4 w-4', isFiltering ? 'text-text-accent' : ' text-text-tertiary')} />
<RiFilter3Line className={cn('h-4 w-4', isFiltering ? 'text-text-accent' : 'text-text-tertiary')} />
</div>
</PortalToFollowElemTrigger>
<PortalToFollowElemContent className="z-[12]">

2
web/app/components/workflow/panel/version-history-panel/loading/item.tsx
View File

@ -18,7 +18,7 @@ const Item: FC<ItemProps> = ({
return (
<div className="relative flex gap-x-1 p-2">
{!isLast && <div className="absolute left-4 top-6 h-[calc(100%-0.75rem)] w-0.5 bg-divider-subtle" />}
<div className=" flex h-5 w-[18px] shrink-0 items-center justify-center">
<div className="flex h-5 w-[18px] shrink-0 items-center justify-center">
<div className="h-2 w-2 rounded-lg border-[2px] border-text-quaternary" />
</div>
<div className="flex grow flex-col gap-y-0.5">

2
web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx
View File

@ -22,7 +22,7 @@ const RestoreConfirmModal: FC<RestoreConfirmModalProps> = ({
return (
<Modal className="p-0" isShow={isOpen} onClose={onClose}>
<div className="flex flex-col gap-y-2 p-6 pb-4 ">
<div className="flex flex-col gap-y-2 p-6 pb-4">
<div className="title-2xl-semi-bold text-text-primary">
{`${t('common.restore', { ns: 'workflow' })} ${versionInfo.marked_name || t('versionHistory.defaultName', { ns: 'workflow' })}`}
</div>

2
web/app/components/workflow/panel/version-history-panel/version-history-item.tsx
View File

@ -83,7 +83,7 @@ const VersionHistoryItem: React.FC<VersionHistoryItemProps> = ({
}}
>
{!isLast && <div className="absolute left-4 top-6 h-[calc(100%-0.75rem)] w-0.5 bg-divider-subtle" />}
<div className=" flex h-5 w-[18px] shrink-0 items-center justify-center">
<div className="flex h-5 w-[18px] shrink-0 items-center justify-center">
<div className={cn(
'h-2 w-2 rounded-lg border-[2px]',
isSelected ? 'border-text-accent' : 'border-text-quaternary',