From dc91b2e3df5156f725c9f7ab15d16c0fa463a743 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Tue, 19 Mar 2024 14:53:56 +0800
Subject: [PATCH] fix: retieveal output error and var ref error

---
 .../workflow/nodes/knowledge-retrieval/panel.tsx          | 2 +-
 .../workflow/nodes/variable-assigner/use-config.ts        | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/panel.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/panel.tsx
index 30b47aedfa..193a86c3ad 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/panel.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/panel.tsx
@@ -97,7 +97,7 @@ const Panel: FC<NodePanelProps<KnowledgeRetrievalNodeType>> = ({
         <OutputVars>
           <>
             <VarItem
-              name='output'
+              name='result'
               type='Array[Object]'
               description={t(`${i18nPrefix}.outputVars.output`)}
               subItems={[
diff --git a/web/app/components/workflow/nodes/variable-assigner/use-config.ts b/web/app/components/workflow/nodes/variable-assigner/use-config.ts
index e25b43b059..c3531095c3 100644
--- a/web/app/components/workflow/nodes/variable-assigner/use-config.ts
+++ b/web/app/components/workflow/nodes/variable-assigner/use-config.ts
@@ -3,7 +3,8 @@ 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 { ValueSelector, Var, VarType } from '@/app/components/workflow/types'
+import type { ValueSelector, Var } from '@/app/components/workflow/types'
+import { VarType } from '@/app/components/workflow/types'
 
 const useConfig = (id: string, payload: VariableAssignerNodeType) => {
   const { inputs, setInputs } = useNodeCrud<VariableAssignerNodeType>(id, payload)
@@ -28,7 +29,10 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => {
     setCurrVarIndex(index)
   }, [])
   const filterVar = useCallback((varPayload: Var, valueSelector: ValueSelector) => {
-    if (varPayload.type !== inputs.output_type)
+    const type = varPayload.type
+    if ((inputs.output_type !== VarType.array && type !== inputs.output_type) || (
+      inputs.output_type === VarType.array && ![VarType.array, VarType.arrayString, VarType.arrayNumber, VarType.arrayObject].includes(type)
+    ))
       return false
 
     // can not choose the same node