diff --git a/modeler/src/views/decision/api.ts b/modeler/src/views/decision/api.ts index f9a932f..6a8714f 100644 --- a/modeler/src/views/decision/api.ts +++ b/modeler/src/views/decision/api.ts @@ -8,23 +8,24 @@ */ import { HttpRequestClient } from '@/utils/request'; -import type { NodeTemplateQuery, NodeTemplatesResponse, TreeModelDetailsResponse, TreeModelGraph, TreeModelsResponse } from './types'; -import type { ApiPaginationQuery, BasicResponse } from '@/types'; +import type { BehaviorTree, BehaviorTreeDetailsResponse, BehaviorTreePageResponse, NodeTemplatesResponse, TreeModelDetailsResponse, TreeModelGraph } from './types'; +import type { BasicResponse } from '@/types'; const req = HttpRequestClient.create({ - baseURL: '/bhtree/api', + baseURL: '/api', }); -export const findTemplatesByQuery = (query: Partial): Promise => { - return req.postJson('/node-templates', query); +export const findNodeTemplates = (): Promise => { + return req.get('/system/nodetemplate/listAll'); }; -export const findTreesByQuery = (query: Partial): Promise => { - return req.postJson('/behavior-trees', query); +export const findTreesByQuery = (query: Partial = {}): Promise => { + return req.get('/system/behaviortree/list', query); }; -export const findOneTreeById = (id: number): Promise => { - return req.get(`/behavior-trees/${id}`); + +export const findOneTreeById = (id: number): Promise => { + return req.get(`/system/behaviortree/${id}`); }; export const updateTree = (rt: Partial): Promise => { diff --git a/modeler/src/views/decision/designer.vue b/modeler/src/views/decision/designer.vue index 168f248..6cf955c 100644 --- a/modeler/src/views/decision/designer.vue +++ b/modeler/src/views/decision/designer.vue @@ -17,7 +17,7 @@
- + @@ -68,7 +68,7 @@ import Header from './header.vue'; import Properties from './properties.vue'; import { useGraphCanvas } from './builder/hooks'; import { registerNodeElement } from './builder/register'; -import type { NodeGraph, NodeTemplate, SettingTaskNodeElement, TreeModel, TreeModelGraph } from './types'; +import type { BehaviorTree, NodeGraph, NodeTemplate, SettingTaskNodeElement, TreeModel, TreeModelGraph } from './types'; import { createTree, findOneTreeById, updateTree } from './api'; import { createTaskNodeElement, createTaskNodeElementFromTemplate, hasElements, hasRootElementNode, resolveNodeGraph } from './utils/node'; import TressCard from './trees-card.vue'; @@ -97,7 +97,7 @@ export default defineComponent({ const currentZoom = ref(1); const draggedNodeData = ref(null); const isDraggingOver = ref(false); - const currentTreeModelGraph = ref(null); + const currentNodeGraph = ref(null); const selectedModelNode = ref | null>(null); const selectedNodeTaskElement = ref(null); const changed = ref(false) @@ -151,7 +151,7 @@ export default defineComponent({ safeStopPropagation(e); isDraggingOver.value = false; - if (!currentTreeModelGraph.value) { + if (!currentNodeGraph.value) { message.error('请先选择或者创建行为树.'); return; } @@ -201,19 +201,19 @@ export default defineComponent({ }; const createElements = () => { - if(graph.value && currentTreeModelGraph.value){ + if(graph.value && currentNodeGraph.value){ graph.value.clearCells(); setTimeout(()=> { nextTick(()=> { try{ - if (currentTreeModelGraph.value && !currentTreeModelGraph.value?.graph){ - currentTreeModelGraph.value.graph = { + if (currentNodeGraph.value && !currentNodeGraph.value?.graph){ + currentNodeGraph.value.graph = { nodes: [], edges: [], } } - const nodes = currentTreeModelGraph.value?.graph?.nodes ?? []; - const edges = currentTreeModelGraph.value?.graph?.edges ?? []; + const nodes = currentNodeGraph.value?.graph?.nodes ?? []; + const edges = currentNodeGraph.value?.graph?.edges ?? []; nodes.forEach(n=> { const node = createTaskNodeElement(n); @@ -297,7 +297,7 @@ export default defineComponent({ console.error('handleSelectTree', treeModel); findOneTreeById(treeModel.id).then(r => { if (r.data) { - currentTreeModelGraph.value = r.data; + currentNodeGraph.value = r.data; createElements(); } else { message.error(r.message ?? '行为树不存在.'); @@ -308,16 +308,16 @@ export default defineComponent({ const handleSave = () => { const graphData: NodeGraph = resolveNodeGraph(graph.value as Graph); console.info('handleSave', graphData); - if (!currentTreeModelGraph.value) { + if (!currentNodeGraph.value) { message.error('当前决策树不存在'); return; } const newModel: TreeModelGraph = { - ...currentTreeModelGraph.value, + ...currentNodeGraph.value, graph: graphData, }; let res = null; - if (currentTreeModelGraph.value.id > 0) { + if (currentNodeGraph.value.id > 0) { res = createTree(newModel); } else { res = updateTree(newModel); @@ -351,7 +351,7 @@ export default defineComponent({ }); return { - currentTreeModelGraph, + currentNodeGraph, selectedNodeTaskElement, selectedModelNode, graph, diff --git a/modeler/src/views/decision/nodes-card.vue b/modeler/src/views/decision/nodes-card.vue index 9ef6a65..85dcd5e 100644 --- a/modeler/src/views/decision/nodes-card.vue +++ b/modeler/src/views/decision/nodes-card.vue @@ -66,60 +66,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -