Chore/variable label (#23270)

web/app/components/workflow/nodes/variable-assigner/components/node-group-item.tsx

@@ -18,10 +18,12 @@ import {
 } from '../hooks'
 import { filterVar } from '../utils'
 import AddVariable from './add-variable'
-import NodeVariableItem from './node-variable-item'
-import { isConversationVar, isENV, isSystemVar } from '@/app/components/workflow/nodes/_base/components/variable/utils'
+import { isSystemVar } from '@/app/components/workflow/nodes/_base/components/variable/utils'
 import cn from '@/utils/classnames'
 import { isExceptionVariable } from '@/app/components/workflow/utils'
+import {
+  VariableLabelInNode,
+} from '@/app/components/workflow/nodes/_base/components/variable/variable-label'
 
 const i18nPrefix = 'workflow.nodes.variableAssigner'
 type GroupItem = {
@@ -122,27 +124,29 @@ const NodeGroupItem = ({
         )
       }
       {
-        !!item.variables.length && item.variables.map((variable = [], index) => {
-          const isSystem = isSystemVar(variable)
-          const isEnv = isENV(variable)
-          const isChatVar = isConversationVar(variable)
+        !!item.variables.length && (
+          <div className='space-y-0.5'>
+            {
+              item.variables.map((variable = [], index) => {
+                const isSystem = isSystemVar(variable)
 
-          const node = isSystem ? nodes.find(node => node.data.type === BlockEnum.Start) : nodes.find(node => node.id === variable[0])
-          const varName = isSystem ? `sys.${variable[variable.length - 1]}` : variable.slice(1).join('.')
-          const isException = isExceptionVariable(varName, node?.data.type)
+                const node = isSystem ? nodes.find(node => node.data.type === BlockEnum.Start) : nodes.find(node => node.id === variable[0])
+                const varName = isSystem ? `sys.${variable[variable.length - 1]}` : variable.slice(1).join('.')
+                const isException = isExceptionVariable(varName, node?.data.type)
 
-          return (
-            <NodeVariableItem
-              key={index}
-              isEnv={isEnv}
-              isChatVar={isChatVar}
-              isException={isException}
-              node={node as Node}
-              varName={varName}
-              showBorder={showSelectedBorder || showSelectionBorder}
-            />
-          )
-        })
+                return (
+                  <VariableLabelInNode
+                    key={index}
+                    variables={variable}
+                    nodeType={node?.data.type}
+                    nodeTitle={node?.data.title}
+                    isExceptionVariable={isException}
+                  />
+                )
+              })
+            }
+          </div>
+        )
       }
     </div>
   )

web/app/components/workflow/nodes/variable-assigner/components/node-variable-item.tsx

@@ -1,111 +0,0 @@
-import {
-  memo,
-  useMemo,
-} from 'react'
-import { useTranslation } from 'react-i18next'
-import cn from '@/utils/classnames'
-import { VarBlockIcon } from '@/app/components/workflow/block-icon'
-import { Line3 } from '@/app/components/base/icons/src/public/common'
-import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
-import { BubbleX, Env } from '@/app/components/base/icons/src/vender/line/others'
-import Badge from '@/app/components/base/badge'
-import type { Node } from '@/app/components/workflow/types'
-
-type NodeVariableItemProps = {
-  isEnv: boolean
-  isChatVar: boolean
-  node: Node
-  varName: string
-  writeMode?: string
-  showBorder?: boolean
-  className?: string
-  isException?: boolean
-}
-
-const i18nPrefix = 'workflow.nodes.assigner'
-
-const NodeVariableItem = ({
-  isEnv,
-  isChatVar,
-  node,
-  varName,
-  writeMode,
-  showBorder,
-  className,
-  isException,
-}: NodeVariableItemProps) => {
-  const { t } = useTranslation()
-
-  const VariableIcon = useMemo(() => {
-    if (isEnv) {
-      return (
-        <Env className='h-3.5 w-3.5 shrink-0 text-util-colors-violet-violet-600' />
-      )
-    }
-
-    if (isChatVar) {
-      return (
-        <BubbleX className='h-3.5 w-3.5 shrink-0 text-util-colors-teal-teal-700' />
-      )
-    }
-
-    return (
-      <Variable02
-        className={cn(
-          'h-3.5 w-3.5 shrink-0 text-text-accent',
-          isException && 'text-text-warning',
-        )}
-      />
-    )
-  }, [isEnv, isChatVar, isException])
-
-  const VariableName = useMemo(() => {
-    return (
-      <div
-        className={cn(
-          'system-xs-medium ml-0.5 shrink truncate text-text-accent',
-          isEnv && 'text-text-primary',
-          isException && 'text-text-warning',
-          isChatVar && 'text-util-colors-teal-teal-700',
-        )}
-        title={varName}
-      >
-        {varName}
-      </div>
-    )
-  }, [isEnv, isChatVar, varName, isException])
-  return (
-    <div className={cn(
-      'relative flex items-center gap-1 self-stretch rounded-md bg-workflow-block-parma-bg p-[3px] pl-[5px]',
-      showBorder && '!bg-state-base-hover',
-      className,
-    )}>
-      <div className='flex w-0 grow items-center'>
-        {
-          node && (
-            <>
-              <div className='shrink-0 p-[1px]'>
-                <VarBlockIcon
-                  className='!text-text-primary'
-                  type={node.data.type}
-                />
-              </div>
-              <div
-                className='mx-0.5 shrink-[1000] truncate text-xs font-medium text-text-secondary'
-                title={node?.data.title}
-              >
-                {node?.data.title}
-              </div>
-              <Line3 className='mr-0.5 shrink-0'></Line3>
-            </>
-          )
-        }
-        {VariableIcon}
-        {VariableName}
-      </div>
-      {writeMode && <Badge className='shrink-0' text={t(`${i18nPrefix}.operations.${writeMode}`)} />}
-    </div>
-  )
-}
-
-export default memo(NodeVariableItem)