diff --git 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 index e8e8b53..d3d500e 100644 --- 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 diff --git 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 index 71f3d2a..fa3b643 100644 --- 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 parameters; private List 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; } diff --git 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 index 59acd0a..9c637d8 100644 --- 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) diff --git 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 index b62ab7a..e830cd4 100644 --- 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) diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml index b0a4f20..1cddc6f 100644 --- 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" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 + + + + + + + diff --git a/modeler/src/style.less b/modeler/src/style.less index ad463ef..90ecaf0 100644 --- 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; + } } \ No newline at end of file diff --git a/modeler/src/views/decision/designer/properties.vue b/modeler/src/views/decision/designer/properties.vue index bc03c30..9f96f84 100644 --- a/modeler/src/views/decision/designer/properties.vue +++ b/modeler/src/views/decision/designer/properties.vue @@ -73,58 +73,60 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -147,8 +149,8 @@