UPDATE: VERSION-20260326

2026-03-26 23:36:47 +08:00
parent 6656479327
commit 8958ecd6dc
13 changed files with 315 additions and 91 deletions
--- a/auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java
+++ b/auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java
@@ -68,6 +68,11 @@ public class FireRuleController extends BaseController {
        return success(ruleService.findAllPlatformComponents());
    }

+    @GetMapping("/platforms/basic")
+    public AjaxResult platformsBasic(){
+        return success(ruleService.findAllBasicPlatformComponents());
+    }
+
    /**
     * 根据平台id获取平台下所有组件
     * @param platformId
--- a/auto-solution-admin/src/main/java/com/solution/web/core/graph/GraphNode.java
+++ b/auto-solution-admin/src/main/java/com/solution/web/core/graph/GraphNode.java
@@ -33,6 +33,8 @@ public class GraphNode implements Serializable {

    private String category;

+    private boolean multiable;
+
    private List<Templateparameterdef> parameters;

    private List<GraphVariable> variables;
@@ -61,6 +63,14 @@ public class GraphNode implements Serializable {
                '}';
    }

+    public boolean isMultiable() {
+        return multiable;
+    }
+
+    public void setMultiable(boolean multiable) {
+        this.multiable = multiable;
+    }
+
    public String getCategory() {
        return category;
    }
--- a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeparameter.java
+++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeparameter.java
@@ -32,6 +32,8 @@ public class Nodeparameter extends BaseEntity
    @Excel(name = "节点实例设置的具体参数值 (覆盖模板默认值)")
    private String value;

+    private int groupIndex;
+
    public void setId(Long id) 
    {
        this.id = id;
@@ -80,6 +82,14 @@ public class Nodeparameter extends BaseEntity
        return value;
    }

+    public int getGroupIndex() {
+        return groupIndex;
+    }
+
+    public void setGroupIndex(int groupIndex) {
+        this.groupIndex = groupIndex;
+    }
+
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--- a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Templateparameterdef.java
+++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Templateparameterdef.java
@@ -42,6 +42,8 @@ public class Templateparameterdef extends BaseEntity
    @Excel(name = "判断参数模版是节点的参数模版还是条件的参数模版")
    private String templateType;

+    private int groupIndex;
+
    public void setId(Long id) 
    {
        this.id = id;
@@ -112,6 +114,14 @@ public class Templateparameterdef extends BaseEntity
        return templateType;
    }

+    public int getGroupIndex() {
+        return groupIndex;
+    }
+
+    public void setGroupIndex(int groupIndex) {
+        this.groupIndex = groupIndex;
+    }
+
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--- a/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml
+++ b/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml
@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="nodeInstanceId"    column="node_instance_id"    />
        <result property="paramDefId"    column="param_def_id"    />
        <result property="value"    column="value"    />
+        <result property="groupIndex"    column="group_index"    />
    </resultMap>

    <delete id="deleteByTreeId">
@@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </delete>

    <sql id="selectNodeparameterVo">
-        select id, treeId, node_instance_id, param_def_id, value from nodeparameter
+        select id, treeId, node_instance_id, param_def_id,`value`, group_index from nodeparameter
    </sql>

    <select id="selectNodeparameterList" parameterType="Nodeparameter" resultMap="NodeparameterResult">
@@ -41,12 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="nodeInstanceId != null">node_instance_id,</if>
            <if test="paramDefId != null">param_def_id,</if>
            <if test="value != null">value,</if>
+            group_index
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="treeId != null">#{treeId},</if>
            <if test="nodeInstanceId != null">#{nodeInstanceId},</if>
            <if test="paramDefId != null">#{paramDefId},</if>
            <if test="value != null">#{value},</if>
+            #{groupIndex}
         </trim>
    </insert>

@@ -57,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="nodeInstanceId != null">node_instance_id = #{nodeInstanceId},</if>
            <if test="paramDefId != null">param_def_id = #{paramDefId},</if>
            <if test="value != null">value = #{value},</if>
+            group_index=#{groupIndex}
        </trim>
        where id = #{id}
    </update>
--- a/auto-solution-rule/src/main/java/com/solution/rule/domain/BasicPlatform.java
+++ b/auto-solution-rule/src/main/java/com/solution/rule/domain/BasicPlatform.java
@@ -0,0 +1,47 @@
+package com.solution.rule.domain;
+/*
+ * This file is part of the kernelstudio package.
+ *
+ * (c) 2014-2026 zlin <admin@kernelstudio.com>
+ *
+ * For the full copyright and license information, please view the LICENSE file
+ * that was distributed with this source code.
+ */
+
+import java.io.Serializable;
+import java.util.List;
+
+public class BasicPlatform implements Serializable {
+
+
+    private Integer id;
+
+    private String name;
+
+    private String description;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+}
--- a/auto-solution-rule/src/main/java/com/solution/rule/domain/Platform.java
+++ b/auto-solution-rule/src/main/java/com/solution/rule/domain/Platform.java
@@ -8,43 +8,12 @@ package com.solution.rule.domain;
 * that was distributed with this source code.
 */

