mirror of
https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git
synced 2025-08-12 06:28:58 +08:00
fix: The name of the copy operator is displayed the same as before ##3265 (#3266)
### What problem does this PR solve? fix: The name of the copy operator is displayed the same as before ##3265 ### Type of change - [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
parent
f45c29360c
commit
96b5d2b3a9
@ -3,25 +3,28 @@ import { CopyOutlined } from '@ant-design/icons';
|
|||||||
import { Flex, MenuProps } from 'antd';
|
import { Flex, MenuProps } from 'antd';
|
||||||
import { useCallback } from 'react';
|
import { useCallback } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { useGetNodeName } from '../../hooks';
|
||||||
import useGraphStore from '../../store';
|
import useGraphStore from '../../store';
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
id: string;
|
id: string;
|
||||||
iconFontColor?: string;
|
iconFontColor?: string;
|
||||||
|
label: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const NodeDropdown = ({ id, iconFontColor }: IProps) => {
|
const NodeDropdown = ({ id, iconFontColor, label }: IProps) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const deleteNodeById = useGraphStore((store) => store.deleteNodeById);
|
const deleteNodeById = useGraphStore((store) => store.deleteNodeById);
|
||||||
const duplicateNodeById = useGraphStore((store) => store.duplicateNode);
|
const duplicateNodeById = useGraphStore((store) => store.duplicateNode);
|
||||||
|
const getNodeName = useGetNodeName();
|
||||||
|
|
||||||
const deleteNode = useCallback(() => {
|
const deleteNode = useCallback(() => {
|
||||||
deleteNodeById(id);
|
deleteNodeById(id);
|
||||||
}, [id, deleteNodeById]);
|
}, [id, deleteNodeById]);
|
||||||
|
|
||||||
const duplicateNode = useCallback(() => {
|
const duplicateNode = useCallback(() => {
|
||||||
duplicateNodeById(id);
|
duplicateNodeById(id, getNodeName(label));
|
||||||
}, [id, duplicateNodeById]);
|
}, [duplicateNodeById, id, getNodeName, label]);
|
||||||
|
|
||||||
const items: MenuProps['items'] = [
|
const items: MenuProps['items'] = [
|
||||||
{
|
{
|
||||||
|
@ -9,13 +9,13 @@ import { NextNodePopover } from './popover';
|
|||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
id: string;
|
id: string;
|
||||||
label?: string;
|
label: string;
|
||||||
name?: string;
|
name: string;
|
||||||
gap?: number;
|
gap?: number;
|
||||||
className?: string;
|
className?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function RunStatus({ id, name }: IProps) {
|
export function RunStatus({ id, name }: Omit<IProps, 'label'>) {
|
||||||
const { t } = useTranslate('flow');
|
const { t } = useTranslate('flow');
|
||||||
return (
|
return (
|
||||||
<section className="flex justify-end items-center pb-1 ">
|
<section className="flex justify-end items-center pb-1 ">
|
||||||
@ -44,7 +44,7 @@ const NodeHeader = ({ label, id, name, gap = 4, className }: IProps) => {
|
|||||||
color={operatorMap[label as Operator].color}
|
color={operatorMap[label as Operator].color}
|
||||||
></OperatorIcon>
|
></OperatorIcon>
|
||||||
<span className={styles.nodeTitle}>{name}</span>
|
<span className={styles.nodeTitle}>{name}</span>
|
||||||
<NodeDropdown id={id}></NodeDropdown>
|
<NodeDropdown id={id} label={label}></NodeDropdown>
|
||||||
</Flex>
|
</Flex>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
@ -62,7 +62,7 @@ function NoteNode({ data, id }: NodeProps<NodeData>) {
|
|||||||
onChange={handleNameChange}
|
onChange={handleNameChange}
|
||||||
className={styles.noteName}
|
className={styles.noteName}
|
||||||
></Input>
|
></Input>
|
||||||
<NodeDropdown id={id}></NodeDropdown>
|
<NodeDropdown id={id} label={data.label}></NodeDropdown>
|
||||||
</Flex>
|
</Flex>
|
||||||
<Form
|
<Form
|
||||||
onValuesChange={handleValuesChange}
|
onValuesChange={handleValuesChange}
|
||||||
|
@ -69,6 +69,7 @@ import { ICategorizeForm, IRelevantForm, ISwitchForm } from './interface';
|
|||||||
import useGraphStore, { RFState } from './store';
|
import useGraphStore, { RFState } from './store';
|
||||||
import {
|
import {
|
||||||
buildDslComponentsByGraph,
|
buildDslComponentsByGraph,
|
||||||
|
generateNodeNamesWithIncreasingIndex,
|
||||||
generateSwitchHandleText,
|
generateSwitchHandleText,
|
||||||
getNodeDragHandle,
|
getNodeDragHandle,
|
||||||
receiveMessageError,
|
receiveMessageError,
|
||||||
@ -159,12 +160,13 @@ export const useHandleDrag = () => {
|
|||||||
return { handleDragStart };
|
return { handleDragStart };
|
||||||
};
|
};
|
||||||
|
|
||||||
const splitName = (name: string) => {
|
export const useGetNodeName = () => {
|
||||||
const names = name.split('_');
|
const { t } = useTranslation();
|
||||||
const type = names.at(0);
|
|
||||||
const index = Number(names.at(-1));
|
|
||||||
|
|
||||||
return { type, index };
|
return (type: string) => {
|
||||||
|
const name = t(`flow.${lowerFirst(type)}`);
|
||||||
|
return name;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useHandleDrop = () => {
|
export const useHandleDrop = () => {
|
||||||
@ -173,54 +175,13 @@ export const useHandleDrop = () => {
|
|||||||
const [reactFlowInstance, setReactFlowInstance] =
|
const [reactFlowInstance, setReactFlowInstance] =
|
||||||
useState<ReactFlowInstance<any, any>>();
|
useState<ReactFlowInstance<any, any>>();
|
||||||
const initializeOperatorParams = useInitializeOperatorParams();
|
const initializeOperatorParams = useInitializeOperatorParams();
|
||||||
const { t } = useTranslation();
|
const getNodeName = useGetNodeName();
|
||||||
|
|
||||||
const onDragOver = useCallback((event: React.DragEvent<HTMLDivElement>) => {
|
const onDragOver = useCallback((event: React.DragEvent<HTMLDivElement>) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
event.dataTransfer.dropEffect = 'move';
|
event.dataTransfer.dropEffect = 'move';
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const generateNodeName = useCallback(
|
|
||||||
(type: string) => {
|
|
||||||
const name = t(`flow.${lowerFirst(type)}`);
|
|
||||||
const templateNameList = nodes
|
|
||||||
.filter((x) => {
|
|
||||||
const temporaryName = x.data.name;
|
|
||||||
|
|
||||||
const { type, index } = splitName(temporaryName);
|
|
||||||
|
|
||||||
return (
|
|
||||||
temporaryName.match(/_/g)?.length === 1 &&
|
|
||||||
type === name &&
|
|
||||||
!isNaN(index)
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.map((x) => {
|
|
||||||
const temporaryName = x.data.name;
|
|
||||||
const { index } = splitName(temporaryName);
|
|
||||||
|
|
||||||
return {
|
|
||||||
idx: index,
|
|
||||||
name: temporaryName,
|
|
||||||
};
|
|
||||||
})
|
|
||||||
.sort((a, b) => a.idx - b.idx);
|
|
||||||
|
|
||||||
let index: number = 0;
|
|
||||||
for (let i = 0; i < templateNameList.length; i++) {
|
|
||||||
const idx = templateNameList[i]?.idx;
|
|
||||||
const nextIdx = templateNameList[i + 1]?.idx;
|
|
||||||
if (idx + 1 !== nextIdx) {
|
|
||||||
index = idx + 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return `${name}_${index}`;
|
|
||||||
},
|
|
||||||
[t, nodes],
|
|
||||||
);
|
|
||||||
|
|
||||||
const onDrop = useCallback(
|
const onDrop = useCallback(
|
||||||
(event: React.DragEvent<HTMLDivElement>) => {
|
(event: React.DragEvent<HTMLDivElement>) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
@ -248,7 +209,7 @@ export const useHandleDrop = () => {
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
label: `${type}`,
|
label: `${type}`,
|
||||||
name: generateNodeName(type),
|
name: generateNodeNamesWithIncreasingIndex(getNodeName(type), nodes),
|
||||||
form: initializeOperatorParams(type as Operator),
|
form: initializeOperatorParams(type as Operator),
|
||||||
},
|
},
|
||||||
sourcePosition: Position.Right,
|
sourcePosition: Position.Right,
|
||||||
@ -258,7 +219,7 @@ export const useHandleDrop = () => {
|
|||||||
|
|
||||||
addNode(newNode);
|
addNode(newNode);
|
||||||
},
|
},
|
||||||
[reactFlowInstance, addNode, initializeOperatorParams, generateNodeName],
|
[reactFlowInstance, getNodeName, nodes, initializeOperatorParams, addNode],
|
||||||
);
|
);
|
||||||
|
|
||||||
return { onDrop, onDragOver, setReactFlowInstance };
|
return { onDrop, onDragOver, setReactFlowInstance };
|
||||||
|
@ -23,7 +23,12 @@ import { devtools } from 'zustand/middleware';
|
|||||||
import { immer } from 'zustand/middleware/immer';
|
import { immer } from 'zustand/middleware/immer';
|
||||||
import { Operator, SwitchElseTo } from './constant';
|
import { Operator, SwitchElseTo } from './constant';
|
||||||
import { NodeData } from './interface';
|
import { NodeData } from './interface';
|
||||||
import { getNodeDragHandle, getOperatorIndex, isEdgeEqual } from './utils';
|
import {
|
||||||
|
generateNodeNamesWithIncreasingIndex,
|
||||||
|
getNodeDragHandle,
|
||||||
|
getOperatorIndex,
|
||||||
|
isEdgeEqual,
|
||||||
|
} from './utils';
|
||||||
|
|
||||||
export type RFState = {
|
export type RFState = {
|
||||||
nodes: Node<NodeData>[];
|
nodes: Node<NodeData>[];
|
||||||
@ -54,7 +59,7 @@ export type RFState = {
|
|||||||
target?: string | null,
|
target?: string | null,
|
||||||
) => void;
|
) => void;
|
||||||
deletePreviousEdgeOfClassificationNode: (connection: Connection) => void;
|
deletePreviousEdgeOfClassificationNode: (connection: Connection) => void;
|
||||||
duplicateNode: (id: string) => void;
|
duplicateNode: (id: string, name: string) => void;
|
||||||
deleteEdge: () => void;
|
deleteEdge: () => void;
|
||||||
deleteEdgeById: (id: string) => void;
|
deleteEdgeById: (id: string) => void;
|
||||||
deleteNodeById: (id: string) => void;
|
deleteNodeById: (id: string) => void;
|
||||||
@ -63,6 +68,7 @@ export type RFState = {
|
|||||||
updateMutableNodeFormItem: (id: string, field: string, value: any) => void;
|
updateMutableNodeFormItem: (id: string, field: string, value: any) => void;
|
||||||
getOperatorTypeFromId: (id?: string | null) => string | undefined;
|
getOperatorTypeFromId: (id?: string | null) => string | undefined;
|
||||||
updateNodeName: (id: string, name: string) => void;
|
updateNodeName: (id: string, name: string) => void;
|
||||||
|
generateNodeName: (name: string) => string;
|
||||||
setClickedNodeId: (id?: string) => void;
|
setClickedNodeId: (id?: string) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -226,8 +232,8 @@ const useGraphStore = create<RFState>()(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
duplicateNode: (id: string) => {
|
duplicateNode: (id: string, name: string) => {
|
||||||
const { getNode, addNode } = get();
|
const { getNode, addNode, generateNodeName } = get();
|
||||||
const node = getNode(id);
|
const node = getNode(id);
|
||||||
const position = {
|
const position = {
|
||||||
x: (node?.position?.x || 0) + 30,
|
x: (node?.position?.x || 0) + 30,
|
||||||
@ -236,7 +242,7 @@ const useGraphStore = create<RFState>()(
|
|||||||
|
|
||||||
addNode({
|
addNode({
|
||||||
...(node || {}),
|
...(node || {}),
|
||||||
data: node?.data,
|
data: { ...(node?.data ?? {}), name: generateNodeName(name) },
|
||||||
selected: false,
|
selected: false,
|
||||||
dragging: false,
|
dragging: false,
|
||||||
id: `${node?.data?.label}:${humanId()}`,
|
id: `${node?.data?.label}:${humanId()}`,
|
||||||
@ -383,6 +389,11 @@ const useGraphStore = create<RFState>()(
|
|||||||
setClickedNodeId: (id?: string) => {
|
setClickedNodeId: (id?: string) => {
|
||||||
set({ clickedNodeId: id });
|
set({ clickedNodeId: id });
|
||||||
},
|
},
|
||||||
|
generateNodeName: (name: string) => {
|
||||||
|
const { nodes } = get();
|
||||||
|
|
||||||
|
return generateNodeNamesWithIncreasingIndex(name, nodes);
|
||||||
|
},
|
||||||
})),
|
})),
|
||||||
{ name: 'graph' },
|
{ name: 'graph' },
|
||||||
),
|
),
|
||||||
|
@ -184,11 +184,12 @@ export const buildNewPositionMap = (
|
|||||||
const intersectionKeys = intersectionWith(
|
const intersectionKeys = intersectionWith(
|
||||||
previousKeys,
|
previousKeys,
|
||||||
currentKeys,
|
currentKeys,
|
||||||
(categoryDataKey, positionMapKey) => categoryDataKey === positionMapKey,
|
(categoryDataKey: string, positionMapKey: string) =>
|
||||||
|
categoryDataKey === positionMapKey,
|
||||||
);
|
);
|
||||||
// difference set
|
// difference set
|
||||||
const currentDifferenceKeys = currentKeys.filter(
|
const currentDifferenceKeys = currentKeys.filter(
|
||||||
(x) => !intersectionKeys.some((y) => y === x),
|
(x) => !intersectionKeys.some((y: string) => y === x),
|
||||||
);
|
);
|
||||||
const newPositionMap = currentDifferenceKeys.reduce<
|
const newPositionMap = currentDifferenceKeys.reduce<
|
||||||
Record<string, IPosition>
|
Record<string, IPosition>
|
||||||
@ -240,3 +241,51 @@ export const generateSwitchHandleText = (idx: number) => {
|
|||||||
export const getNodeDragHandle = (nodeType?: string) => {
|
export const getNodeDragHandle = (nodeType?: string) => {
|
||||||
return nodeType === Operator.Note ? '.note-drag-handle' : undefined;
|
return nodeType === Operator.Note ? '.note-drag-handle' : undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const splitName = (name: string) => {
|
||||||
|
const names = name.split('_');
|
||||||
|
const type = names.at(0);
|
||||||
|
const index = Number(names.at(-1));
|
||||||
|
|
||||||
|
return { type, index };
|
||||||
|
};
|
||||||
|
|
||||||
|
export const generateNodeNamesWithIncreasingIndex = (
|
||||||
|
name: string,
|
||||||
|
nodes: Node[],
|
||||||
|
) => {
|
||||||
|
const templateNameList = nodes
|
||||||
|
.filter((x) => {
|
||||||
|
const temporaryName = x.data.name;
|
||||||
|
|
||||||
|
const { type, index } = splitName(temporaryName);
|
||||||
|
|
||||||
|
return (
|
||||||
|
temporaryName.match(/_/g)?.length === 1 &&
|
||||||
|
type === name &&
|
||||||
|
!isNaN(index)
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.map((x) => {
|
||||||
|
const temporaryName = x.data.name;
|
||||||
|
const { index } = splitName(temporaryName);
|
||||||
|
|
||||||
|
return {
|
||||||
|
idx: index,
|
||||||
|
name: temporaryName,
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.sort((a, b) => a.idx - b.idx);
|
||||||
|
|
||||||
|
let index: number = 0;
|
||||||
|
for (let i = 0; i < templateNameList.length; i++) {
|
||||||
|
const idx = templateNameList[i]?.idx;
|
||||||
|
const nextIdx = templateNameList[i + 1]?.idx;
|
||||||
|
if (idx + 1 !== nextIdx) {
|
||||||
|
index = idx + 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${name}_${index}`;
|
||||||
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user