diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue
index a7df31a5b238a4fbfdc141c3fa1b017e66f9bc3c..8b0bafd4907f2643f53c819c5bef7d5a4976e757 100644
--- a/src/components/dialoguePanel/DialoguePanel.vue
+++ b/src/components/dialoguePanel/DialoguePanel.vue
@@ -1118,6 +1118,9 @@ const handleSendMessage = async (question, user_selected_flow, user_selected_app
.content {
margin-left: 0px;
min-height: 48px;
+ .message {
+ white-space: pre-line;
+ }
}
}
.dialogue-panel__user-time {
diff --git a/src/views/createapp/components/codeMirror/nodeMirrorText.vue b/src/views/createapp/components/codeMirror/nodeMirrorText.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4d3327d1437387a10c3a7dc42b8b68e9f434c87a
--- /dev/null
+++ b/src/views/createapp/components/codeMirror/nodeMirrorText.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ resultInfo.time }}
+ 展开结果
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index 6f185433d047872b3a6b49f6d96985dfdbcc225b..bd4233a57b9e42d7dab3de20bc291180cf93dc1f 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -389,7 +389,7 @@ const redrageFlow = (nodesList, edgesList) => {
newNode.deletable = false;
} else if (node.type === 'choice') {
newNode.type = 'branch';
- newNode.data.parameters['input_parameters'] = node.parameters;
+ newNode.data.parameters['input_parameters'] = { ...node.parameters };
} else {
newNode.type = 'custom';
}
@@ -457,6 +457,26 @@ const saveFlow = () => {
};
return newEdge;
});
+ console.log(
+ {
+ appId: appId,
+ flowId: flowObj.value.flowId,
+ topologyCheck: false,
+ },
+ '---------',
+ {
+ flow: {
+ ...flowObj.value,
+ nodes: updateNodes,
+ edges: updateEdges,
+ },
+ focusPoint: {
+ x: 800,
+ y: 800,
+ },
+ },
+ );
+ // return;
// 更新最新的节点与边的数据
api
.createOrUpdateFlowTopology(
diff --git a/src/views/createapp/components/workFlowConfig/BranchNode.vue b/src/views/createapp/components/workFlowConfig/BranchNode.vue
index feb83a41a3ed85cda7216eb0fb019842dd65ce7d..894c5c3cfdff98bef755b39550f1b5297f2ca5d9 100644
--- a/src/views/createapp/components/workFlowConfig/BranchNode.vue
+++ b/src/views/createapp/components/workFlowConfig/BranchNode.vue
@@ -2,6 +2,7 @@
import { Position, Handle } from '@vue-flow/core';
import { ref, onMounted, watch } from 'vue';
import { BranchSourceIdType } from '../types';
+import NodeMirrorText from '../codeMirror/nodeMirrorText.vue';
const props = defineProps({
id: {
type: String,
@@ -22,7 +23,7 @@ const props = defineProps({
});
const emits = defineEmits(['delNode', 'editYamlDrawer']);
-const statusList = ref(['waiting', 'success', 'error', 'default']);
+const statusList = ref(['running', 'success', 'error']);
const branchIdList = ref([]);
@@ -78,12 +79,13 @@ const editYaml = (nodeName, yamlCode) => {
{{ item.description }}
-
+
+
diff --git a/src/views/createapp/components/workFlowConfig/CustomNode.vue b/src/views/createapp/components/workFlowConfig/CustomNode.vue
index a72f6740014b049799f4a3354da1e04e0fba627e..a062088e49242c25b335ca0aa049c2d5fc3ed4f3 100644
--- a/src/views/createapp/components/workFlowConfig/CustomNode.vue
+++ b/src/views/createapp/components/workFlowConfig/CustomNode.vue
@@ -1,6 +1,7 @@