-import java.io.Serializable;
 import java.util.List;

-public class Platform implements Serializable {
-
-    private Integer id;
-
-    private String name;
-
-    private String description;
+public class Platform extends BasicPlatform {

    private List<PlatformComponent> components;

-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
    public List<PlatformComponent> getComponents() {
        return components;
    }
@@ -52,5 +21,4 @@ public class Platform implements Serializable {
    public void setComponents(List<PlatformComponent> components) {
        this.components = components;
    }
-
 }
--- a/auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java
+++ b/auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java
@@ -1,5 +1,6 @@
 package com.solution.rule.mapper;

+import com.solution.rule.domain.BasicPlatform;
 import com.solution.rule.domain.Platform;
 import com.solution.rule.domain.PlatformComponent;
 import com.solution.rule.domain.vo.ComponentCountVO;
@@ -44,4 +45,6 @@ public interface FireRuleMapper {
    List<Platform> findPlatformComponents(Integer scenarioId);

    List<Platform> findAllPlatformComponents();
+
+    List<BasicPlatform> findAllBasicPlatformComponents();
 }
--- a/auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
+++ b/auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
@@ -1,5 +1,6 @@
 package com.solution.rule.service;

+import com.solution.rule.domain.BasicPlatform;
 import com.solution.rule.domain.FireRuleExecuteDTO;
 import com.solution.rule.domain.Platform;
 import com.solution.rule.domain.PlatformComponent;
@@ -47,4 +48,6 @@ public interface FireRuleService {
    List<Platform> findPlatformComponents(Integer scenarioId);

    List<Platform> findAllPlatformComponents();
+
+    List<BasicPlatform> findAllBasicPlatformComponents();
 }
--- a/auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java
+++ b/auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java
@@ -3,10 +3,7 @@ package com.solution.rule.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.solution.common.constant.ExceptionConstants;
-import com.solution.rule.domain.FireRuleExecuteDTO;
-import com.solution.rule.domain.Platform;
-import com.solution.rule.domain.PlatformComponent;
-import com.solution.rule.domain.RuleParam;
+import com.solution.rule.domain.*;
 import com.solution.rule.domain.dto.WeaponModelDTO;
 import com.solution.rule.domain.vo.ComponentCountVO;
 import com.solution.rule.domain.vo.PlatformComponentNamesVO;
@@ -181,4 +178,9 @@ public class FireRuleServiceImpl implements FireRuleService {
        return ruleMapper.findAllPlatformComponents();
    }

+    @Override
+    public List<BasicPlatform> findAllBasicPlatformComponents() {
+        return ruleMapper.findAllBasicPlatformComponents();
+    }
+
 }
--- a/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml
+++ b/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml
@@ -85,6 +85,16 @@
        WHERE platform_id=#{platformId}
    </select>

+    <resultMap id="VPBasicPlatformMap" type="com.solution.rule.domain.BasicPlatform">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="description" column="description"/>
+    </resultMap>
+    <select id="findAllBasicPlatformComponents" resultMap="VPBasicPlatformMap">
+        SELECT *
+        FROM platform
+    </select>
+
    <resultMap id="VPlatformMap" type="com.solution.rule.domain.Platform">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
--- a/modeler/src/style.less
+++ b/modeler/src/style.less
@@ -1829,4 +1829,45 @@
    }
  }

