Merge branch 'release/v0.2.3' into develop

web/src/views/Workflow/components/Editor/index.tsx

@@ -242,7 +242,7 @@ const Editor: FC<LexicalEditorProps> =({
         {enableLineNumbers && <LineNumberPlugin />}
         <AutocompletePlugin options={options} enableJinja2={enableJinja2} />
         <CharacterCountPlugin setCount={(count) => { setCount(count) }} onChange={onChange} />
-        <InitialValuePlugin value={value} options={options} enableJinja2={enableJinja2} />
+        <InitialValuePlugin key={language} value={value} options={options} enableLineNumbers={enableLineNumbers} />
         {enableLineNumbers && <BlurPlugin />}
       </div>
     </LexicalComposer>

web/src/views/Workflow/components/Editor/plugin/BlurPlugin.tsx

@@ -16,6 +16,12 @@ export default function BlurPlugin() {
             return;
           }
           
+          // 检查是否是粘贴操作导致的焦点变化
+          const relatedTarget = e.relatedTarget as HTMLElement;
+          if (!relatedTarget || relatedTarget === document.body) {
+            return;
+          }
+          
           editor.update(() => {
             $setSelection(null);
           });

web/src/views/Workflow/components/Editor/plugin/InitialValuePlugin.tsx

@@ -8,12 +8,13 @@ import { type Suggestion } from '../plugin/AutocompletePlugin'
 interface InitialValuePluginProps {
   value: string;
   options?: Suggestion[];
-  enableJinja2?: boolean;
+  enableLineNumbers?: boolean;
 }
 
-const InitialValuePlugin: React.FC<InitialValuePluginProps> = ({ value, options = [], enableJinja2 = false }) => {
+const InitialValuePlugin: React.FC<InitialValuePluginProps> = ({ value, options = [], enableLineNumbers = false }) => {
   const [editor] = useLexicalComposerContext();
   const prevValueRef = useRef<string>('');
+  const prevEnableLineNumbersRef = useRef<boolean>(enableLineNumbers);
   const isUserInputRef = useRef(false);
 
   useEffect(() => {
@@ -32,7 +33,7 @@ const InitialValuePlugin: React.FC<InitialValuePluginProps> = ({ value, options
   }, [editor]);
 
   useEffect(() => {
-    if (value !== prevValueRef.current && !isUserInputRef.current) {
+    if ((value !== prevValueRef.current || enableLineNumbers !== prevEnableLineNumbersRef.current) && !isUserInputRef.current) {
       queueMicrotask(() => {
         editor.update(() => {
         const root = $getRoot();
@@ -40,7 +41,7 @@ const InitialValuePlugin: React.FC<InitialValuePluginProps> = ({ value, options
 
         const parts = value.split(/(\{\{[^}]+\}\})/);
 
-        if (enableJinja2) {
+        if (enableLineNumbers) {
           // Handle newlines properly in Jinja2 mode
           const lines = value.split('\n');
           lines.forEach((line) => {
@@ -104,8 +105,9 @@ const InitialValuePlugin: React.FC<InitialValuePluginProps> = ({ value, options
     }
     
     prevValueRef.current = value;
+    prevEnableLineNumbersRef.current = enableLineNumbers;
     isUserInputRef.current = false;
-  }, [value, options, editor, enableJinja2]);
+  }, [value, options, editor, enableLineNumbers]);
 
   return null;
 };

web/src/views/Workflow/components/Editor/plugin/JavaScriptHighlightPlugin.tsx

@@ -1,6 +1,6 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
-import { TextNode, $createTextNode, $getSelection, $isRangeSelection } from 'lexical';
+import { TextNode, $createTextNode, $getSelection, $isRangeSelection, COMMAND_PRIORITY_LOW, PASTE_COMMAND } from 'lexical';
 
 const JS_KEYWORDS = new Set([
   'async', 'await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger', 'default',
@@ -11,13 +11,31 @@ const JS_KEYWORDS = new Set([
 
 const JavaScriptHighlightPlugin = () => {
   const [editor] = useLexicalComposerContext();
+  const isPastingRef = useRef(false);
+
+  useEffect(() => {
+    return editor.registerCommand(
+      PASTE_COMMAND,
+      () => {
+        isPastingRef.current = true;
+        setTimeout(() => {
+          isPastingRef.current = false;
+        }, 100);
+        return false;
+      },
+      COMMAND_PRIORITY_LOW
+    );
+  }, [editor]);
 
   useEffect(() => {
     return editor.registerNodeTransform(TextNode, (textNode: TextNode) => {
+      if (isPastingRef.current) return;
+      
       const text = textNode.getTextContent();
       
       if (textNode.hasFormat('code')) return;
       if (!needsHighlight(text)) return;
+      if (textNode.getStyle()) return;
       
       const parent = textNode.getParent();
       if (!parent) return;

web/src/views/Workflow/components/Editor/plugin/Python3HighlightPlugin.tsx

@@ -1,6 +1,6 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
-import { TextNode, $createTextNode, $getSelection, $isRangeSelection } from 'lexical';
+import { TextNode, $createTextNode, $getSelection, $isRangeSelection, COMMAND_PRIORITY_LOW, PASTE_COMMAND } from 'lexical';
 
 const PYTHON_KEYWORDS = new Set([
   'False', 'None', 'True', 'and', 'as', 'assert', 'async', 'await', 'break', 'class', 'continue',
@@ -11,12 +11,30 @@ const PYTHON_KEYWORDS = new Set([
 
 const Python3HighlightPlugin = () => {
   const [editor] = useLexicalComposerContext();
+  const isPastingRef = useRef(false);
+
+  useEffect(() => {
+    return editor.registerCommand(
+      PASTE_COMMAND,
+      () => {
+        isPastingRef.current = true;
+        setTimeout(() => {
+          isPastingRef.current = false;
+        }, 100);
+        return false;
+      },
+      COMMAND_PRIORITY_LOW
+    );
+  }, [editor]);
 
   useEffect(() => {
     return editor.registerNodeTransform(TextNode, (textNode: TextNode) => {
+      if (isPastingRef.current) return;
+      
       const text = textNode.getTextContent();
       
       if (textNode.hasFormat('code')) return;
+      if (textNode.getStyle()) return;
       if (!needsHighlight(text)) return;
       
       const parent = textNode.getParent();

web/src/views/Workflow/components/Properties/CodeExecution/index.tsx

@@ -33,7 +33,6 @@ const codeTemplate = {
 const CodeExecution: FC<CodeExecutionProps> = ({ options }) => {
   const { t } = useTranslation()
   const form = Form.useFormInstance()
-  const values = Form.useWatch([], form) || {}
 
   const handleRefresh = () => {
     const code = form.getFieldValue('code') || ''
@@ -66,7 +65,6 @@ const CodeExecution: FC<CodeExecutionProps> = ({ options }) => {
     form.setFieldValue('code', newTemplate)
   }
   const handleChangeLanguage = (value: string) => {
-    form.setFieldValue('code', codeTemplate[value as keyof typeof codeTemplate])
     form.setFieldsValue({
       input_variables: [{ name: 'arg1' }, { name: 'arg2' }],
       code: codeTemplate[value as keyof typeof codeTemplate]
@@ -109,8 +107,12 @@ const CodeExecution: FC<CodeExecutionProps> = ({ options }) => {
             </Form.Item>
           </Col>
         </Row>
-        <Form.Item name="code" noStyle>
-          <Editor size="small" language={values.language} />
+        <Form.Item noStyle shouldUpdate={(prev, curr) => prev.language !== curr.language}>
+          {() => (
+            <Form.Item name="code" noStyle>
+              <Editor size="small" language={form.getFieldValue('language')} />
+            </Form.Item>
+          )}
         </Form.Item>
       </Space>