+
-
-
-
diff --git a/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8ec4414b514288fd2065cbcd28ebe4997051c54e
--- /dev/null
+++ b/src/views/createapp/components/workFlowConfig/CodeNodeDrawer.vue
@@ -0,0 +1,1154 @@
+
+ {{ props.data.name }}
-
-
- ···
-
+
-
-
+
-
+
+
- {{ props.data.name }}
+
+
- {{ $t('semantic.edit') }}
-
-
- {{ $t('semantic.interface_delete') }}
-
-
+ ···
+
+ {{ $t('semantic.edit') }}
+
+
+ {{ $t('semantic.interface_delete') }}
+
+
+
- {{ props.data.description }}
-
-
+
+
+
+
+
- {{ item.description }}
-
+ {{ item.description }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/createapp/components/workFlowConfig/CustomNode.vue b/src/views/createapp/components/workFlowConfig/CustomNode.vue
index 3ea0b1258bc04c2d48d31d5566b384f5fd6f077f..0d85a182b5f8f4ffb017d189ff011b50dd09cd7b 100644
--- a/src/views/createapp/components/workFlowConfig/CustomNode.vue
+++ b/src/views/createapp/components/workFlowConfig/CustomNode.vue
@@ -28,6 +28,10 @@ const props = defineProps({
type: Boolean,
required: false,
},
+ selected: {
+ type: Boolean,
+ default: false,
+ },
});
const emits = defineEmits(['delNode', 'editYamlDrawer', 'updateConnectHandle']);
const { t } = useI18n();
@@ -101,6 +105,13 @@ const setConnectStatus = (type) => {
emits('updateConnectHandle', props.id);
};
+// 处理节点点击事件
+const handleNodeClick = () => {
+ if (!props.disabled) {
+ editYaml(props.data.name, props.data.description, props.data.parameters);
+ }
+};
+
const handleCopyTextToclipboard = (text) => {
const input = document.createElement('input');
input.value = text;
@@ -119,75 +130,67 @@ const handleCopyTextToclipboard = (text) => {
-
+
+
+
+
+
+ ![]()
+ {{ $t('flow.step_configuration') }} - {{ nodeName }}
+
+
+
+
+
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+ 变量管理
+
+
+
+
+
+
+
+
+ 执行配置
+
+
+
+
+
+
+
+
+ 代码编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择工作流中的变量作为代码输入
+
+
+
+
+
+
+
+
+
+
+
+ 暂无输入变量
+选择变量作为代码输入参数
+
+
+
+ 定义节点的输出变量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无输出变量
+输出变量应在代码的返回值中定义
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- ![]()
-
-
-
+ {{ props.data.name }}
-
+
+
-
+
-
+ ![]()
+
+
+
- {{ props.data.name }}
+
-
-
-
+
- {{ $t('semantic.edit') }}
-
-
- {{ $t('semantic.interface_delete') }}
-
-
-
-
-
-
-
-
-
-
-
+
- {{ desc }}
+
+
+ {{ $t('semantic.edit') }}
+
+
+ {{ $t('semantic.interface_delete') }}
+
+
+
+
+
+
+
+
+
+
+
import { Position, Handle } from '@vue-flow/core';
-import { ref, onMounted, watch } from 'vue';
+import { ref, onMounted, watch, nextTick, computed } from 'vue';
const props = defineProps({
id: {
type: String,
@@ -22,8 +22,17 @@ const props = defineProps({
type: Object,
required: false,
},
+ selected: {
+ type: Boolean,
+ default: false,
+ },
+ // 外部传入的对话变量数据
+ conversationVariables: {
+ type: Array,
+ default: () => [],
+ },
});
-const emits = defineEmits(['updateConnectHandle']);
+const emits = defineEmits(['updateConnectHandle', 'editYamlDrawer', 'editStartNodeDrawer']);
const statusList = ref(['running', 'success', 'error']);
@@ -44,6 +53,91 @@ const setConnectStatus = (type) => {
emits('updateConnectHandle', props.id);
};
+// 处理开始节点点击编辑
+const handleStartNodeClick = () => {
+ const isStartNode = props.data.name === '开始' || props.data.name === 'start';
+ if (isStartNode) {
+ // 使用nextTick确保DOM更新完成
+ nextTick(() => {
+ // 开始节点使用表单编辑器
+ const startNodeParams = {
+ input_parameters: props.data.parameters?.input_parameters || {},
+ output_parameters: props.data.parameters?.output_parameters || {}
+ };
+ // 传递实际的节点描述，如果没有则传递空字符串
+ const nodeDesc = props.data.description || '';
+ emits('editStartNodeDrawer', props.data.name, nodeDesc, startNodeParams, props.id);
+ });
+ }
+};
+
+// 获取input params的键名数组，用于显示
+const getInputParamKeys = () => {
+ const inputParams = props.data.parameters?.input_parameters || {};
+ return Object.keys(inputParams);
+};
+
+// 使用computed缓存对话级变量数据，优先使用外部传入的数据
+const conversationVariables = computed(() => {
+ // 优先使用外部传入的conversationVariables props
+ if (props.conversationVariables && props.conversationVariables.length > 0) {
+ console.log('🎯 使用外部传入的对话变量数据:', props.conversationVariables);
+ return props.conversationVariables.map((variable: any) => ({
+ name: variable.name,
+ type: getVariableTypeDisplay(variable.var_type || variable.type || 'string'),
+ value: variable.value
+ }));
+ }
+
+ // 降级处理：从节点数据中获取（保持向后兼容）
+ console.log('🔍 CustomSaENode computed - props.data:', props.data);
+ console.log('🔍 props.data.variables:', props.data.variables);
+ console.log('🔍 props.data.parameters?.conversation_variables:', props.data.parameters?.conversation_variables);
+
+ const variables = props.data.variables || props.data.parameters?.conversation_variables || {};
+
+ console.log('🔍 最终使用的variables:', variables);
+
+ if (!variables || Object.keys(variables).length === 0) {
+ console.log('⚠️ 变量为空，返回空数组');
+ return [];
+ }
+
+ const result = Object.entries(variables).map(([key, value]: [string, any]) => ({
+ name: key,
+ type: getVariableTypeDisplay(value?.type || value?.var_type || (typeof value === 'object' && value !== null ? 'object' : typeof value)),
+ value: value?.value !== undefined ? value.value : value
+ }));
+
+ console.log('✅ conversationVariables computed result:', result);
+ return result;
+});
+
+// 获取对话级变量的键名数组，用于显示（保持向后兼容）
+const getConversationVariableKeys = () => {
+ return conversationVariables.value.map(v => v.name);
+};
+
+// 获取对话级变量的详细信息，包括类型等（保持向后兼容）
+const getConversationVariables = () => {
+ return conversationVariables.value;
+};
+
+// 获取变量类型的显示名称
+const getVariableTypeDisplay = (type: string): string => {
+ const typeMap: Record = {
+ 'string': 'String',
+ 'number': 'Number',
+ 'boolean': 'Boolean',
+ 'object': 'Object',
+ 'array_file': 'Array[File]',
+ 'array[file]': 'Array[File]',
+ 'array': 'Array',
+ 'secret': 'Secret'
+ }
+ return typeMap[type] || type.charAt(0).toUpperCase() + type.slice(1);
+};
+
watch(
() => props.data,
() => {
@@ -62,7 +156,7 @@ watch(
- ID:
-
- {{ props.id }}
-
+ {{ props.id }}
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/createapp/components/workFlowConfig/useDnD.js b/src/views/createapp/components/workFlowConfig/useDnD.js
index eecea56426ec7da0bf145167a44c52b5f3b28ea8..b69d9b145e35397811a29721e0cc46b2b83d9414 100644
--- a/src/views/createapp/components/workFlowConfig/useDnD.js
+++ b/src/views/createapp/components/workFlowConfig/useDnD.js
@@ -91,12 +91,42 @@ export default function useDragAndDrop() {
const nodeId = getId();
+ // 清洗节点数据，确保Code节点有正确的parameters结构
+ let cleanNodeData = { ...nodeData.value };
+
+ // 如果是Code节点，确保parameters结构正确
+ if (cleanNodeData.callId === 'Code' || cleanNodeData.type === 'Code') {
+ // 清洗parameters，只保留input_parameters和output_parameters
+ cleanNodeData.parameters = {
+ input_parameters: {}, // 默认为空对象
+ output_parameters: { // 修复：确保是正确的变量映射格式
+ result: {
+ type: 'string',
+ description: ''
+ }
+ }
+ };
+
+ // 确保代码节点的其他配置属性在正确位置
+ cleanNodeData = {
+ ...cleanNodeData,
+ nodeId: 'Code', // 设置正确的nodeId
+ // 确保这些字段在节点数据的根级别，而不是在parameters中
+ code: cleanNodeData.code || '',
+ codeType: cleanNodeData.codeType || 'python',
+ securityLevel: cleanNodeData.securityLevel || 'low',
+ timeoutSeconds: cleanNodeData.timeoutSeconds || 30,
+ memoryLimitMb: cleanNodeData.memoryLimitMb || 128,
+ cpuLimit: cleanNodeData.cpuLimit || 0.5,
+ };
+ }
+
const newNode = {
id: nodeId,
type: draggedType.value,
position,
class: 'round-start',
- data: nodeData.value,
+ data: cleanNodeData,
};
/**
diff --git a/src/views/createapp/components/workFlowConfig/workFlowDialog.vue b/src/views/createapp/components/workFlowConfig/workFlowDialog.vue
index 25ed229cbb365a0c18de908faac9242c852afddb..c600411e1519272d5254dbd7be1cafc8273dec33 100644
--- a/src/views/createapp/components/workFlowConfig/workFlowDialog.vue
+++ b/src/views/createapp/components/workFlowConfig/workFlowDialog.vue
@@ -39,9 +39,11 @@
class="o-dlg-btn"
type="primary"
size="small"
+ :loading="isSubmitting"
+ :disabled="isSubmitting"
@click="handleSubmit(workFlowForm)"
>
- {{ $t('semantic.submit') }}
+ {{ isSubmitting ? '提交中...' : $t('semantic.submit') }}
{{ $t('semantic.cancel') }}
@@ -59,6 +61,8 @@ import { ElMessage, FormInstance } from 'element-plus';
import i18n from 'src/i18n';
const workFlowDiaVisible = ref(true);
const route = useRoute();
+// 添加loading状态
+const isSubmitting = ref(false);
const props = defineProps({
diaType: {
type: String,
@@ -102,6 +106,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
return;
}
+ // 设置提交状态为loading
+ isSubmitting.value = true;
+
// 创建工作流
const appId = route.query?.appId;
// 创建使用生成的flowId
@@ -169,6 +176,14 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
emits('createFlowId', { ...res[1].result.flow });
onCancel();
}
+ })
+ .catch((error) => {
+ console.error('创建工作流失败:', error);
+ ElMessage.error(i18n.global.t('app.createFailed') || '创建失败，请重试');
+ })
+ .finally(() => {
+ // 无论成功或失败都要重置loading状态
+ isSubmitting.value = false;
});
}
});
@@ -188,5 +203,29 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
}
}
}
+
+ // 按钮样式修复
+ .dialog-footer {
+ display: flex;
+ justify-content: center;
+ gap: 16px;
+
+ .o-dlg-btn {
+ min-width: 80px; // 设置最小宽度防止loading时宽度变化
+ height: 32px; // 固定高度
+
+ // 提交按钮特殊处理
+ &.el-button--primary {
+ min-width: 88px; // 提交按钮稍宽一些
+ }
+
+ // loading状态下保持按钮稳定
+ &.is-loading {
+ .el-icon {
+ margin-right: 6px; // 确保loading图标与文字间距
+ }
+ }
+ }
+ }
}
diff --git a/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue b/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue
index a84090a6e20d6bacea47757fc2937eea7fde2d9c..5360c68d5af93514daa06cfabf36c08d69e1e418 100644
--- a/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue
@@ -3,10 +3,10 @@
-
-
-
{{ $t('main.start') }}
- {{ $t('main.end') }}
+
+
+
+
+
+
+
+
+
+ {{ $t('main.start') }}
+ {{ $t('main.end') }}
+
+
+
+
+
+
+
+
+ {x} {{ variable.name }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6028e970150ff7e915d14d836b0832eb62f6eb69
--- /dev/null
+++ b/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
@@ -0,0 +1,979 @@
+
+
+
+
+
+
+
+ ![]()
+ {{ $t('flow.step_configuration') }} - {{ nodeName }}
+
+
+
+
+
+
+
+
+
+ 设置
+
+
+
+
+
+
+
+
+ 输入变量
+
+
+
+
+
+
+
+
+
+
+ {{ getCodeLanguageLabel() }}
+
+
+
+
+
+
+
+
+ 输出变量
+
+
+
+
+
+
+
+
+
+
+ 失败时重试
+
+
+
+
+
+
+
+
+ 异常处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无输入变量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无输出变量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/createapp/components/workFlowConfig/paramEditDialog.vue b/src/views/createapp/components/workFlowConfig/paramEditDialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..452f8db8863101e5ca9895c9493ed28f52d7469a
--- /dev/null
+++ b/src/views/createapp/components/workFlowConfig/paramEditDialog.vue
@@ -0,0 +1,302 @@
+
+
+
+
+
+
+
+
+
+ 开始
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开始节点
+
+
+ {{ nodeDescription }}
+
+
+
+
+
+
+
+ 设置
+
+
+
+
+
+
+
+
+
+
+ 输入字段
+ 设置的输入可在工作流程中使用
+
+
+
+
+
+
+ {x}
+
+
+ {{ variable.name }}
+ {{ getVariableTypeDisplay(variable.var_type) }}
+
+
+
+
+ {x}
+
+
+ {{ getVariableDisplayName(variable) }}
+ {{ getVariableTypeDisplay(variable.var_type) }}
+
+
+ 暂无变量
+
+
+
+
+
+
+
+
+
+ {{ $t('flow.param_name') }}
+ {{ errors.key }}
+
+
+
+ {{ $t('flow.param_label') }}
+
+
+
+
+
+ {{ $t('flow.param_type') }}
+
+
+
+ {{ $t('flow.param_settings') }}
+
+
+ {{ $t('flow.required') }}
+
+
+
+
+ {{ $t('flow.default_value') }}
+
@@ -48,7 +48,7 @@
class="outputYaml"
v-model:updateVal="item.yamlCode"
:yamlCode="item.yamlCode"
- :disabled="item.disabled"
+ :disabled="!!item.disabled"
>
+
+
@@ -106,7 +121,7 @@
+ {{ $t('flow.add_description') }}
+
+
+ {{ yamlExpress[0].description }}
+