+}
+
+.ks-add-parameter-action{
+  color: #eee;
+  position: absolute;
+  right: 14px;
+  top: 6px;
+  cursor: pointer;
+}
+
+.ks-parameter-setting-tabs{
+  .ant-tabs-nav{
+    background: none;
+  }
+  .ant-tabs-nav-list{
+    margin-left: 0;
+  }
+  &.ant-tabs-left >.ant-tabs-content-holder,
+  &.ant-tabs-left >div>.ant-tabs-content-holder{
+    border-left-color: #09264b;
+  }
+  .ant-tabs-tab-remove{
+    //position: absolute;
+    //right: 10px;
+    //top: 7px;
+    .anticon{
+      color: rgb(173 206 224);
+    }
+  }
+  &.ant-tabs-left >.ant-tabs-nav .ant-tabs-tab{
+    border-radius: 0!important;
+  }
+  &.ant-tabs-card >.ant-tabs-nav .ant-tabs-tab-active,
+  &.ant-tabs-card >div>.ant-tabs-nav .ant-tabs-tab-active {
+    background: #09264c;
+  }
+
+  &.ant-tabs-left >.ant-tabs-content-holder >.ant-tabs-content>.ant-tabs-tabpane,
+  &.ant-tabs-left >div>.ant-tabs-content-holder >.ant-tabs-content>.ant-tabs-tabpane{
+    padding-left: 5px;
+  }
 }
--- a/modeler/src/views/decision/designer/properties.vue
+++ b/modeler/src/views/decision/designer/properties.vue
@@ -73,58 +73,60 @@
        <template #leftExtra>
          <span class="ks-model-builder-title-icon icon-input"></span>
        </template>
+
+        <template #rightExtra v-if="multiableParameters">
+          <a-tooltip title="添加平台" placement="left">
+            <div class="ks-add-parameter-action" @click="()=> addParameterTab()">
+              <a-space>
+                <PlusCircleOutlined/>
+                <span>添加</span>
+              </a-space>
+            </div>
+          </a-tooltip>
+        </template>
        <a-tab-pane key="1" tab="节点变量">
+          <template v-if="currentElement.parameters && currentElement.parameters.length > 0">
+            <a-form
+              autocomplete="off"
+              layout="vertical"
+              name="basic"
+              style="padding-bottom:15px;"
+            >

-          <a-form
-            v-if="currentElement.parameters && currentElement.parameters.length > 0"
-            autocomplete="off"
-            layout="vertical"
-            name="basic"
-            style="padding-bottom:15px;"
-          >
-            <a-form-item v-for="setting in currentElement.parameters" :label="setting.description">
-              <a-input-number v-if="setting.dataType === 'double'" v-model:value="setting.defaultValue" :placeholder="setting.description" size="small" style="width:100%;" />
-              <a-input v-else v-model:value="setting.defaultValue" :placeholder="setting.description" size="small" />
-            </a-form-item>
-          </a-form>
+              <template v-if="multiableParameters">
+                <a-tabs class="ks-parameter-setting-tabs"
+                        v-model:activeKey="groupedParametersActiveTab"
+                        tab-position="left"
+                        hide-add
+                        size="small"
+                        type="editable-card"
+                        @edit="onEditParameterTab">
+                  <a-tab-pane v-for="(grouped,index) in groupedParameters" :key="index" :tab="`平台 ${index + 1}`" :closable="true">
+                    <a-form-item v-for="setting in grouped" :label="setting.description">
+                      <a-input-number v-if="setting.dataType === 'double'" v-model:value="setting.defaultValue"
+                                      :placeholder="setting.description" size="small" style="width:100%;" />
+                      <a-input v-else v-model:value="setting.defaultValue" :placeholder="setting.description" size="small" />
+                    </a-form-item>
+                  </a-tab-pane>
+<!--                  <template #leftExtra>-->
+<!--                    <a-button class="ks-btn" size="small" style="margin-bottom: 15px; width: 100%" block @click="()=> addParameterTab()">-->
+<!--                      <PlusOutlined />-->
+<!--&lt;!&ndash;                      <span>添加</span>&ndash;&gt;-->
+<!--                    </a-button>-->
+<!--                  </template>-->
+                </a-tabs>
+              </template>
+              <template v-else>
+                <a-form-item v-for="setting in currentElement.parameters" :label="setting.description">
+                  <a-input-number v-if="setting.dataType === 'double'" v-model:value="setting.defaultValue"
+                                  :placeholder="setting.description" size="small" style="width:100%;" />
+                  <a-input v-else v-model:value="setting.defaultValue" :placeholder="setting.description" size="small" />
+                </a-form-item>
+              </template>
+            </a-form>
+          </template>
          <a-empty v-else>
