From 63fc41dede37a6c58236db54decfc4a154b1381d Mon Sep 17 00:00:00 2001 From: dengqichen Date: Tue, 21 Oct 2025 17:27:10 +0800 Subject: [PATCH] 1 --- .../Design/components/EdgeConfigModal.tsx | 26 +- .../Design/components/NodeConfigModal.tsx | 522 ++++++++++-------- .../Design/nodes/JenkinsBuildNode.tsx | 14 +- .../Workflow/Design/utils/dataSourceLoader.ts | 122 ++++ .../Workflow/Design/utils/schemaConverter.ts | 117 ++++ 5 files changed, 563 insertions(+), 238 deletions(-) create mode 100644 frontend/src/pages/Workflow/Design/utils/dataSourceLoader.ts create mode 100644 frontend/src/pages/Workflow/Design/utils/schemaConverter.ts diff --git a/frontend/src/pages/Workflow/Design/components/EdgeConfigModal.tsx b/frontend/src/pages/Workflow/Design/components/EdgeConfigModal.tsx index eec036e8..598ed060 100644 --- a/frontend/src/pages/Workflow/Design/components/EdgeConfigModal.tsx +++ b/frontend/src/pages/Workflow/Design/components/EdgeConfigModal.tsx @@ -84,19 +84,19 @@ const EdgeConfigModal: React.FC = ({ const handleSubmit = (values: EdgeConditionFormValues) => { if (!edge) return; - + // 检查表达式是否包含变量引用 if (values.type === 'EXPRESSION' && values.expression) { - const hasVariable = /\$\{[\w.]+\}/.test(values.expression); - if (!hasVariable) { + const hasVariable = /\$\{[\w.]+\}/.test(values.expression); + if (!hasVariable) { toast({ title: '提示', description: '表达式建议包含变量引用,格式:${变量名}', }); + } } - } - - onOk(edge.id, values); + + onOk(edge.id, values); handleClose(); }; @@ -174,8 +174,8 @@ const EdgeConfigModal: React.FC = ({ 条件表达式