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

Merge branch 'main' into feat/hitl-frontend

Browse Source
This commit is contained in:
twwu
2026-01-21 10:44:23 +08:00
parent 2b28074f4c 95f92e07e4
commit 711cca01b8
357 changed files with 20553 additions and 1181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/components/workflow/nodes/_base/components/editor/base.tsx
View File

@ -95,7 +95,7 @@ const Base: FC<Props> = ({
}}
>
{headerRight}
{showCodeGenerator && codeLanguages && (
{!!(showCodeGenerator && codeLanguages) && (
<div className="ml-1">
<CodeGeneratorButton
onGenerated={onGenerated}
@ -119,7 +119,7 @@ const Base: FC<Props> = ({
</div>
</div>
</div>
{tip && <div className="px-1 py-0.5">{tip}</div>}
{!!tip && <div className="px-1 py-0.5">{tip}</div>}
<PromptEditorHeightResizeWrap
height={isExpand ? editorExpandHeight : editorContentHeight}
minHeight={editorContentMinHeight}

6
web/app/components/workflow/nodes/_base/components/field.tsx
View File

@ -46,7 +46,7 @@ const Field: FC<Props> = ({
{' '}
{required && <span className="text-text-destructive">*</span>}
</div>
{tooltip && (
{!!tooltip && (
<Tooltip
popupContent={tooltip}
popupClassName="ml-1"
@ -55,13 +55,13 @@ const Field: FC<Props> = ({
)}
</div>
<div className="flex">
{operations && <div>{operations}</div>}
{!!operations && <div>{operations}</div>}
{supportFold && (
<RiArrowDownSLine className="h-4 w-4 cursor-pointer text-text-tertiary transition-transform" style={{ transform: fold ? 'rotate(-90deg)' : 'rotate(0deg)' }} />
)}
</div>
</div>
{children && (!supportFold || (supportFold && !fold)) && <div className={cn(!inline && 'mt-1')}>{children}</div>}
{!!(children && (!supportFold || (supportFold && !fold))) && <div className={cn(!inline && 'mt-1')}>{children}</div>}
</div>
)
}

2
web/app/components/workflow/nodes/_base/components/prompt/editor.tsx
View File

@ -165,7 +165,7 @@ const Editor: FC<Props> = ({
{' '}
{required && <span className="text-text-destructive">*</span>}
</div>
{titleTooltip && <Tooltip popupContent={titleTooltip} />}
{!!titleTooltip && <Tooltip popupContent={titleTooltip} />}
</div>
<div className="flex items-center">
<div className="text-xs font-medium leading-[18px] text-text-tertiary">{value?.length || 0}</div>

3
web/app/components/workflow/nodes/_base/components/variable/utils.ts
View File

@ -477,7 +477,6 @@ const formatItem = (
break
}
// eslint-disable-next-line sonarjs/no-duplicated-branches
case BlockEnum.VariableAggregator: {
const { output_type, advanced_settings }
= data as VariableAssignerNodeType
@ -1901,7 +1900,7 @@ export const updateNodeVars = (
}
break
}
// eslint-disable-next-line sonarjs/no-duplicated-branches
case BlockEnum.VariableAggregator: {
const payload = data as VariableAssignerNodeType
if (payload.variables) {

2
web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-label.tsx
View File

@ -61,7 +61,7 @@ const VariableLabel = ({
notShowFullPath={notShowFullPath}
/>
{
variableType && (
!!variableType && (
<div className="system-xs-regular shrink-0 text-text-tertiary">
{capitalize(variableType)}
</div>

6
web/app/components/workflow/nodes/_base/node.tsx
View File

@ -276,7 +276,7 @@ const BaseNode: FC<BaseNodeProps> = ({
}
</div>
{
data._iterationLength && data._iterationIndex && data._runningStatus === NodeRunningStatus.Running && (
!!(data._iterationLength && data._iterationIndex && data._runningStatus === NodeRunningStatus.Running) && (
<div className="mr-1.5 text-xs font-medium text-text-accent">
{data._iterationIndex > data._iterationLength ? data._iterationLength : data._iterationIndex}
/
@ -285,7 +285,7 @@ const BaseNode: FC<BaseNodeProps> = ({
)
}
{
data.type === BlockEnum.Loop && data._loopIndex && LoopIndex
!!(data.type === BlockEnum.Loop && data._loopIndex) && LoopIndex
}
{
isLoading && <RiLoader2Line className="h-3.5 w-3.5 animate-spin text-text-accent" />
@ -340,7 +340,7 @@ const BaseNode: FC<BaseNodeProps> = ({
)
}
{
data.desc && data.type !== BlockEnum.Iteration && data.type !== BlockEnum.Loop && (
!!(data.desc && data.type !== BlockEnum.Iteration && data.type !== BlockEnum.Loop) && (
<div className="system-xs-regular whitespace-pre-line break-words px-3 pb-2 pt-1 text-text-tertiary">
{data.desc}
</div>