-
          </a-empty>
-<!--          <div class="w-full">-->
-<!--            <a-space>-->
-<!--              <a-button size="small" type="primary" @click="addVariable">添加</a-button>-->
-<!--            </a-space>-->
-<!--            <a-table-->
-<!--              :columns="actionSpaceColumns"-->
-<!--              :dataSource="currentElement.variables"-->
-<!--              :pagination="false"-->
-<!--              :scroll="{ x: 500 }"-->
-<!--              class="mt-1"-->
-<!--              row-key="key"-->
-<!--              size="small"-->
-<!--              style="overflow-y:auto;height:35vh;"-->
-<!--            >-->
-<!--              <template #bodyCell="{column, record, index}">-->
-<!--                <template v-if="column.dataIndex === 'index'">-->
-<!--                  {{ index + 1 }}-->
-<!--                </template>-->
-<!--                <template v-else-if="column.dataIndex === '_actions'">-->
-<!--                  <a-button-->
-<!--                    class="btn-link-delete"-->
-<!--                    danger-->
-<!--                    size="small"-->
-<!--                    type="text"-->
-<!--                    @click="()=> removeVariable(record)"-->
-<!--                  >-->
-<!--                    删除-->
-<!--                  </a-button>-->
-<!--                </template>-->
-<!--                <template v-else>-->
-<!--                  <a-input v-model:value="record[column.dataIndex]" size="small" />-->
-<!--                </template>-->
-<!--              </template>-->
-<!--            </a-table>-->
-<!--          </div>-->
        </a-tab-pane>
      </a-tabs>

@@ -147,8 +149,8 @@

 <script lang="ts">
 import { defineComponent, onMounted, type PropType, ref, watch } from 'vue';
