Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit c64d629a by heheer Committed by GitHub
Options

fix: loop node snapshot & infinite reload (#3349)

parent 1a294c1f
Showing with 84 additions and 81 deletions
packages/web/hooks/useI18n.ts
...@@ -34,7 +34,7 @@ export const useI18nLng = () => { ...@@ -34,7 +34,7 @@ export const useI18nLng = () => {
const currentLng = i18n?.language; const currentLng = i18n?.language;
await i18n?.changeLanguage?.(lang); await i18n?.changeLanguage?.(lang);
if (currentLng !== lang) { if (currentLng !== lang && currentLng) {
window?.location?.reload?.(); window?.location?.reload?.();
} }
}; };
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx
...@@ -292,63 +292,7 @@ export const useWorkflow = () => { ...@@ -292,63 +292,7 @@ export const useWorkflow = () => {
const { getIntersectingNodes } = useReactFlow(); const { getIntersectingNodes } = useReactFlow();
const { isDowningCtrl } = useKeyboard(); const { isDowningCtrl } = useKeyboard();
// Loop node size and position const { resetParentNodeSizeAndPosition } = useLoopNode();
const resetParentNodeSizeAndPosition = useMemoizedFn((parentId: string) => {
const { childNodes, loopNode } = nodes.reduce(
(acc, node) => {
if (node.data.parentNodeId === parentId) {
acc.childNodes.push(node);
}
if (node.id === parentId) {
acc.loopNode = node;
}
return acc;
},
{ childNodes: [] as Node[], loopNode: undefined as Node<FlowNodeItemType> | undefined }
);
if (!loopNode) return;
const rect = getNodesBounds(childNodes);
// Calculate parent node size with minimum width/height constraints
const width = Math.max(rect.width + 80, 840);
const height = Math.max(rect.height + 80, 600);
const offsetHeight =
loopNode.data.inputs.find((input) => input.key === NodeInputKeyEnum.loopNodeInputHeight)
?.value ?? 83;
// Update parentNode size and position
onChangeNode({
nodeId: parentId,
type: 'updateInput',
key: NodeInputKeyEnum.nodeWidth,
value: {
...Input_Template_Node_Width,
value: width
}
});
onChangeNode({
nodeId: parentId,
type: 'updateInput',
key: NodeInputKeyEnum.nodeHeight,
value: {
...Input_Template_Node_Height,
value: height
}
});
// Update parentNode position
onNodesChange([
{
id: parentId,
type: 'position',
position: {
x: rect.x - 70,
y: rect.y - offsetHeight - 240
}
}
]);
});
/* helper line */ /* helper line */
const [helperLineHorizontal, setHelperLineHorizontal] = useState<THelperLine>(); const [helperLineHorizontal, setHelperLineHorizontal] = useState<THelperLine>();
...@@ -704,7 +648,7 @@ export const useWorkflow = () => { ...@@ -704,7 +648,7 @@ export const useWorkflow = () => {
chatConfig: appDetail.chatConfig chatConfig: appDetail.chatConfig
}); });
}, },
[nodes, edges, appDetail.chatConfig, pushPastSnapshot], [nodes, edges, appDetail.chatConfig],
{ wait: 500 } { wait: 500 }
); );
...@@ -721,7 +665,73 @@ export const useWorkflow = () => { ...@@ -721,7 +665,73 @@ export const useWorkflow = () => {
helperLineVertical, helperLineVertical,
onNodeDragStop, onNodeDragStop,
onPaneContextMenu, onPaneContextMenu,
onPaneClick, onPaneClick
};
};
export const useLoopNode = () => {
const nodes = useContextSelector(WorkflowInitContext, (state) => state.nodes);
const onNodesChange = useContextSelector(WorkflowNodeEdgeContext, (state) => state.onNodesChange);
const { onChangeNode } = useContextSelector(WorkflowContext, (v) => v);
const resetParentNodeSizeAndPosition = useMemoizedFn((parentId: string) => {
const { childNodes, loopNode } = nodes.reduce(
(acc, node) => {
if (node.data.parentNodeId === parentId) {
acc.childNodes.push(node);
}
if (node.id === parentId) {
acc.loopNode = node;
}
return acc;
},
{ childNodes: [] as Node[], loopNode: undefined as Node<FlowNodeItemType> | undefined }
);
if (!loopNode) return;
const rect = getNodesBounds(childNodes);
// Calculate parent node size with minimum width/height constraints
const width = Math.max(rect.width + 80, 840);
const height = Math.max(rect.height + 80, 600);
const offsetHeight =
loopNode.data.inputs.find((input) => input.key === NodeInputKeyEnum.loopNodeInputHeight)
?.value ?? 83;
// Update parentNode size and position
onChangeNode({
nodeId: parentId,
type: 'updateInput',
key: NodeInputKeyEnum.nodeWidth,
value: {
...Input_Template_Node_Width,
value: width
}
});
onChangeNode({
nodeId: parentId,
type: 'updateInput',
key: NodeInputKeyEnum.nodeHeight,
value: {
...Input_Template_Node_Height,
value: height
}
});
// Update parentNode position
onNodesChange([
{
id: parentId,
type: 'position',
position: {
x: rect.x - 70,
y: rect.y - offsetHeight - 240
}
}
]);
});
return {
resetParentNodeSizeAndPosition resetParentNodeSizeAndPosition
}; };
}; };
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/Loop/NodeLoop.tsx
...@@ -31,7 +31,7 @@ import { getWorkflowGlobalVariables } from '@/web/core/workflow/utils'; ...@@ -31,7 +31,7 @@ import { getWorkflowGlobalVariables } from '@/web/core/workflow/utils';
import { AppContext } from '../../../../context'; import { AppContext } from '../../../../context';
import { isValidArrayReferenceValue } from '@fastgpt/global/core/workflow/utils'; import { isValidArrayReferenceValue } from '@fastgpt/global/core/workflow/utils';
import { ReferenceArrayValueType } from '@fastgpt/global/core/workflow/type/io'; import { ReferenceArrayValueType } from '@fastgpt/global/core/workflow/type/io';
import { useWorkflow } from '../../hooks/useWorkflow'; import { useLoopNode } from '../../hooks/useWorkflow';
import { useSize } from 'ahooks'; import { useSize } from 'ahooks';
const NodeLoop = ({ data, selected }: NodeProps<FlowNodeItemType>) => { const NodeLoop = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
...@@ -41,7 +41,7 @@ const NodeLoop = ({ data, selected }: NodeProps<FlowNodeItemType>) => { ...@@ -41,7 +41,7 @@ const NodeLoop = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode); const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode);
const appDetail = useContextSelector(AppContext, (v) => v.appDetail); const appDetail = useContextSelector(AppContext, (v) => v.appDetail);
const { resetParentNodeSizeAndPosition } = useWorkflow(); const { resetParentNodeSizeAndPosition } = useLoopNode();
const { const {
nodeWidth, nodeWidth,
...@@ -50,8 +50,12 @@ const NodeLoop = ({ data, selected }: NodeProps<FlowNodeItemType>) => { ...@@ -50,8 +50,12 @@ const NodeLoop = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
loopNodeInputHeight = Input_Template_LOOP_NODE_OFFSET loopNodeInputHeight = Input_Template_LOOP_NODE_OFFSET
} = useMemo(() => { } = useMemo(() => {
return { return {
nodeWidth: inputs.find((input) => input.key === NodeInputKeyEnum.nodeWidth)?.value, nodeWidth: Number(
nodeHeight: inputs.find((input) => input.key === NodeInputKeyEnum.nodeHeight)?.value, inputs.find((input) => input.key === NodeInputKeyEnum.nodeWidth)?.value?.toFixed(0)
),
nodeHeight: Number(
inputs.find((input) => input.key === NodeInputKeyEnum.nodeHeight)?.value?.toFixed(0)
),
loopInputArray: inputs.find((input) => input.key === NodeInputKeyEnum.loopInputArray), loopInputArray: inputs.find((input) => input.key === NodeInputKeyEnum.loopInputArray),
loopNodeInputHeight: inputs.find( loopNodeInputHeight: inputs.find(
(input) => input.key === NodeInputKeyEnum.loopNodeInputHeight (input) => input.key === NodeInputKeyEnum.loopNodeInputHeight
......
projects/app/src/pages/app/detail/components/WorkflowComponents/context/index.tsx
...@@ -2,7 +2,6 @@ import { postWorkflowDebug } from '@/web/core/workflow/api'; ...@@ -2,7 +2,6 @@ import { postWorkflowDebug } from '@/web/core/workflow/api';
import { import {
checkWorkflowNodeAndConnection, checkWorkflowNodeAndConnection,
compareSnapshot, compareSnapshot,
simplifyWorkflowNodes,
storeEdgesRenderEdge, storeEdgesRenderEdge,
storeNode2FlowNode storeNode2FlowNode
} from '@/web/core/workflow/utils'; } from '@/web/core/workflow/utils';
...@@ -833,10 +832,10 @@ const WorkflowContextProvider = ({ ...@@ -833,10 +832,10 @@ const WorkflowContextProvider = ({
if (past.length > 1) { if (past.length > 1) {
forbiddenSaveSnapshot.current = true; forbiddenSaveSnapshot.current = true;
const firstPast = past[0]; const firstPast = past[1];
resetSnapshot(firstPast); resetSnapshot(firstPast);
setFuture((future) => [firstPast, ...future]); setFuture((future) => [past[0], ...future]);
setPast((past) => past.slice(1)); setPast((past) => past.slice(1));
} }
}); });
...@@ -937,10 +936,10 @@ const WorkflowContextProvider = ({ ...@@ -937,10 +936,10 @@ const WorkflowContextProvider = ({
if (isInit && past.length === 0) { if (isInit && past.length === 0) {
setPast([ setPast([
{ {
nodes: nodes,
edges: edges,
title: t(`app:app.version_initial`), title: t(`app:app.version_initial`),
isSaved: true, isSaved: true,
nodes: simplifyWorkflowNodes(nodes),
edges,
chatConfig: e.chatConfig || appDetail.chatConfig chatConfig: e.chatConfig || appDetail.chatConfig
} }
]); ]);
......
projects/app/src/web/core/workflow/utils.ts
...@@ -619,7 +619,6 @@ export const compareSnapshot = ( ...@@ -619,7 +619,6 @@ export const compareSnapshot = (
return nodes return nodes
.filter((node) => { .filter((node) => {
if (!node) return; if (!node) return;
if (FlowNodeTypeEnum.systemConfig === node.type) return;
return true; return true;
}) })
...@@ -634,7 +633,8 @@ export const compareSnapshot = ( ...@@ -634,7 +633,8 @@ export const compareSnapshot = (
key: input.key, key: input.key,
selectedTypeIndex: input.selectedTypeIndex ?? 0, selectedTypeIndex: input.selectedTypeIndex ?? 0,
renderTypeLis: input.renderTypeList, renderTypeLis: input.renderTypeList,
valueType: input.valueType, // set to arrayAny for loopInputArray to skip valueType comparison
valueType: input.key === NodeInputKeyEnum.loopInputArray ? 'arrayAny' : input.valueType,
value: input.value ?? undefined value: input.value ?? undefined
})), })),
outputs: node.data.outputs.map((item: FlowNodeOutputItemType) => ({ outputs: node.data.outputs.map((item: FlowNodeOutputItemType) => ({
...@@ -661,13 +661,3 @@ export const compareSnapshot = ( ...@@ -661,13 +661,3 @@ export const compareSnapshot = (
return isEqual(node1, node2); return isEqual(node1, node2);
}; };
// remove node size
export const simplifyWorkflowNodes = (nodes: Node[]) => {
return nodes.map((node) => ({
id: node.id,
type: node.type,
position: node.position,
data: node.data
}));
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment