UPDATE: VERSION-20260314

2026-03-14 22:35:21 +08:00
parent 1504c3fc1b
commit 2e55254412
5 changed files with 84 additions and 64 deletions
--- a/modeler/src/style.less
+++ b/modeler/src/style.less
@@ -1819,3 +1819,12 @@
    background: #0d2d4e;
  }
 }
+
+.ks-model-builder-body .ks-model-builder-left .ant-collapse {
+  &.platform-collapse{
+    .ant-collapse-content-box{
+      max-height: 45.5vh;
+    }
+  }
+
+}
--- a/modeler/src/views/decision/communication/api.ts
+++ b/modeler/src/views/decision/communication/api.ts
@@ -8,7 +8,7 @@
 */

 import { HttpRequestClient } from '@/utils/request';
-import type { ScenarioPageableResponse, ScenarioRequest } from './types';
+import type { PlatformWithComponentsResponse, ScenarioPageableResponse, ScenarioRequest } from './types';
 import type { BasicResponse } from '@/types';

 const req = HttpRequestClient.create<BasicResponse>({
@@ -35,3 +35,7 @@ export const findScenarioByQuery = (_query: Partial<ScenarioRequest> = {}): Prom
 export const deleteOneScenarioById = (id: number): Promise<BasicResponse> => {
  return req.delete(`/system/behaviortree/${id}`);
 };
+
+export const findPlatformWithComponents = (id: number): Promise<PlatformWithComponentsResponse> => {
+  return req.get(`system/firerule/platforms/${id}`);
+};
--- a/modeler/src/views/decision/communication/communication.vue
+++ b/modeler/src/views/decision/communication/communication.vue
@@ -19,7 +19,7 @@
          <div class="ks-model-builder-content" style="width: calc(100% - 250px);">
            <div class="ks-model-builder-actions">
              <a-space>
-                <a-button v-if="graph && currentBehaviorTree" class="ks-model-builder-save" size="small" @click="handleSave">
+                <a-button v-if="graph && currentScenario" class="ks-model-builder-save" size="small" @click="handleSave">
                  <CheckOutlined />
                  <span>保存</span>
                </a-button>
@@ -51,7 +51,8 @@ import { CheckCircleOutlined, CheckOutlined, RollbackOutlined, SaveOutlined } fr
 import { Wrapper } from '@/components/wrapper';
 import { safePreventDefault, safeStopPropagation } from '@/utils/event';
 import Header from '../header.vue';
-import type { BehaviorTree, NodeDragTemplate, NodeTemplate } from '../types';
+
+import type { currentScenario, NodeDragTemplate, NodeTemplate } from '../types';
 import type { GraphTaskElement, NodeGraph } from '../builder/element';
 import { useGraphCanvas } from '../builder/hooks';
 import { registerNodeElement } from '../builder/register';
@@ -59,6 +60,7 @@ import { createLineOptions } from '../builder/line';
 import { createTree, findOneTreeById, updateTree } from '../designer/api';
 import { createGraphTaskElement, hasElements, hasRootElementNode, resolveNodeGraph } from '../builder/utils';
 import { createGraphTaskElementFromTemplate } from '../utils/node';
+
 import PlatformCard from './platform-card.vue';
 import NodesCard from './nodes-card.vue';

@@ -85,7 +87,7 @@ export default defineComponent({
    const draggedNodeData = ref<NodeDragTemplate | null>(null);
    const isDraggingOver = ref(false);
    const currentTreeEditing = ref<boolean>(false);
-    const currentBehaviorTree = ref<BehaviorTree | null>(null);
+    const currentScenario = ref<currentScenario | null>(null);
    const currentNodeGraph = ref<NodeGraph | null>(null);
    const selectedModelNode = ref<Node<NodeProperties> | null>(null);
    const selectedNodeTaskElement = ref<GraphTaskElement | null>(null);
@@ -142,7 +144,7 @@ export default defineComponent({
      isDraggingOver.value = false;
      currentTreeEditing.value = false;

-      if (!currentBehaviorTree.value) {
+      if (!currentScenario.value) {
        message.error('请先选择或者创建行为树.');
        return;
      }
@@ -191,7 +193,7 @@ export default defineComponent({
      }
    };

-    const handleSelectTree = (tree: BehaviorTree) => {
+    const handleSelectTree = (tree: currentScenario) => {
      console.info('handleSelectTree', tree);
      findOneTreeById(tree.id).then(r => {
        if (r.data) {
@@ -207,7 +209,7 @@ export default defineComponent({
              edges: [],
            };
          }
-          currentBehaviorTree.value = {
+          currentScenario.value = {
            ...r.data,
            graph: nodeGraph,
          };
@@ -227,19 +229,19 @@ export default defineComponent({
          console.error('clear cells error, cause:', e);
        }
        setTimeout(() => {
-          if (currentBehaviorTree.value?.graph && graph.value) {
-            if (currentBehaviorTree.value?.graph.nodes) {
-              currentBehaviorTree.value?.graph.nodes.forEach(ele => {
+          if (currentScenario.value?.graph && graph.value) {
+            if (currentScenario.value?.graph.nodes) {
+              currentScenario.value?.graph.nodes.forEach(ele => {
                const node = createGraphTaskElement(ele as GraphTaskElement);
                console.info('create node: ', ele);
                // 将节点添加到画布
                graph.value?.addNode(node as Node);
              });
            }
-            if (currentBehaviorTree.value?.graph.edges) {
+            if (currentScenario.value?.graph.edges) {
              // 然后添加所有边，确保包含桩点信息
              setTimeout(() => {
-                currentBehaviorTree.value?.graph.edges.forEach(edgeData => {
+                currentScenario.value?.graph.edges.forEach(edgeData => {
                  graph.value?.addEdge({
                    ...edgeData,
                    ...createLineOptions(),
@@ -253,7 +255,7 @@ export default defineComponent({
    };

    const handleCreateTree = () => {
-      currentBehaviorTree.value = {
+      currentScenario.value = {
        id: 0,
        name: '行为树',
        description: null,
@@ -296,7 +298,7 @@ export default defineComponent({
        handleGraphEvent('blank:click', () => {
          selectedModelNode.value = null;
          selectedNodeTaskElement.value = null;
-          currentTreeEditing.value = null !== currentBehaviorTree.value;
+          currentTreeEditing.value = null !== currentScenario.value;
        });

        handleGraphEvent('node:click', (args: any) => {
@@ -348,12 +350,12 @@ export default defineComponent({
    const handleSave = () => {
      const graphData: NodeGraph = resolveNodeGraph(graph.value as Graph);
      console.info('handleSave', graphData);
-      if (!currentBehaviorTree.value) {
+      if (!currentScenario.value) {
        message.error('当前决策树不存在');
        return;
      }
-      const newTree: BehaviorTree = {
-        ...currentBehaviorTree.value,
+      const newTree: currentScenario = {
+        ...currentScenario.value,
        graph: graphData,
        xmlContent: JSON.stringify(graphData),
      };
@@ -366,7 +368,7 @@ export default defineComponent({
        return;
      }
      let res = null;
-      if (currentBehaviorTree.value.id > 0) {
+      if (currentScenario.value.id > 0) {
        res = createTree(newTree);
      } else {
        res = updateTree(newTree);
@@ -404,7 +406,7 @@ export default defineComponent({
      treesCardRef,
      handleCreateTree,
      currentTreeEditing,
-      currentBehaviorTree,
+      currentScenario,
      currentNodeGraph,
      selectedNodeTaskElement,
      selectedModelNode,
--- a/modeler/src/views/decision/communication/nodes-card.vue
+++ b/modeler/src/views/decision/communication/nodes-card.vue
@@ -1,22 +1,21 @@
 <template>
  <div class="w-full">
-    <a-collapse v-model:activeKey="activeKey" :accordion="true">
+    <a-collapse v-model:activeKey="activeKey" :accordion="true" class="platform-collapse">
      <a-collapse-panel key="1">
        <template #header>
-          <span class="ks-model-builder-title-icon icon-model"></span>控制节点
+          <span class="ks-model-builder-title-icon icon-model"></span>平台名称
        </template>
        <div class="w-full h-full">
          <a-row>
-            <a-col v-for="nm in controlTemplates" :span="12">
+            <a-col v-for="nm in templateData" :span="12">
              <div
                :key="nm.id"
-                :data-type="nm.type"
                class="ks-model-drag-item"
                @dragend="handleDragEnd"
-                @dragstart="handleDragStart($event, nm, 'control')"
+                @dragstart="handleDragStart($event, nm)"
              >
-                <img :alt="nm.name ?? ''" class="icon" src="@/assets/icons/model-4.svg" />
-                <span class="desc">{{ nm.name }}</span>
+                <img :alt="nm.description ?? nm.name ?? ''" class="icon" src="@/assets/icons/model-4.svg" />
+                <span class="desc">{{ nm.description ?? nm.name }}</span>
              </div>
            </a-col>
          </a-row>
@@ -29,49 +28,29 @@

 <script lang="ts">
 import { defineComponent, onMounted, ref } from 'vue';
-import type { NodeDragTemplate, NodeTemplate } from '../types';
-import { findNodeTemplates } from '../designer/api';
 import { safePreventDefault, safeStopPropagation } from '@/utils/event';
+import {findPlatformWithComponents} from './api'
+import {type PlatformWithComponents} from './types'

 export default defineComponent({
  emits: ['drag-item-start', 'drag-item-end'],
  setup(_props, { emit }) {

    const activeKey = ref<number>(1);
-    const templateData = ref<NodeTemplate[]>([]);
+    const templateData = ref<PlatformWithComponents[]>([]);
    const isDraggingOver = ref<boolean>(false);
-    const draggedNodeData = ref<NodeDragTemplate | null>(null);
-    // 控制节点
-    const controlTemplates = ref<NodeTemplate[]>([]);
-    // 条件节点
-    const conditionTemplates = ref<NodeTemplate[]>([]);
-    // 行为节点
-    const actionsTemplates = ref<NodeTemplate[]>([]);
+    const draggedNodeData = ref<PlatformWithComponents | null>(null);

    const loadTress = () => {
-      controlTemplates.value = [];
-      conditionTemplates.value = [];
-      actionsTemplates.value = [];
-
-      findNodeTemplates().then(r => {
-        templateData.value = r.data;
-        if (r.data) {
-          r.data.forEach(tpl => {
-            if (tpl.type === 'action') {
-              actionsTemplates.value.push(tpl);
-            } else if (tpl.type === 'parallel' || tpl.type === 'sequence' || tpl.type === 'select'|| tpl.type === 'root') {
-              controlTemplates.value.push(tpl);
-            } else {
-              conditionTemplates.value.push(tpl);
-            }
-          });
-        }
+      templateData.value = []
+      findPlatformWithComponents(1).then(r => {
+        templateData.value = r.data ?? []
      });
    };

-    const handleDragStart = (e: DragEvent, nm: NodeTemplate, group: String) => {
-      let dragNode: NodeDragTemplate = { ...nm, group: group };
-      draggedNodeData.value = dragNode as NodeDragTemplate;
+    const handleDragStart = (e: DragEvent, nm: PlatformWithComponents) => {
+      let dragNode: PlatformWithComponents = { ...nm };
+      draggedNodeData.value = dragNode as PlatformWithComponents;

      if (e.dataTransfer) {
        e.dataTransfer.setData('text/plain', JSON.stringify(draggedNodeData.value));
@@ -105,17 +84,21 @@ export default defineComponent({
      emit('drag-item-end', isDraggingOver.value, e);
    };

+
+    const load = ()=> {
+      findPlatformWithComponents(1).then(re=> {
+        console.error(re);
+      })
+    }
+
    onMounted(() => {
      loadTress();
+      load();
    });

    return {
      activeKey,
-
-      controlTemplates,
-      conditionTemplates,
-      actionsTemplates,
-
+      templateData,
      handleDragStart,
      handleDragEnd,
    };
--- a/modeler/src/views/decision/communication/types.ts
+++ b/modeler/src/views/decision/communication/types.ts
@@ -8,8 +8,7 @@
 */


-import type { NullableString, PageableResponse } from '@/types';
-import type { FireRule } from '@/views/decision/rule/types.ts';
+import type { ApiDataResponse, NullableString, PageableResponse } from '@/types';

 export interface Scenario {
  id: number,
@@ -17,7 +16,7 @@ export interface Scenario {
  description: NullableString,
 }

-export interface ScenarioRequest extends FireRule {
+export interface ScenarioRequest extends Scenario {
  pageNum: number,
  pageSize: number,
 }
@@ -25,3 +24,26 @@ export interface ScenarioRequest extends FireRule {
 export interface ScenarioPageableResponse extends PageableResponse<Scenario> {

 }
+
+export interface Platform {
+  id: number,
+  name: NullableString,
+  description: NullableString,
+  scenarioId: number,
+}
+
+export interface PlatformComponent {
+  id: number,
+  name: NullableString,
+  type: NullableString,
+  description: NullableString,
+  platformId: number,
+}
+
+export interface PlatformWithComponents extends Platform {
+  components: PlatformComponent[],
+}
+
+export interface PlatformWithComponentsResponse extends ApiDataResponse<PlatformWithComponents[]> {
+
+}