Merge commit 'fb41b215' into sandboxed-agent-rebase

Made-with: Cursor # Conflicts: # .devcontainer/post_create_command.sh # api/commands.py # api/core/agent/cot_agent_runner.py # api/core/agent/fc_agent_runner.py # api/core/app/apps/workflow_app_runner.py # api/core/app/entities/queue_entities.py # api/core/app/entities/task_entities.py # api/core/workflow/workflow_entry.py # api/dify_graph/enums.py # api/dify_graph/graph/graph.py # api/dify_graph/graph_events/node.py # api/dify_graph/model_runtime/entities/message_entities.py # api/dify_graph/node_events/node.py # api/dify_graph/nodes/agent/agent_node.py # api/dify_graph/nodes/base/__init__.py # api/dify_graph/nodes/base/entities.py # api/dify_graph/nodes/base/node.py # api/dify_graph/nodes/llm/entities.py # api/dify_graph/nodes/llm/node.py # api/dify_graph/nodes/tool/tool_node.py # api/pyproject.toml # api/uv.lock # web/app/components/base/avatar/__tests__/index.spec.tsx # web/app/components/base/avatar/index.tsx # web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx # web/app/components/base/file-uploader/file-from-link-or-local/index.tsx # web/app/components/base/prompt-editor/index.tsx # web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx # web/app/components/header/account-dropdown/index.spec.tsx # web/app/components/share/text-generation/index.tsx # web/app/components/workflow/block-selector/tool/action-item.tsx # web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx # web/app/components/workflow/hooks/use-edges-interactions.ts # web/app/components/workflow/hooks/use-nodes-interactions.ts # web/app/components/workflow/index.tsx # web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx # web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx # web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-item.tsx # web/app/components/workflow/nodes/loop/use-interactions.ts # web/contract/router.ts # web/env.ts # web/eslint-suppressions.json # web/package.json # web/pnpm-lock.yaml
2026-05-06 10:28:10 +08:00 · 2026-03-23 10:52:06 +08:00
parent b15a9bea21 fb41b215c8
commit 5041d96bb1
1395 changed files with 167201 additions and 73658 deletions
--- a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
@ -1,24 +1,18 @@
 'use client'
 import type { FC } from 'react'
-import Editor, { loader } from '@monaco-editor/react'
 import { noop } from 'es-toolkit/function'
 import * as React from 'react'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import {
  getFilesInLogs,
 } from '@/app/components/base/file-uploader/utils'
+import { ModernMonacoEditor } from '@/app/components/base/modern-monaco/modern-monaco-editor'
 import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
-import useTheme from '@/hooks/use-theme'
-import { Theme } from '@/types/app'
 import { cn } from '@/utils/classnames'
-import { basePath } from '@/utils/var'
 import Base from '../base'
 import './style.css'

-// load file from local instead of cdn https://github.com/suren-atoyan/monaco-react/issues/482
-if (typeof window !== 'undefined')
-  loader.config({ paths: { vs: `${window.location.origin}${basePath}/vs` } })
-
 const CODE_EDITOR_LINE_HEIGHT = 18

 export type Props = {
@ -76,15 +70,10 @@ const CodeEditor: FC<Props> = ({
  tip,
  footer,
 }) => {
+  const { t } = useTranslation()
  const [isFocus, setIsFocus] = React.useState(false)
-  const [isMounted, setIsMounted] = React.useState(false)
  const minHeight = height || 200
  const [editorContentHeight, setEditorContentHeight] = useState(56)
-  const { theme: appTheme } = useTheme()
-  const valueRef = useRef(value)
-  useEffect(() => {
-    valueRef.current = value
-  }, [value])

  const fileList = useMemo(() => {
    if (typeof value === 'object')
@ -111,19 +100,16 @@ const CodeEditor: FC<Props> = ({
    editorRef.current = editor
    resizeEditorToContent()

-    editor.onDidFocusEditorText(() => {
-      setIsFocus(true)
-      onFocus?.()
-    })
-    editor.onDidBlurEditorText(() => {
-      setIsFocus(false)
-      onBlur?.()
-    })
-
-    monaco.editor.setTheme(appTheme === Theme.light ? 'light' : 'vs-dark') // Fix: sometimes not load the default theme

    onMount?.(editor, monaco)
-    setIsMounted(true)
+  }
+
+  const handleEditorFocus = () => {
+    setIsFocus(true)
+  }
+
+  const handleEditorBlur = () => {
+    setIsFocus(false)
  }

  const outPutValue = (() => {
@ -137,31 +123,23 @@ const CodeEditor: FC<Props> = ({
    }
  })()

-  const theme = useMemo(() => {
-    if (appTheme === Theme.light)
-      return 'light'
-    return 'vs-dark'
-  }, [appTheme])
-
  const main = (
    <>
-      {/* https://www.npmjs.com/package/@monaco-editor/react */}
-      <Editor
+      <ModernMonacoEditor
        // className='min-h-[100%]' // h-full
        // language={language === CodeLanguage.javascript ? 'javascript' : 'python'}
        language={languageMap[language] || 'javascript'}
-        theme={isMounted ? theme : 'default-theme'} // sometimes not load the default theme
        value={outPutValue}
-        loading={<span className="text-text-primary">Loading...</span>}
+        readOnly={readOnly}
        onChange={handleEditorChange}
+        onFocus={handleEditorFocus}
+        onBlur={handleEditorBlur}
+        onReady={handleEditorDidMount}
+        loading={<span className="text-text-primary">{t('loading', { ns: 'common' })}</span>}
        // https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IEditorOptions.html
        options={{
-          readOnly,
-          domReadOnly: true,
          quickSuggestions: false,
-          minimap: { enabled: false },
          lineNumbersMinChars: 1, // would change line num width
-          wordWrap: 'on', // auto line wrap
          // lineNumbers: (num) => {
          //   return <div>{num}</div>
          // }
@ -171,7 +149,6 @@ const CodeEditor: FC<Props> = ({
          },
          stickyScroll: { enabled: false },
        }}
-        onMount={handleEditorDidMount}
      />
      {!outPutValue && !isFocus && <div className="pointer-events-none absolute left-[36px] top-0 text-[13px] font-normal leading-[18px] text-components-input-text-placeholder">{placeholder}</div>}
    </>
--- a/web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx
+++ b/web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx
@ -61,12 +61,12 @@ const Editor: FC<Props> = ({
  const setShowInputFieldPanel = useStore(s => s.setShowInputFieldPanel)

  return (
-    <div className={cn(className, 'relative')}>
+    <div className={cn(className, 'relative min-h-8')}>
      <>
        <PromptEditor
          key={`${instanceId ?? 'input-support-select-var'}-${readOnly ? 'ro' : 'rw'}`}
          instanceId={instanceId}
-          className={cn(promptMinHeightClassName, '!leading-[18px]')}
+          className={cn(promptMinHeightClassName, 'leading-[18px]')}
          placeholder={placeholder}
          placeholderClassName={placeholderClassName}
          value={value}
--- a/web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-label.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-label.tsx
@ -36,6 +36,7 @@ const VariableLabel = ({
      )}
      onClick={onClick}
      ref={ref}
+      {...(isExceptionVariable ? { 'data-testid': 'exception-variable' } : {})}
    >
      {isShowNodeLabel && (
        <VariableNodeLabel