fix node-title.tsx

xlorne · xlorne · commit 1acce26f0def · 2026-03-02T16:48:06.000+08:00
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
@@ -34,6 +34,7 @@ export class NodeTitleGroovyConvertor implements GroovyScriptConverter {
 
     resetExpression(value:string) {
         const returnExpression = GroovyScriptUtil.getReturnExpression(this.script);
-        return this.script.replace(returnExpression, `"${value}"`);
+        const script = GroovyScriptUtil.toScript(value, this.mappings);
+        return this.script.replace(returnExpression, `${script}`);
     }
 }
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
@@ -12,17 +12,17 @@ export interface GroovyScriptConverter {
     /**
      * 转换为完整Groovy脚本（编辑时）
      */
-    toScript():string;
+    toScript(): string;
 
     /**
      * 转换为可视化表达式（回显时）
      */
-    toExpression():string;
+    toExpression(): string;
 
     /**
      * 获取默认脚本模板
      */
-    getDefaultScript():string;
+    getDefaultScript(): string;
 
     /**
      * 添加变量到脚本中
@@ -34,7 +34,7 @@ export interface GroovyScriptConverter {
      * 重置脚本中的表达式部分（编辑时）
      * @param value
      */
-    resetExpression(value:string):void;
+    resetExpression(value: string): void;
 }
 
 
@@ -92,6 +92,65 @@ export class GroovyScriptUtil {
         }
     }
 
+    /**
+     * 将可视化表达式转换为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表达式转换为可视化表达式（回显时）
@@ -102,7 +161,7 @@ export class GroovyScriptUtil {
         let result = script;
         const exprToLabel = new Map<string, string>();
         for (const mapping of mappings) {
-            exprToLabel.set(mapping.expression, mapping.label);
+            exprToLabel.set(mapping.value, mapping.label);
         }
 
         const sortedExprs = Array.from(exprToLabel.keys()).sort((a, b) => b.length - a.length);
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
@@ -17,68 +17,68 @@ export class GroovyVariableUtil {
             // ========== 操作人相关 ==========
             {
                 label: '当前操作人',
-                value: 'request.operatorName',
-                expression: 'request.getOperatorName()',
+                value: 'request.getOperatorName()',
+                expression: "${当前操作人}",
                 tag: VariableTag.OPERATOR,
                 order: 1,
             },
             {
                 label: '当前操作人ID',
-                value: 'request.operatorId',
-                expression: 'request.getOperatorId()',
+                value: 'request.getOperatorId()',
+                expression: '${当前操作人ID}',
                 tag: VariableTag.OPERATOR,
                 order: 2,
             },
             {
                 label: '是否管理员',
-                value: 'request.isFlowManager',
-                expression: 'request.getIsFlowManager()',
+                value: 'request.getIsFlowManager()',
+                expression: '${是否管理员}',
                 tag: VariableTag.OPERATOR,
                 order: 3,
             },
             {
                 label: '流程创建人',
-                value: 'request.creatorName',
-                expression: 'request.getCreatorName()',
+                value: 'request.getCreatorName()',
+                expression: '${流程创建人}',
                 tag: VariableTag.OPERATOR,
                 order: 4,
             },
 
             // ========== 流程相关 ==========
             {
                 label: '流程标题',
-                value: 'request.workflowTitle',
-                expression: 'request.getWorkflowTitle()',
+                value: 'request.getWorkflowTitle()',
+                expression: '${流程标题}',
                 tag: VariableTag.WORKFLOW,
                 order: 10,
             },
             {
                 label: '流程编码',
-                value: 'request.workflowCode',
-                expression: 'request.getWorkflowCode()',
+                value: 'request.getWorkflowCode()',
+                expression: '${流程编码}',
                 tag: VariableTag.WORKFLOW,
                 order: 11,
             },
             {
                 label: '当前节点',
-                value: 'request.nodeName',
-                expression: 'request.getNodeName()',
+                value: 'request.getNodeName()',
+                expression: '${当前节点}',
                 tag: VariableTag.WORKFLOW,
                 order: 12,
             },
             {
                 label: '节点类型',
-                value: 'request.nodeType',
-                expression: 'request.getNodeType()',
+                value: 'request.getNodeType()',
+                expression: '${节点类型}',
                 tag: VariableTag.WORKFLOW,
                 order: 13,
             },
 
             // ========== 流程编号 ==========
             {
                 label: '流程编号',
-                value: 'request.workCode',
-                expression: 'request.getWorkCode()',
+                value: 'request.getWorkCode()',
+                expression: '${流程编号}',
                 tag: VariableTag.WORK_CODE,
                 order: 20,
             }
@@ -92,8 +92,8 @@ export class GroovyVariableUtil {
 
         return formMeta.fields.map((field, index) => ({
             label: `${field.name}`,
-            value: `request.formData(${field.code})`,
-            expression: `request.getFormData('${field.name}')`,
+            value: `request.getFormData('${field.code}')`,
+            expression: `${field.name}`,
             tag: VariableTag.FORM_FIELD,
             order: 100 + index,
         }));
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
@@ -37,7 +37,7 @@ describe('NodeTitleGroovyConvertor', () => {
 
 
 
-    describe('toScript', () => {
+    describe('toExpression', () => {
         it('should convert simple text to groovy script', () => {
             const script = `
 // @CUSTOM_SCRIPT 
@@ -50,4 +50,19 @@ def run(request){
             expect(result).toEqual("你有一条${当前操作人}的${流程标题}待办消息 【${当前节点}】");
         });
     });
+
+
+    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);
+        });
+    });
 });
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
@@ -3,7 +3,7 @@ import {GroovyScriptUtil} from "@/components/design-editor/node-components/scrip
 
 describe('GroovyScriptUtil', () => {
 
-    describe('toScript', () => {
+    describe('getReturnExpression', () => {
         it('should convert simple text to groovy script', () => {
             const script = ` def run(request){
 // @CUSTOM_SCRIPT

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ export class NodeTitleGroovyConvertor implements GroovyScriptConverter {`
`34`	`34`
`35`	`35`	`resetExpression(value:string) {`
`36`	`36`	`const returnExpression = GroovyScriptUtil.getReturnExpression(this.script);`
`37`		- return this.script.replace(returnExpression, `"${value}"`);
	`37`	`+ const script = GroovyScriptUtil.toScript(value, this.mappings);`
	`38`	+ return this.script.replace(returnExpression, `${script}`);
`38`	`39`	`}`
`39`	`40`	`}`