diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index bddef15..e62eb63 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -122,7 +122,7 @@ { immediate: true } ) const menus = ref([ - { label: 'Copy', tip: 'Ctrl+C', on: () => emit('copy-node', clickTaskId.value) }, + { label: 'Copy', tip: 'Ctrl+C', on: () => emit('copy-node') }, { label: 'Delete', tip: 'Del', @@ -228,6 +228,7 @@ ...options, } depthCanvasWorkbench(workbenchData) + depthCanvasClose() }, onClose:depthCanvasClose } diff --git a/src/components/Canvas/FlowCanvas/flow-canvas.vue b/src/components/Canvas/FlowCanvas/flow-canvas.vue index 15972e8..cdbe86b 100644 --- a/src/components/Canvas/FlowCanvas/flow-canvas.vue +++ b/src/components/Canvas/FlowCanvas/flow-canvas.vue @@ -38,7 +38,7 @@ :data="node.data.data" v-bind="node.data" @delete-node="deleteNode(node.id)" - @copy-node="copyNode($event, node.id)" + @copy-node="copyNode(node.id)" @update-data="(v) => (node.data.data = v)" @bring-to-font="bringToFont(node.id)" @send-to-back="sendToBack(node.id)" @@ -179,8 +179,8 @@ nodeManager.deleteNode(id) } /** 复制节点 */ - const copyNode = (clickTaskId, id) => { - nodeManager.copyNodeById(clickTaskId, id) + const copyNode = (id) => { + nodeManager.copyNodeById(id) } /** 节点zIndex设置最大 */ const bringToFont = (id) => { diff --git a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts index 50b202c..d975bb3 100644 --- a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts +++ b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts @@ -139,10 +139,9 @@ export class NodeManager { return this.createNode(options_) } - copyNodeById(clickTaskId:string, id: string) { + copyNodeById(id: string) { const node = this.stateManager.getNodeById(id) let copyNode = JSON.parse(JSON.stringify(node)) - copyNode.data.data.imageProcessTasks = copyNode.data.data.imageProcessTasks.filter((item:any)=>item.taskId == clickTaskId) const flowNode = this.stateManager.flowManager.getNodeById(id) if (!node) return console.warn(`${id}找不到对应节点`) if (node.data?.disableCopy) return console.warn(`${id}节点已禁用复制`) @@ -156,6 +155,9 @@ export class NodeManager { } delete node_.data?.superiorID delete node_.data?.disableDelete + node_.data.data.imageProcessTasks.forEach((item) => { + item.canvasId = null + }) this.stateManager.addNode(node_) } dispose() {} diff --git a/src/views/home/agent/components/Agent.vue b/src/views/home/agent/components/Agent.vue index 57a949b..7033d44 100644 --- a/src/views/home/agent/components/Agent.vue +++ b/src/views/home/agent/components/Agent.vue @@ -323,10 +323,6 @@ params.versionID = versionID projectStore.setProject({ nodeId: versionID }) } - // if (eventName === 'webAddress') { - // console.log('webAddress111111111111111', eventName, dataLines) - // debugger - // } if (eventName === 'tool') { MyEvent.emit('loading-sketch', sketchList.value.length) @@ -357,6 +353,9 @@ MyEvent.emit('OpenSketch') // contentBody += `` } + if (eventName === 'reportName' || eventName === 'reportTitle') { + aiMessage.reportName = jsonData.reportName || jsonData.reportTitle + } if (eventName === 'report') { reportsContent.value += jsonData.report } else { @@ -495,9 +494,11 @@ i++ } else if (item.role === 'assistant') { // assistant 角色,拼接直到下一个 user + let combinedContent = item.content || '' let combinedThinkingText = item.reasoning || '' let combinedImageUrl = item.image_url || null + let reportName = item.reportName || null let webAddress = item.webAddress || null // 继续往后找连续的 assistant 消息 let j = i + 1 @@ -508,6 +509,9 @@ if (dialogue[j].image_url) { combinedImageUrl = dialogue[j].image_url } + if (dialogue[j].reportName) { + reportName = dialogue[j].reportName + } if (dialogue[j].webAddress) { combinedContent += `` webAddress = dialogue[j].webAddress @@ -524,6 +528,7 @@ result.push({ ...item, + reportName, content: combinedContent, thinkingText: combinedThinkingText, text: combinedContent, @@ -629,7 +634,6 @@ item.text += `` } }) - messageList.value = [...ancestorsList] params.versionID = current?.id sketchList.value = imgList diff --git a/src/views/home/agent/components/Item.vue b/src/views/home/agent/components/Item.vue index 161edc3..bc149b1 100644 --- a/src/views/home/agent/components/Item.vue +++ b/src/views/home/agent/components/Item.vue @@ -56,7 +56,10 @@ :rehype-plugins="[rehypeRaw]" >