fix(flow-editor):修正事件监听与发送编辑器的参数方向及逻辑判断

production
钟良源 7 months ago
parent 9dec93bf0d
commit 354ae04092

@ -26,20 +26,20 @@ const EventListenEditor: React.FC<NodeEditorProps> = ({ nodeData, updateNodeData
<EventSelect <EventSelect
nodeData={nodeData} nodeData={nodeData}
eventList={eventList} eventList={eventList}
type="send" type="listen"
onRefresh={getEventList} onRefresh={getEventList}
onUpdateData={(data) => { onUpdateData={(data) => {
updateNodeData('component', { updateNodeData('component', {
...data ...data
}); });
}} /> }} />
<Typography.Title heading={5}><IconUnorderedList style={{ marginRight: 5 }} /></Typography.Title> <Typography.Title heading={5}><IconUnorderedList style={{ marginRight: 5 }} /></Typography.Title>
<ParamsTable <ParamsTable
initialData={nodeData.parameters.dataIns || []} initialData={nodeData.parameters.dataOuts || []}
onUpdateData={(data) => { onUpdateData={(data) => {
updateNodeData('parameters', { updateNodeData('parameters', {
...nodeData.parameters, ...nodeData.parameters,
dataIns: data dataOuts: data
}); });
}} }}
/> />

@ -31,16 +31,29 @@ const EventSelect: React.FC<EventSelectProps> = ({ nodeData, eventList, type, on
const { currentAppData } = useSelector(state => state.ideContainer); const { currentAppData } = useSelector(state => state.ideContainer);
useEffect(() => { useEffect(() => {
if (eventList && eventList.length > 0) { if (nodeData && eventList && eventList.length > 0) {
setSpecialOptions(eventList.find(item => item.topic.includes('**empty**'))); setSpecialOptions(eventList.find(item => item.topic.includes('**empty**')));
setOptions(eventList.filter(item => !item.topic.includes('**empty**'))); setOptions(eventList.filter(item => !item.topic.includes('**empty**')));
try { try {
setCurrentEvent(eventList.find(item => JSON.parse(nodeData.component?.customDef).eventId === item.id)); const customDef = JSON.parse(nodeData.component?.customDef);
// 先判断topic是不是**empty**是就不设置currentevent
if (customDef.topic && customDef.topic.includes('**empty**')) {
setCurrentEvent(null);
}
else {
setCurrentEvent(eventList.find(item => customDef.eventId === item.id));
}
} catch (e) { } catch (e) {
setCurrentEvent(eventList.find(item => nodeData.component?.customDef.eventId === item.id)); // 先判断topic是不是**empty**是就不设置currentevent
if (nodeData.component?.customDef?.topic && nodeData.component?.customDef?.topic.includes('**empty**')) {
setCurrentEvent(null);
}
else {
setCurrentEvent(eventList.find(item => nodeData.component?.customDef.eventId === item.id));
}
} }
} }
}, [eventList, nodeData]); }, [nodeData, eventList]);
const addItem = () => { const addItem = () => {
setShowModal(true); setShowModal(true);

@ -33,13 +33,13 @@ const EventSendEditor: React.FC<NodeEditorProps> = ({ nodeData, updateNodeData }
...data ...data
}); });
}} /> }} />
<Typography.Title heading={5}><IconUnorderedList style={{ marginRight: 5 }} /></Typography.Title> <Typography.Title heading={5}><IconUnorderedList style={{ marginRight: 5 }} /></Typography.Title>
<ParamsTable <ParamsTable
initialData={nodeData.parameters.dataOuts || []} initialData={nodeData.parameters.dataIns || []}
onUpdateData={(data) => { onUpdateData={(data) => {
updateNodeData('parameters', { updateNodeData('parameters', {
...nodeData.parameters, ...nodeData.parameters,
dataOuts: data dataIns: data
}); });
}} }}
/> />

Loading…
Cancel
Save