Merge branch 'refs/heads/master' into production

production
钟良源 7 months ago
commit b22743946c

@ -26,7 +26,7 @@ interface HistoryProviderProps {
onHistoryChange: (nodes: Node[], edges: Edge[]) => void; onHistoryChange: (nodes: Node[], edges: Edge[]) => void;
} }
export const HistoryProvider: React.FC<HistoryProviderProps> = ({ const HistoryProvider: React.FC<HistoryProviderProps> = ({
children, children,
initialNodes, initialNodes,
initialEdges, initialEdges,
@ -45,7 +45,10 @@ export const HistoryProvider: React.FC<HistoryProviderProps> = ({
}); });
// 检查两个状态是否相等 // 检查两个状态是否相等
const isSameState = useCallback((state1: { nodes: Node[]; edges: Edge[] }, state2: { nodes: Node[]; edges: Edge[] }) => { const isSameState = useCallback((state1: { nodes: Node[]; edges: Edge[] }, state2: {
nodes: Node[];
edges: Edge[]
}) => {
// 只比较节点和边的关键属性,忽略拖动过程中的临时状态 // 只比较节点和边的关键属性,忽略拖动过程中的临时状态
if (state1.nodes.length !== state2.nodes.length || state1.edges.length !== state2.edges.length) { if (state1.nodes.length !== state2.nodes.length || state1.edges.length !== state2.edges.length) {
return false; return false;
@ -170,3 +173,5 @@ export const HistoryProvider: React.FC<HistoryProviderProps> = ({
</HistoryContext.Provider> </HistoryContext.Provider>
); );
}; };
export default HistoryProvider;

@ -41,7 +41,7 @@ import { setMainFlow } from '@/api/appRes';
import { getUserToken } from '@/api/user'; import { getUserToken } from '@/api/user';
import { Message } from '@arco-design/web-react'; import { Message } from '@arco-design/web-react';
import BasicNode from '@/components/FlowEditor/node/basicNode/BasicNode'; import BasicNode from '@/components/FlowEditor/node/basicNode/BasicNode';
import { HistoryProvider, useHistory } from './components/historyContext'; import HistoryProvider, { useHistory } from './components/historyContext';
import useWebSocket from '@/hooks/useWebSocket'; import useWebSocket from '@/hooks/useWebSocket';
const edgeTypes: EdgeTypes = { const edgeTypes: EdgeTypes = {

Loading…
Cancel
Save