From 74ead43ae1af58c86bd753c19686b9970d1d4b86 Mon Sep 17 00:00:00 2001 From: Joel Date: Mon, 1 Apr 2024 16:49:16 +0800 Subject: [PATCH] fix: query selector set sys value problem --- .../_base/components/variable/var-reference-picker.tsx | 2 +- .../nodes/_base/components/variable/var-reference-vars.tsx | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx index c96727c255..adc20c6387 100644 --- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx +++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx @@ -88,7 +88,7 @@ const VarReferencePicker: FC = ({ return getNodeInfoById(availableNodes, outputVarNodeId)?.data })() - const varName = hasValue ? value[value.length - 1] : '' + const varName = hasValue ? `${isSystemVar(value as ValueSelector) ? 'sys.' : ''}${value[value.length - 1]}` : '' const getVarType = () => { if (isConstant) diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx index 62c7227e99..c53df1d0a1 100644 --- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx +++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx @@ -76,7 +76,12 @@ const Item: FC = ({ }, [isHovering]) const handleChosen = (e: React.MouseEvent) => { e.stopPropagation() - onChange([nodeId, ...objPath, itemData.variable], itemData) + if (itemData.variable.startsWith('sys.')) { // system variable + onChange([...objPath, ...itemData.variable.split('.')], itemData) + } + else { + onChange([nodeId, ...objPath, itemData.variable], itemData) + } } return (