diff --git a/src/hooks/useFlowCallbacks.ts b/src/hooks/useFlowCallbacks.ts index c39ea0f..d8d9242 100644 --- a/src/hooks/useFlowCallbacks.ts +++ b/src/hooks/useFlowCallbacks.ts @@ -39,7 +39,7 @@ import { appFLowHandle } from '@/pages/flowEditor/utils/appFlowhandle'; import { handelEventNodeList, updateEvent, upDatePublish } from '@/pages/flowEditor/utils/common'; import { Dispatch } from 'redux'; -import { getAppListBySceneId, runMainFlow, stopApp } from '@/api/apps'; +import { getAppListBySceneId, runMainFlow, runSubFlow, stopApp } from '@/api/apps'; import store from '@/store'; import { updateAppEvent, updateAppEventChannel, updateAppFlowData } from '@/api/appEvent'; import { getUrlParams, sleep } from '@/utils/common'; @@ -74,6 +74,19 @@ export const useFlowCallbacks = ( setIsDelete: React.Dispatch> ) => { const { getGuidelines, clearGuidelines } = useAlignmentGuidelines(); + + // 辅助函数：获取当前应用/子流程的唯一标识符 + const getCurrentAppKey = useCallback(() => { + const { currentAppData } = store.getState().ideContainer; + if (!currentAppData) return null; + // 如果是子流程（key包含'sub'），使用key作为标识符 + if (currentAppData.key && currentAppData.key.includes('sub')) { + return currentAppData.key; + } + // 否则使用id或initialData.appId + return currentAppData.id || initialData?.appId; + }, [initialData]); + // region 画布操作 // 节点变更处理，添加防抖机制 const onNodesChange = useCallback((changes: any) => { @@ -448,8 +461,9 @@ export const useFlowCallbacks = ( // region 画布数据处理 // 初始化画布数据 const initializeCanvasData = useCallback(() => { - if (canvasDataMap[initialData?.appId]) { - const { edges, nodes } = canvasDataMap[initialData?.appId]; + const appKey = getCurrentAppKey(); + if (appKey && canvasDataMap[appKey]) { + const { edges, nodes } = canvasDataMap[appKey]; setNodes(nodes); setEdges(edges); } @@ -461,18 +475,19 @@ export const useFlowCallbacks = ( // 标记历史记录已初始化 setHistoryInitialized(true); - }, [initialData, canvasDataMap]); + }, [initialData, canvasDataMap, getCurrentAppKey]); // 实时更新 canvasDataMap const updateCanvasDataMapEffect = useCallback(() => { - if (initialData?.appId) { - updateCanvasDataMapDebounced(dispatch, canvasDataMap, initialData.appId, nodes, edges); + const appKey = getCurrentAppKey(); + if (appKey) { + updateCanvasDataMapDebounced(dispatch, canvasDataMap, appKey, nodes, edges); } // 清理函数，在组件卸载时取消防抖 return () => { // 取消防抖函数 }; - }, [nodes, edges, initialData?.appId, dispatch, canvasDataMap]); + }, [nodes, edges, dispatch, canvasDataMap, getCurrentAppKey]); // 关闭编辑弹窗 const closeEditModal = useCallback(() => { setIsEditModalOpen(false); @@ -1152,14 +1167,19 @@ export const useFlowCallbacks = ( const appRes: any = await getAppInfoNew(currentAppData.parentAppId); // 更新 flowData 中的数据 dispatch(updateFlowData({ [currentAppData.parentAppId]: appRes.data })); - // 同步更新到 canvasDataMap + // 同步更新主流程到 canvasDataMap（使用父应用ID） if (appRes.data.main?.components) { - const { nodes, edges } = convertFlowData(appRes.data.main.components, true); + const { nodes: parentNodes, edges: parentEdges } = convertFlowData(appRes.data.main.components, true); dispatch(updateCanvasDataMap({ ...canvasDataMap, - [currentAppData.parentAppId]: { nodes, edges } + [currentAppData.parentAppId]: { nodes: parentNodes, edges: parentEdges } })); } + // 同步更新子流程到 canvasDataMap（使用子流程key） + dispatch(updateCanvasDataMap({ + ...canvasDataMap, + [currentAppData.key]: { nodes, edges } + })); } else { Message.error(res.message); @@ -1294,42 +1314,86 @@ export const useFlowCallbacks = ( // 运行处理函数 const handleRun = useCallback(async (running: boolean) => { const { currentAppData, socketId, appRuntimeData } = store.getState().ideContainer; + const appKey = getCurrentAppKey(); + if (running) { - // 启动运行 - const params = { - appId: currentAppData.id, - socketId - }; - const res: any = await runMainFlow(params); - if (res.code === 200) { - // 设置运行状态为true - dispatch(updateIsRunning(true)); + // 子流程运行 + if (currentAppData.key.includes('sub')) { + // 启动运行 + const params = { + appId: currentAppData.parentAppId, + socketId, + subflowId: currentAppData.key + }; + const res: any = await runSubFlow(params); - // 重置节点状态 - dispatch(resetNodeStatus()); + if (res.code === 200) { + // 设置运行状态为true + dispatch(updateIsRunning(true)); - // 更新运行ID - dispatch(updateRuntimeId(res.data)); + // 重置节点状态 + dispatch(resetNodeStatus()); - // 开始运行时动画 - setEdges((eds) => eds.map(edge => ({ - ...edge, - data: { - ...edge.data, - isRunning: true, - animationProgress: 0 - } - }))); + // 更新运行ID + dispatch(updateRuntimeId(res.data)); + + // 开始运行时动画 + setEdges((eds) => eds.map(edge => ({ + ...edge, + data: { + ...edge.data, + isRunning: true, + animationProgress: 0 + } + }))); + } + else { + Message.error(res.message); + } } + // 主流程运行 else { - Message.error(res.message); + // 启动运行 + const params = { + appId: currentAppData.id, + socketId + }; + const res: any = await runMainFlow(params); + if (res.code === 200) { + // 设置运行状态为true + dispatch(updateIsRunning(true)); + + // 重置节点状态 + dispatch(resetNodeStatus()); + + // 更新运行ID + dispatch(updateRuntimeId(res.data)); + + // 开始运行时动画 + setEdges((eds) => eds.map(edge => ({ + ...edge, + data: { + ...edge.data, + isRunning: true, + animationProgress: 0 + } + }))); + } + else { + Message.error(res.message); + } } } else { // 设置运行状态为false dispatch(updateIsRunning(false)); - await stopApp(appRuntimeData[currentAppData.id].runId); + // 使用正确的 appKey 获取 runId + const runId = appKey && appRuntimeData[appKey] ? appRuntimeData[appKey].runId : ''; + if (runId) { + await stopApp(runId); + } + // 更新运行ID dispatch(updateRuntimeId('')); @@ -1344,9 +1408,11 @@ export const useFlowCallbacks = ( }))); // 清空当前应用的运行日志 - dispatch(clearRuntimeLogs({ appId: currentAppData.id })); + if (appKey) { + dispatch(clearRuntimeLogs({ appId: appKey })); + } } - }, [initialData?.appId]); + }, [getCurrentAppKey]); return { // Event handlers diff --git a/src/hooks/useFlowEditorState.ts b/src/hooks/useFlowEditorState.ts index fe5df89..56f6e47 100644 --- a/src/hooks/useFlowEditorState.ts +++ b/src/hooks/useFlowEditorState.ts @@ -12,9 +12,21 @@ export const useFlowEditorState = (initialData?: any) => { const { canvasDataMap, nodeStatusMap, isRunning, appRuntimeData, currentAppData } = useSelector((state: any) => state.ideContainer); const dispatch = useDispatch(); + // 辅助函数：获取当前应用/子流程的唯一标识符 + const getCurrentAppKey = (currentAppData: any) => { + if (!currentAppData) return null; + // 如果是子流程（key包含'sub'），使用key作为标识符 + if (currentAppData.key && currentAppData.key.includes('sub')) { + return currentAppData.key; + } + // 否则使用id + return currentAppData.id; + }; + // 获取当前应用的运行状态 - const currentAppIsRunning = currentAppData?.id && appRuntimeData[currentAppData.id] - ? appRuntimeData[currentAppData.id].isRunning + const currentAppKey = getCurrentAppKey(currentAppData); + const currentAppIsRunning = currentAppKey && appRuntimeData[currentAppKey] + ? appRuntimeData[currentAppKey].isRunning : false; // 添加编辑弹窗相关状态 diff --git a/src/pages/flowEditor/FlowEditorMain.tsx b/src/pages/flowEditor/FlowEditorMain.tsx index 38973f6..d20d68a 100644 --- a/src/pages/flowEditor/FlowEditorMain.tsx +++ b/src/pages/flowEditor/FlowEditorMain.tsx @@ -175,8 +175,21 @@ const FlowEditorMain: React.FC = (props) => { // 从Redux store中获取当前应用的运行状态 const { appRuntimeData, currentAppData } = useSelector((state: any) => state.ideContainer); - const currentAppIsRunning = currentAppData?.id && appRuntimeData[currentAppData.id] - ? appRuntimeData[currentAppData.id].isRunning + + // 辅助函数：获取当前应用/子流程的唯一标识符 + const getCurrentAppKey = () => { + if (!currentAppData) return null; + // 如果是子流程（key包含'sub'），使用key作为标识符 + if (currentAppData.key && currentAppData.key.includes('sub')) { + return currentAppData.key; + } + // 否则使用id + return currentAppData.id; + }; + + const currentAppKey = getCurrentAppKey(); + const currentAppIsRunning = currentAppKey && appRuntimeData[currentAppKey] + ? appRuntimeData[currentAppKey].isRunning : false; // 在应用编排模式下（useDefault为false）禁用删除功能 diff --git a/src/pages/flowEditor/components/actionBar.tsx b/src/pages/flowEditor/components/actionBar.tsx index 4daede0..1f2f557 100644 --- a/src/pages/flowEditor/components/actionBar.tsx +++ b/src/pages/flowEditor/components/actionBar.tsx @@ -29,10 +29,22 @@ const ActionBar: React.FC = ({ }) => { const { logBarStatus, appRuntimeData, currentAppData } = useSelector((state: any) => state.ideContainer); const dispatch = useDispatch(); - + + // 辅助函数：获取当前应用/子流程的唯一标识符 + const getCurrentAppKey = () => { + if (!currentAppData) return null; + // 如果是子流程（key包含'sub'），使用key作为标识符 + if (currentAppData.key && currentAppData.key.includes('sub')) { + return currentAppData.key; + } + // 否则使用id + return currentAppData.id; + }; + // 获取当前应用的运行状态 - const currentAppIsRunning = currentAppData?.id && appRuntimeData[currentAppData.id] - ? appRuntimeData[currentAppData.id].isRunning + const currentAppKey = getCurrentAppKey(); + const currentAppIsRunning = currentAppKey && appRuntimeData[currentAppKey] + ? appRuntimeData[currentAppKey].isRunning : false; const changeLogBarStatus = () => { diff --git a/src/pages/flowEditor/utils/projectFlowHandle.ts b/src/pages/flowEditor/utils/projectFlowHandle.ts index 0da732d..1d90aef 100644 --- a/src/pages/flowEditor/utils/projectFlowHandle.ts +++ b/src/pages/flowEditor/utils/projectFlowHandle.ts @@ -21,10 +21,13 @@ export const projectFlowHandle = (initialData, useDefault, setNodes, setEdges, d setNodes(convertedNodes); setEdges(initialEdges); - if (initialData?.appId) { + // 确定要使用的key: 对于子流程使用flowId，对于主流程使用appId + const cacheKey = initialData?.flowId || initialData?.appId; + + if (cacheKey) { dispatch(updateCanvasDataMap({ ...canvasDataMap, - [initialData.appId]: { nodes: convertedNodes, edges: initialEdges } + [cacheKey]: { nodes: convertedNodes, edges: initialEdges } })); } }; \ No newline at end of file diff --git a/src/pages/ideContainer/index.tsx b/src/pages/ideContainer/index.tsx index d997743..8369954 100644 --- a/src/pages/ideContainer/index.tsx +++ b/src/pages/ideContainer/index.tsx @@ -30,7 +30,7 @@ import ComponentList from '@/pages/componentDevelopment/componentList'; import ComponentCoding from '@/pages/componentDevelopment/componentCoding'; import ComponentDeployment from '@/pages/componentDevelopment/componentDeployment'; import ComponentTest from '@/pages/componentDevelopment/componentTest'; -import ComponentEnv from "@/pages/componentDevelopment/componentEnv" +import ComponentEnv from '@/pages/componentDevelopment/componentEnv'; import { getUserToken } from '@/api/user'; import { Message } from '@arco-design/web-react'; import { queryEventItemBySceneId, queryEventItemBySceneIdOld } from '@/api/event'; @@ -80,7 +80,6 @@ function IDEContainer() { // console.log('收到WebSocket消息:', event.data); const socketMessage = JSON.parse(event.data); if (socketMessage?.socketId) dispatch(updateSocketId(socketMessage.socketId)); - // 处理节点状态更新 if (socketMessage?.nodeLog) { const { nodeId, state, runLog } = socketMessage.nodeLog; @@ -122,12 +121,13 @@ function IDEContainer() { useEffect(() => { const handleOpenSubNodeTab = async (event: CustomEvent) => { const { node } = event.detail; - const subCompList = flowData[currentAppData.id].subs; + const subCompList = flowData[currentAppData.id]?.subs || []; const customDef = isJSON(node.data.component.customDef) ? JSON.parse(node.data.component.customDef) : {}; const currentSubComp = subCompList.find((item) => item.flowId === customDef.subflowId); // 根据节点信息创建新的标签页 if (currentSubComp && Object.keys(currentSubComp).length > 0) { - await getAppList(); + // await getAppList(); // 避免重置 subMenuData 导致 sidebar 数据丢失 + const newNodeKey = currentSubComp.flowId; // 查找菜单项 @@ -180,6 +180,9 @@ function IDEContainer() { }); } } + else { + Message.error('未找到对应的复合组件'); + } }; // 添加事件监听器 @@ -257,6 +260,7 @@ function IDEContainer() { useEffect(() => { if (selected.key) { setOpenedTabs(prev => new Set(prev).add(selected.key!)); + handleTabChange(selected.key) } }, [selected.key]); @@ -269,7 +273,6 @@ function IDEContainer() { const isOpened = openedTabs.has(selected.key); // 检查是否是当前选中的路径 const isSelected = selected.path === path; - // 只有已打开且已经选中的组件才渲染，通过CSS控制显示/隐藏 return isOpened && isSelected ? (
= () => { const [activeTab, setActiveTab] = useState('1'); const resizeBoxRef = useRef(null); // 引用 ResizeBox 容器 const [validationLogs, setValidationLogs] = useState([]); - const [runtimeLogs, setRuntimeLogs] = useState([]); // 添加运行时日志状态 + const [runtimeLogs, setruntimeLogs] = useState([]); // 添加运行时日志状态 const [logContainerHeight, setLogContainerHeight] = useState('250px'); // 添加日志容器高度状态 const [runtimeData, setRuntimeData] = useState({}); // 添加运行数据状态 const [loading, setLoading] = useState(false); @@ -60,6 +60,17 @@ const LogBar: React.FC = () => { const dispatch = useDispatch(); + // 辅助函数：获取当前应用/子流程的唯一标识符 + const getCurrentAppKey = () => { + if (!currentAppData) return null; + // 如果是子流程（key包含'sub'），使用key作为标识符 + if (currentAppData.key && currentAppData.key.includes('sub')) { + return currentAppData.key; + } + // 否则使用id + return currentAppData.id; + }; + // 处理 Tab 点击事件 const handleTabClick = (key: string) => { // 如果点击当前激活的 tab，则切换收起状态 @@ -125,19 +136,19 @@ const LogBar: React.FC = () => { timestamp }; - setRuntimeLogs(prev => [...prev, newLog]); + setruntimeLogs(prev => [...prev, newLog]); // 自动切换到运行日志tab并展开logBar dispatch(updateLogBarStatus(true)); // 同时将日志添加到当前应用的运行日志中 - const appId = currentAppData?.id; - if (appId) { + const appKey = getCurrentAppKey(); + if (appKey) { dispatch({ type: 'ideContainer/addRuntimeLog', payload: { log: newLog, - appId: appId + appId: appKey // 使用 appKey 而不是 id } }); } @@ -151,21 +162,22 @@ const LogBar: React.FC = () => { return () => { document.removeEventListener('logMessage', handleLogMessage as EventListener); }; - }, [dispatch, currentAppData?.id]); + }, [dispatch, currentAppData]); // 实现轮询获取运行数据 useEffect(() => { let intervalId: NodeJS.Timeout | null = null; + const currentAppKey = getCurrentAppKey(); // 只有在当前tab是运行数据且有当前应用时才开始轮询 - if (activeTab === '3' && currentAppData?.id && logBarStatus && appRuntimeData[currentAppData.id]?.runId) { + if (activeTab === '3' && currentAppKey && logBarStatus && appRuntimeData[currentAppKey]?.runId) { const fetchRuntimeData = async () => { try { setLoading(true); - const response = await getNodeData(appRuntimeData[currentAppData.id].runId); + const response = await getNodeData(appRuntimeData[currentAppKey].runId); setRuntimeData(prev => ({ ...prev, - [currentAppData.id]: response.data + [currentAppKey]: response.data })); } catch (error) { console.error('获取运行数据失败:', error); @@ -187,7 +199,7 @@ const LogBar: React.FC = () => { clearInterval(intervalId); } }; - }, [activeTab, currentAppData?.id, logBarStatus]); + }, [activeTab, currentAppData, logBarStatus]); // 渲染校验日志内容 const renderValidationLogs = () => { @@ -214,8 +226,9 @@ const LogBar: React.FC = () => { // 渲染运行时日志内容 const renderRuntimeLogs = () => { // 获取当前应用的运行日志 - const currentAppLogs = currentAppData?.id && appRuntimeData[currentAppData.id] - ? appRuntimeData[currentAppData.id].logs || [] + const currentAppKey = getCurrentAppKey(); + const currentAppLogs = currentAppKey && appRuntimeData[currentAppKey] + ? appRuntimeData[currentAppKey].logs || [] : []; return ( @@ -240,7 +253,8 @@ const LogBar: React.FC = () => { // 渲染运行数据内容 const renderRuntimeData = () => { - const currentAppDataContent = currentAppData?.id ? runtimeData[currentAppData.id] : null; + const currentAppKey = getCurrentAppKey(); + const currentAppDataContent = currentAppKey ? runtimeData[currentAppKey] : null; return (
diff --git a/src/pages/ideContainer/navBar.tsx b/src/pages/ideContainer/navBar.tsx index 2f8c7ea..9fa7af4 100644 --- a/src/pages/ideContainer/navBar.tsx +++ b/src/pages/ideContainer/navBar.tsx @@ -93,10 +93,11 @@ const NavBar: React.ForwardRefRenderFunction = ({ const currentIndex = tabs.findIndex(tab => tab.key === key); const nextIndex = currentIndex > 0 ? currentIndex - 1 : 0; const nextTab = newTabs[nextIndex]; - + setActiveTab(nextTab.key); onTabChange?.(nextTab.key); - } else { + } + else { // 如果没有更多tabs，重置状态 setActiveTab(''); onTabChange?.(''); diff --git a/src/pages/ideContainer/sideBar.tsx b/src/pages/ideContainer/sideBar.tsx index 5fc022c..1830dc0 100644 --- a/src/pages/ideContainer/sideBar.tsx +++ b/src/pages/ideContainer/sideBar.tsx @@ -208,6 +208,8 @@ const SideBar: React.FC = ({ }); // 添加右键菜单状态 // 用于存储隐藏的节点ID const [hiddenNodes, setHiddenNodes] = useState>(new Set()); + // 用于控制展开的节点 + const [expandedKeys, setExpandedKeys] = useState(['0']); const resizeBoxRef = useRef(null); // 引用第一个 ResizeBox 容器 const contextMenuRef = useRef(null); // 右键菜单引用 const { menuData, info, canvasDataMap } = useSelector(state => state.ideContainer); @@ -396,29 +398,40 @@ const SideBar: React.FC = ({ }; }); children.children[1].children = Object.keys(res.data.compList).map(item => { - return { - title: compTypeMap[item], - icon: item === 'appComponent' ? '/ideContainer/icon/app1.png' : '/ideContainer/icon/complexApp.png', - children: item === 'appComponent' ? res.data.compList[item].map(title => { - return { - title: title, - children: null, - icon: '/ideContainer/icon/tool.png' - }; - }) : res.data.subs.map(info => { - return { - title: info.flowName, - children: null, - icon: '/ideContainer/icon/tool.png', - compData: info, - path: 'complexFlow', - key: info.flowId, - pathTitle: `${data.title} / ${info.flowName}`, - parentKey: 'appList', - parentAppId: data.id - }; - }) - }; + // 对于普通组件，直接渲染组件名称列表 + if (item === 'appComponent') { + return { + title: compTypeMap[item], + icon: '/ideContainer/icon/app1.png', + children: res.data.compList[item].map(title => { + return { + title: title, + children: null, + icon: '/ideContainer/icon/tool.png' + }; + }) + }; + } + // 对于复合组件，直接渲染复合组件本身（不渲染子流程） + else { + return { + title: compTypeMap[item], + icon: '/ideContainer/icon/complexApp.png', + children: res.data.subs.map(info => { + return { + title: info.flowName, + children: null, + icon: '/ideContainer/icon/tool.png', + compData: info, + path: 'complexFlow', + key: info.flowId, + pathTitle: `${data.title} / ${info.flowName}`, + parentKey: 'appList', + parentAppId: data.id + }; + }) + }; + } }); const findMenuItem = (menuItems: any[], key: string): any => { @@ -588,11 +601,11 @@ const SideBar: React.FC = ({ // 监听导航到Tab的事件 const handleNavigateToTab = (event: CustomEvent) => { const { path } = event.detail; - + // 查找对应的菜单项 const menuItems = menuData[identity]; if (!menuItems) return; - + const findMenuItem = (items: any[]): any => { for (const item of items) { if (item.path === path) { @@ -605,7 +618,7 @@ const SideBar: React.FC = ({ } return null; }; - + const menuItem = findMenuItem(menuItems); if (menuItem) { // 触发菜单选择 @@ -792,7 +805,8 @@ const SideBar: React.FC = ({ {/* 子菜单 */}
setExpandedKeys(keys as string[])} selectedKeys={[]} // 移除选中样式 onMouseDown={handleMouseDown} onSelect={async (_selectedKeys, info) => { diff --git a/src/store/ideContainer.ts b/src/store/ideContainer.ts index e5f0c0e..f19d8f1 100644 --- a/src/store/ideContainer.ts +++ b/src/store/ideContainer.ts @@ -59,6 +59,18 @@ const initialState: IDEContainerState = { } }; +// 辅助函数：获取当前应用/子流程的唯一标识符 +// 对于子流程，使用 key（如 sub_xxx）；对于主流程，使用 id +const getCurrentAppKey = (currentAppData: any) => { + if (!currentAppData) return null; + // 如果是子流程（key包含'sub'），使用key作为标识符 + if (currentAppData.key && currentAppData.key.includes('sub')) { + return currentAppData.key; + } + // 否则使用id + return currentAppData.id; +}; + // 创建切片 const ideContainerSlice = createSlice({ name: 'ideContainer', @@ -113,10 +125,10 @@ const ideContainerSlice = createSlice({ } // 同时更新当前应用的节点状态 - const appId = state.currentAppData?.id; - if (appId) { - if (!state.appRuntimeData[appId]) { - state.appRuntimeData[appId] = { + const appKey = getCurrentAppKey(state.currentAppData); + if (appKey) { + if (!state.appRuntimeData[appKey]) { + state.appRuntimeData[appKey] = { nodeStatusMap: {}, isRunning: false, logs: [], @@ -125,7 +137,7 @@ const ideContainerSlice = createSlice({ eventlisteneList: [] }; } - state.appRuntimeData[appId].nodeStatusMap[nodeId] = status; + state.appRuntimeData[appKey].nodeStatusMap[nodeId] = status; } }, // 重置节点状态 @@ -133,9 +145,9 @@ const ideContainerSlice = createSlice({ state.nodeStatusMap = {}; // 同时重置当前应用的节点状态 - const appId = state.currentAppData?.id; - if (appId && state.appRuntimeData[appId]) { - state.appRuntimeData[appId].nodeStatusMap = {}; + const appKey = getCurrentAppKey(state.currentAppData); + if (appKey && state.appRuntimeData[appKey]) { + state.appRuntimeData[appKey].nodeStatusMap = {}; } }, // 更新运行状态 @@ -143,10 +155,10 @@ const ideContainerSlice = createSlice({ state.isRunning = payload; // 同时更新当前应用的运行状态 - const appId = state.currentAppData?.id; - if (appId) { - if (!state.appRuntimeData[appId]) { - state.appRuntimeData[appId] = { + const appKey = getCurrentAppKey(state.currentAppData); + if (appKey) { + if (!state.appRuntimeData[appKey]) { + state.appRuntimeData[appKey] = { nodeStatusMap: {}, isRunning: false, logs: [], @@ -155,14 +167,14 @@ const ideContainerSlice = createSlice({ eventlisteneList: [] }; } - state.appRuntimeData[appId].isRunning = payload; + state.appRuntimeData[appKey].isRunning = payload; } }, // 添加运行id updateRuntimeId: (state, { payload }) => { - const appId = state.currentAppData?.id; - if (!state.appRuntimeData[appId]) { - state.appRuntimeData[appId] = { + const appKey = getCurrentAppKey(state.currentAppData); + if (!state.appRuntimeData[appKey]) { + state.appRuntimeData[appKey] = { nodeStatusMap: {}, isRunning: false, logs: [], @@ -171,13 +183,13 @@ const ideContainerSlice = createSlice({ eventlisteneList: [] }; } - state.appRuntimeData[appId].runId = payload; + state.appRuntimeData[appKey].runId = payload; }, // 更新事件节点列表 updateEventNodeList: (state, { payload }) => { - const appId = state.currentAppData?.id; - if (!state.appRuntimeData[appId]) { - state.appRuntimeData[appId] = { + const appKey = getCurrentAppKey(state.currentAppData); + if (!state.appRuntimeData[appKey]) { + state.appRuntimeData[appKey] = { nodeStatusMap: {}, isRunning: false, logs: [], @@ -186,7 +198,7 @@ const ideContainerSlice = createSlice({ eventlisteneList: [] }; } - state.appRuntimeData[appId] = { ...state.appRuntimeData[appId], ...payload }; + state.appRuntimeData[appKey] = { ...state.appRuntimeData[appKey], ...payload }; }, // 添加运行日志 addRuntimeLog: (state, { payload }) => {