Merge branch 'refs/heads/master' into production

src/pages/flowEditor/components/historyContext.tsx

@@ -26,18 +26,18 @@ interface HistoryProviderProps {
   onHistoryChange: (nodes: Node[], edges: Edge[]) => void;
 }
 
-export const HistoryProvider: React.FC<HistoryProviderProps> = ({
+const HistoryProvider: React.FC<HistoryProviderProps> = ({
-  children,
+                                                           children,
-  initialNodes,
+                                                           initialNodes,
-  initialEdges,
+                                                           initialEdges,
-  onHistoryChange
+                                                           onHistoryChange
-}) => {
+                                                         }) => {
   // 历史记录状态
   const [history, setHistory] = useState<{ nodes: Node[]; edges: Edge[] }[]>([
     { nodes: initialNodes, edges: initialEdges }
   ]);
   const [step, setStep] = useState(0);
-  
+
   // 当前状态的引用，避免重复添加相同状态
   const currentState = useRef({
     nodes: initialNodes,
@@ -45,40 +45,43 @@ 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) {
       return false;
     }
-    
+
     // 比较节点
     for (let i = 0; i < state1.nodes.length; i++) {
       const node1 = state1.nodes[i];
       const node2 = state2.nodes[i];
-      
+
-      if (node1.id !== node2.id || 
+      if (node1.id !== node2.id ||
-          node1.type !== node2.type || 
+        node1.type !== node2.type ||
-          node1.position.x !== node2.position.x || 
+        node1.position.x !== node2.position.x ||
-          node1.position.y !== node2.position.y ||
+        node1.position.y !== node2.position.y ||
-          JSON.stringify(node1.data) !== JSON.stringify(node2.data)) {
+        JSON.stringify(node1.data) !== JSON.stringify(node2.data)) {
         return false;
       }
     }
-    
+
     // 比较边
     for (let i = 0; i < state1.edges.length; i++) {
       const edge1 = state1.edges[i];
       const edge2 = state2.edges[i];
-      
+
-      if (edge1.id !== edge2.id || 
+      if (edge1.id !== edge2.id ||
-          edge1.source !== edge2.source || 
+        edge1.source !== edge2.source ||
-          edge1.target !== edge2.target ||
+        edge1.target !== edge2.target ||
-          edge1.sourceHandle !== edge2.sourceHandle ||
+        edge1.sourceHandle !== edge2.sourceHandle ||
-          edge1.targetHandle !== edge2.targetHandle) {
+        edge1.targetHandle !== edge2.targetHandle) {
         return false;
       }
     }
-    
+
     return true;
   }, []);
 
@@ -86,7 +89,7 @@ export const HistoryProvider: React.FC<HistoryProviderProps> = ({
   const takeSnapshot = useCallback(() => {
     // 获取当前状态
     const { nodes, edges } = currentState.current;
-    
+
     // 如果当前状态与历史记录中的当前步骤相同，则不添加新快照
     const currentHistoryState = history[step];
     if (isSameState({ nodes, edges }, currentHistoryState)) {
@@ -95,20 +98,20 @@ export const HistoryProvider: React.FC<HistoryProviderProps> = ({
 
     // 删除当前步骤之后的所有历史记录
     const newHistory = history.slice(0, step + 1);
-    
+
     // 添加新快照
-    newHistory.push({ 
+    newHistory.push({
-      nodes: nodes.map(node => ({...node})), 
+      nodes: nodes.map(node => ({ ...node })),
-      edges: edges.map(edge => ({...edge})) 
+      edges: edges.map(edge => ({ ...edge }))
     });
-    
+
     // 限制历史记录长度，防止内存泄漏
     const maxLength = 100;
     if (newHistory.length > maxLength) {
       newHistory.shift();
       setStep(prev => prev - 1);
     }
-    
+
     setHistory(newHistory);
     setStep(newHistory.length - 1);
   }, [history, step, isSameState]);
@@ -116,10 +119,10 @@ export const HistoryProvider: React.FC<HistoryProviderProps> = ({
   // 撤销操作
   const undo = useCallback(() => {
     if (step <= 0) return;
-    
+
     const prevStep = step - 1;
     const { nodes, edges } = history[prevStep];
-    
+
     currentState.current = { nodes, edges };
     setStep(prevStep);
     onHistoryChange([...nodes], [...edges]);
@@ -128,10 +131,10 @@ export const HistoryProvider: React.FC<HistoryProviderProps> = ({
   // 重做操作
   const redo = useCallback(() => {
     if (step >= history.length - 1) return;
-    
+
     const nextStep = step + 1;
     const { nodes, edges } = history[nextStep];
-    
+
     currentState.current = { nodes, edges };
     setStep(nextStep);
     onHistoryChange([...nodes], [...edges]);
@@ -169,4 +172,6 @@ export const HistoryProvider: React.FC<HistoryProviderProps> = ({
       {children}
     </HistoryContext.Provider>
   );
-};
+};
+
+export default HistoryProvider;

src/pages/flowEditor/index.tsx

@@ -41,7 +41,7 @@ import { setMainFlow } from '@/api/appRes';
 import { getUserToken } from '@/api/user';
 import { Message } from '@arco-design/web-react';
 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';
 
 const edgeTypes: EdgeTypes = {