feat: support filter obj select type

web/app/components/workflow/nodes/_base/components/variable/utils.ts

@@ -1,7 +1,7 @@
 import type { CodeNodeType } from '../../../code/types'
 import { BlockEnum, InputVarType, VarType } from '@/app/components/workflow/types'
 import type { StartNodeType } from '@/app/components/workflow/nodes/start/types'
-import type { NodeOutPutVar } from '@/app/components/workflow/types'
+import type { NodeOutPutVar, Var } from '@/app/components/workflow/types'
 import type { VariableAssignerNodeType } from '@/app/components/workflow/nodes/variable-assigner/types'
 import {
   CHAT_QUESTION_CLASSIFIER_OUTPUT_STRUCT,
@@ -21,7 +21,24 @@ const inputVarTypeToVarType = (type: InputVarType): VarType => {
   return VarType.string
 }
 
-const formatItem = (item: any, isChatMode: boolean, varType?: VarType): NodeOutPutVar => {
+const findExceptVarInObject = (obj: any, filterVar: (payload: Var) => boolean): Var => {
+  const { children } = obj
+  const res: Var = {
+    variable: obj.variable,
+    type: VarType.object,
+    children: children.filter((item: Var) => {
+      const { children } = item
+      if (!children)
+        return filterVar(item)
+
+      const obj = findExceptVarInObject(item, filterVar)
+      return obj.children && obj.children?.length > 0
+    }),
+  }
+  return res
+}
+
+const formatItem = (item: any, isChatMode: boolean, filterVar: (payload: any) => boolean): NodeOutPutVar => {
   const { id, data } = item
   const res: NodeOutPutVar = {
     nodeId: id,
@@ -109,15 +126,28 @@ const formatItem = (item: any, isChatMode: boolean, varType?: VarType): NodeOutP
       break
     }
   }
-  if (varType)
+
-    res.vars = res.vars.filter(v => v.type === varType)
+  res.vars = res.vars.filter((v) => {
+    const { children } = v
+    if (!children)
+      return filterVar(v)
+
+    const obj = findExceptVarInObject(v, filterVar)
+    return obj?.children && obj?.children.length > 0
+  }).map((v) => {
+    const { children } = v
+    if (!children)
+      return v
+
+    return findExceptVarInObject(v, filterVar)
+  })
 
   return res
 }
-export const toNodeOutputVars = (nodes: any[], isChatMode: boolean, varType?: VarType): NodeOutPutVar[] => {
+export const toNodeOutputVars = (nodes: any[], isChatMode: boolean, filterVar = (_payload: Var) => true): NodeOutPutVar[] => {
   const res = nodes
     .filter(node => SUPPORT_OUTPUT_VARS_NODE.includes(node.data.type))
-    .map(node => formatItem(node, isChatMode, varType))
+    .map(node => formatItem(node, isChatMode, filterVar))
     .filter(item => item.vars.length > 0)
   return res
 }

web/app/components/workflow/nodes/_base/components/variable/var-list.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import produce from 'immer'
 import RemoveButton from '../remove-button'
 import VarReferencePicker from './var-reference-picker'
-import { type ValueSelector, type VarType, type Variable } from '@/app/components/workflow/types'
+import type { ValueSelector, Var, Variable } from '@/app/components/workflow/types'
 import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
 
 type Props = {
@@ -15,7 +15,7 @@ type Props = {
   onChange: (list: Variable[]) => void
   isSupportConstantValue?: boolean
   onlyLeafNodeVar?: boolean
-  onlyVarType?: VarType
+  filterVar?: (payload: Var) => boolean
 }
 
 const VarList: FC<Props> = ({
@@ -25,7 +25,7 @@ const VarList: FC<Props> = ({
   onChange,
   isSupportConstantValue,
   onlyLeafNodeVar,
-  onlyVarType,
+  filterVar,
 }) => {
   const { t } = useTranslation()
 
@@ -90,7 +90,7 @@ const VarList: FC<Props> = ({
             onChange={handleVarReferenceChange(index)}
             defaultVarKindType={item.variable_type}
             onlyLeafNodeVar={onlyLeafNodeVar}
-            onlyVarType={onlyVarType}
+            filterVar={filterVar}
           />
           <RemoveButton
             className='!p-2 !bg-gray-100 hover:!bg-gray-200'

web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx

@@ -6,7 +6,7 @@ import cn from 'classnames'
 import { isArray } from 'lodash-es'
 import VarReferencePopup from './var-reference-popup'
 import { toNodeOutputVars } from './utils'
-import type { ValueSelector } from '@/app/components/workflow/types'
+import type { ValueSelector, Var } from '@/app/components/workflow/types'
 import { VarType } from '@/app/components/workflow/types'
 import { VarBlockIcon } from '@/app/components/workflow/block-icon'
 import { Line3 } from '@/app/components/base/icons/src/public/common'
@@ -35,7 +35,7 @@ type Props = {
   isSupportConstantValue?: boolean
   defaultVarKindType?: VarKindType
   onlyLeafNodeVar?: boolean
-  onlyVarType?: VarType
+  filterVar?: (payload: Var) => boolean
 }
 
 export const getNodeInfoById = (nodes: any, id: string) => {
@@ -56,7 +56,7 @@ const VarReferencePicker: FC<Props> = ({
   isSupportConstantValue,
   defaultVarKindType = VarKindType.static,
   onlyLeafNodeVar,
-  onlyVarType,
+  filterVar = () => true,
 }) => {
   const { t } = useTranslation()
 
@@ -65,7 +65,7 @@ const VarReferencePicker: FC<Props> = ({
   const isConstant = isSupportConstantValue && varKindType === VarKindType.static
   const { getTreeLeafNodes, getBeforeNodesInSameBranch } = useWorkflow()
   const availableNodes = onlyLeafNodeVar ? getTreeLeafNodes(nodeId) : getBeforeNodesInSameBranch(nodeId)
-  const outputVars = toNodeOutputVars(availableNodes, isChatMode, onlyVarType)
+  const outputVars = toNodeOutputVars(availableNodes, isChatMode, filterVar)
   const [open, setOpen] = useState(false)
   const hasValue = !isConstant && value.length > 0
   const outputVarNodeId = hasValue ? value[0] : ''

web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx

@@ -86,7 +86,7 @@ const ObjectChildren: FC<ObjectChildrenProps> = ({
 
   return (
     <div className='absolute top-[-2px] bg-white rounded-lg border border-gray-200 shadow-lg space-y-1' style={{
-      right: itemWidth ? itemWidth - 4 : 215,
+      right: itemWidth ? itemWidth - 10 : 215,
       minWidth: 252,
     }}>
       <div className='flex items-center h-[22px] px-3 text-xs font-normal text-gray-700'><span className='text-gray-500'>{title}.</span>{currObjPath.join('.')}</div>

web/app/components/workflow/nodes/variable-assigner/components/var-list/index.tsx

@@ -5,7 +5,7 @@ import React, { useCallback } from 'react'
 import produce from 'immer'
 import RemoveButton from '../../../_base/components/remove-button'
 import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
-import type { ValueSelector, VarType } from '@/app/components/workflow/types'
+import type { ValueSelector, Var } from '@/app/components/workflow/types'
 
 type Props = {
   readonly: boolean
@@ -13,7 +13,7 @@ type Props = {
   list: ValueSelector[]
   onChange: (list: ValueSelector[]) => void
   onlyLeafNodeVar?: boolean
-  onlyVarType?: VarType
+  filterVar?: (payload: Var) => boolean
 }
 
 const VarList: FC<Props> = ({
@@ -22,7 +22,7 @@ const VarList: FC<Props> = ({
   list,
   onChange,
   onlyLeafNodeVar,
-  onlyVarType,
+  filterVar,
 }) => {
   const { t } = useTranslation()
   const handleVarReferenceChange = useCallback((index: number) => {
@@ -63,7 +63,7 @@ const VarList: FC<Props> = ({
             value={item}
             onChange={handleVarReferenceChange(index)}
             onlyLeafNodeVar={onlyLeafNodeVar}
-            onlyVarType={onlyVarType}
+            filterVar={filterVar}
             width={350}
           />
           <RemoveButton

web/app/components/workflow/nodes/variable-assigner/panel.tsx

@@ -24,6 +24,7 @@ const Panel: FC<NodePanelProps<VariableAssignerNodeType>> = ({
     handleOutputTypeChange,
     handleVarListChange,
     handleAddVariable,
+    filterVar,
   } = useConfig(id, data)
 
   const typeOptions = [
@@ -66,7 +67,7 @@ const Panel: FC<NodePanelProps<VariableAssignerNodeType>> = ({
             list={inputs.variables}
             onChange={handleVarListChange}
             onlyLeafNodeVar
-            onlyVarType={inputs.output_type}
+            filterVar={filterVar}
           />
         </Field>
       </div>

web/app/components/workflow/nodes/variable-assigner/use-config.ts

@@ -3,13 +3,14 @@ import produce from 'immer'
 import useVarList from './components/var-list/use-var-list'
 import type { VariableAssignerNodeType } from './types'
 import useNodeCrud from '@/app/components/workflow/nodes/_base/hooks/use-node-crud'
+import type { Var, VarType } from '@/app/components/workflow/types'
 
 const useConfig = (id: string, payload: VariableAssignerNodeType) => {
   const { inputs, setInputs } = useNodeCrud<VariableAssignerNodeType>(id, payload)
 
   const handleOutputTypeChange = useCallback((outputType: string) => {
     const newInputs = produce(inputs, (draft: VariableAssignerNodeType) => {
-      draft.output_type = outputType
+      draft.output_type = outputType as VarType
     })
     setInputs(newInputs)
   }, [inputs, setInputs])
@@ -19,11 +20,18 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => {
     inputs,
     setInputs,
   })
+
+  const filterVar = useCallback((varPayload: Var) => {
+    if (varPayload.type !== inputs.output_type)
+      return false
+    return true
+  }, [inputs])
   return {
     inputs,
     handleOutputTypeChange,
     handleVarListChange,
     handleAddVariable,
+    filterVar,
   }
 }