AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 01:59:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: the new node name is generated based on the original node when duplicating (#4675)

Browse Source
This commit is contained in:
非法操作 2024-05-28 13:50:43 +08:00 committed by GitHub
parent eb8dc15ad6
commit b7f81f0999
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/components/workflow/hooks/use-nodes-interactions.ts
View File

@ -33,6 +33,7 @@ import {
Y_OFFSET,
} from '../constants'
import {
genNewNodeTitleFromOld,
generateNewNode,
getNodesConnectedSourceOrTargetHandleIdsMap,
getTopLeftNodePosition,
@ -1067,7 +1068,6 @@ export const useNodesInteractions = () => {
const offsetY = currentPosition.y - y
clipboardElements.forEach((nodeToPaste, index) => {
const nodeType = nodeToPaste.data.type
const nodesWithSameType = nodes.filter(node => node.data.type === nodeType)
const newNode = generateNewNode({
data: {
@ -1077,7 +1077,7 @@ export const useNodesInteractions = () => {
_isBundled: false,
_connectedSourceHandleIds: [],
_connectedTargetHandleIds: [],
title: nodesWithSameType.length > 0 ? `${t(`workflow.blocks.${nodeType}`)} ${nodesWithSameType.length + 1}` : t(`workflow.blocks.${nodeType}`),
title: genNewNodeTitleFromOld(nodeToPaste.data.title),
},
position: {
x: nodeToPaste.position.x + offsetX,

14
web/app/components/workflow/utils.ts
View File

@ -289,6 +289,20 @@ export const generateNewNode = ({ data, position, id, zIndex, ...rest }: Omit<No
} as Node
}
export const genNewNodeTitleFromOld = (oldTitle: string) => {
const regex = /^(.+?)\s*\((\d+)\)\s*$/
const match = oldTitle.match(regex)
if (match) {
const title = match[1]
const num = parseInt(match[2], 10)
return `${title} (${num + 1})`
}
else {
return `${oldTitle} (1)`
}
}
export const getValidTreeNodes = (nodes: Node[], edges: Edge[]) => {
const startNode = nodes.find(node => node.data.type === BlockEnum.Start)