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

fix(web): llm/document-extractor support file type variable

Browse Source
This commit is contained in:
zhaoying
2026-04-07 12:05:20 +08:00
parent 3ece83d419
commit 2e7ebf174b
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/views/Workflow/components/Properties/VariableSelect.tsx
View File

@@ -20,7 +20,7 @@ interface VariableSelectProps {
multiple?: boolean; multiple?: boolean;
size?: 'small' | 'middle' | 'large'; size?: 'small' | 'middle' | 'large';
placeholder?: string; placeholder?: string;
variant?: 'outlined' | 'borderless'; variant?: 'outlined' | 'borderless' | 'filled';
className?: string; className?: string;
onChange?: (value: string | string[], option: Suggestion | Suggestion[] | undefined) => void; onChange?: (value: string | string[], option: Suggestion | Suggestion[] | undefined) => void;
} }
@@ -190,12 +190,12 @@ const VariableSelect: FC<VariableSelectProps> = ({
{/* Trigger */} {/* Trigger */}
<div <div
className={clsx( className={clsx(
'rb:w-full rb:flex rb:items-center rb:justify-between rb:cursor-pointer rb:rounded-md rb:bg-white rb:px-2 rb:transition-colors', 'rb:w-full rb:flex rb:items-center rb:justify-between rb:cursor-pointer rb:rounded-md rb:px-2 rb:transition-colors',
variant === 'outlined' && 'rb:border rb:border-[#d9d9d9] hover:rb:border-[#4096ff]', variant === 'outlined' && 'rb:border rb:border-[#d9d9d9] hover:rb:border-[#4096ff] rb:bg-white',
variant === 'outlined' && open && 'rb:border-[#4096ff] rb:shadow-[0_0_0_2px_rgba(5,145,255,0.1)]', variant === 'outlined' && open && 'rb:border-[#4096ff] rb:shadow-[0_0_0_2px_rgba(5,145,255,0.1)]',
variant === 'borderless' && 'rb:border-none rb:shadow-none rb:bg-transparent', variant === 'borderless' && 'rb:border-none rb:shadow-none rb:bg-transparent',
multiple && size === 'small' ? 'rb:min-h-6 rb:py-0.75' : multiple ? 'rb:min-h-8 rb:py-1' : size === 'small' ? 'rb:h-6 rb:text-[10px]' : size === 'large' ? 'rb:h-10' : 'rb:h-8 rb:text-[12px]', multiple && size === 'small' ? 'rb:min-h-6 rb:py-0.75' : multiple ? 'rb:min-h-8 rb:py-1' : size === 'small' ? 'rb:h-6 rb:text-[10px]' : size === 'large' ? 'rb:h-10' : 'rb:h-8 rb:text-[12px]',
!multiple && (size === 'small' ? 'rb:text-[10px]' : 'rb:text-[12px]'), !multiple && (size === 'small' ? 'rb:text-[12px]' : 'rb:text-[12px]'),
className className
)} )}
onClick={() => setOpen(o => !o)} onClick={() => setOpen(o => !o)}

25
web/src/views/Workflow/components/Properties/index.tsx
View File

@@ -38,6 +38,7 @@ import RbCard from '@/components/RbCard/Card';
import ModelConfig from './ModelConfig' import ModelConfig from './ModelConfig'
import ModelSelect from '@/components/ModelSelect' import ModelSelect from '@/components/ModelSelect'
import ListOperator from './ListOperator' import ListOperator from './ListOperator'
import type { Variable } from "./VariableList/types";
/** /**
* Props for Properties component * Props for Properties component
@@ -229,7 +230,6 @@ const Properties: FC<PropertiesProps> = ({
} }
return filteredList; return filteredList;
}; };
if (nodeType === 'llm') { if (nodeType === 'llm') {
// For LLM nodes that are children of iteration or loop nodes, include parent variables // For LLM nodes that are children of iteration or loop nodes, include parent variables
const parentLoopNode = selectedNode ? (() => { const parentLoopNode = selectedNode ? (() => {
@@ -790,8 +790,25 @@ const Properties: FC<PropertiesProps> = ({
return nodeTypeMatch || variableNameMatch; return nodeTypeMatch || variableNameMatch;
}); });
} }
if (config.onFilterVariableNames) { if (config.onFilterVariableType) {
return baseVariableList.filter(variable => Array.isArray(config.onFilterVariableNames) && config.onFilterVariableNames.includes(variable.label)); const types = config.onFilterVariableType as string[];
let list: Suggestion[] = []
baseVariableList.forEach((variable) => {
if (variable.children?.length) {
const filteredChildren = variable.children.filter((c: Suggestion) => types.includes(c.dataType));
console.log('filteredChildren', filteredChildren)
if (filteredChildren.length > 0) {
list.push({ ...variable, children: filteredChildren });
} else if (types.includes(variable.dataType)) {
list.push({ ...variable, children: [] });
}
} else if (types.includes(variable.dataType)) {
list.push(variable);
}
});
console.log('list', list)
return list
} }
// Filter child nodes for iteration output // Filter child nodes for iteration output
if (config.filterChildNodes && selectedNode) { if (config.filterChildNodes && selectedNode) {
@@ -812,7 +829,7 @@ const Properties: FC<PropertiesProps> = ({
} }
return baseVariableList; return baseVariableList;
})()} })()}
onChange={(value, option) => handleChangeVariableList(value, option, key)} onChange={(value, option) => handleChangeVariableList(value as string, option, key)}
size="small" size="small"
/> />
: config.type === 'switch' : config.type === 'switch'

4
web/src/views/Workflow/constant.ts
View File

@@ -128,7 +128,7 @@ export const nodeLibrary: NodeLibrary[] = [
}, },
vision_input: { vision_input: {
type: 'variableList', type: 'variableList',
onFilterVariableNames: ['sys.files'] onFilterVariableType: ['array[file]']
} }
} }
}, },
@@ -457,7 +457,7 @@ export const nodeLibrary: NodeLibrary[] = [
file_selector: { file_selector: {
type: 'variableList', type: 'variableList',
placeholder: 'common.pleaseSelect', placeholder: 'common.pleaseSelect',
onFilterVariableNames: ['sys.files'] onFilterVariableType: ['array[file]', 'file']
} }
} }
}, },