Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1483 from FlowiseAI/bugfix/Pass-JSON-Variable-Value 

Bugfix/Pass Json Variable Value
This commit is contained in:
Henry Heng 2024-01-08 13:13:00 +00:00 committed by GitHub
parent d5b8db5599 8cb9393862
commit 33c74261ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/components/nodes/utilities/CustomFunction/CustomFunction.ts
View File

@ -65,7 +65,7 @@ class CustomFunction_Utilities implements INode {
inputVars = inputVars =
typeof functionInputVariablesRaw === 'object' ? functionInputVariablesRaw : JSON.parse(functionInputVariablesRaw) typeof functionInputVariablesRaw === 'object' ? functionInputVariablesRaw : JSON.parse(functionInputVariablesRaw)
} catch (exception) { } catch (exception) {
throw new Error("Invalid JSON in the PromptTemplate's promptValues: " + exception) throw new Error('Invalid JSON in the Custom Function Input Variables: ' + exception)
} }
} }

4
packages/server/src/utils/index.ts
View File

@ -561,7 +561,11 @@ export const getVariableValue = (
variablePaths.forEach((path) => { variablePaths.forEach((path) => {
const variableValue = variableDict[path] const variableValue = variableDict[path]
// Replace all occurrence // Replace all occurrence
if (typeof variableValue === 'object') {
returnVal = returnVal.split(path).join(JSON.stringify(variableValue).replace(/"/g, '\\"'))
} else {
returnVal = returnVal.split(path).join(variableValue) returnVal = returnVal.split(path).join(variableValue)
}
}) })
return returnVal return returnVal
} }

4
packages/ui/src/ui-component/dialog/ExpandTextDialog.js
View File

@ -67,8 +67,12 @@ const ExpandTextDialog = ({ show, dialogProps, onCancel, onConfirm }) => {
useEffect(() => { useEffect(() => {
if (executeCustomFunctionNodeApi.data) { if (executeCustomFunctionNodeApi.data) {
if (typeof executeCustomFunctionNodeApi.data === 'object') {
setCodeExecutedResult(JSON.stringify(executeCustomFunctionNodeApi.data, null, 2))
} else {
setCodeExecutedResult(executeCustomFunctionNodeApi.data) setCodeExecutedResult(executeCustomFunctionNodeApi.data)
} }
}
}, [executeCustomFunctionNodeApi.data]) }, [executeCustomFunctionNodeApi.data])
useEffect(() => { useEffect(() => {