adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/node_run

Browse Source
This commit is contained in:
yingzhao
2026-04-20 15:54:19 +08:00
committed by GitHub
parent 643a3fbe09 7f1cf13b23
commit 1744b045fb
179 changed files with 6329 additions and 1706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
web/src/views/Workflow/components/Nodes/ConditionNode.tsx
View File

@@ -7,12 +7,17 @@ import { CheckCircleFilled, CloseCircleFilled, LoadingOutlined } from '@ant-desi
import NodeTools from './NodeTools'
import { useVariableList } from '../Properties/hooks/useVariableList'
import { isSubExprSet } from '../../utils'
import { fileSubFieldOperators } from '../Properties/CaseList'
const caculateIsSet = (item: any, type: string) => {
switch (type) {
case 'categories':
return typeof item?.class_name === 'string' && item?.class_name !== ''
case 'cases': {
if (item?.sub_variable_condition !== undefined) {
return !!item.left && !!item.operator
}
if (!item.left) return false
if (['not_empty', 'empty'].includes(item.operator)) return true
return !!item.left && (!!item.right || typeof item.right === 'boolean' || typeof item.right === 'number')
@@ -26,12 +31,24 @@ const ConditionNode: ReactShapeConfig['component'] = ({ node }) => {
const variableList = useVariableList(node ?? null, graphRef, data.chatVariables ?? [])
const getLocaleField = (field: string, filedType: string) => {
const key = filedType === 'boolean' ? `workflow.config.if-else..boolean.${field}` : filedType === 'number' ? `workflow.config.if-else.num.${field}` : `workflow.config.if-else.${field}`
const key = filedType === 'boolean'
? `workflow.config.if-else..boolean.${field}`
: filedType === 'number'
? `workflow.config.if-else.num.${field}`
: `workflow.config.if-else.${field}`
const value = t(key)
return value !== key ? value : t(`workflow.config.if-else.num.${field}`)
};
const getSubLocaleField = (field: string, fieldKey: string) => {
const operators = fileSubFieldOperators[fieldKey] ?? fileSubFieldOperators.default
const match = operators?.find(op => op.value === field)
return match?.label ? t(match.label as string) : field
}
const labelRender = (value: string) => {
const filterOption = variableList.find(vo => `{{${vo.value}}}` === value)
?? variableList.flatMap(vo => vo.children ?? []).find(child => `{{${child.value}}}` === value)
?? variableList.flatMap(vo => vo.children ?? []).flatMap((child: any) => child.children ?? []).find((grandchild: any) => `{{${grandchild.value}}}` === value)
if (filterOption) {
return (
@@ -91,7 +108,8 @@ const ConditionNode: ReactShapeConfig['component'] = ({ node }) => {
{item.expressions.map((expression: any, eIndex: number) => (
<div key={eIndex} className="rb:relative">
{item.expressions.length > 1 && eIndex > 0 && <div className="rb:absolute rb:-top-2 rb:right-2 rb:text-[10px] rb:text-[#155EEF] rb:font-medium rb:leading-3.5 rb:text-right rb:pr-0.5">{item.logical_operator?.toLocaleUpperCase()}</div>}
<Flex align="center" className="rb:bg-[#F0F3F8] rb:shadow-[0px_2px_4px_0px_rgba(23,23,25,0.03)] rb:rounded-md rb:py-1! rb:px-1.5! rb:text-[10px] rb:text-[#5B6167] rb:font-medium rb:leading-3.5">
<Flex vertical gap={2} className="rb:bg-[#F0F3F8] rb:shadow-[0px_2px_4px_0px_rgba(23,23,25,0.03)] rb:rounded-md rb:py-1! rb:px-1.5! rb:text-[10px] rb:text-[#5B6167] rb:font-medium rb:leading-3.5">
<Flex align="center">
{caculateIsSet(expression, 'cases')
? <>
{labelRender(expression.left)}
@@ -100,6 +118,33 @@ const ConditionNode: ReactShapeConfig['component'] = ({ node }) => {
</>
: t(`workflow.config.${data.type}.unset`)
}
</Flex>
{expression.sub_variable_condition?.conditions?.length > 0 && expression.sub_variable_condition?.conditions.every(isSubExprSet)
? <div className="rb-border-l rb:ml-2 rb:mt-1.5">
{expression.sub_variable_condition?.conditions.map((sub: any, sIndex: number) => (
<div key={sIndex} className="rb:relative">
{expression.sub_variable_condition?.conditions.length > 1 && sIndex > 0 && <div className="rb:absolute rb:-top-2 rb:right-2 rb:text-[10px] rb:text-[#155EEF] rb:font-medium rb:leading-3.5 rb:text-right rb:pr-0.5">{expression.sub_variable_condition?.logical_operator?.toLocaleUpperCase()}</div>}
<Flex align="center" className=" rb:py-1! rb:px-1.5! rb:text-[10px] rb:text-[#5B6167] rb:font-medium rb:leading-3.5">
<span className="rb:text-[#155EEF]">{sub.key}</span>
<span className="rb:mx-1">{getSubLocaleField(sub.operator, sub.key)}</span>
<span className="rb:break-all rb:line-clamp-1">
{sub.key === 'type'
? t(`application.${sub.value}`)
:!['not_empty', 'empty'].includes(sub.operator)
? <span>{typeof sub.value === 'boolean' ? String(sub.value).charAt(0).toUpperCase() + String(sub.value).slice(1) : sub.value}</span>
: null
}
</span>
</Flex>
</div>
))}
</div>
: expression.sub_variable_condition?.conditions?.length > 0
? <Flex align="center" className="rb:mt-1! rb:pl-2! rb:rounded-md rb:py-1! rb:px-1.5! rb:text-[10px] rb:text-[#5B6167] rb:font-medium rb:leading-3.5">
{t(`workflow.config.${data.type}.unset`)}
</Flex>
: null
}
</Flex>
</div>
))}