Merge branch 'main' into feat/trigger

2026-05-05 18:08:07 +08:00 · 2025-10-10 15:09:38 +08:00
parent 1d4e36d58f cf1778e696
commit 85f1cf1d90
124 changed files with 886 additions and 271 deletions
--- a/web/app/components/workflow/block-selector/tool/tool.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool.tsx
@ -74,7 +74,7 @@ const Tool: FC<Props> = ({
    if (isHovering && !isAllSelected) {
      return (
        <span className='system-xs-regular text-components-button-secondary-accent-text'
-          onClick={(e) => {
+          onClick={() => {
            onSelectMultiple?.(BlockEnum.Tool, actions.filter(action => !getIsDisabled(action)).map((tool) => {
              const params: Record<string, string> = {}
              if (tool.parameters) {
--- a/web/app/components/workflow/hooks/use-shortcuts.ts
+++ b/web/app/components/workflow/hooks/use-shortcuts.ts
@ -108,7 +108,8 @@ export const useShortcuts = (): void => {
    const { showDebugAndPreviewPanel } = workflowStore.getState()
    if (shouldHandleShortcut(e) && !showDebugAndPreviewPanel) {
      e.preventDefault()
-      workflowHistoryShortcutsEnabled && handleHistoryBack()
+      if (workflowHistoryShortcutsEnabled)
+        handleHistoryBack()
    }
  }, { exactMatch: true, useCapture: true })

@ -117,7 +118,8 @@ export const useShortcuts = (): void => {
    (e) => {
      if (shouldHandleShortcut(e)) {
        e.preventDefault()
-        workflowHistoryShortcutsEnabled && handleHistoryForward()
+        if (workflowHistoryShortcutsEnabled)
+          handleHistoryForward()
      }
    },
    { exactMatch: true, useCapture: true },
--- a/web/app/components/workflow/hooks/use-workflow-history.ts
+++ b/web/app/components/workflow/hooks/use-workflow-history.ts
@ -41,16 +41,16 @@ export const useWorkflowHistory = () => {
  const { store: workflowHistoryStore } = useWorkflowHistoryStore()
  const { t } = useTranslation()

-  const [undoCallbacks, setUndoCallbacks] = useState<any[]>([])
-  const [redoCallbacks, setRedoCallbacks] = useState<any[]>([])
+  const [undoCallbacks, setUndoCallbacks] = useState<(() => void)[]>([])
+  const [redoCallbacks, setRedoCallbacks] = useState<(() => void)[]>([])

-  const onUndo = useCallback((callback: unknown) => {
-    setUndoCallbacks((prev: any) => [...prev, callback])
+  const onUndo = useCallback((callback: () => void) => {
+    setUndoCallbacks(prev => [...prev, callback])
    return () => setUndoCallbacks(prev => prev.filter(cb => cb !== callback))
  }, [])

-  const onRedo = useCallback((callback: unknown) => {
-    setRedoCallbacks((prev: any) => [...prev, callback])
+  const onRedo = useCallback((callback: () => void) => {
+    setRedoCallbacks(prev => [...prev, callback])
    return () => setRedoCallbacks(prev => prev.filter(cb => cb !== callback))
  }, [])

--- a/web/app/components/workflow/hooks/use-workflow.ts
+++ b/web/app/components/workflow/hooks/use-workflow.ts
@ -386,7 +386,7 @@ export const useWorkflow = () => {
    return startNodes
  }, [nodesMap, getRootNodesById])

-  const isValidConnection = useCallback(({ source, sourceHandle, target }: Connection) => {
+  const isValidConnection = useCallback(({ source, sourceHandle: _sourceHandle, target }: Connection) => {
    const {
      edges,
      getNodes,
--- a/web/app/components/workflow/nodes/_base/components/retry/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/retry/utils.ts
@ -0,0 +1 @@
+export {}
--- 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
@ -129,7 +129,7 @@ const VarReferencePicker: FC<Props> = ({

  const reactflow = useReactFlow()

-  const startNode = availableNodes.find((node: any) => {
+  const startNode = availableNodes.find((node: Node) => {
    return node.data.type === BlockEnum.Start
  })

@ -409,7 +409,10 @@ const VarReferencePicker: FC<Props> = ({
        <WrapElem onClick={() => {
          if (readonly)
            return
-          !isConstant ? setOpen(!open) : setControlFocus(Date.now())
+          if (!isConstant)
+            setOpen(!open)
+          else
+            setControlFocus(Date.now())
        }} className='group/picker-trigger-wrap relative !flex'>
          <>
            {isAddBtnTrigger
@ -459,7 +462,10 @@ const VarReferencePicker: FC<Props> = ({
                      onClick={() => {
                        if (readonly)
                          return
-                        !isConstant ? setOpen(!open) : setControlFocus(Date.now())
+                        if (!isConstant)
+                          setOpen(!open)
+                        else
+                          setControlFocus(Date.now())
                      }}
                      className='h-full grow'
                    >
--- 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
@ -137,7 +137,7 @@ const Item: FC<ItemProps> = ({
  const isHovering = isItemHovering || isChildrenHovering
  const open = (isObj || isStructureOutput) && isHovering
  useEffect(() => {
-    onHovering && onHovering(isHovering)
+    onHovering?.(isHovering)
  }, [isHovering])
  const handleChosen = (e: React.MouseEvent) => {
    e.stopPropagation()
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
@ -25,12 +25,12 @@ type Props = {
 } & Partial<ResultPanelProps>

 const LastRun: FC<Props> = ({
-  appId,
+  appId: _appId,
  nodeId,
  canSingleRun,
  isRunAfterSingleRun,
  updateNodeRunningStatus,
-  nodeInfo,
+  nodeInfo: _nodeInfo,
  runningStatus: oneStepRunRunningStatus,
  onSingleRunClicked,
  singleRunResult,
--- a/web/app/components/workflow/nodes/http/components/timeout/index.tsx
+++ b/web/app/components/workflow/nodes/http/components/timeout/index.tsx
@ -5,6 +5,8 @@ import { useTranslation } from 'react-i18next'
 import type { Timeout as TimeoutPayloadType } from '../../types'
 import Input from '@/app/components/base/input'
 import { FieldCollapse } from '@/app/components/workflow/nodes/_base/components/collapse'
+import { useStore } from '@/app/components/workflow/store'
+import { BlockEnum } from '@/app/components/workflow/types'

 type Props = {
  readonly: boolean
@ -61,6 +63,11 @@ const Timeout: FC<Props> = ({ readonly, payload, onChange }) => {
  const { t } = useTranslation()
  const { connect, read, write, max_connect_timeout, max_read_timeout, max_write_timeout } = payload ?? {}

+  // Get default config from store for max timeout values
+  const nodesDefaultConfigs = useStore(s => s.nodesDefaultConfigs)
+  const defaultConfig = nodesDefaultConfigs?.[BlockEnum.HttpRequest]
+  const defaultTimeout = defaultConfig?.timeout || {}
+
  return (
    <FieldCollapse title={t(`${i18nPrefix}.timeout.title`)}>
      <div className='mt-2 space-y-1'>
@ -73,7 +80,7 @@ const Timeout: FC<Props> = ({ readonly, payload, onChange }) => {
            value={connect}
            onChange={v => onChange?.({ ...payload, connect: v })}
            min={1}
-            max={max_connect_timeout || 300}
+            max={max_connect_timeout || defaultTimeout.max_connect_timeout || 10}
          />
          <InputField
            title={t('workflow.nodes.http.timeout.readLabel')!}
@ -83,7 +90,7 @@ const Timeout: FC<Props> = ({ readonly, payload, onChange }) => {
            value={read}
            onChange={v => onChange?.({ ...payload, read: v })}
            min={1}
-            max={max_read_timeout || 600}
+            max={max_read_timeout || defaultTimeout.max_read_timeout || 600}
          />
          <InputField
            title={t('workflow.nodes.http.timeout.writeLabel')!}
@ -93,7 +100,7 @@ const Timeout: FC<Props> = ({ readonly, payload, onChange }) => {
            value={write}
            onChange={v => onChange?.({ ...payload, write: v })}
            min={1}
-            max={max_write_timeout || 600}
+            max={max_write_timeout || defaultTimeout.max_write_timeout || 600}
          />
        </div>
      </div>
--- a/web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx
@ -88,7 +88,8 @@ const OptionCard = memo(({
      )}
      onClick={(e) => {
        e.stopPropagation()
-        !readonly && enableSelect && id && onClick?.(id)
+        if (!readonly && enableSelect && id)
+          onClick?.(id)
      }}
    >
      <div className={cn(
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx
@ -120,7 +120,7 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
      setJson(JSON.stringify(schema, null, 2))
  }, [currentTab])

-  const handleSubmit = useCallback((schema: any) => {
+  const handleSubmit = useCallback((schema: Record<string, unknown>) => {
    const jsonSchema = jsonToSchema(schema) as SchemaRoot
    if (currentTab === SchemaView.VisualEditor)
      setJsonSchema(jsonSchema)
@ -139,8 +139,10 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
  const handleResetDefaults = useCallback(() => {
    if (currentTab === SchemaView.VisualEditor) {
      setHoveringProperty(null)
-      advancedEditing && setAdvancedEditing(false)
-      isAddingNewField && setIsAddingNewField(false)
+      if (advancedEditing)
+        setAdvancedEditing(false)
+      if (isAddingNewField)
+        setIsAddingNewField(false)
    }
    setJsonSchema(DEFAULT_SCHEMA)
    setJson(JSON.stringify(DEFAULT_SCHEMA, null, 2))
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/index.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/index.tsx
@ -87,8 +87,10 @@ const EditCard: FC<EditCardProps> = ({
  })

  useSubscribe('fieldChangeSuccess', () => {
-    isAddingNewField && setIsAddingNewField(false)
-    advancedEditing && setAdvancedEditing(false)
+    if (isAddingNewField)
+      setIsAddingNewField(false)
+    if (advancedEditing)
+      setAdvancedEditing(false)
  })

  const emitPropertyNameChange = useCallback(() => {
@ -150,14 +152,16 @@ const EditCard: FC<EditCardProps> = ({
  }, [isAdvancedEditing, emitPropertyOptionsChange, currentFields])

  const handleAdvancedOptionsChange = useCallback((options: AdvancedOptionsType) => {
-    let enumValue: any = options.enum
-    if (enumValue === '') {
+    let enumValue: SchemaEnumType | undefined
+    if (options.enum === '') {
      enumValue = undefined
    }
    else {
-      enumValue = options.enum.replace(/\s/g, '').split(',')
+      const stringArray = options.enum.replace(/\s/g, '').split(',')
      if (currentFields.type === Type.number)
-        enumValue = (enumValue as SchemaEnumType).map(value => Number(value)).filter(num => !Number.isNaN(num))
+        enumValue = stringArray.map(value => Number(value)).filter(num => !Number.isNaN(num))
+      else
+        enumValue = stringArray
    }
    setCurrentFields(prev => ({ ...prev, enum: enumValue }))
    if (isAdvancedEditing) return
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
@ -45,8 +45,10 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
      onChange(backupSchema)
      setBackupSchema(null)
    }
-    isAddingNewField && setIsAddingNewField(false)
-    advancedEditing && setAdvancedEditing(false)
+    if (isAddingNewField)
+      setIsAddingNewField(false)
+    if (advancedEditing)
+      setAdvancedEditing(false)
    setHoveringProperty(null)
  })

@ -221,7 +223,8 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
  })

  useSubscribe('addField', (params) => {
-    advancedEditing && setAdvancedEditing(false)
+    if (advancedEditing)
+      setAdvancedEditing(false)
    setBackupSchema(jsonSchema)
    const { path } = params as AddEventParams
    setIsAddingNewField(true)
--- a/web/app/components/workflow/nodes/llm/panel.tsx
+++ b/web/app/components/workflow/nodes/llm/panel.tsx
@ -293,6 +293,11 @@ const Panel: FC<NodePanelProps<LLMNodeType>> = ({
            type='string'
            description={t(`${i18nPrefix}.outputVars.output`)}
          />
+          <VarItem
+            name='reasoning_content'
+            type='string'
+            description={t(`${i18nPrefix}.outputVars.reasoning_content`)}
+          />
          <VarItem
            name='usage'
            type='object'
--- a/web/app/components/workflow/nodes/loop/components/condition-value.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-value.tsx
@ -22,7 +22,7 @@ type ConditionValueProps = {
 }
 const ConditionValue = ({
  variableSelector,
-  labelName,
+  labelName: _labelName,
  operator,
  value,
 }: ConditionValueProps) => {
--- a/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal-trigger.tsx
+++ b/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal-trigger.tsx
@ -35,7 +35,8 @@ const VariableModalTrigger = ({
      open={open}
      onOpenChange={() => {
        setOpen(v => !v)
-        open && onClose()
+        if (open)
+          onClose()
      }}
      placement='left-start'
      offset={{
@ -45,7 +46,8 @@ const VariableModalTrigger = ({
    >
      <PortalToFollowElemTrigger onClick={() => {
        setOpen(v => !v)
-        open && onClose()
+        if (open)
+          onClose()
      }}>
        <Button variant='primary'>
          <RiAddLine className='mr-1 h-4 w-4' />
--- a/web/app/components/workflow/panel/env-panel/variable-trigger.tsx
+++ b/web/app/components/workflow/panel/env-panel/variable-trigger.tsx
@ -33,7 +33,8 @@ const VariableTrigger = ({
      open={open}
      onOpenChange={() => {
        setOpen(v => !v)
-        open && onClose()
+        if (open)
+          onClose()
      }}
      placement='left-start'
      offset={{
@ -43,7 +44,8 @@ const VariableTrigger = ({
    >
      <PortalToFollowElemTrigger onClick={() => {
        setOpen(v => !v)
-        open && onClose()
+        if (open)
+          onClose()
      }}>
        <Button variant='primary'>
          <RiAddLine className='mr-1 h-4 w-4' />
--- a/web/app/components/workflow/run/index.tsx
+++ b/web/app/components/workflow/run/index.tsx
@ -86,9 +86,12 @@ const RunPanel: FC<RunProps> = ({

  const switchTab = async (tab: string) => {
    setCurrentTab(tab)
-    if (tab === 'RESULT')
-      runDetailUrl && await getResult()
-    tracingListUrl && await getTracingList()
+    if (tab === 'RESULT') {
+      if (runDetailUrl)
+        await getResult()
+    }
+    if (tracingListUrl)
+      await getTracingList()
  }

  useEffect(() => {
--- a/web/app/components/workflow/workflow-preview/components/nodes/loop/node.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/loop/node.tsx
@ -15,7 +15,7 @@ import { useNodeLoopInteractions } from './hooks'

 const Node: FC<NodeProps<LoopNodeType>> = ({
  id,
-  data,
+  data: _data,
 }) => {
  const { zoom } = useViewport()
  const nodesInitialized = useNodesInitialized()