From 0f73f6b20c924efbff4df7d16b91e11f5179ea3e Mon Sep 17 00:00:00 2001
From: JzoNg <jzongcode@gmail.com>
Date: Fri, 13 Jun 2025 14:20:53 +0800
Subject: [PATCH] fix: conversation variable updating & number 0 display

---
 .../workflow/hooks/use-inspect-vars-crud.ts       | 15 ++++++---------
 .../components/variable-modal.tsx                 |  4 ++--
 .../workflow/variable-inspect/right.tsx           |  4 ++--
 .../workflow/variable-inspect/value-content.tsx   |  9 +++++----
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/web/app/components/workflow/hooks/use-inspect-vars-crud.ts b/web/app/components/workflow/hooks/use-inspect-vars-crud.ts
index a3676b24b3..59cc98a17b 100644
--- a/web/app/components/workflow/hooks/use-inspect-vars-crud.ts
+++ b/web/app/components/workflow/hooks/use-inspect-vars-crud.ts
@@ -169,16 +169,13 @@ const useInspectVarsCrud = () => {
   }
 
   const editInspectVarValue = useCallback(async (nodeId: string, varId: string, value: any) => {
-    if (nodeId === VarInInspectType.conversation) {
+    await doEditInspectorVar({
+      varId,
+      value,
+    })
+    setInspectVarValue(nodeId, varId, value)
+    if (nodeId === VarInInspectType.conversation)
       invalidateConversationVarValues()
-    }
-    else {
-      await doEditInspectorVar({
-        varId,
-        value,
-      })
-      setInspectVarValue(nodeId, varId, value)
-    }
     if (nodeId === VarInInspectType.system)
       invalidateSysVarValues()
   }, [doEditInspectorVar, invalidateConversationVarValues, invalidateSysVarValues, setInspectVarValue])
diff --git a/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal.tsx b/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal.tsx
index d8da0e69a3..3240496b62 100644
--- a/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal.tsx
+++ b/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal.tsx
@@ -324,7 +324,7 @@ const ChatVariableModal = ({
             {type === ChatVarType.String && (
               // Input will remove \n\r, so use Textarea just like description area
               <textarea
-                className='system-sm-regular placeholder:system-sm-regular block h-20 w-full resize-none appearance-none rounded-lg border border-transparent bg-components-input-bg-normal p-2 caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs'
+                className='system-sm-regular placeholder:system-sm-regular block h-20 w-full resize-none appearance-none rounded-lg border border-transparent bg-components-input-bg-normal p-2 text-components-input-text-filled caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs'
                 value={value}
                 placeholder={t('workflow.chatVariable.modal.valuePlaceholder') || ''}
                 onChange={e => setValue(e.target.value)}
@@ -377,7 +377,7 @@ const ChatVariableModal = ({
           <div className='system-sm-semibold mb-1 flex h-6 items-center text-text-secondary'>{t('workflow.chatVariable.modal.description')}</div>
           <div className='flex'>
             <textarea
-              className='system-sm-regular placeholder:system-sm-regular block h-20 w-full resize-none appearance-none rounded-lg border border-transparent bg-components-input-bg-normal p-2 caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs'
+              className='system-sm-regular placeholder:system-sm-regular block h-20 w-full resize-none appearance-none rounded-lg border border-transparent bg-components-input-bg-normal p-2 text-components-input-text-filled caret-primary-600 outline-none placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs'
               value={des}
               placeholder={t('workflow.chatVariable.modal.descriptionPlaceholder') || ''}
               onChange={e => setDes(e.target.value)}
diff --git a/web/app/components/workflow/variable-inspect/right.tsx b/web/app/components/workflow/variable-inspect/right.tsx
index e4563567c1..851078d972 100644
--- a/web/app/components/workflow/variable-inspect/right.tsx
+++ b/web/app/components/workflow/variable-inspect/right.tsx
@@ -109,14 +109,14 @@ const Right = ({
                   <span className='system-2xs-semibold-uupercase'>{t('workflow.debug.variableInspect.edited')}</span>
                 </Badge>
               )}
-              {currentNodeVar.var.edited && (
+              {currentNodeVar.var.edited && currentNodeVar.var.type !== VarInInspectType.conversation && (
                 <Tooltip popupContent={t('workflow.debug.variableInspect.reset')}>
                   <ActionButton onClick={resetValue}>
                     <RiArrowGoBackLine className='h-4 w-4' />
                   </ActionButton>
                 </Tooltip>
               )}
-              {currentNodeVar.var.type === VarInInspectType.conversation && (
+              {currentNodeVar.var.edited && currentNodeVar.var.type === VarInInspectType.conversation && (
                 <Tooltip popupContent={t('workflow.debug.variableInspect.resetConversationVar')}>
                   <ActionButton onClick={handleClear}>
                     <RiArrowGoBackLine className='h-4 w-4' />
diff --git a/web/app/components/workflow/variable-inspect/value-content.tsx b/web/app/components/workflow/variable-inspect/value-content.tsx
index 5fad36efef..d88734708d 100644
--- a/web/app/components/workflow/variable-inspect/value-content.tsx
+++ b/web/app/components/workflow/variable-inspect/value-content.tsx
@@ -58,10 +58,10 @@ const ValueContent = ({
   // update default value when id changed
   useEffect(() => {
     if (showTextEditor) {
-      if (!currentVar.value)
-        return setValue('')
       if (currentVar.value_type === 'number')
         return setValue(JSON.stringify(currentVar.value))
+      if (!currentVar.value)
+        return setValue('')
       setValue(currentVar.value)
     }
     if (showJSONEditor)
@@ -86,9 +86,10 @@ const ValueContent = ({
 
     if (currentVar.value_type === 'number') {
       if (/^-?\d+(\.)?(\d+)?$/.test(value))
-        setValue(value)
+        setValue(Number.parseFloat(value))
     }
-    debounceValueChange(currentVar.id, value)
+    const newValue = currentVar.value_type === 'number' ? Number.parseFloat(value) : value
+    debounceValueChange(currentVar.id, newValue)
   }
 
   const jsonValueValidate = (value: string, type: string) => {