Compare commits

...

2 Commits

Author SHA1 Message Date
e78df2ed5d style: 调整文件名称 2026-08-07 16:45:45 +08:00
add482aee2 feat: 拖动到循环体节点连线断开 2026-08-07 16:41:38 +08:00
6 changed files with 16 additions and 5 deletions

View File

@ -35,7 +35,7 @@ import CodeNodeParams from './params/CodeNodeParams.vue'
import HttpNodeParams from './params/HttpNodeParams.vue'
import SdAgentNodeParams from './params/SdAgentNodeParams.vue'
import RecognizeNodeParams from './params/RecognizeNodeParams.vue'
import DeviceUniversal from './params/Device_universal.vue'
import DeviceUniversal from './params/DeviceUniversal.vue'
import SwitchNodeParams from './params/SwitchNodeParams.vue'
const props = defineProps({
@ -62,7 +62,7 @@ const currentComponent = computed(() => {
if (type === 'http') return HttpNodeParams
if (type === 'sdAgent') return SdAgentNodeParams
if (type === 'recognize') return RecognizeNodeParams
if (type === 'device_universal') return DeviceUniversal
if (type === 'deviceUniversal') return DeviceUniversal
if (type === 'branch') return SwitchNodeParams
return null
})

View File

@ -337,7 +337,7 @@ function handler(params) {
{
icon: cameraSvg,
name: "通用指令",
type: "device_universal",
type: "deviceUniversal",
desc: "执行设备通用指令",
action: 'DEVICE_EXECUTE_JSON_COMMAND',
nodeType: 'EDGE',

View File

@ -78,7 +78,7 @@ import CodeNode from "../nodes/function/codeNode.vue";
import CurrentLoopNode from "../nodes/function/currentLoop.vue";
import SdAgentNode from "../nodes/function/sdAgent.vue";
import RecognizeNode from "../nodes/function/recognize.vue";
import DeviceUniversal from "../nodes/function/device_universal.vue";
import DeviceUniversal from "../nodes/function/deviceUniversal.vue";
const props = defineProps({
id: String,
@ -103,7 +103,7 @@ const componentMap = {
currentLoop: CurrentLoopNode,
sdAgent: SdAgentNode,
recognize: RecognizeNode,
device_universal: DeviceUniversal,
deviceUniversal: DeviceUniversal,
};
const flowStore = useFlowStore();

View File

@ -791,10 +791,21 @@ export const createFlowFacade = (store) => {
const group = store.findNode(groupId);
const child = store.findNode(childId);
if (!group || !child || GROUP_TYPES.has(child.data.flowType)) return;
const previousParentId = child.parentNode || child.data?.properties?.parentId;
const graph = facade.getGraphData();
const groupData = graph.nodes.find((node) => node.id === groupId);
const childData = graph.nodes.find((node) => node.id === childId);
if (!groupData || !childData) return;
// 节点从循环体外进入循环体后,原连线的两端已处于不同执行作用域,必须全部断开。
// 在重新渲染父子结构前直接过滤图数据,可保证入边、出边和层级变更在同一次更新中完成。
const enteringLoop = group.data.flowType === "loop" && previousParentId !== groupId;
if (enteringLoop) {
graph.edges = graph.edges.filter((edge) => (
edge.sourceNodeId !== childId && edge.targetNodeId !== childId
));
}
groupData.children = Array.from(new Set([...(groupData.children || []), childId]));
childData.properties = { ...(childData.properties || {}), parentId: groupId };
if (dropCenter) {