-import { CheckOutlined } from '@ant-design/icons-vue';
-import type { ElementVariable, GraphTaskElement } from '../graph';
+import { CheckOutlined, PlusCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
+import type { ElementParameter, ElementVariable, GraphTaskElement } from '../graph';
 import type { BehaviorTree } from './tree';
 import type { Graph, Node, NodeProperties } from '@antv/x6';
 import { generateKey } from '@/utils/strings';
@@ -162,7 +164,7 @@ const actionSpaceColumns = [
 ];

 export default defineComponent({
-  components: { CheckOutlined },
+  components: { CheckOutlined, PlusOutlined, PlusCircleOutlined },
  props: {
    tree: { type: [Object, null] as PropType<BehaviorTree | null | undefined>, required: false },
    treeEditing: { type: Boolean as PropType<boolean>, required: true, default: false },
@@ -180,10 +182,98 @@ export default defineComponent({
    const currentNode = ref<Node | null>(props.node ?? null);
    const currentElement = ref<GraphTaskElement | null>(null);

-    const load = () => {
+    const emptyParameters = ref<ElementParameter[]>([]);
+    const groupedParameters = ref<Array<ElementParameter[]>>([]);
+    const multiableParameters = ref<boolean>(false);
+    const groupedParametersActiveTab = ref<number>(0);
+
+    const createEmptyParameters = (): ElementParameter[] => {
+      try {
+        return JSON.parse(JSON.stringify(currentElement.value?.parameters ?? [])) as ElementParameter[];
+      } catch (e: any) {
+        return [];
+      }
    };

+    const dumpParameters = (): ElementParameter[] => {
+      return JSON.parse(JSON.stringify(emptyParameters.value)) as ElementParameter[];
+    };
+
+    const addParameterTab = () => {
+      let newParameters = dumpParameters();
+      // 新增一个空的参数分组
+      groupedParameters.value.push(newParameters);
+      // 自动切换到新增的分组
+      groupedParametersActiveTab.value = groupedParameters.value.length - 1;
+    };
+
+
+    const removeParameterTab = (index: number) => {
+      // 边界判断：防止删除不存在的分组 / 只剩一个分组时禁止删除
+      if (index < 0 || index >= groupedParameters.value.length) return;
+      if (groupedParameters.value.length <= 1) return;
+
+      // 从数组中删除对应索引的分组
+      groupedParameters.value.splice(index, 1);
+
+      if (groupedParameters.value.length === 0) {
+        groupedParameters.value.push(dumpParameters());
+      }
+
+      // 删除后处理激活状态：
+      // 如果删除的是最后一个分组，激活前一个
+      if (groupedParametersActiveTab.value >= groupedParameters.value.length) {
+        groupedParametersActiveTab.value = groupedParameters.value.length - 1;
+      }
+
+    };
+
+    const onEditParameterTab = (targetKey: number | MouseEvent, action: string) => {
+      if (action === 'add') {
+        addParameterTab();
+      } else {
+        removeParameterTab(targetKey as number);
+      }
+    };
+
+    const resolveGroupedParameters = () => {
+      emptyParameters.value = createEmptyParameters();
+      // 解构获取当前元素的关键属性，简化代码
+      const { multiable, parameters } = currentElement.value || {};
+
+      // 1. 不满足多分组条件：直接清空分组
+      if (multiable !== true || !parameters || parameters.length === 0) {
+        groupedParameters.value = [];
+        multiableParameters.value = multiable === true;
+        return;
+      }
+
+      // 2. 满足条件：根据 groupIndex 对参数进行分组
+      // 第一步：用 Map 做临时分组（key=groupIndex，value=当前分组的参数数组）
+      const groupMap = new Map<number, ElementParameter[]>();
+      parameters.forEach(param => {
+        const index = param.groupIndex;
+        // 如果 Map 中没有该分组，先初始化空数组
+        if (!groupMap.has(index)) {
+          groupMap.set(index, []);
+        }
+        // 将当前参数推入对应分组
+        groupMap.get(index)!.push(param);
+      });
+
+      // 第二步：将 Map 转换为二维数组（按 groupIndex 升序排序）
+      groupedParameters.value = Array.from(groupMap.entries())
+        // 按分组索引从小到大排序（保证分组顺序正确）
+        .sort((a, b) => a[0] - b[0])
+        // 只保留分组后的参数数组，丢弃 key
+        .map(item => item[1]);
+
+      multiableParameters.value = multiable === true && groupedParameters.value.length > 0;
+    };
+
+
    const resolveNode = (n?: Node | null | undefined) => {
+      groupedParametersActiveTab.value = 0;
      currentNode.value = n ?? null;
      if (n) {
        const data = n.getData();
@@ -191,6 +281,7 @@ export default defineComponent({
      } else {
        currentElement.value = null;
      }
+      resolveGroupedParameters();
    };

    const addVariable = () => {
@@ -218,10 +309,20 @@ export default defineComponent({
    };

    const updateNode = () => {
-      console.error('currentElement.value',currentElement.value)
      if (currentNode.value && currentElement.value) {
        // 深拷贝当前元素数据
        const newElement = JSON.parse(JSON.stringify(currentElement.value)) as GraphTaskElement;
+
+        if (multiableParameters.value) {
+          newElement.parameters = groupedParameters.value.flatMap((group, groupIndex) => {
+            // 遍历每个分组，给组内所有参数统一设置/保持 groupIndex
+            return group.map(param => ({
+              ...param,
+              groupIndex: groupIndex // 强制保证：当前参数的分组索引 = 所在分组的索引
+            }));
+          });
+        }
+
        // 更新节点数据
        currentNode.value.replaceData(newElement);
        // 触发事件通知父组件
@@ -229,6 +330,9 @@ export default defineComponent({
      }
    };

+    const load = () => {
+    };
+
    watch(
      () => props.node,
      (n?: Node | null | undefined) => resolveNode(n),
@@ -251,11 +355,18 @@ export default defineComponent({
      { deep: true, immediate: true },
    );

+    watch(() => groupedParameters.value, () => updateNode(), { deep: true });
+
    watch(() => currentElement.value, () => updateNode(), { deep: true });

    onMounted(() => load());

    return {
+      addParameterTab,
+      groupedParametersActiveTab,
+      multiableParameters,
+      onEditParameterTab,
+      groupedParameters,
      actionSpaceColumns,
      activeTopTabsKey,
      activeBottomTabsKey,