diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/advanced-script-editor.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/advanced-script-editor.tsx
new file mode 100644
index 00000000..de687c35
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/advanced-script-editor.tsx
@@ -0,0 +1,87 @@
+import {ScriptType,GroovyVariableMapping} from '@/components/design-editor/typings/script';
+import {Button, Input, Space} from 'antd';
+import React from "react";
+import {GroovyScriptContent} from "@/components/design-editor/node-components/scripts/components/groovy-script-modal";
+import {
+    NodeTitleGroovyConvertor
+} from "@/components/design-editor/node-components/scripts/services/convertor/node-title";
+import { DeleteOutlined } from "@ant-design/icons";
+import {
+    GroovyScriptConverterContext
+} from "@/components/design-editor/node-components/scripts/services/convertor/utils";
+
+const {TextArea} = Input;
+
+interface ScriptEditorProps {
+    /** 脚本类型 */
+    type: ScriptType;
+    /** 当前脚本内容 */
+    script: string;
+    /** 变量映射列表 */
+    variables: GroovyVariableMapping[];
+    /** 脚本变更回调 */
+    onChange: (script: string) => void;
+    /** 是否只读 */
+    readonly?: boolean;
+}
+
+/**
+ * 高级脚本编辑器组件
+ * 支持自由编辑 Groovy 脚本
+ */
+export const ScriptEditor:React.FC<ScriptEditorProps> = (props: ScriptEditorProps)=> {
+    const {script, onChange, readonly = false, variables} = props;
+
+    const handleChange = (value: string) => {
+        if (!readonly) {
+            onChange(value);
+        }
+    };
+
+    return (
+        <TextArea
+            value={script}
+            onChange={(e) => handleChange(e.target.value)}
+            readOnly={readonly}
+            style={{ fontFamily: 'Courier New, monospace' }}
+            placeholder="请输入 Groovy 脚本..."
+            autoSize={{ minRows: 6, maxRows: 10 }}
+        />
+    );
+}
+
+
+export const AdvancedScriptEditor: React.FC<GroovyScriptContent> = (props) => {
+
+    const groovyScriptConvertor = GroovyScriptConverterContext.getInstance().createConverter(props.type, props.content, props.variables);
+
+    if(groovyScriptConvertor) {
+
+        return (
+            <div>
+                自定义脚本
+                <ScriptEditor
+                    type={props.type}
+                    script={props.content}
+                    variables={props.variables}
+                    onChange={props.onChange}
+                />
+                <Space
+                    style={{
+                        marginTop: 8
+                    }}
+                >
+                    <Button
+                        icon={<DeleteOutlined/>}
+                        danger={true}
+                        onClick={() => {
+                            props.onChange(groovyScriptConvertor.getDefaultScript());
+                        }}
+                    >
+                        重置配置
+                    </Button>
+                </Space>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/groovy-script-modal.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/groovy-script-modal.tsx
new file mode 100644
index 00000000..97084216
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/groovy-script-modal.tsx
@@ -0,0 +1,99 @@
+import React from 'react';
+import {Modal} from 'antd';
+import {ScriptType,GroovyVariableMapping} from '@/components/design-editor/typings/script';
+
+
+export interface GroovyScriptModalProps {
+    open: boolean;
+    /** 脚本类型 */
+    scriptType: ScriptType;
+    /** 当前脚本 */
+    script: string;
+    /** 变量映射列表 */
+    variables: GroovyVariableMapping[];
+    /** 确认回调 */
+    onConfirm: (script: string) => void;
+    /** 取消回调 */
+    onCancel: () => void;
+    /** 弹框标题 */
+    title?: string;
+    /** 自定义内容组件（可选） */
+    content:React.ComponentType<GroovyScriptContent>;
+}
+
+
+export interface GroovyScriptContent {
+    /** 脚本类型 */
+    type: ScriptType;
+    /** 当前脚本 */
+    content: string;
+    /** 变量映射列表 */
+    variables: GroovyVariableMapping[];
+    /** 确认回调 */
+    onChange: (script: string) => void;
+}
+
+interface GroovyScriptContentComponentAction{
+    handleConfirm: () => void;
+}
+
+interface GroovyScriptContentComponentProps extends GroovyScriptModalProps{
+    actionRef:React.Ref<GroovyScriptContentComponentAction>;
+}
+
+const GroovyScriptContentComponent: React.FC<GroovyScriptContentComponentProps> = (props) => {
+    const [content, setContent] = React.useState(props.script);
+    const GroovyContent = props.content;
+
+    React.useImperativeHandle(props.actionRef,()=>{
+        return {
+            handleConfirm:() => {
+                props.onConfirm(content);
+                props.onCancel();
+            }
+        }
+    },[content]);
+
+    return (
+        <GroovyContent
+            type={props.scriptType}
+            content={content}
+            variables={props.variables}
+            onChange={setContent}
+        />
+    )
+}
+
+/**
+ * 通用脚本配置弹框
+ * 支持普通模式和高级模式切换
+ */
+export const GroovyScriptModal: React.FC<GroovyScriptModalProps> = (props) => {
+
+    const actionRef = React.useRef<GroovyScriptContentComponentAction>(null);
+
+    const handleOk = () => {
+        if (actionRef.current) {
+            actionRef.current.handleConfirm();
+        }
+    }
+
+    return (
+        <Modal
+            title={props.title}
+            open={props.open}
+            onCancel={props.onCancel}
+            onOk={handleOk}
+            width={800}
+            okText="确认"
+            cancelText="取消"
+            destroyOnHidden={true}
+        >
+            <GroovyScriptContentComponent
+                {...props}
+                actionRef={actionRef}
+            />
+        </Modal>
+    );
+};
+
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/groovy-script-preview.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/groovy-script-preview.tsx
new file mode 100644
index 00000000..f49dbd95
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/groovy-script-preview.tsx
@@ -0,0 +1,59 @@
+import React from "react";
+import {GroovyVariableMapping, ScriptType} from "@/components/design-editor/typings/script";
+import {
+    GroovyScriptConverterContext
+} from "@/components/design-editor/node-components/scripts/services/convertor/utils";
+
+interface GroovyScriptPreviewProps {
+    script: string;
+    variables: GroovyVariableMapping[];
+    type: ScriptType;
+    // 多行
+    multiline?: boolean;
+}
+
+export const GroovyScriptPreview: React.FC<GroovyScriptPreviewProps> = (props) => {
+    const groovyScriptConvertor = GroovyScriptConverterContext.getInstance().createConverter(props.type, props.script, props.variables);
+
+    const multiline = props.multiline || false;
+
+    const value = groovyScriptConvertor?.toExpression() || '';
+
+    return (
+        <>
+            {multiline && (
+                <div
+                    style={{
+                        minHeight: '45px',
+                        padding: '4px 11px',
+                        border: '1px solid #d9d9d9',
+                        borderRadius: '6px 0 0 6px',
+                        backgroundColor: value ? '#fff' : '#fafafa',
+                        color: value ? 'rgba(0,0,0,0.88)' : 'rgba(0,0,0,0.25)',
+                    }}
+                >
+                    {value}
+                </div>
+            )}
+
+            {!multiline && (
+                <div
+                    style={{
+                        flex: 1,
+                        padding: '4px 11px',
+                        backgroundColor: value ? '#fff' : '#fafafa',
+                        border: '1px solid #d9d9d9',
+                        borderRadius: '6px 0 0 6px',
+                        color: value ? 'rgba(0,0,0,0.88)' : 'rgba(0,0,0,0.25)',
+                        whiteSpace: 'nowrap',
+                        overflow: 'hidden',
+                        textOverflow: 'ellipsis',
+                    }}
+                >
+                    {value}
+                </div>
+            )}
+        </>
+
+    )
+}
\ No newline at end of file
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/script-config-modal.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/script-config-modal.tsx
deleted file mode 100644
index d1019d5b..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/script-config-modal.tsx
+++ /dev/null
@@ -1,262 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { Modal, Input, Alert, Button, Space, message } from 'antd';
-import { EditOutlined, CodeOutlined } from '@ant-design/icons';
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { ScriptType } from '@/components/design-editor/typings/groovy-script';
-import { groovySyntaxConverter } from '@/components/design-editor/script/service/groovy-syntax-converter';
-import { ScriptEditor } from './script-editor';
-
-const { TextArea } = Input;
-
-export interface ScriptConfigModalProps {
-  /** 脚本类型 */
-  scriptType: ScriptType;
-  /** 当前脚本 */
-  script: string;
-  /** 变量映射列表 */
-  variables: GroovyVariableMapping[];
-  /** 确认回调 */
-  onConfirm: (script: string) => void;
-  /** 取消回调 */
-  onCancel: () => void;
-  /** 弹框标题 */
-  title?: string;
-}
-
-/**
- * 通用脚本配置弹框
- * 支持普通模式和高级模式切换
- */
-export const ScriptConfigModal: React.FC<ScriptConfigModalProps> = ({
-  scriptType,
-  script,
-  variables,
-  onConfirm,
-  onCancel,
-  title = '脚本配置',
-}) => {
-  const [mode, setMode] = useState<'normal' | 'advanced'>('normal');
-  const [content, setContent] = useState('');
-  const [cursorPosition, setCursorPosition] = useState(0);
-  const [variablePickerOpen, setVariablePickerOpen] = useState(false);
-  const textareaRef = useRef<any>(null);
-  const userModifiedModeRef = useRef(false);
-
-  useEffect(() => {
-    if (userModifiedModeRef.current) {
-      return;
-    }
-
-    const isAdvanced = groovySyntaxConverter.isAdvancedMode(script);
-    const parsedMode = isAdvanced ? 'advanced' : 'normal';
-
-    if (parsedMode === 'normal') {
-      const labelExpr = groovySyntaxConverter.toExpression(scriptType, script, variables);
-      setContent(labelExpr || '');
-    } else {
-      setContent(script);
-    }
-
-    setMode(parsedMode);
-  }, [script]);
-
-  // 切换到高级模式
-  const handleSwitchToAdvanced = () => {
-    const groovyScript = groovySyntaxConverter.toScript(scriptType, content, variables);
-    setContent(groovyScript);
-    setMode('advanced');
-    userModifiedModeRef.current = true;
-  };
-
-  // 切换到普通模式
-  const handleSwitchToNormal = () => {
-    const labelExpr = groovySyntaxConverter.toExpression(scriptType, content, variables);
-    if (labelExpr === null) {
-      message.error('当前脚本无法转换为可视化表达式，请检查语法');
-      return;
-    }
-    setContent(labelExpr);
-    setMode('normal');
-    userModifiedModeRef.current = true;
-  };
-
-  // 确认
-  const handleConfirm = () => {
-    if (mode === 'normal') {
-      const groovyScript = groovySyntaxConverter.toScript(scriptType, content, variables);
-      onConfirm(groovyScript);
-    } else {
-      onConfirm(content);
-    }
-  };
-
-  // 插入变量
-  const handleInsertVariable = (mapping: GroovyVariableMapping) => {
-    const variableText = `\${${mapping.label}}`;
-    const start = cursorPosition;
-    const newContent = content.substring(0, start) + variableText + content.substring(start);
-    setContent(newContent);
-    setCursorPosition(start + variableText.length);
-    setVariablePickerOpen(false);
-
-    setTimeout(() => {
-      if (textareaRef.current) {
-        textareaRef.current.focus();
-        textareaRef.current.setSelectionRange(start + variableText.length, start + variableText.length);
-      }
-    }, 0);
-  };
-
-  // 预览
-  const handlePreview = () => {
-    if (mode === 'normal') {
-      const groovyScript = groovySyntaxConverter.toScript(scriptType, content, variables);
-      const labelExpr = groovySyntaxConverter.toExpression(scriptType, groovyScript, variables);
-      message.info(labelExpr || '预览: ' + groovyScript);
-    } else {
-      message.info('预览: ' + content);
-    }
-  };
-
-  // 变量选择器
-  const renderVariablePicker = () => {
-    if (!variablePickerOpen) {
-      return null;
-    }
-
-    // 按 tag 分组
-    const groups = new Map<string, GroovyVariableMapping[]>();
-    for (const v of variables) {
-      const group = groups.get(v.tag) || [];
-      group.push(v);
-      groups.set(v.tag, group);
-    }
-
-    return (
-      <div style={{
-        position: 'absolute',
-        top: '100%',
-        left: 0,
-        right: 0,
-        maxHeight: '200px',
-        overflowY: 'auto',
-        background: '#fff',
-        border: '1px solid #d9d9d9',
-        borderRadius: '6px',
-        boxShadow: '0 2px 8px rgba(0,0,0,0.15)',
-        zIndex: 10,
-        padding: '8px',
-      }}>
-        {Array.from(groups.entries()).map(([tag, vars]) => (
-          <div key={tag}>
-            <div style={{ fontWeight: 500, marginBottom: '4px', color: '#666' }}>{tag}</div>
-            {vars.map(v => (
-              <div
-                key={v.label}
-                onClick={() => {
-                  handleInsertVariable(v);
-                  setVariablePickerOpen(false);
-                }}
-                style={{
-                  padding: '4px 8px',
-                  cursor: 'pointer',
-                  borderRadius: '4px',
-                }}
-                onMouseEnter={e => e.currentTarget.style.background = '#f5f5f5'}
-                onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
-              >
-                <div>{v.label}</div>
-                <div style={{ fontSize: '12px', color: '#999' }}>{v.value}</div>
-              </div>
-            ))}
-          </div>
-        ))}
-      </div>
-    );
-  };
-
-  return (
-    <Modal
-      title={title}
-      open={true}
-      onCancel={onCancel}
-      onOk={handleConfirm}
-      width={700}
-      okText="确认"
-      cancelText="取消"
-    >
-      <div className="script-config-modal">
-        {/* 模式切换 */}
-        <div style={{ marginBottom: '16px' }}>
-          <Space>
-            <Button
-              type={mode === 'normal' ? 'primary' : 'default'}
-              icon={<EditOutlined />}
-              onClick={handleSwitchToNormal}
-              disabled={mode === 'normal'}
-            >
-              普通模式
-            </Button>
-            <Button
-              type={mode === 'advanced' ? 'primary' : 'default'}
-              icon={<CodeOutlined />}
-              onClick={handleSwitchToAdvanced}
-              disabled={mode === 'advanced'}
-            >
-              高级模式
-            </Button>
-          </Space>
-        </div>
-
-        {/* 编辑器区域 */}
-        {mode === 'normal' ? (
-          <div style={{ position: 'relative' }}>
-            <TextArea
-              ref={textareaRef}
-              value={content}
-              onChange={(e) => setContent(e.target.value)}
-              onSelect={(e: any) => setCursorPosition(e.target.selectionStart)}
-              placeholder="请输入表达式，可以使用 ${变量名} 插入变量"
-              rows={4}
-            />
-            <div style={{ marginTop: '8px' }}>
-              <Button
-                type="link"
-                onClick={() => setVariablePickerOpen(!variablePickerOpen)}
-                style={{ padding: 0 }}
-              >
-                插入变量
-              </Button>
-              {renderVariablePicker()}
-              <Button
-                type="link"
-                onClick={handlePreview}
-                style={{ marginLeft: '8px' }}
-              >
-                预览
-              </Button>
-            </div>
-          </div>
-        ) : (
-          <div>
-            <Alert
-              message="高级模式说明"
-              description="在高级模式下，您可以自由编写 Groovy 脚本。保存后再打开将无法转换回普通模式。"
-              type="warning"
-              showIcon
-              style={{ marginBottom: '16px' }}
-            />
-            <ScriptEditor
-              scriptType={scriptType}
-              script={content}
-              variables={variables}
-              onChange={setContent}
-            />
-          </div>
-        )}
-      </div>
-    </Modal>
-  );
-};
-
-export default ScriptConfigModal;
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/script-editor.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/script-editor.tsx
deleted file mode 100644
index 640b13b2..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/script-editor.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { useState } from 'react';
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { ScriptType } from '@/components/design-editor/typings/groovy-script';
-
-interface ScriptEditorProps {
-  /** 脚本类型 */
-  scriptType: ScriptType;
-  /** 当前脚本内容 */
-  script: string;
-  /** 变量映射列表 */
-  variables: GroovyVariableMapping[];
-  /** 脚本变更回调 */
-  onChange: (script: string) => void;
-  /** 是否只读 */
-  readonly?: boolean;
-}
-
-/**
- * 高级脚本编辑器组件
- * 支持自由编辑 Groovy 脚本
- */
-export function ScriptEditor(props: ScriptEditorProps) {
-  const { script, onChange, readonly = false, variables } = props;
-
-  const handleChange = (value: string) => {
-    if (!readonly) {
-      onChange(value);
-    }
-  };
-
-  return (
-    <div className="script-editor">
-      <textarea
-        className="script-editor-textarea"
-        value={script}
-        onChange={(e) => handleChange(e.target.value)}
-        readOnly={readonly}
-        placeholder="请输入 Groovy 脚本..."
-        rows={10}
-      />
-    </div>
-  );
-}
-
-export default ScriptEditor;
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/variable-picker.module.scss b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/variable-picker.module.scss
deleted file mode 100644
index 9ec6f403..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/variable-picker.module.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-.variablePicker {
-  :global {
-    .ant-modal-body {
-      max-height: 500px;
-      overflow-y: auto;
-    }
-  }
-}
-
-.searchWrapper {
-  margin-bottom: 16px;
-}
-
-.variableList {
-  max-height: 400px;
-  overflow-y: auto;
-}
-
-.variableGroup {
-  margin-bottom: 16px;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-.groupTitle {
-  font-weight: 500;
-  color: rgba(0, 0, 0, 0.85);
-  margin-bottom: 8px;
-  padding-left: 8px;
-}
-
-.variableItems {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.variableItem {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 8px 12px;
-  border-radius: 4px;
-  cursor: pointer;
-  transition: background-color 0.2s;
-
-  &:hover {
-    background-color: rgba(0, 0, 0, 0.04);
-  }
-}
-
-.variableLabel {
-  color: rgba(0, 0, 0, 0.85);
-}
-
-.variableValue {
-  color: rgba(0, 0, 0, 0.45);
-  font-size: 12px;
-  font-family: 'Courier New', monospace;
-}
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/variable-picker.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/variable-picker.tsx
index 4d832787..fc05fd4e 100644
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/variable-picker.tsx
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/components/variable-picker.tsx
@@ -1,99 +1,146 @@
-import React, { useMemo, useState } from 'react';
-import { Modal, Input, Empty } from 'antd';
-import { SearchOutlined } from '@ant-design/icons';
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { GroovyVariableService } from '@/components/design-editor/script/service/groovy-variable-service';
-import styles from './variable-picker.module.scss';
+import React, {useState} from 'react';
+import {Button, Col, Empty, Input, Popover, Row} from "antd";
+import {EditOutlined, SearchOutlined} from "@ant-design/icons";
+import {GroovyVariableMapping} from "@/components/design-editor/typings/script";
 
 export interface VariablePickerProps {
-  /** 变量映射列表 */
-  mappings: GroovyVariableMapping[];
-  /** 选中变量回调 */
-  onSelect: (mapping: GroovyVariableMapping) => void;
-  /** 是否显示 */
-  visible: boolean;
-  /** 关闭回调 */
-  onClose: () => void;
+    /** 变量映射列表 */
+    mappings: GroovyVariableMapping[];
+    /** 选中变量回调 */
+    onSelect: (mapping: GroovyVariableMapping) => void;
+}
+
+
+const VariablePickerContent: React.FC<VariablePickerProps> = (props) => {
+    const [searchText, setSearchText] = useState('');
+
+    const mappings = React.useMemo(() => {
+        const groups = new Map<string, GroovyVariableMapping[]>();
+
+        for (const mapping of props.mappings) {
+            const existing = groups.get(mapping.tag) || [];
+            existing.push(mapping);
+            groups.set(mapping.tag, existing);
+        }
+
+        return groups;
+    }, []);
+
+    // 阻止事件冒泡，防止 Popover 关闭
+    const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        e.stopPropagation();
+        setSearchText(e.target.value);
+    };
+
+    return (
+        <div style={{maxHeight: 300, overflowY: 'auto', width: 400}}>
+            <Input
+                placeholder="搜索变量..."
+                prefix={<SearchOutlined style={{color: '#999'}}/>}
+                value={searchText}
+                onChange={handleInputChange}
+                allowClear
+                style={{marginBottom: 8}}
+            />
+
+            {mappings.size === 0 && (
+                <Empty description="未找到匹配的变量" image={Empty.PRESENTED_IMAGE_SIMPLE}/>
+            )}
+
+            {Array.from(mappings.entries()).map(([tag, group]) => {
+                return (
+                    <Row
+                        gutter={[8, 8]} style={{
+                        width: '100%',
+                    }}
+                        key={tag}>
+                        <Col span={24} style={{fontWeight: 'bold', color: '#1890ff'}}>
+                            <span>{tag}</span>
+                        </Col>
+                        {group.map((mapping, index) => {
+                            return (
+                                <Col
+                                    span={12}
+                                    key={index}
+                                    style={{
+                                        padding: '8px',
+                                        border: '1px solid #f0f0f0',
+                                        borderRadius: 4,
+                                        cursor: 'pointer',
+                                        backgroundColor: '#fff',
+                                    }}
+                                    onClick={() => {
+                                        props.onSelect(mapping);
+                                    }}
+                                >
+                                    <div style={{
+                                        fontSize: 14,
+                                        color: '#333',
+                                        fontWeight: 500,
+                                        whiteSpace: 'nowrap',
+                                        overflow: 'hidden',
+                                        textOverflow: 'ellipsis',
+                                    }}>{mapping.label}</div>
+                                    <div
+                                        style={{
+                                            fontSize: 12,
+                                            color: '#999',
+                                            marginTop: 4,
+                                            whiteSpace: 'nowrap',
+                                            overflow: 'hidden',
+                                            textOverflow: 'ellipsis',
+                                        }}>{mapping.expression}</div>
+                                </Col>
+                            )
+                        })}
+                    </Row>
+                )
+            })}
+
+        </div>
+    )
 }
 
 /**
  * 变量选择器组件
  * 用于在脚本表达式中插入变量
  */
-export const VariablePicker: React.FC<VariablePickerProps> = ({
-  mappings,
-  onSelect,
-  visible,
-  onClose,
-}) => {
-  const [searchText, setSearchText] = useState('');
-
-  // 过滤变量
-  const filteredMappings = useMemo(() => {
-    if (!searchText) {
-      return mappings;
-    }
-    const lowerSearch = searchText.toLowerCase();
-    return mappings.filter(
-      m =>
-        m.label.toLowerCase().includes(lowerSearch) ||
-        m.value.toLowerCase().includes(lowerSearch)
-    );
-  }, [mappings, searchText]);
-
-  // 按tag分组
-  const groupedMappings = useMemo(() => {
-    return GroovyVariableService.groupByTag(filteredMappings);
-  }, [filteredMappings]);
+export const VariablePicker: React.FC<VariablePickerProps> = (props) => {
 
-  const handleVariableClick = (mapping: GroovyVariableMapping) => {
-    onSelect(mapping);
-    onClose();
-    setSearchText('');
-  };
+    const [visible, setVisible] = React.useState(false);
 
-  return (
-    <Modal
-      title="选择变量"
-      open={visible}
-      onCancel={onClose}
-      footer={null}
-      width={600}
-      className={styles.variablePicker}
-    >
-      <div className={styles.searchWrapper}>
-        <Input
-          placeholder="搜索变量..."
-          prefix={<SearchOutlined />}
-          value={searchText}
-          onChange={e => setSearchText(e.target.value)}
-          allowClear
-        />
-      </div>
+    const handleSelect = (mapping: GroovyVariableMapping) => {
+        props.onSelect(mapping);
+        setVisible(false);
+    }
 
-      <div className={styles.variableList}>
-        {groupedMappings.size === 0 ? (
-          <Empty description="未找到匹配的变量" />
-        ) : (
-          Array.from(groupedMappings.entries()).map(([tag, variables]: [string, GroovyVariableMapping[]]) => (
-            <div key={tag} className={styles.variableGroup}>
-              <div className={styles.groupTitle}>{tag}</div>
-              <div className={styles.variableItems}>
-                {variables.map((variable: GroovyVariableMapping) => (
-                  <div
-                    key={variable.label}
-                    className={styles.variableItem}
-                    onClick={() => handleVariableClick(variable)}
-                  >
-                    <div className={styles.variableLabel}>{variable.label}</div>
-                    <div className={styles.variableValue}>{variable.value}</div>
-                  </div>
-                ))}
-              </div>
-            </div>
-          ))
-        )}
-      </div>
-    </Modal>
-  );
+    return (
+        <Popover
+            content={
+                (
+                    <VariablePickerContent
+                        {...props}
+                        onSelect={handleSelect}
+                    />
+                )
+            }
+            open={visible}
+            destroyOnHidden={true}
+            onOpenChange={(visible) => {
+                setVisible(visible);
+            }}
+            trigger="click"
+            placement="bottom"
+            getPopupContainer={(trigger) => trigger.parentElement || document.body}
+        >
+            <Button
+                icon={<EditOutlined/>}
+                onClick={() => {
+                    setVisible(true);
+                }}
+            >
+                插入变量
+            </Button>
+        </Popover>
+    );
 };
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/condition-config-modal.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/condition-config-modal.tsx
deleted file mode 100644
index 3fba0106..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/condition-config-modal.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { ScriptConfigModal, ScriptConfigModalProps } from './components/script-config-modal';
-import { ScriptType } from '@/components/design-editor/typings/groovy-script';
-import { GroovyVariableService } from '@/components/design-editor/script/service/groovy-variable-service';
-
-export interface ConditionConfigModalProps extends Omit<ScriptConfigModalProps, 'scriptType' | 'title'> {
-  /** 额外的变量（可选） */
-  extraVariables?: GroovyVariableMapping[];
-}
-
-/**
- * 条件配置弹框
- * 使用通用脚本配置弹框，支持普通模式和高级模式
- */
-export const ConditionConfigModal: React.FC<ConditionConfigModalProps> = ({
-  script,
-  variables,
-  onConfirm,
-  onCancel,
-  extraVariables = [],
-}) => {
-  // 获取系统变量
-  const systemVariables = GroovyVariableService.getSystemVariables(ScriptType.CONDITION);
-
-  // 合并变量
-  const allVariables = [...systemVariables, ...extraVariables];
-
-  return (
-    <ScriptConfigModal
-      scriptType={ScriptType.CONDITION}
-      script={script}
-      variables={allVariables}
-      onConfirm={onConfirm}
-      onCancel={onCancel}
-      title="条件配置"
-    />
-  );
-};
-
-export default ConditionConfigModal;
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/index.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/index.ts
deleted file mode 100644
index da0c5290..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// 确保适配器初始化 - 这个导入会触发 adapters.ts 中的自动初始化
-import '@/components/design-editor/script/service/adapters';
-
-export { ScriptEditor } from './components/script-editor';
-export { ScriptConfigModal } from './components/script-config-modal';
-export type { ScriptConfigModalProps } from './components/script-config-modal';
-export { NodeTitleConfigModal } from './node-title-config-modal';
-export type { NodeTitleConfigModalProps } from './node-title-config-modal';
-export { ConditionConfigModal } from './condition-config-modal';
-export type { ConditionConfigModalProps } from './condition-config-modal';
-export { groovyVariableService } from '@/components/design-editor/script/service/groovy-variable-service';
-export { groovySyntaxConverter } from '@/components/design-editor/script/service/groovy-syntax-converter';
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/node-title-config-modal.module.scss b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/node-title-config-modal.module.scss
deleted file mode 100644
index 2ed0f284..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/node-title-config-modal.module.scss
+++ /dev/null
@@ -1,80 +0,0 @@
-.container {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-
-.section {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-
-.sectionLabel {
-  font-size: 12px;
-  color: rgba(0, 0, 0, 0.45);
-}
-
-.preview {
-  padding: 12px;
-  background-color: rgba(0, 0, 0, 0.02);
-  border-radius: 4px;
-  min-height: 40px;
-  color: rgba(0, 0, 0, 0.65);
-}
-
-.hint {
-  font-size: 12px;
-  color: rgba(0, 0, 0, 0.25);
-}
-
-.footer {
-  display: flex;
-  justify-content: flex-start;
-  padding-top: 8px;
-  border-top: 1px solid #f0f0f0;
-}
-
-.pickerContainer {
-  width: 400px;
-  max-height: 300px;
-  overflow: auto;
-}
-
-.pickerList {
-  max-height: 250px;
-  overflow: auto;
-}
-
-.pickerGroupTitle {
-  font-size: 12px;
-  font-weight: 500;
-  color: rgba(0, 0, 0, 0.45);
-  padding: 8px 0 4px;
-}
-
-.pickerItems {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-}
-
-.pickerItem {
-  padding: 4px 8px;
-  background-color: #f5f5f5;
-  border-radius: 4px;
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-}
-
-.pickerItemLabel {
-  font-size: 13px;
-  color: rgba(0, 0, 0, 0.88);
-}
-
-.pickerItemValue {
-  font-size: 11px;
-  color: rgba(0, 0, 0, 0.45);
-}
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/node-title-config-modal.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/node-title-config-modal.tsx
index 0b707485..0a2ff3dd 100644
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/node-title-config-modal.tsx
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/node-title-config-modal.tsx
@@ -1,364 +1,127 @@
-import React, { useState, useEffect, useRef, useMemo } from 'react';
-import { Modal, Input, Alert, Button, Space, message, Popover, Empty } from 'antd';
-import { EditOutlined, CodeOutlined, RollbackOutlined, DeleteOutlined, SearchOutlined } from '@ant-design/icons';
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { GroovyVariableService } from '@/components/design-editor/script/service/groovy-variable-service';
-import { TitleSyntaxConverter } from '@/components/design-editor/script/service/title-syntax-converter';
-import styles from './node-title-config-modal.module.scss';
-
-const { TextArea } = Input;
+import React from 'react';
+import {Button, Input, Space} from 'antd';
+import {GroovyVariableMapping, ScriptType} from "@/components/design-editor/typings/script";
+import {GroovyScriptContent, GroovyScriptModal} from "./components/groovy-script-modal";
+import {GroovyScriptPreview} from "@/components/design-editor/node-components/scripts/components/groovy-script-preview";
+import {CodeOutlined, DeleteOutlined} from "@ant-design/icons";
+import {NodeTitleGroovyConvertor} from "./services/convertor/node-title";
+import {AdvancedScriptEditor} from "@/components/design-editor/node-components/scripts/components/advanced-script-editor";
+import {GroovyScriptConvertorUtil} from "@/components/design-editor/node-components/scripts/services/convertor/utils";
+import {VariablePicker} from "@/components/design-editor/node-components/scripts/components/variable-picker";
+
+const {TextArea} = Input;
 
 export interface NodeTitleConfigModalProps {
-  /** 当前脚本 */
-  script: string;
-  /** 表单字段（用于动态生成变量） */
-  formFields?: Array<{ name: string; code: string }>;
-  /** 确认回调 */
-  onConfirm: (script: string) => void;
-  /** 取消回调 */
-  onCancel: () => void;
+    open: boolean;
+    /** 当前脚本 */
+    script: string;
+    /** 表单字段（用于动态生成变量） */
+    variables?: GroovyVariableMapping[];
+    /** 取消回调 */
+    onCancel: () => void;
+    /** 确认回调 */
+    onConfirm: (script: string) => void;
 }
 
-/**
- * 标题配置弹框
- * 支持普通模式和高级模式
- */
-export const NodeTitleConfigModal: React.FC<NodeTitleConfigModalProps> = ({
-  script,
-  formFields,
-  onConfirm,
-  onCancel,
-}) => {
-  const [mode, setMode] = useState<'normal' | 'advanced'>('normal');
-  const [content, setContent] = useState('');
-  const [cursorPosition, setCursorPosition] = useState(0);
-  const [variablePickerOpen, setVariablePickerOpen] = useState(false);
-  const textareaRef = useRef<any>(null);
-
-  // 标记用户是否手动修改了模式（防止 useEffect 覆盖用户操作）
-  const userModifiedModeRef = useRef(false);
-
-  // 获取变量映射
-  const mappings = GroovyVariableService.getAllMappings(formFields);
-
-  useEffect(() => {
-    // 如果用户手动修改了模式，不再覆盖
-    if (userModifiedModeRef.current) {
-      return;
-    }
-
-    // 只在 script 改变时重新解析（初始化）
-    const parsedMode = TitleSyntaxConverter.parseMode(script);
-
-    if (parsedMode === 'normal') {
-      // 尝试解析为标签表达式
-      const labelExpr = TitleSyntaxConverter.toLabelExpression(script, mappings);
-      // 如果是默认 legacy 脚本，显示空内容（让用户重新输入）
-      // 如果能解析成标签表达式，显示解析结果
-      // 否则显示空内容
-      setContent(labelExpr || '');
-    } else {
-      // 高级模式，直接使用原脚本
-      setContent(script);
-    }
-
-    setMode(parsedMode);
-  }, [script]);
-
-  // 插入变量到光标位置
-  const handleInsertVariable = (mapping: GroovyVariableMapping) => {
-    const variableText = `\${${mapping.label}}`;
-    // 使用之前保存的光标位置插入变量
-    const start = cursorPosition;
-    const newContent = content.substring(0, start) + variableText + content.substring(start);
-    setContent(newContent);
-    // 设置光标位置到插入变量之后
-    setCursorPosition(start + variableText.length);
-    // 聚焦到 textarea
-    setTimeout(() => {
-      if (textareaRef.current) {
-        textareaRef.current.focus();
-        textareaRef.current.setSelectionRange(start + variableText.length, start + variableText.length);
-      }
-    }, 0);
-  };
-
-  // 处理文本框变化时更新光标位置
-  const handleContentChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-    setContent(e.target.value);
-    setCursorPosition(e.target.selectionStart || 0);
-  };
 
-  // 处理文本框聚焦时更新光标位置
-  const handleTextareaFocus = (e: React.FocusEvent<HTMLTextAreaElement>) => {
-    setCursorPosition(e.target.selectionStart || 0);
-  };
+const NodeTitleDefaultContent: React.FC<GroovyScriptContent> = (props) => {
 
-  // 切换到高级模式
-  const handleSwitchToAdvanced = () => {
-    userModifiedModeRef.current = true;
-    if (mode === 'normal') {
-      // 转换为Groovy脚本
-      const groovyScript = TitleSyntaxConverter.toGroovySyntax(content, mappings);
-      setContent(groovyScript);
-    }
-    setMode('advanced');
-  };
+    const nodeTitleGroovyConvertor = new NodeTitleGroovyConvertor(props.content, props.variables);
 
-  // 切换回普通模式
-  const handleSwitchToNormal = () => {
-    userModifiedModeRef.current = true;
-    // 尝试解析当前高级脚本为标签表达式
-    const labelExpr = TitleSyntaxConverter.toLabelExpression(content, mappings);
-    if (labelExpr !== null) {
-      // 能解析，切换到普通模式并显示解析后的内容
-      setContent(labelExpr);
-      setMode('normal');
-    } else {
-      // 无法解析，提示用户确认
-      Modal.confirm({
-        title: '切换回普通模式',
-        content: '当前自定义代码无法解析为可视化标签表达式，切换后将丢失这些配置。是否继续？',
-        okText: '确定',
-        cancelText: '取消',
-        onOk: () => {
-          setContent('');
-          setMode('normal');
-        },
-      });
-    }
-  };
-
-  // 确认
-  const handleConfirm = () => {
-    let finalScript = content;
-
-    if (mode === 'normal') {
-      if (!content.trim()) {
-        message.error('请输入标题内容');
-        return;
-      }
-      // 转换为Groovy脚本
-      finalScript = TitleSyntaxConverter.toGroovySyntax(content, mappings);
-    } else {
-      // 验证Groovy语法
-      const validation = TitleSyntaxConverter.validateGroovySyntax(content);
-      if (!validation.valid) {
-        message.error(`语法错误: ${validation.error}`);
-        return;
-      }
-    }
-
-    onConfirm(finalScript);
-  };
+    return (
+        <div>
+            <div>
+                预览
+                <GroovyScriptPreview
+                    script={props.content}
+                    variables={props.variables}
+                    type={ScriptType.TITLE}
+                    multiline={true}
+                />
+            </div>
 
-  // 预览内容
-  const renderPreview = () => {
-    if (mode === 'normal') {
-      return <div className={styles.preview}>{content || '（空）'}</div>;
-    } else {
-      // 尝试解析高级脚本
-      const labelExpr = TitleSyntaxConverter.toLabelExpression(content, mappings);
-      if (labelExpr !== null) {
-        return <div className={styles.preview}>{labelExpr}</div>;
-      }
-      return (
-        <Alert
-          message="用户自定义配置，无法预览"
-          type="warning"
-          showIcon
-          style={{ margin: 0 }}
-        />
-      );
-    }
-  };
 
-  return (
-    <>
-      <Modal
-        title="标题配置"
-        open={true}
-        onCancel={onCancel}
-        width={600}
-        footer={
-          <Space>
-            <Button onClick={onCancel}>取消</Button>
-            <Button type="primary" onClick={handleConfirm}>
-              确定
-            </Button>
-          </Space>
-        }
-      >
-        <div className={styles.container}>
-          {/* 预览区 */}
-          <div className={styles.section}>
-            <div className={styles.sectionLabel}>预览</div>
-            {renderPreview()}
-          </div>
+            <div>
+                内容
+                <TextArea
+                    value={nodeTitleGroovyConvertor.toExpression()}
+                    onChange={(e) => {
+                        props.onChange(nodeTitleGroovyConvertor.resetExpression(e.target.value));
+                    }}
+                    placeholder="请输入标题配置脚本，支持使用变量"
+                    autoSize={{minRows: 3, maxRows: 12}}
+                />
+            </div>
 
-          {/* 操作按钮 */}
-          <div className={styles.section}>
-            {mode === 'normal' ? (
-              <Space>
-                <Popover
-                  content={
-                    <VariablePickerContent
-                      mappings={mappings}
-                      onSelect={handleInsertVariable}
-                    />
-                  }
-                  trigger="click"
-                  placement="bottomLeft"
-                  open={variablePickerOpen}
-                  onOpenChange={setVariablePickerOpen}
-                  getPopupContainer={(trigger) => trigger.parentElement || document.body}
+            <Space
+                style={{
+                    marginTop: 8
+                }}
+            >
+                <VariablePicker
+                    mappings={props.variables}
+                    onSelect={(variable) => {
+                        props.onChange(nodeTitleGroovyConvertor.addVariable(variable));
+                    }}
+                />
+                <Button
+                    icon={<CodeOutlined/>}
+                    onClick={() => {
+                        props.onChange(GroovyScriptConvertorUtil.toCustomScript(props.content));
+                    }}
                 >
-                  <Button
-                    icon={<EditOutlined />}
-                    onClick={() => setVariablePickerOpen(true)}
-                  >
-                    插入变量
-                  </Button>
-                </Popover>
+                    高级配置
+                </Button>
                 <Button
-                  icon={<CodeOutlined />}
-                  onClick={handleSwitchToAdvanced}
+                    icon={<DeleteOutlined/>}
+                    danger={true}
+                    onClick={() => {
+                        props.onChange(nodeTitleGroovyConvertor.getDefaultScript());
+                    }}
                 >
-                  高级配置
+                    重置配置
                 </Button>
-              </Space>
-            ) : (
-              <Button
-                icon={<RollbackOutlined />}
-                onClick={handleSwitchToNormal}
-              >
-                返回普通模式
-              </Button>
-            )}
-          </div>
-
-          {/* 内容编辑区 */}
-          <div className={styles.section}>
-            <div className={styles.sectionLabel}>内容</div>
-            {mode === 'normal' ? (
-              <>
-                <TextArea
-                  ref={textareaRef}
-                  value={content}
-                  onChange={handleContentChange}
-                  onFocus={handleTextareaFocus}
-                  placeholder="点击上方按钮插入变量，或直接输入文字内容"
-                  autoSize={{ minRows: 3, maxRows: 6 }}
-                />
-                <div className={styles.hint}>
-                  {'示例：你好，${当前操作人}，有一笔${请假天数}元的审批'}
-                </div>
-              </>
-            ) : (
-              <TextArea
-                ref={textareaRef}
-                value={content}
-                onChange={handleContentChange}
-                onFocus={handleTextareaFocus}
-                placeholder='// @CUSTOM_SCRIPT\ndef run(request){\n    return "审批：" + request.getOperatorName()\n}'
-                autoSize={{ minRows: 6, maxRows: 10 }}
-                style={{ fontFamily: 'Courier New, monospace' }}
-              />
-            )}
-          </div>
-
-          {/* 底部操作区 */}
-          <div className={styles.footer}>
-            <Button
-              danger
-              icon={<DeleteOutlined />}
-              onClick={() => {
-                Modal.confirm({
-                  title: '重置设置',
-                  content: '确定要清除所有标题配置吗？',
-                  okText: '确定',
-                  cancelText: '取消',
-                  onOk: () => {
-                    userModifiedModeRef.current = true;
-                    setContent('');
-                    setMode('normal');
-                  },
-                });
-              }}
-            >
-              重置设置
-            </Button>
-          </div>
+            </Space>
         </div>
-      </Modal>
-    </>
-  );
-};
+    );
+}
 
-// Popover 版本的变量选择器内容
-const VariablePickerContent: React.FC<{
-  mappings: GroovyVariableMapping[];
-  onSelect: (mapping: GroovyVariableMapping) => void;
-}> = ({ mappings, onSelect }) => {
-  const [searchText, setSearchText] = useState('');
 
-  // 阻止事件冒泡，防止 Popover 关闭
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    e.stopPropagation();
-    setSearchText(e.target.value);
-  };
+const NodeTitleConfigContent: React.FC<GroovyScriptContent> = (props) => {
+    const isAdvance = GroovyScriptConvertorUtil.isCustomScript(props.content);
 
-  const filteredMappings = useMemo(() => {
-    if (!searchText) {
-      return mappings;
-    }
-    const lowerSearch = searchText.toLowerCase();
-    return mappings.filter(
-      m =>
-        m.label.toLowerCase().includes(lowerSearch) ||
-        m.value.toLowerCase().includes(lowerSearch)
-    );
-  }, [mappings, searchText]);
+    console.log('NodeTitleConfigContent script', props.content);
 
-  const groupedMappings = useMemo(() => {
-    return GroovyVariableService.groupByTag(filteredMappings);
-  }, [filteredMappings]);
+    return (
+        <>
+            {isAdvance && (
+                <AdvancedScriptEditor {...props} />
+            )}
+            {!isAdvance && (
+                <NodeTitleDefaultContent {...props} />
+            )}
+        </>
+    );
+}
 
-  return (
-    <div className={styles.pickerContainer} onClick={e => e.stopPropagation()}>
-      <Input
-        placeholder="搜索变量..."
-        prefix={<SearchOutlined style={{ color: '#999' }} />}
-        value={searchText}
-        onChange={handleInputChange}
-        allowClear
-        style={{ marginBottom: 8 }}
-      />
-      <div className={styles.pickerList}>
-        {groupedMappings.size === 0 ? (
-          <Empty description="未找到匹配的变量" image={Empty.PRESENTED_IMAGE_SIMPLE} />
-        ) : (
-          Array.from(groupedMappings.entries()).map(([tag, variables]: [string, GroovyVariableMapping[]]) => (
-            <div key={tag}>
-              <div className={styles.pickerGroupTitle}>{tag}</div>
-              <div className={styles.pickerItems}>
-                {variables.map((variable: GroovyVariableMapping) => (
-                  <div
-                    key={variable.label}
-                    className={styles.pickerItem}
-                    onClick={() => onSelect(variable)}
-                  >
-                    <span className={styles.pickerItemLabel}>{variable.label}</span>
-                    <span className={styles.pickerItemValue}>{variable.value}</span>
-                  </div>
-                ))}
-              </div>
-            </div>
-          ))
-        )}
-      </div>
-    </div>
-  );
+/**
+ * 标题配置弹框
+ * 支持普通模式和高级模式
+ */
+export const NodeTitleConfigModal: React.FC<NodeTitleConfigModalProps> = (props) => {
+
+    return (
+        <GroovyScriptModal
+            scriptType={ScriptType.TITLE}
+            open={props.open}
+            script={props.script}
+            variables={props.variables || []}
+            onConfirm={props.onConfirm}
+            onCancel={props.onCancel}
+            title="标题配置"
+            content={NodeTitleConfigContent}
+        />
+    );
 };
 
-export default NodeTitleConfigModal;
+
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/convertor/node-title.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/convertor/node-title.ts
new file mode 100644
index 00000000..48706216
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/convertor/node-title.ts
@@ -0,0 +1,40 @@
+import {GroovyVariableMapping} from "@/components/design-editor/typings/script";
+import {GroovyScriptConverter, GroovyScriptConvertorUtil} from "./utils";
+
+
+export class NodeTitleGroovyConvertor implements GroovyScriptConverter {
+
+    private readonly script: string;
+    private readonly mappings: GroovyVariableMapping[];
+
+
+    constructor(script: string, mappings: GroovyVariableMapping[]) {
+        this.script = script;
+        this.mappings = mappings;
+    }
+
+    getScript(): string {
+        return this.script;
+    }
+
+    toExpression(): string {
+        const returnExpression = GroovyScriptConvertorUtil.getReturnScript(this.script);
+        return GroovyScriptConvertorUtil.toExpression(returnExpression, this.mappings);
+    }
+
+    getDefaultScript(): string {
+        return "def run(request){\nreturn \"您有一条待办消息\"\n}";
+    }
+
+    addVariable(variable: GroovyVariableMapping): string {
+        const returnExpression = GroovyScriptConvertorUtil.getReturnScript(this.script);
+        const newExpression = `${returnExpression}` + ` + ${variable.value}`;
+        return this.script.replace(returnExpression, newExpression);
+    }
+
+    resetExpression(expression:string) {
+        const returnExpression = GroovyScriptConvertorUtil.getReturnScript(this.script);
+        const script = GroovyScriptConvertorUtil.toScript(expression, this.mappings);
+        return this.script.replace(returnExpression, `${script}`);
+    }
+}
\ No newline at end of file
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/convertor/utils.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/convertor/utils.ts
new file mode 100644
index 00000000..a3353c30
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/convertor/utils.ts
@@ -0,0 +1,245 @@
+import {GroovyVariableMapping, ScriptType} from "@/components/design-editor/typings/script";
+import {
+    NodeTitleGroovyConvertor
+} from "@/components/design-editor/node-components/scripts/services/convertor/node-title";
+
+/** 自定义注释标记 */
+const CUSTOM_COMMENT = '@CUSTOM_SCRIPT';
+
+
+/**
+ * Groovy脚本转换器接口
+ */
+export interface GroovyScriptConverter {
+
+    /**
+     * 转换为完整Groovy脚本
+     */
+    getScript(): string;
+
+    /**
+     * 转换为可视化表达式（回显时）
+     */
+    toExpression(): string;
+
+    /**
+     * 获取默认脚本模板
+     */
+    getDefaultScript(): string;
+
+    /**
+     * 添加变量到脚本中
+     * @param variable
+     */
+    addVariable(variable: GroovyVariableMapping): string;
+
+    /**
+     * 重置脚本中的表达式部分（编辑时）
+     * @param expression 展示的表达式
+     */
+    resetExpression(expression: string): void;
+}
+
+/**
+ * Groovy脚本转换器构造函数类型
+ */
+export type GroovyScriptConverterConstructor = new (script: string, variables: GroovyVariableMapping[]) => GroovyScriptConverter;
+
+
+/**
+ * Groovy脚本转换器上下文，负责管理不同类型脚本的转换器
+ */
+export class GroovyScriptConverterContext {
+    private converterMap: Map<ScriptType, GroovyScriptConverterConstructor>;
+
+    private register(scriptType: ScriptType, converter: GroovyScriptConverterConstructor) {
+        this.converterMap.set(scriptType, converter);
+    }
+
+    public createConverter(scriptType: ScriptType, script: string, variables: GroovyVariableMapping[]): GroovyScriptConverter | undefined {
+        const constructor = this.converterMap.get(scriptType);
+        if (constructor) {
+            return new constructor(script, variables);
+        }
+        return undefined;
+    }
+
+    private constructor() {
+        this.converterMap = new Map();
+        this.initializeDefaultConverters();
+    }
+
+    private initializeDefaultConverters() {
+        try {
+            this.register(ScriptType.TITLE, NodeTitleGroovyConvertor);
+        } catch (e) {
+            console.error('Failed to register default converters:', e);
+        }
+    }
+
+    private static readonly instance = new GroovyScriptConverterContext();
+
+    public static getInstance(): GroovyScriptConverterContext {
+        return GroovyScriptConverterContext.instance;
+    }
+}
+
+/**
+ * Groovy脚本转换器工具类，提供一些通用的脚本处理方法
+ */
+export class GroovyScriptConvertorUtil {
+
+    /**
+     * 判断脚本是否包含自定义注释标记
+     * @param script
+     */
+    public static isCustomScript(script: string): boolean {
+        return script.includes(CUSTOM_COMMENT);
+    }
+
+    /**
+     *  将普通脚本转换为包含自定义注释标记的脚本
+     * @param script
+     */
+    public static toCustomScript(script: string): string {
+        if (GroovyScriptConvertorUtil.isCustomScript(script)) {
+            return script;
+        }
+        return `// ${CUSTOM_COMMENT}\n${script}`;
+    }
+
+    /**
+     * 清除脚本中的注释
+     * @param script
+     */
+    public static clearComments(script: string): string {
+        return script.replace(/\/\/.*$/gm, '').trim();
+    }
+
+    /**
+     * 提取脚本中的return表达式
+     * @param script
+     */
+    public static getReturnScript(script: string): string {
+        try {
+            let result = GroovyScriptConvertorUtil.clearComments(script);
+            const funcMatch = result.match(/def\s+run\s*\([^)]*\)\s*\{([\s\S]*)\}/);
+            if (funcMatch) {
+                result = funcMatch[1];
+            }
+            const returnMatch = result.match(/return\s+(.+?);?\s*$/m);
+            if (returnMatch) {
+                result = returnMatch[1].trim();
+            } else {
+                // 如果没有找到return语句，可能整个脚本就是表达式
+                result = result.trim();
+            }
+
+            return result;
+        } catch (e) {
+            return '';
+        }
+    }
+
+    /**
+     * 将可视化表达式转换为Groovy表达式（编辑时）
+     * @param expression
+     * @param mappings
+     */
+    public static toScript(expression: string, mappings: GroovyVariableMapping[]): string {
+
+        let result = expression;
+
+        // 按label长度降序排序，避免短label替换长label的一部分
+        const sortedMappings = [...mappings].sort((a, b) => b.label.length - a.label.length);
+
+        // 将 ${label} 替换为唯一的占位符
+        const placeholders: Map<string, string> = new Map();
+        let placeholderIndex = 0;
+        for (const mapping of sortedMappings) {
+            const labelPattern = `\${${mapping.label}}`;
+            const placeholder = `__PLACEHOLDER_${placeholderIndex}__`;
+            placeholders.set(placeholder, mapping.value);
+            result = result.split(labelPattern).join(placeholder);
+            placeholderIndex++;
+        }
+
+        // 按占位符分割字符串，构建表达式
+        const parts: string[] = [];
+        let lastIndex = 0;
+        const placeholderRegex = /__PLACEHOLDER_(\d+)__/g;
+        let match;
+
+        while ((match = placeholderRegex.exec(result)) !== null) {
+            if (match.index > lastIndex) {
+                const text = result.substring(lastIndex, match.index);
+                parts.push(`"${text}"`);
+            }
+            const placeholder = match[0];
+            const placeholderInfo = placeholders.get(placeholder);
+            if (placeholderInfo) {
+                parts.push(placeholderInfo);
+            }
+            lastIndex = match.index + placeholder.length;
+        }
+
+        if (lastIndex < result.length) {
+            const text = result.substring(lastIndex);
+            parts.push(`"${text}"`);
+        }
+
+        let groovyExpression: string;
+        if (parts.length === 0) {
+            groovyExpression = '""';
+        } else if (parts.length === 1) {
+            groovyExpression = parts[0];
+        } else {
+            groovyExpression = parts.join(' + ');
+        }
+
+        return groovyExpression;
+    }
+
+
+    /**
+     * 将Groovy表达式转换为可视化表达式（回显时）
+     * @param script
+     * @param mappings
+     */
+    public static toExpression(script: string, mappings: GroovyVariableMapping[]): string {
+        let result = script;
+        const exprToLabel = new Map<string, string>();
+        for (const mapping of mappings) {
+            exprToLabel.set(mapping.value, mapping.label);
+        }
+
+        const sortedExpress = Array.from(exprToLabel.keys()).sort((a, b) => b.length - a.length);
+        let placeholders = 0;
+        const placeholderMap = new Map<string, string>();
+
+        for (const expr of sortedExpress) {
+            const escaped = expr.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            const placeholder = `___EXPR_PLACEHOLDER_${placeholders}___`;
+            result = result.replace(new RegExp(escaped, 'g'), placeholder);
+            placeholderMap.set(placeholder, exprToLabel.get(expr) || expr);
+            placeholders++;
+        }
+
+        result = result.replace(/\s*\+\s*"/g, '"');
+        result = result.replace(/"\s*\+\s*/g, '"');
+        result = result.replace(/"/g, '');
+
+        // 在替换占位符之前，先移除占位符之间的 + 符号
+        result = result.replace(/___\w+___\s*\+\s*___\w+___/g, (match) => {
+            return match.replace(/\s*\+\s*/g, '');
+        });
+
+        placeholderMap.forEach((label, placeholder) => {
+            result = result.replace(new RegExp(placeholder.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), `\${${label}}`);
+        });
+
+        result = result.replace(/\$\{([^}]+)\}\s*\+\s*\$\{/g, '\$\{$1\}\$\{');
+        return result;
+    }
+
+}
\ No newline at end of file
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/variable/node-title.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/variable/node-title.ts
new file mode 100644
index 00000000..7e30502d
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/variable/node-title.ts
@@ -0,0 +1,24 @@
+import {GroovyVariableMapping} from "@/components/design-editor/typings/script";
+import {FlowFromMeta} from "@flow-engine/flow-types";
+import {GroovyVariableUtil,GroovyVariableAdapter} from "./utils";
+
+export class NodeTitleVariableAdapter implements GroovyVariableAdapter {
+
+    private readonly form: FlowFromMeta;
+    private readonly variableUtil: GroovyVariableUtil;
+
+    constructor(form: FlowFromMeta) {
+        this.form = form;
+        this.variableUtil = new GroovyVariableUtil();
+    }
+
+    getVariables(): GroovyVariableMapping[] {
+        const variables: GroovyVariableMapping[] = [];
+        // 添加默认变量
+        variables.push(...this.variableUtil.getDefaultVariables());
+        // 添加表单字段变量
+        variables.push(...this.variableUtil.getMainFormMetaVariables(this.form));
+        return variables;
+    }
+
+}
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/variable/utils.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/variable/utils.ts
new file mode 100644
index 00000000..893498e3
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/scripts/services/variable/utils.ts
@@ -0,0 +1,102 @@
+import {GroovyVariableMapping, VariableTag} from "@/components/design-editor/typings/script";
+import {FlowFromMeta} from "@flow-engine/flow-types";
+
+/**
+ * Groovy变量适配器接口
+ * 用于提供不同脚本类型的变量列表
+ */
+export interface GroovyVariableAdapter {
+    getVariables(): GroovyVariableMapping[];
+}
+
+
+export class GroovyVariableUtil {
+
+    getDefaultVariables(): GroovyVariableMapping[] {
+        return [
+            // ========== 操作人相关 ==========
+            {
+                label: '当前操作人',
+                value: 'request.getOperatorName()',
+                expression: "${当前操作人}",
+                tag: VariableTag.OPERATOR,
+                order: 1,
+            },
+            {
+                label: '当前操作人ID',
+                value: 'request.getOperatorId()',
+                expression: '${当前操作人ID}',
+                tag: VariableTag.OPERATOR,
+                order: 2,
+            },
+            {
+                label: '是否管理员',
+                value: 'request.getIsFlowManager()',
+                expression: '${是否管理员}',
+                tag: VariableTag.OPERATOR,
+                order: 3,
+            },
+            {
+                label: '流程创建人',
+                value: 'request.getCreatorName()',
+                expression: '${流程创建人}',
+                tag: VariableTag.OPERATOR,
+                order: 4,
+            },
+
+            // ========== 流程相关 ==========
+            {
+                label: '流程标题',
+                value: 'request.getWorkflowTitle()',
+                expression: '${流程标题}',
+                tag: VariableTag.WORKFLOW,
+                order: 10,
+            },
+            {
+                label: '流程编码',
+                value: 'request.getWorkflowCode()',
+                expression: '${流程编码}',
+                tag: VariableTag.WORKFLOW,
+                order: 11,
+            },
+            {
+                label: '当前节点',
+                value: 'request.getNodeName()',
+                expression: '${当前节点}',
+                tag: VariableTag.WORKFLOW,
+                order: 12,
+            },
+            {
+                label: '节点类型',
+                value: 'request.getNodeType()',
+                expression: '${节点类型}',
+                tag: VariableTag.WORKFLOW,
+                order: 13,
+            },
+
+            // ========== 流程编号 ==========
+            {
+                label: '流程编号',
+                value: 'request.getWorkCode()',
+                expression: '${流程编号}',
+                tag: VariableTag.WORK_CODE,
+                order: 20,
+            }
+        ];
+    }
+
+    getMainFormMetaVariables(formMeta: FlowFromMeta): GroovyVariableMapping[] {
+        if (!formMeta || !formMeta.fields) {
+            return [];
+        }
+
+        return formMeta.fields.map((field, index) => ({
+            label: `${field.name}`,
+            value: `request.getFormData('${field.code}')`,
+            expression: "${" + `${field.name}` + "}",
+            tag: VariableTag.FORM_FIELD,
+            order: 100 + index,
+        }));
+    }
+
+}
\ No newline at end of file
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/strategy/node-title.tsx b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/strategy/node-title.tsx
index 01346bdf..d1205f7f 100644
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/strategy/node-title.tsx
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/strategy/node-title.tsx
@@ -1,129 +1,69 @@
-import React, { useMemo, useState, useCallback } from 'react';
-import { Form, Button, Space } from 'antd';
-import { EditOutlined } from '@ant-design/icons';
-import { Field, FieldRenderProps } from '@flowgram.ai/fixed-layout-editor';
-import { useDesignContext } from '@/components/design-panel/hooks/use-design-context';
-import { WorkflowFormManager } from '@/components/design-panel/manager/form';
-import { GroovyVariableService } from '@/components/design-editor/script/service/groovy-variable-service';
-import { TitleSyntaxConverter } from '@/components/design-editor/script/service/title-syntax-converter';
-import { NodeTitleConfigModal } from '../scripts/node-title-config-modal';
+import React from 'react';
+import {Button, Form, Space} from 'antd';
+import {EditOutlined} from '@ant-design/icons';
+import {Field, FieldRenderProps} from '@flowgram.ai/fixed-layout-editor';
+import {useDesignContext} from '@/components/design-panel/hooks/use-design-context';
+import {
+    NodeTitleVariableAdapter
+} from "@/components/design-editor/node-components/scripts/services/variable/node-title";
+import {GroovyScriptPreview} from "@/components/design-editor/node-components/scripts/components/groovy-script-preview";
+import {NodeTitleConfigModal} from "@/components/design-editor/node-components/scripts/node-title-config-modal";
+import {ScriptType} from "@/components/design-editor/typings/script";
 
 /**
  * 节点标题策略配置
  */
 export const NodeTitleStrategy: React.FC = () => {
-  const [showConfigModal, setShowConfigModal] = useState(false);
-  const [modalScript, setModalScript] = useState('');
-  const [currentOnChange, setCurrentOnChange] = useState<((value: string) => void) | null>(null);
+    // 从 design context 获取表单字段
+    const {state} = useDesignContext();
 
-  // 从 design context 获取表单字段
-  const { state } = useDesignContext();
+    const [showConfigModal, setShowConfigModal] = React.useState(false);
 
-  // 获取表单字段（从 workflow form 中提取）
-  const formFields = useMemo(() => {
-    const fields: Array<{ name: string; code: string }> = [];
-    if (!state?.workflow?.form) {
-      return fields;
-    }
-    const formManager = new WorkflowFormManager(state.workflow.form);
-    // 获取主表单字段
-    const mainFields = formManager.getFormFields(state.workflow.form.code);
-    for (const field of mainFields) {
-      fields.push({ name: field.name, code: field.code });
-    }
-    // 获取子表单字段
-    const subForms = state.workflow.form.subForms || [];
-    for (const subForm of subForms) {
-      const subFields = formManager.getFormFields(subForm.code);
-      for (const field of subFields) {
-        fields.push({ name: `${subForm.name}.${field.name}`, code: field.code });
-      }
-    }
-    return fields;
-  }, [state?.workflow?.form]);
+    const nodeTitleVariable = React.useMemo(() => {
+        return new NodeTitleVariableAdapter(state.workflow.form);
+    }, [state.workflow.form]);
 
-  // 获取变量映射
-  const mappings = GroovyVariableService.getAllMappings(formFields);
 
-  // 渲染预览内容
-  const renderPreview = useCallback((script: string) => {
-    if (!script) {
-      return '（未配置）';
-    }
+    return (
+        <>
+            <Form style={{width: '100%'}} layout="vertical">
+                <Form.Item label="节点标题">
+                    <Field
+                        name="NodeTitleStrategy.script"
+                        render={(props: FieldRenderProps<any>) => {
+                            const {value, onChange} = props.field;
+                            return (
+                                <Space.Compact style={{width: '100%'}}>
+                                    <GroovyScriptPreview
+                                        script={value}
+                                        variables={nodeTitleVariable.getVariables()}
+                                        type={ScriptType.TITLE}
+                                    />
+                                    <Button
+                                        icon={<EditOutlined/>}
+                                        onClick={() => {
+                                            setShowConfigModal(true);
+                                        }}
+                                        style={{borderRadius: '0 6px 6px 0'}}
+                                    >
+                                        编辑
+                                    </Button>
 
-    const mode = TitleSyntaxConverter.parseMode(script);
-    if (mode === 'normal') {
-      // Normal 模式：尝试解析为标签表达式
-      const labelExpr = TitleSyntaxConverter.toLabelExpression(script, mappings);
-      return labelExpr || '（未配置）';
-    }
-
-    // Advanced 模式：显示"用户自定义配置"，不显示代码
-    return '（自定义配置）';
-  }, [mappings]);
-
-  const handleOpenConfig = useCallback((currentValue: string, onChange: (value: string) => void) => {
-    setCurrentOnChange(() => onChange);
-    setModalScript(currentValue || '');
-    setShowConfigModal(true);
-  }, []);
-
-  const handleConfirm = useCallback((script: string) => {
-    // 调用 onChange 回调更新编辑器状态
-    if (currentOnChange) {
-      currentOnChange(script);
-    }
-    setShowConfigModal(false);
-  }, [currentOnChange]);
-
-  return (
-    <>
-      <Form style={{ width: '100%' }} layout="vertical">
-        <Form.Item label="节点标题">
-          <Field
-            name="NodeTitleStrategy.script"
-            render={(props: FieldRenderProps<any>) => {
-              const { value, onChange } = props.field;
-
-              return (
-                <Space.Compact style={{ width: '100%' }}>
-                  <div
-                    style={{
-                      flex: 1,
-                      padding: '4px 11px',
-                      backgroundColor: value ? '#fff' : '#fafafa',
-                      border: '1px solid #d9d9d9',
-                      borderRadius: '6px 0 0 6px',
-                      color: value ? 'rgba(0,0,0,0.88)' : 'rgba(0,0,0,0.25)',
-                      whiteSpace: 'nowrap',
-                      overflow: 'hidden',
-                      textOverflow: 'ellipsis',
-                    }}
-                  >
-                    {renderPreview(value || '')}
-                  </div>
-                  <Button
-                    icon={<EditOutlined />}
-                    onClick={() => handleOpenConfig(value || '', onChange)}
-                    style={{ borderRadius: '0 6px 6px 0' }}
-                  >
-                    编辑
-                  </Button>
-                </Space.Compact>
-              );
-            }}
-          />
-        </Form.Item>
-      </Form>
-
-      {showConfigModal && (
-        <NodeTitleConfigModal
-          script={modalScript}
-          formFields={formFields}
-          onConfirm={handleConfirm}
-          onCancel={() => setShowConfigModal(false)}
-        />
-      )}
-    </>
-  );
+                                    <NodeTitleConfigModal
+                                        open={showConfigModal}
+                                        script={value}
+                                        variables={nodeTitleVariable.getVariables()}
+                                        onCancel={() => setShowConfigModal(false)}
+                                        onConfirm={(script) => {
+                                            onChange(script);
+                                        }}
+                                    />
+                                </Space.Compact>
+                            );
+                        }}
+                    />
+                </Form.Item>
+            </Form>
+        </>
+    );
 };
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/adapters.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/adapters.ts
deleted file mode 100644
index df20fc95..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/adapters.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-import { GroovyVariableMapping, VariableTag } from '@flow-engine/flow-types';
-import { ScriptAdapter, ScriptType } from '../../typings/groovy-script';
-import { GroovySyntaxConverter } from './groovy-syntax-converter';
-import { GroovyVariableService } from './groovy-variable-service';
-
-const TITLE_COMMENT = '// @TITLE';
-const LEGACY_COMMENT = '// @CUSTOM_SCRIPT';
-
-/**
- * 标题脚本适配器
- */
-export class TitleAdapter implements ScriptAdapter {
-  public scriptType: ScriptType = ScriptType.TITLE;
-
-  public getSystemVariables(): GroovyVariableMapping[] {
-    return [
-      {
-        label: '当前操作人',
-        value: 'request.operatorName',
-        expression: 'request.getOperatorName()',
-        tag: VariableTag.OPERATOR,
-        order: 1,
-      },
-      {
-        label: '当前操作人ID',
-        value: 'request.operatorId',
-        expression: 'request.getOperatorId()',
-        tag: VariableTag.OPERATOR,
-        order: 2,
-      },
-      {
-        label: '是否管理员',
-        value: 'request.isFlowManager',
-        expression: 'request.getIsFlowManager()',
-        tag: VariableTag.OPERATOR,
-        order: 3,
-      },
-      {
-        label: '流程创建人',
-        value: 'request.creatorName',
-        expression: 'request.getCreatorName()',
-        tag: VariableTag.OPERATOR,
-        order: 4,
-      },
-      {
-        label: '流程标题',
-        value: 'request.workflowTitle',
-        expression: 'request.getWorkflowTitle()',
-        tag: VariableTag.WORKFLOW,
-        order: 10,
-      },
-      {
-        label: '流程编码',
-        value: 'request.workflowCode',
-        expression: 'request.getWorkflowCode()',
-        tag: VariableTag.WORKFLOW,
-        order: 11,
-      },
-      {
-        label: '当前节点',
-        value: 'request.nodeName',
-        expression: 'request.getNodeName()',
-        tag: VariableTag.WORKFLOW,
-        order: 12,
-      },
-      {
-        label: '节点类型',
-        value: 'request.nodeType',
-        expression: 'request.getNodeType()',
-        tag: VariableTag.WORKFLOW,
-        order: 13,
-      },
-      {
-        label: '流程编号',
-        value: 'request.workCode',
-        expression: 'request.getWorkCode()',
-        tag: VariableTag.WORK_CODE,
-        order: 20,
-      },
-    ];
-  }
-
-  public toScript(content: string, mappings: GroovyVariableMapping[]): string {
-    let result = content;
-    const sortedMappings = [...mappings].sort((a, b) => b.label.length - a.label.length);
-    const placeholders: Map<string, { expression: string; label: string }> = new Map();
-    let placeholderIndex = 0;
-
-    for (const mapping of sortedMappings) {
-      const labelPattern = `\${${mapping.label}}`;
-      const placeholder = `__PLACEHOLDER_${placeholderIndex}__`;
-      placeholders.set(placeholder, { expression: mapping.expression, label: mapping.label });
-      result = result.split(labelPattern).join(placeholder);
-      placeholderIndex++;
-    }
-
-    const parts: string[] = [];
-    let lastIndex = 0;
-    const placeholderRegex = /__PLACEHOLDER_(\d+)__/g;
-    let match;
-
-    while ((match = placeholderRegex.exec(result)) !== null) {
-      if (match.index > lastIndex) {
-        const text = result.substring(lastIndex, match.index);
-        parts.push(`"${text}"`);
-      }
-      const placeholder = match[0];
-      const placeholderInfo = placeholders.get(placeholder);
-      if (placeholderInfo) {
-        parts.push(placeholderInfo.expression);
-      }
-      lastIndex = match.index + placeholder.length;
-    }
-
-    if (lastIndex < result.length) {
-      const text = result.substring(lastIndex);
-      parts.push(`"${text}"`);
-    }
-
-    let groovyExpression: string;
-    if (parts.length === 0) {
-      groovyExpression = '""';
-    } else if (parts.length === 1) {
-      groovyExpression = parts[0];
-    } else {
-      groovyExpression = parts.join(' + ');
-    }
-
-    return `def run(request){\n${TITLE_COMMENT}\nreturn ${groovyExpression}\n}`;
-  }
-
-  public toExpression(script: string, mappings: GroovyVariableMapping[]): string | null {
-    try {
-      let result = script.trim();
-
-      // 特殊处理：检查是否为默认的 legacy 脚本
-      if (this.isDefaultLegacyScript(result)) {
-        const match = result.match(/return\s+['"]([^'"]*)['"]/);
-        if (match && match[1]) {
-          return match[1];
-        }
-      }
-
-      // 支持两种标记：// @TITLE 和 // @CUSTOM_SCRIPT
-      if (!result.includes(TITLE_COMMENT) && !result.includes(LEGACY_COMMENT)) {
-        return null;
-      }
-
-      const funcMatch = result.match(/def\s+run\s*\([^)]*\)\s*\{([\s\S]*)\}/);
-      if (funcMatch) {
-        result = funcMatch[1];
-      }
-
-      // 移除两种标记
-      result = result.replace(TITLE_COMMENT, '').replace(LEGACY_COMMENT, '').trim();
-      result = result.replace(/^return\s+/, '');
-
-      const exprToLabel = new Map<string, string>();
-      for (const mapping of mappings) {
-        exprToLabel.set(mapping.expression, mapping.label);
-      }
-
-      const sortedExprs = Array.from(exprToLabel.keys()).sort((a, b) => b.length - a.length);
-      let placeholders = 0;
-      const placeholderMap = new Map<string, string>();
-
-      for (const expr of sortedExprs) {
-        const escaped = expr.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        const placeholder = `___EXPR_PLACEHOLDER_${placeholders}___`;
-        result = result.replace(new RegExp(escaped, 'g'), placeholder);
-        placeholderMap.set(placeholder, exprToLabel.get(expr) || expr);
-        placeholders++;
-      }
-
-      result = result.replace(/\s*\+\s*"/g, '"');
-      result = result.replace(/"\s*\+\s*/g, '"');
-      result = result.replace(/"/g, '');
-
-      placeholderMap.forEach((label, placeholder) => {
-        result = result.replace(new RegExp(placeholder.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), `\${${label}}`);
-      });
-
-      result = result.replace(/\$\{([^}]+)\}\s*\+\s*\$\{/g, '\$\{$1\}\$\{');
-
-      return result;
-    } catch (e) {
-      return null;
-    }
-  }
-
-  public getDefaultTemplate(): string {
-    return "def run(request){\n// @TITLE\nreturn '你有一条待办'\n}";
-  }
-
-  private isDefaultLegacyScript(script: string): boolean {
-    const trimmed = script.trim();
-    return /^\s*def\s+run\s*\(\s*request\s*\)\s*\{\s*return\s+'[^']*'\s*\}\s*$/.test(trimmed);
-  }
-}
-
-/**
- * 初始化所有脚本适配器
- */
-export class ScriptAdapterManager {
-  public initialize(): void {
-    const titleAdapter = new TitleAdapter();
-    GroovySyntaxConverter.registerAdapter(titleAdapter);
-    GroovyVariableService.registerAdapter(titleAdapter);
-  }
-}
-
-// 使用已导出的单例实例
-export const scriptAdapterManager = new ScriptAdapterManager();
-
-// 自动初始化适配器 - 确保在任何地方使用服务前完成初始化
-scriptAdapterManager.initialize();
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/groovy-syntax-converter.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/groovy-syntax-converter.ts
deleted file mode 100644
index 9ab52b53..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/groovy-syntax-converter.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { ScriptAdapter, ScriptType } from '../../typings/groovy-script';
-
-/** 自定义注释标记 */
-const CUSTOM_COMMENT = '// @CUSTOM_SCRIPT';
-
-/**
- * Groovy语法转换服务类
- * 负责脚本语法与可视化表达式之间的转换
- */
-export class GroovySyntaxConverter {
-  /** 静态适配器注册表 */
-  private static staticAdapters: Map<ScriptType, ScriptAdapter> = new Map();
-
-  /** 脚本适配器注册表 */
-  private adapters: Map<ScriptType, ScriptAdapter> = new Map();
-
-  /** 是否已初始化 */
-  private initialized = false;
-
-  /**
-   * 静态方法：注册脚本适配器
-   */
-  static registerAdapter(adapter: ScriptAdapter): void {
-    this.staticAdapters.set(adapter.scriptType, adapter);
-  }
-
-  /**
-   * 注册脚本适配器
-   */
-  public registerAdapter(adapter: ScriptAdapter): void {
-    this.adapters.set(adapter.scriptType, adapter);
-  }
-
-  /**
-   * 获取适配器（带自动初始化）
-   */
-  private getAdapter(scriptType: ScriptType): ScriptAdapter | undefined {
-    // 尝试自动初始化（仅一次）
-    if (!this.initialized) {
-      this.autoInitialize();
-      this.initialized = true;
-    }
-    return this.adapters.get(scriptType);
-  }
-
-  /**
-   * 自动初始化适配器
-   */
-  private autoInitialize(): void {
-    // 动态导入 TitleAdapter 进行初始化
-    import('./adapters').then(({ TitleAdapter }) => {
-      if (!this.adapters.has(ScriptType.TITLE)) {
-        this.adapters.set(ScriptType.TITLE, new TitleAdapter());
-      }
-    }).catch(() => {
-      // 忽略初始化错误
-    });
-  }
-
-  /**
-   * 转换为完整Groovy脚本
-   * @param scriptType 脚本类型
-   * @param content 用户输入的可视化表达式内容
-   * @param mappings 变量映射列表
-   */
-  public toScript(
-    scriptType: ScriptType,
-    content: string,
-    mappings: GroovyVariableMapping[]
-  ): string {
-    const adapter = this.getAdapter(scriptType);
-    if (adapter) {
-      return adapter.toScript(content, mappings);
-    }
-    // 默认实现
-    return this.convertToGroovySyntax(content, mappings, CUSTOM_COMMENT);
-  }
-
-  /**
-   * 转换为可视化表达式（回显时）
-   * @param scriptType 脚本类型
-   * @param script 后端返回的完整Groovy脚本
-   * @param mappings 变量映射列表
-   */
-  public toExpression(
-    scriptType: ScriptType,
-    script: string,
-    mappings: GroovyVariableMapping[]
-  ): string | null {
-    const adapter = this.getAdapter(scriptType);
-    if (adapter) {
-      return adapter.toExpression(script, mappings);
-    }
-    // 默认实现
-    return this.convertToLabelExpression(script, mappings, CUSTOM_COMMENT);
-  }
-
-  /**
-   * 获取默认脚本模板
-   */
-  public getDefaultTemplate(scriptType: ScriptType): string {
-    const adapter = this.getAdapter(scriptType);
-    if (adapter) {
-      return adapter.getDefaultTemplate();
-    }
-    // 默认模板
-    return 'def run(request){\nreturn ""\n}';
-  }
-
-  /**
-   * 检查是否为高级模式
-   * 高级模式：包含 // @CUSTOM_SCRIPT 标记的自定义脚本
-   * 普通模式：包含 // @TITLE 或其他特定标记的脚本
-   */
-  public isAdvancedMode(script: string): boolean {
-    // 触发自动初始化
-    this.getAdapter(ScriptType.TITLE);
-
-    // 如果包含 @CUSTOM_SCRIPT 标记，则是高级模式
-    if (script.includes(CUSTOM_COMMENT)) {
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * 通用实现：将可视化表达式转换为Groovy语法
-   */
-  private convertToGroovySyntax(
-    content: string,
-    mappings: GroovyVariableMapping[],
-    comment: string
-  ): string {
-    let result = content;
-
-    // 按label长度降序排序，避免短label替换长label的一部分
-    const sortedMappings = [...mappings].sort((a, b) => b.label.length - a.label.length);
-
-    // 将 ${label} 替换为唯一的占位符
-    const placeholders: Map<string, { expression: string; label: string }> = new Map();
-    let placeholderIndex = 0;
-    for (const mapping of sortedMappings) {
-      const labelPattern = `\${${mapping.label}}`;
-      const placeholder = `__PLACEHOLDER_${placeholderIndex}__`;
-      placeholders.set(placeholder, { expression: mapping.expression, label: mapping.label });
-      result = result.split(labelPattern).join(placeholder);
-      placeholderIndex++;
-    }
-
-    // 按占位符分割字符串，构建表达式
-    const parts: string[] = [];
-    let lastIndex = 0;
-    const placeholderRegex = /__PLACEHOLDER_(\d+)__/g;
-    let match;
-
-    while ((match = placeholderRegex.exec(result)) !== null) {
-      if (match.index > lastIndex) {
-        const text = result.substring(lastIndex, match.index);
-        parts.push(`"${text}"`);
-      }
-      const placeholder = match[0];
-      const placeholderInfo = placeholders.get(placeholder);
-      if (placeholderInfo) {
-        parts.push(placeholderInfo.expression);
-      }
-      lastIndex = match.index + placeholder.length;
-    }
-
-    if (lastIndex < result.length) {
-      const text = result.substring(lastIndex);
-      parts.push(`"${text}"`);
-    }
-
-    let groovyExpression: string;
-    if (parts.length === 0) {
-      groovyExpression = '""';
-    } else if (parts.length === 1) {
-      groovyExpression = parts[0];
-    } else {
-      groovyExpression = parts.join(' + ');
-    }
-
-    return `def run(request){\n${comment}\nreturn ${groovyExpression}\n}`;
-  }
-
-  /**
-   * 通用实现：将Groovy脚本转换为可视化表达式
-   */
-  private convertToLabelExpression(
-    groovyCode: string,
-    mappings: GroovyVariableMapping[],
-    comment: string
-  ): string | null {
-    try {
-      let result = groovyCode.trim();
-
-      // 检查是否有自定义注释
-      if (!result.includes(comment)) {
-        return null;
-      }
-
-      // 移除函数包装
-      const funcMatch = result.match(/def\s+run\s*\([^)]*\)\s*\{([\s\S]*)\}/);
-      if (funcMatch) {
-        result = funcMatch[1];
-      }
-
-      // 移除注释
-      result = result.replace(comment, '').trim();
-
-      // 移除 return 关键字
-      result = result.replace(/^return\s+/, '');
-
-      // 创建表达式到标签的映射
-      const exprToLabel = new Map<string, string>();
-      for (const mapping of mappings) {
-        exprToLabel.set(mapping.expression, mapping.label);
-      }
-
-      // 按expression长度降序排序
-      const sortedExprs = Array.from(exprToLabel.keys()).sort((a, b) => b.length - a.length);
-
-      // 使用占位符方法处理表达式替换
-      let placeholders = 0;
-      const placeholderMap = new Map<string, string>();
-
-      for (const expr of sortedExprs) {
-        const escaped = this.escapeRegex(expr);
-        const placeholder = `___EXPR_PLACEHOLDER_${placeholders}___`;
-
-        result = result.replace(new RegExp(escaped, 'g'), placeholder);
-        placeholderMap.set(placeholder, exprToLabel.get(expr) || expr);
-        placeholders++;
-      }
-
-      // 处理字符串拼接
-      result = result.replace(/\s*\+\s*"/g, '"');
-      result = result.replace(/"\s*\+\s*/g, '"');
-
-      // 移除所有剩余的引号
-      result = result.replace(/"/g, '');
-
-      // 还原占位符为 ${label}
-      placeholderMap.forEach((label, placeholder) => {
-        result = result.replace(new RegExp(this.escapeRegex(placeholder), 'g'), `\${${label}}`);
-      });
-
-      // 处理连续变量之间剩余的 + 号
-      result = result.replace(/\$\{([^}]+)\}\s*\+\s*\$\{/g, '\$\{$1\}\$\{');
-
-      return result;
-    } catch (e) {
-      console.error('Failed to parse label expression:', e);
-      return null;
-    }
-  }
-
-  /**
-   * 转义正则表达式特殊字符
-   */
-  private escapeRegex(str: string): string {
-    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-  }
-}
-
-/** 单例实例 */
-export const groovySyntaxConverter = new GroovySyntaxConverter();
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/groovy-variable-service.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/groovy-variable-service.ts
deleted file mode 100644
index f3f9d13d..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/groovy-variable-service.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import { GroovyVariableMapping, VariableTag } from '@flow-engine/flow-types';
-import { ScriptType } from '../../typings/groovy-script';
-
-/**
- * Groovy变量预定义映射服务
- */
-export class GroovyVariableService {
-  /** 适配器映射 */
-  private static adapters: Map<ScriptType, any> = new Map();
-
-  /**
-   * 注册脚本适配器（供 ScriptAdapterManager 使用）
-   */
-  static registerAdapter(adapter: any): void {
-    this.adapters.set(adapter.scriptType, adapter);
-  }
-
-  /**
-   * 获取指定脚本类型的系统变量
-   */
-  static getSystemVariables(scriptType: ScriptType): GroovyVariableMapping[] {
-    // 目前所有脚本类型使用相同的预定义变量
-    return this.getPredefinedMappings();
-  }
-
-  /**
-   * 获取变量列表（系统变量 + 表单字段）
-   */
-  static getVariables(
-    scriptType: ScriptType,
-    context?: { formFields?: Array<{ name: string; code: string }> }
-  ): GroovyVariableMapping[] {
-    const mappings = [...this.getPredefinedMappings()];
-
-    if (context?.formFields && context.formFields.length > 0) {
-      mappings.push(...this.getFormFieldMappings(context.formFields));
-    }
-
-    return mappings;
-  }
-
-  /**
-   * 获取预定义变量映射
-   */
-  static getPredefinedMappings(): GroovyVariableMapping[] {
-    return [
-      // ========== 操作人相关 ==========
-      {
-        label: '当前操作人',
-        value: 'request.operatorName',
-        expression: 'request.getOperatorName()',
-        tag: VariableTag.OPERATOR,
-        order: 1,
-      },
-      {
-        label: '当前操作人ID',
-        value: 'request.operatorId',
-        expression: 'request.getOperatorId()',
-        tag: VariableTag.OPERATOR,
-        order: 2,
-      },
-      {
-        label: '是否管理员',
-        value: 'request.isFlowManager',
-        expression: 'request.getIsFlowManager()',
-        tag: VariableTag.OPERATOR,
-        order: 3,
-      },
-      {
-        label: '流程创建人',
-        value: 'request.creatorName',
-        expression: 'request.getCreatorName()',
-        tag: VariableTag.OPERATOR,
-        order: 4,
-      },
-
-      // ========== 流程相关 ==========
-      {
-        label: '流程标题',
-        value: 'request.workflowTitle',
-        expression: 'request.getWorkflowTitle()',
-        tag: VariableTag.WORKFLOW,
-        order: 10,
-      },
-      {
-        label: '流程编码',
-        value: 'request.workflowCode',
-        expression: 'request.getWorkflowCode()',
-        tag: VariableTag.WORKFLOW,
-        order: 11,
-      },
-      {
-        label: '当前节点',
-        value: 'request.nodeName',
-        expression: 'request.getNodeName()',
-        tag: VariableTag.WORKFLOW,
-        order: 12,
-      },
-      {
-        label: '节点类型',
-        value: 'request.nodeType',
-        expression: 'request.getNodeType()',
-        tag: VariableTag.WORKFLOW,
-        order: 13,
-      },
-
-      // ========== 流程编号 ==========
-      {
-        label: '流程编号',
-        value: 'request.workCode',
-        expression: 'request.getWorkCode()',
-        tag: VariableTag.WORK_CODE,
-        order: 20,
-      },
-    ];
-  }
-
-  /**
-   * 获取表单字段映射（动态生成）
-   */
-  static getFormFieldMappings(fields: Array<{ name: string; code: string }>): GroovyVariableMapping[] {
-    return fields.map((field, index) => ({
-      label: field.name,
-      value: `request.formData("${field.code}")`,
-      expression: `request.getFormData("${field.code}")`,
-      tag: VariableTag.FORM_FIELD,
-      order: 100 + index,
-    }));
-  }
-
-  // tag 排序权重（数值越小越靠前）
-  private static readonly TAG_ORDER: Record<string, number> = {
-    '操作人相关': 1,
-    '流程相关': 2,
-    '流程编号': 3,
-    '表单字段': 4, // 表单字段放在最后
-  };
-
-  /**
-   * 获取所有变量映射（预定义 + 表单字段）
-   */
-  static getAllMappings(formFields?: Array<{ name: string; code: string }>): GroovyVariableMapping[] {
-    const mappings = [...this.getPredefinedMappings()];
-
-    if (formFields && formFields.length > 0) {
-      mappings.push(...this.getFormFieldMappings(formFields));
-    }
-
-    // 按tag权重和order排序
-    return mappings.sort((a, b) => {
-      const tagOrderA = this.TAG_ORDER[a.tag] ?? 99;
-      const tagOrderB = this.TAG_ORDER[b.tag] ?? 99;
-      if (tagOrderA !== tagOrderB) return tagOrderA - tagOrderB;
-      return a.order - b.order;
-    });
-  }
-
-  /**
-   * 按tag分组变量映射
-   */
-  static groupByTag(mappings: GroovyVariableMapping[]): Map<string, GroovyVariableMapping[]> {
-    const groups = new Map<string, GroovyVariableMapping[]>();
-
-    for (const mapping of mappings) {
-      const existing = groups.get(mapping.tag) || [];
-      existing.push(mapping);
-      groups.set(mapping.tag, existing);
-    }
-
-    return groups;
-  }
-
-  /**
-   * 通过label查找映射
-   */
-  static findByLabel(label: string, mappings: GroovyVariableMapping[]): GroovyVariableMapping | undefined {
-    return mappings.find(m => m.label === label);
-  }
-
-  /**
-   * 检查是否为高级模式（无法解析回可视化）
-   * 通过检测完整的 def run(request){// @CUSTOM_SCRIPT ...} 格式
-   */
-  static isAdvancedMode(script: string): boolean {
-    // 检查是否包含 // @CUSTOM_SCRIPT 注释
-    if (!script.includes('// @CUSTOM_SCRIPT')) {
-      return false;
-    }
-    // 检查是否有完整的函数包装 def run(request){...}
-    return /def\s+run\s*\(\s*request\s*\)\s*\{[\s\S]*\/\/\s*@CUSTOM_SCRIPT[\s\S]*\}/.test(script);
-  }
-}
-
-/** 单例实例（供适配器使用） */
-export const groovyVariableService = new GroovyVariableService();
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/index.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/index.ts
deleted file mode 100644
index 509b623e..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { GroovySyntaxConverter, groovySyntaxConverter } from './groovy-syntax-converter';
-export { GroovyVariableService, groovyVariableService } from './groovy-variable-service';
-export { TitleSyntaxConverter } from './title-syntax-converter';
-export { ScriptAdapterManager, scriptAdapterManager } from './adapters';
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/title-syntax-converter.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/title-syntax-converter.ts
deleted file mode 100644
index 8d27bddb..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/script/service/title-syntax-converter.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { GroovyVariableService } from './groovy-variable-service';
-
-const TITLE_COMMENT = '// @CUSTOM_SCRIPT';
-
-/**
- * 标题表达式语法转换工具
- */
-export class TitleSyntaxConverter {
-  /**
-   * 用户界面显示语法 → Groovy脚本语法
-   * 输入: "你好，${当前操作人}"
-   * 输出: "// @TITLE\nreturn \"你好，\" + request.getOperatorName()"
-   */
-  static toGroovySyntax(
-    content: string,
-    mappings: GroovyVariableMapping[]
-  ): string {
-    let result = content;
-
-    // 按label长度降序排序，避免短label替换长label的一部分
-    const sortedMappings = [...mappings].sort((a, b) => b.label.length - a.label.length);
-
-    // 将 ${label} 替换为唯一的占位符
-    const placeholders: Map<string, { expression: string; label: string }> = new Map();
-    let placeholderIndex = 0;
-    for (const mapping of sortedMappings) {
-      const labelPattern = `\${${mapping.label}}`;
-      const placeholder = `__PLACEHOLDER_${placeholderIndex}__`;
-      placeholders.set(placeholder, { expression: mapping.expression, label: mapping.label });
-      result = result.split(labelPattern).join(placeholder);
-      placeholderIndex++;
-    }
-
-    // 按占位符分割字符串，构建表达式
-    const parts: string[] = [];
-    let lastIndex = 0;
-    const placeholderRegex = /__PLACEHOLDER_(\d+)__/g;
-    let match;
-
-    while ((match = placeholderRegex.exec(result)) !== null) {
-      // 添加占位符之前的文本
-      if (match.index > lastIndex) {
-        const text = result.substring(lastIndex, match.index);
-        parts.push(`"${text}"`);
-      }
-      // 添加占位符对应的表达式
-      const placeholder = match[0];
-      const placeholderInfo = placeholders.get(placeholder);
-      if (placeholderInfo) {
-        parts.push(placeholderInfo.expression);
-      }
-      lastIndex = match.index + placeholder.length;
-    }
-
-    // 添加最后一个占位符之后的文本
-    if (lastIndex < result.length) {
-      const text = result.substring(lastIndex);
-      parts.push(`"${text}"`);
-    }
-
-    // 组合成完整的Groovy表达式
-    let groovyExpression: string;
-    if (parts.length === 0) {
-      groovyExpression = '""';
-    } else if (parts.length === 1) {
-      groovyExpression = parts[0];
-    } else {
-      groovyExpression = parts.join(' + ');
-    }
-
-    // 添加 return 和标题注释，包装成完整的Groovy函数
-    // 后端期望格式: def run(request){// @TITLE\nreturn "..."}
-    return `def run(request){\n${TITLE_COMMENT}\nreturn ${groovyExpression}\n}`;
-  }
-
-  /**
-   * Groovy脚本语法 → 用户界面显示语法
-   * 输入: "// @TITLE\nreturn \"你好，\" + request.getOperatorName()"
-   * 输出: "你好，${当前操作人}"
-   */
-  static toLabelExpression(
-    groovyCode: string,
-    mappings: GroovyVariableMapping[]
-  ): string | null {
-    try {
-      let result = groovyCode.trim();
-
-      // 特殊处理：检查是否为默认的 legacy 脚本
-      // 格式: def run(request){return '你有一条待办'}
-      if (this.isDefaultLegacyScript(result)) {
-        // 提取 return 语句中的字符串
-        const match = result.match(/return\s+['"]([^'"]*)['"]/);
-        if (match && match[1]) {
-          return match[1];
-        }
-      }
-
-      // 检查是否有 @TITLE 注释
-      if (!result.includes(TITLE_COMMENT)) {
-        return null; // 无法解析
-      }
-
-      // 移除函数包装 def run(request){...}
-      // 提取函数体内容
-      const funcMatch = result.match(/def\s+run\s*\([^)]*\)\s*\{([\s\S]*)\}/);
-      if (funcMatch) {
-        result = funcMatch[1];
-      }
-
-      // 移除 @TITLE 注释
-      result = result.replace(TITLE_COMMENT, '').trim();
-
-      // 移除 return 关键字
-      result = result.replace(/^return\s+/, '');
-
-      // 创建表达式到标签的映射
-      const exprToLabel = new Map<string, string>();
-      for (const mapping of mappings) {
-        exprToLabel.set(mapping.expression, mapping.label);
-      }
-
-      // 按expression长度降序排序（优先匹配长表达式）
-      const sortedExprs = Array.from(exprToLabel.keys()).sort((a, b) => b.length - a.length);
-
-      // 使用占位符方法处理表达式替换
-      let placeholders = 0;
-      const placeholderMap = new Map<string, string>();
-
-      // 首先替换所有表达式为占位符
-      for (const expr of sortedExprs) {
-        const escaped = this.escapeRegex(expr);
-        const placeholder = `___EXPR_PLACEHOLDER_${placeholders}___`;
-
-        result = result.replace(new RegExp(escaped, 'g'), placeholder);
-        placeholderMap.set(placeholder, exprToLabel.get(expr) || expr);
-        placeholders++;
-      }
-
-      // 处理字符串拼接：移除 + 连接符
-      // 情况1：expr + "text" -> expr text（删除 " 前面的 + 和空格）
-      result = result.replace(/\s*\+\s*"/g, '"');
-      // 情况2："text" + expr -> text expr（删除 " 后面的 + 和空格）
-      result = result.replace(/"\s*\+\s*/g, '"');
-
-      // 移除所有剩余的引号
-      result = result.replace(/"/g, '');
-
-      // 还原占位符为 ${label}
-      placeholderMap.forEach((label, placeholder) => {
-        result = result.replace(new RegExp(this.escapeRegex(placeholder), 'g'), `\${${label}}`);
-      });
-
-      // 处理连续变量之间剩余的 + 号（如 ${变量1} + ${变量2} -> ${变量1}${变量2}）
-      // 先把 ${xxx} 替换为占位符，处理中间的 + 号，再还原
-      result = result.replace(/\$\{([^}]+)\}\s*\+\s*\$\{/g, '\$\{$1\}\$\{');
-
-      return result;
-    } catch (e) {
-      console.error('Failed to parse label expression:', e);
-      return null;
-    }
-  }
-
-  /**
-   * 转义正则表达式特殊字符
-   */
-  private static escapeRegex(str: string): string {
-    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-  }
-
-  /**
-   * 解析脚本模式
-   */
-  static parseMode(script: string): 'normal' | 'advanced' {
-    // 特殊处理：检测是否为默认的 legacy 脚本
-    // 如果是默认脚本，视为 normal 模式（可以重新编辑）
-    if (this.isDefaultLegacyScript(script)) {
-      return 'normal';
-    }
-
-    if (GroovyVariableService.isAdvancedMode(script)) {
-      // 尝试解析为正常模式
-      const mappings = GroovyVariableService.getPredefinedMappings();
-      const labelExpr = this.toLabelExpression(script, mappings);
-      return labelExpr !== null ? 'normal' : 'advanced';
-    }
-    // 旧脚本或无注释脚本，视为高级模式
-    return 'advanced';
-  }
-
-  /**
-   * 检查是否为默认的 legacy 脚本
-   */
-  private static isDefaultLegacyScript(script: string): boolean {
-    const trimmed = script.trim();
-    // 匹配默认脚本格式: def run(request){return '你有一条待办'}
-    return /^\s*def\s+run\s*\(\s*request\s*\)\s*\{\s*return\s+'[^']*'\s*\}\s*$/.test(trimmed);
-  }
-
-  /**
-   * 验证Groovy脚本语法（基础检查）
-   */
-  static validateGroovySyntax(script: string): { valid: boolean; error?: string } {
-    if (!script || script.trim().length === 0) {
-      return { valid: false, error: '脚本不能为空' };
-    }
-
-    // 基础语法检查
-    if (!script.includes('return')) {
-      return { valid: false, error: '脚本必须包含 return 语句' };
-    }
-
-    // 检查括号匹配
-    const openBraces = (script.match(/\{/g) || []).length;
-    const closeBraces = (script.match(/\}/g) || []).length;
-    if (openBraces !== closeBraces) {
-      return { valid: false, error: '大括号不匹配' };
-    }
-
-    const openParens = (script.match(/\(/g) || []).length;
-    const closeParens = (script.match(/\)/g) || []).length;
-    if (openParens !== closeParens) {
-      return { valid: false, error: '圆括号不匹配' };
-    }
-
-    return { valid: true };
-  }
-}
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/typings/groovy-script.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/typings/groovy-script.ts
deleted file mode 100644
index 403f305b..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/typings/groovy-script.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Groovy脚本类型枚举
- */
-export enum ScriptType {
-  /** 标题脚本 */
-  TITLE = 'TITLE',
-  /** 条件脚本 */
-  CONDITION = 'CONDITION',
-  /** 人员加载脚本 */
-  OPERATOR_LOAD = 'OPERATOR_LOAD',
-  /** 自定义脚本 */
-  CUSTOM = 'CUSTOM',
-}
-
-/**
- * 脚本适配器接口
- * 用于扩展不同脚本类型的变量和转换逻辑
- */
-export interface ScriptAdapter {
-  /** 脚本类型 */
-  scriptType: ScriptType;
-
-  /** 获取系统变量 */
-  getSystemVariables(): import('@flow-engine/flow-types').GroovyVariableMapping[];
-
-  /** 转换为完整Groovy脚本（编辑时） */
-  toScript(content: string, mappings: import('@flow-engine/flow-types').GroovyVariableMapping[]): string;
-
-  /** 转换为可视化表达式（回显时） */
-  toExpression(script: string, mappings: import('@flow-engine/flow-types').GroovyVariableMapping[]): string | null;
-
-  /** 获取默认脚本模板 */
-  getDefaultTemplate(): string;
-}
-
-/**
- * 脚本配置项
- */
-export interface ScriptConfig {
-  /** 脚本类型 */
-  type: ScriptType;
-  /** 脚本内容 */
-  script: string;
-  /** 是否为高级模式 */
-  advanced?: boolean;
-}
diff --git a/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/typings/script.ts b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/typings/script.ts
new file mode 100644
index 00000000..9d98e5ae
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/typings/script.ts
@@ -0,0 +1,44 @@
+/**
+ * Groovy脚本类型枚举
+ */
+export enum ScriptType {
+  /** 标题脚本 */
+  TITLE = 'TITLE',
+  /** 条件脚本 */
+  CONDITION = 'CONDITION',
+  /** 人员加载脚本 */
+  OPERATOR_LOAD = 'OPERATOR_LOAD',
+  /** 自定义脚本 */
+  CUSTOM = 'CUSTOM',
+}
+
+/**
+ * Groovy变量映射接口
+ * 用于前后端变量映射统一
+ */
+export interface GroovyVariableMapping {
+    /** 中文显示名称：如"当前操作人" */
+    label: string;
+
+    /** 变量展示名：如"request.getOperatorName()" */
+    value: string;
+
+    /** Groovy表达式：如"${当前操作人}" */
+    expression: string;
+
+    /** 分组标签：如"操作人相关" */
+    tag: string;
+
+    /** 排序序号 */
+    order: number;
+}
+
+/** 变量分组标签枚举 */
+export enum VariableTag {
+    OPERATOR = '操作人相关',
+    WORKFLOW = '流程相关',
+    FORM_FIELD = '表单字段',
+    WORK_CODE = '流程编号',
+}
+
+
diff --git a/frontend/packages/flow-pc/flow-pc-design/tests/components/VariablePicker.test.tsx b/frontend/packages/flow-pc/flow-pc-design/tests/components/VariablePicker.test.tsx
deleted file mode 100644
index 72c62440..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/tests/components/VariablePicker.test.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import {afterEach, describe, expect, test} from '@rstest/core';
-import {cleanup} from '@testing-library/react';
-
-// Note: Full rendering test requires Less support in test environment
-// This test verifies the component structure can be imported
-describe('VariablePicker', () => {
-    afterEach(() => {
-        cleanup();
-    });
-
-    test('should be importable', () => {
-        // Component is defined in src/components/design-editor/node-components/strategy/VariablePicker.tsx
-        // This test verifies the module exists
-        expect(true).toBe(true);
-    });
-});
diff --git a/frontend/packages/flow-pc/flow-pc-design/tests/script/service/groovy-syntax-converter.test.ts b/frontend/packages/flow-pc/flow-pc-design/tests/script/service/groovy-syntax-converter.test.ts
deleted file mode 100644
index c62601c4..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/tests/script/service/groovy-syntax-converter.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { describe, expect, it } from '@rstest/core';
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { GroovySyntaxConverter } from '@/components/design-editor/script/service/groovy-syntax-converter';
-import { ScriptType } from '@/components/design-editor/typings/groovy-script';
-
-describe('GroovySyntaxConverter', () => {
-  const converter = new GroovySyntaxConverter();
-
-  const mappings: GroovyVariableMapping[] = [
-    { label: '当前操作人', value: 'request.operatorName', expression: 'request.getOperatorName()', tag: '操作人相关', order: 1 },
-    { label: '请假天数', value: 'request.formData("days")', expression: 'request.getFormData("days")', tag: '表单字段', order: 100 },
-  ];
-
-  describe('toScript', () => {
-    it('should convert simple text to groovy script', () => {
-      const result = converter.toScript(ScriptType.TITLE, '你好', mappings);
-      expect(result).toContain('return "你好"');
-      expect(result).toContain('def run(request)');
-    });
-
-    it('should convert single variable', () => {
-      const result = converter.toScript(ScriptType.TITLE, '${当前操作人}', mappings);
-      expect(result).toContain('request.getOperatorName()');
-    });
-
-    it('should convert multiple variables', () => {
-      const result = converter.toScript(ScriptType.TITLE, '你好，${当前操作人}，请假${请假天数}天', mappings);
-      expect(result).toContain('request.getOperatorName()');
-      expect(result).toContain('request.getFormData("days")');
-    });
-
-    it('should handle empty content', () => {
-      const result = converter.toScript(ScriptType.TITLE, '', mappings);
-      expect(result).toContain('return ""');
-    });
-  });
-
-  describe('toExpression', () => {
-    it('should return null when no adapter registered', () => {
-      const groovy = '// @TITLE\nreturn "你好，" + request.getOperatorName() + "，请审批"';
-      const result = converter.toExpression(ScriptType.TITLE, groovy, mappings);
-      // Without adapter, default implementation returns null for custom comment
-      expect(result).toBeNull();
-    });
-
-    it('should return null for non-title script', () => {
-      const groovy = 'def run(request){return "custom"}';
-      const result = converter.toExpression(ScriptType.TITLE, groovy, mappings);
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('getDefaultTemplate', () => {
-    it('should return default template for unknown type', () => {
-      const result = converter.getDefaultTemplate(ScriptType.CUSTOM);
-      expect(result).toContain('def run(request)');
-      expect(result).toContain('return ""');
-    });
-
-    it('should return default template when no adapter registered', () => {
-      const result = converter.getDefaultTemplate(ScriptType.TITLE);
-      expect(result).toContain('def run(request)');
-    });
-  });
-
-  describe('isAdvancedMode', () => {
-    it('should return false for simple script', () => {
-      const script = "def run(request){return 'test'}";
-      expect(converter.isAdvancedMode(script)).toBe(false);
-    });
-
-    it('should return true for custom script with comment', () => {
-      const script = 'def run(request){\n// @CUSTOM_SCRIPT\nreturn "test"\n}';
-      expect(converter.isAdvancedMode(script)).toBe(true);
-    });
-  });
-
-  describe('registerAdapter', () => {
-    it('should register and use custom adapter', () => {
-      const mockAdapter = {
-        scriptType: ScriptType.CUSTOM,
-        getSystemVariables: () => [],
-        toScript: (content: string) => `custom:${content}`,
-        toExpression: () => null,
-        getDefaultTemplate: () => 'custom-template',
-      };
-
-      converter.registerAdapter(mockAdapter);
-
-      const result = converter.toScript(ScriptType.CUSTOM, 'test', []);
-      expect(result).toBe('custom:test');
-    });
-  });
-});
diff --git a/frontend/packages/flow-pc/flow-pc-design/tests/script/service/groovy-variable-service.test.ts b/frontend/packages/flow-pc/flow-pc-design/tests/script/service/groovy-variable-service.test.ts
deleted file mode 100644
index dd0280ea..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/tests/script/service/groovy-variable-service.test.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { describe, expect, it } from '@rstest/core';
-import { GroovyVariableService } from '@/components/design-editor/script/service/groovy-variable-service';
-import { ScriptType } from '@/components/design-editor/typings/groovy-script';
-
-describe('GroovyVariableService', () => {
-  const service = new GroovyVariableService();
-
-  describe('getSystemVariables', () => {
-    it('should return predefined variables for TITLE type', () => {
-      const variables = service.getSystemVariables(ScriptType.TITLE);
-
-      expect(variables.length).toBeGreaterThan(0);
-      expect(variables.some(v => v.label === '当前操作人')).toBe(true);
-      expect(variables.some(v => v.label === '流程标题')).toBe(true);
-    });
-
-    it('should return predefined variables for unknown type', () => {
-      const variables = service.getSystemVariables(ScriptType.CUSTOM);
-
-      expect(variables.length).toBeGreaterThan(0);
-    });
-  });
-
-  describe('getVariables', () => {
-    it('should return variables without form fields', () => {
-      const variables = service.getVariables(ScriptType.TITLE);
-
-      expect(variables.length).toBeGreaterThan(0);
-    });
-
-    it('should include form fields when provided', () => {
-      const formFields = [
-        { name: '请假天数', code: 'days' },
-        { name: '请假人', code: 'name' },
-      ];
-
-      const variables = service.getVariables(ScriptType.TITLE, { formFields });
-
-      expect(variables.length).toBeGreaterThan(2);
-      expect(variables.some(v => v.label === '请假天数')).toBe(true);
-      expect(variables.some(v => v.label === '请假人')).toBe(true);
-    });
-  });
-
-  describe('getFormFieldVariables', () => {
-    it('should convert form fields to variable mappings', () => {
-      const fields = [
-        { name: '请假天数', code: 'days' },
-        { name: '请假人', code: 'name' },
-      ];
-
-      const variables = service.getFormFieldVariables(fields);
-
-      expect(variables.length).toBe(2);
-      expect(variables[0].label).toBe('请假天数');
-      expect(variables[0].expression).toBe('request.getFormData("days")');
-      expect(variables[1].label).toBe('请假人');
-      expect(variables[1].expression).toBe('request.getFormData("name")');
-    });
-  });
-
-  describe('groupByTag', () => {
-    it('should group variables by tag', () => {
-      const variables = service.getSystemVariables(ScriptType.TITLE);
-
-      const groups = service.groupByTag(variables);
-
-      expect(groups.size).toBeGreaterThan(0);
-      expect(groups.has('操作人相关')).toBe(true);
-      expect(groups.has('流程相关')).toBe(true);
-    });
-
-    it('should return empty map for empty input', () => {
-      const groups = service.groupByTag([]);
-
-      expect(groups.size).toBe(0);
-    });
-  });
-
-  describe('registerAdapter', () => {
-    it('should register and use custom adapter', () => {
-      const customVariables = [
-        { label: '自定义变量', value: 'custom', expression: 'getCustom()', tag: '自定义', order: 1 },
-      ];
-
-      const mockAdapter = {
-        scriptType: ScriptType.CUSTOM,
-        getSystemVariables: () => customVariables,
-        toScript: () => '',
-        toExpression: () => null,
-        getDefaultTemplate: () => '',
-      };
-
-      service.registerAdapter(mockAdapter);
-
-      const variables = service.getSystemVariables(ScriptType.CUSTOM);
-
-      expect(variables).toEqual(customVariables);
-    });
-  });
-});
diff --git a/frontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-node-title.test.ts b/frontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-node-title.test.ts
new file mode 100644
index 00000000..2a0640a1
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-node-title.test.ts
@@ -0,0 +1,67 @@
+import {describe, expect, it} from '@rstest/core';
+import {FlowFromMeta} from "@flow-engine/flow-types";
+import {
+    NodeTitleGroovyConvertor
+} from "@/components/design-editor/node-components/scripts/services/convertor/node-title";
+import {
+    NodeTitleVariableAdapter
+} from "@/components/design-editor/node-components/scripts/services/variable/node-title";
+
+describe('NodeTitleGroovyConvertor', () => {
+
+    const form :FlowFromMeta= {
+        name:'请假单',
+        code:'leave',
+        fields:[
+            {
+                id:'1',
+                name:'天数',
+                code:'days',
+                type:'number',
+                required:true,
+                defaultValue:''
+            },
+            {
+                id:'2',
+                name:'理由',
+                code:'desc',
+                type:'string',
+                required:true,
+                defaultValue:''
+            },
+        ],
+        subForms:[]
+    }
+
+    const nodeTitleVariableAdapter = new NodeTitleVariableAdapter(form);
+
+
+
+    describe('toExpression', () => {
+        it('should convert simple text to groovy script', () => {
+            const script = `
+def run(request){
+return "您有一条待办消息" + request.getOperatorId() + request.getOperatorId() + request.getCreatorName() + request.getIsFlowManager()
+}
+`
+            const nodeTitleGroovyConvertor = new NodeTitleGroovyConvertor(script, nodeTitleVariableAdapter.getVariables());
+            const result = nodeTitleGroovyConvertor.toExpression()
+            expect(result).toEqual("您有一条待办消息${当前操作人ID}${当前操作人ID}${流程创建人}${是否管理员}");
+        });
+    });
+
+
+    describe('resetExpression', () => {
+        it('should convert simple text to groovy script', () => {
+            const script = `
+// @CUSTOM_SCRIPT 
+def run(request){
+    return "你有一条" + request.getOperatorName() + "的" + request.getWorkflowTitle() + "待办消息 【" + request.getNodeName() + "】"
+}
+`
+            const nodeTitleGroovyConvertor = new NodeTitleGroovyConvertor(script, nodeTitleVariableAdapter.getVariables());
+            const result = nodeTitleGroovyConvertor.resetExpression('你有一条${当前操作人}的${流程标题}待办消息 【${当前节点}】')
+            expect(result).toEqual(script);
+        });
+    });
+});
\ No newline at end of file
diff --git a/frontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-utils.test.ts b/frontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-utils.test.ts
new file mode 100644
index 00000000..abfe6d20
--- /dev/null
+++ b/frontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-utils.test.ts
@@ -0,0 +1,16 @@
+import {describe, expect, it} from '@rstest/core';
+import {GroovyScriptConvertorUtil} from "@/components/design-editor/node-components/scripts/services/convertor/utils";
+
+describe('GroovyScriptUtil', () => {
+
+    describe('getReturnScript', () => {
+        it('should convert simple text to groovy script', () => {
+            const script = ` def run(request){
+// @CUSTOM_SCRIPT
+return "你有一条" + request.getOperatorName() + "的" + request.getWorkflowTitle() + "待办消息 【" + request.getNodeName() + "】"
+}`
+            const result = GroovyScriptConvertorUtil.getReturnScript(script)
+            expect(result).toEqual(`"你有一条" + request.getOperatorName() + "的" + request.getWorkflowTitle() + "待办消息 【" + request.getNodeName() + "】"`);
+        });
+    });
+});
\ No newline at end of file
diff --git a/frontend/packages/flow-pc/flow-pc-design/tests/utils/title-syntax-converter.test.ts b/frontend/packages/flow-pc/flow-pc-design/tests/utils/title-syntax-converter.test.ts
deleted file mode 100644
index f4f769de..00000000
--- a/frontend/packages/flow-pc/flow-pc-design/tests/utils/title-syntax-converter.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { describe, expect, it } from '@rstest/core';
-import { GroovyVariableMapping } from '@flow-engine/flow-types';
-import { TitleSyntaxConverter } from '@/components/design-editor/script/service/title-syntax-converter';
-
-describe('TitleSyntaxConverter', () => {
-  const mappings: GroovyVariableMapping[] = [
-    { label: '当前操作人', value: 'request.operatorName', expression: 'request.getOperatorName()', tag: '操作人相关', order: 1 },
-    { label: '请假天数', value: 'request.formData("days")', expression: 'request.getFormData("days")', tag: '表单字段', order: 100 },
-  ];
-
-  describe('toGroovySyntax', () => {
-    it('should convert simple text', () => {
-      const result = TitleSyntaxConverter.toGroovySyntax('你好', mappings);
-      expect(result).toContain('return "你好"');
-    });
-
-    it('should convert single variable', () => {
-      const result = TitleSyntaxConverter.toGroovySyntax('${当前操作人}', mappings);
-      expect(result).toContain('request.getOperatorName()');
-    });
-
-    it('should convert multiple variables', () => {
-      const result = TitleSyntaxConverter.toGroovySyntax('你好，${当前操作人}，请假${请假天数}天', mappings);
-      expect(result).toContain('request.getOperatorName()');
-      expect(result).toContain('request.getFormData("days")');
-    });
-  });
-
-  describe('toLabelExpression', () => {
-    it('should parse groovy to label', () => {
-      const groovy = '// @TITLE\nreturn "你好，" + request.getOperatorName() + "，请审批"';
-      const result = TitleSyntaxConverter.toLabelExpression(groovy, mappings);
-      expect(result).toBe('你好，${当前操作人}，请审批');
-    });
-
-    it('should return null for non-title script', () => {
-      const groovy = 'def run(request){return "custom"}';
-      const result = TitleSyntaxConverter.toLabelExpression(groovy, mappings);
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('parseMode', () => {
-    it('should detect normal mode', () => {
-      const script = '// @TITLE\nreturn "你好，" + request.getOperatorName()';
-      const mode = TitleSyntaxConverter.parseMode(script);
-      expect(mode).toBe('normal');
-    });
-
-    it('should detect advanced mode', () => {
-      const script = 'def run(request){return "custom"}';
-      const mode = TitleSyntaxConverter.parseMode(script);
-      expect(mode).toBe('advanced');
-    });
-  });
-});
diff --git a/frontend/packages/flow-types/src/types/groovy-variable.ts b/frontend/packages/flow-types/src/types/groovy-variable.ts
deleted file mode 100644
index 07adb6ea..00000000
--- a/frontend/packages/flow-types/src/types/groovy-variable.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Groovy变量映射接口
- * 用于前后端变量映射统一
- */
-export interface GroovyVariableMapping {
-  /** 中文显示名称：如"当前操作人" */
-  label: string;
-
-  /** 变量展示名：如"request.operatorName" */
-  value: string;
-
-  /** Groovy表达式：如"request.getOperatorName()" */
-  expression: string;
-
-  /** 分组标签：如"操作人相关" */
-  tag: string;
-
-  /** 排序序号 */
-  order: number;
-}
-
-/** 变量分组标签枚举 */
-export enum VariableTag {
-  OPERATOR = '操作人相关',
-  WORKFLOW = '流程相关',
-  FORM_FIELD = '表单字段',
-  WORK_CODE = '流程编号',
-}
-
-/** 标题表达式类型 */
-export type TitleExpressionMode = 'normal' | 'advanced';
diff --git a/frontend/packages/flow-types/src/types/index.ts b/frontend/packages/flow-types/src/types/index.ts
index c7f0e012..3c757c7a 100644
--- a/frontend/packages/flow-types/src/types/index.ts
+++ b/frontend/packages/flow-types/src/types/index.ts
@@ -1,4 +1,3 @@
 export * from './view-component';
 export * from './form-instance';
-export * from './flow-approval';
-export * from './groovy-variable';
\ No newline at end of file
+export * from './flow-approval';
\ No newline at end of file