From 494dbd208b56675d322783fcd7e425fc4267bdc2 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Thu, 12 Jun 2025 13:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A0=B8=E5=BF=83=E5=8F=91?= =?UTF-8?q?=E5=B8=83:=208.2.80=20=20=201)=20=E4=BF=AE=E5=A4=8D=E7=94=BB?= =?UTF-8?q?=E5=9B=BE=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A4=8D=E5=88=B6=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E5=BD=A2=E7=9A=84=20parent=20=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=BB=E5=B8=83=E7=9A=84=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AE=B9=E5=99=A8=20id=20=E7=9A=84=20bug.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 基础框架发布: 8.2.18 1) 修复规则引擎的决策树和决策表中引入枚举变量是的无法编译的问题。 2）增加规则引擎导出时的文件添加类型标识(_model.json:模型; _lib.json: 特征库; _meta.json: 元数据) 3) 修复规则引擎深度复制(新)出现错误的 Bug --- cips.frontend/package.json | 4 +-- erm.frontend/package.json | 4 +-- gradle.properties | 4 +-- io.sc.engine.mv.frontend/package.json | 4 +-- .../impl/processor/DecisionTree.java | 23 ++++++------ .../impl/processor/ExecutionFlow.java | 36 +++++++++---------- io.sc.engine.rule.frontend/package.json | 4 +-- .../controller/DictionaryWebController.java | 2 +- .../lib/controller/LibWebController.java | 2 +- .../converter/ParameterEntityConverter.java | 4 +-- .../parameter/InOptionParameterEntity.java | 16 ++++----- .../controller/ResourceWebController.java | 2 +- io.sc.engine.st.frontend/package.json | 4 +-- io.sc.platform.ai.frontend/package.json | 4 +-- io.sc.platform.core.frontend/package.json | 2 +- .../graph/handler/PlatformKeyBindHandler.ts | 7 ++-- .../maxgraph/AutoCompletionManager.ts | 1 - .../template-project/package.json | 4 +-- .../maxgraph/AutoCompletionManager.ts | 1 - io.sc.platform.developer.doc/package.json | 4 +-- .../package.json | 4 +-- io.sc.platform.lcdp.frontend/package.json | 4 +-- .../package.json | 4 +-- io.sc.platform.mvc.frontend/package.json | 4 +-- .../package.json | 4 +-- io.sc.platform.system.frontend/package.json | 4 +-- io.sc.standard.frontend/package.json | 4 +-- io.sc.website/package.json | 4 +-- wra.report.frontend/package.json | 4 +-- 29 files changed, 82 insertions(+), 86 deletions(-) diff --git a/cips.frontend/package.json b/cips.frontend/package.json index a4663029..09cdfe58 100644 --- a/cips.frontend/package.json +++ b/cips.frontend/package.json @@ -1,6 +1,6 @@ { "name": "cips.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 07eaa2eb..b0d60f59 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index 86711fa4..99d943cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,9 +37,9 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.2.17 +platform_version=8.2.18 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.79 +platform_core_frontend_version=8.2.80 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index bf9ea3e0..2a8028c0 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.mv.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java index 668edb70..0d91cad5 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java @@ -4,8 +4,7 @@ import io.sc.engine.rule.core.mxgraph.parser.DecisionTreeParser; import io.sc.engine.rule.core.mxgraph.po.*; import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.DecisionTreeParameterProcessor; -import io.sc.engine.rule.core.util.ExpressionReplacer; -import io.sc.platform.util.StringUtil; +import io.sc.engine.rule.core.util.GroovyExpressionReplacer; import java.util.ArrayList; import java.util.HashMap; @@ -81,7 +80,7 @@ public class DecisionTree { */ private String generateConditionGroovyCode(Map methodNameCache,Parameter parameter,ConditionNode conditionNode,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//条件判断").append("\n"); + sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//条件判断").append("\n"); List branches =conditionNode.getOuts(); //获取条件的所有出口边 if(branches!=null && branches.size()>0) { List outs =orderEdges(branches); //对出口边进行排序，有条件的放前面，无条件的放后面 @@ -90,10 +89,10 @@ public class DecisionTree { GraphNode nexNode =edge.getOuts().get(0); //出口边指向的节点 if(i==0) { - sb.append("\tif((").append(ExpressionReplacer.groovy(conditionNode.getCondition(),null)).append(")==").append(ExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); + sb.append("\tif((").append(GroovyExpressionReplacer.groovy(conditionNode.getCondition(),null)).append(")==").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); }else { if(edge.getValue()!=null && !edge.getValue().trim().isEmpty()) { - sb.append("else if((").append(ExpressionReplacer.groovy(conditionNode.getCondition(),null)).append(")==").append(ExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); + sb.append("else if((").append(GroovyExpressionReplacer.groovy(conditionNode.getCondition(),null)).append(")==").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); }else { sb.append("else {").append("\n"); } @@ -107,7 +106,7 @@ public class DecisionTree { } } } - sb.append("\t\t").append("return Tree_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(ExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); + sb.append("\t\t").append("return Tree_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); sb.append("\t}"); } sb.append("\n}\n\n"); @@ -129,13 +128,13 @@ public class DecisionTree { */ private String generateExpressionGroovyCode(Map methodNameCache,Parameter parameter,ExpressionNode expressionNode,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//表达式").append("\n"); + sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//表达式").append("\n"); String expression =expressionNode.getExpression(); String commands =expressionNode.getCommands(); if(commands!=null && !commands.isEmpty()) { - sb.append("\t").append(ExpressionReplacer.groovy(commands,null)).append("\n"); + sb.append("\t").append(GroovyExpressionReplacer.groovy(commands,null)).append("\n"); } - sb.append("\t").append("return ").append(ExpressionReplacer.groovy(expression,parameter.getValueType())).append(";\n"); + sb.append("\t").append("return ").append(GroovyExpressionReplacer.groovy(expression,parameter.getValueType())).append(";\n"); sb.append("}").append("\n\n"); return sb.toString(); @@ -151,9 +150,9 @@ public class DecisionTree { */ private String generateResourceAbstractGroovyCode(Map methodNameCache,Parameter parameter,ResourceAbstractNode expressionNode,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); - String code =ExpressionReplacer.groovy(expressionNode.getCode(),String.class.getName()); - String version =ExpressionReplacer.groovy(expressionNode.getVersion(),Long.class.getName()); + sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); + String code =GroovyExpressionReplacer.groovy(expressionNode.getCode(),String.class.getName()); + String version =GroovyExpressionReplacer.groovy(expressionNode.getVersion(),Long.class.getName()); if(version==null || version.trim().isEmpty()) { version ="null"; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java index 5064daeb..72f62008 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java @@ -4,7 +4,7 @@ import io.sc.engine.rule.core.mxgraph.parser.ExecutionFlowParser; import io.sc.engine.rule.core.mxgraph.po.*; import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.ExecutionFlowParameterProcessor; -import io.sc.engine.rule.core.util.ExpressionReplacer; +import io.sc.engine.rule.core.util.GroovyExpressionReplacer; import io.sc.platform.util.StringUtil; import java.util.ArrayList; @@ -101,7 +101,7 @@ public class ExecutionFlow { */ private String generateConditionGroovyCode(Map methodNameCache,Parameter parameter,ConditionNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//条件判断").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//条件判断").append("\n"); List branches =node.getOuts(); //获取条件的所有出口边 if(branches!=null && branches.size()>0) { List outs =orderEdges(branches); //对出口边进行排序，有条件的放前面，无条件的放后面 @@ -109,10 +109,10 @@ public class ExecutionFlow { EdgeConditionBranchNode edge =(EdgeConditionBranchNode)outs.get(i); //出口边 GraphNode nexNode =edge.getOuts().get(0); //出口边指向的节点 if(i==0) { - sb.append("\tif((").append(ExpressionReplacer.groovy(node.getCondition(),null)).append(")==").append(ExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); + sb.append("\tif((").append(GroovyExpressionReplacer.groovy(node.getCondition(),null)).append(")==").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); }else { if(edge.getValue()!=null && !edge.getValue().trim().isEmpty()) { - sb.append("else if((").append(ExpressionReplacer.groovy(node.getCondition(),null)).append(")==").append(ExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); + sb.append("else if((").append(GroovyExpressionReplacer.groovy(node.getCondition(),null)).append(")==").append(GroovyExpressionReplacer.groovy(edge.getValue(),edge.getValueType())).append("){").append("\n"); }else { sb.append("else {").append("\n"); } @@ -126,7 +126,7 @@ public class ExecutionFlow { } } } - sb.append("\t\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(ExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); + sb.append("\t\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); sb.append("\t}"); } sb.append("\n}\n\n"); @@ -148,14 +148,14 @@ public class ExecutionFlow { */ private String generateParallelGroovyCode(Map methodNameCache,Parameter parameter,ParallelNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//并发网关").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//并发网关").append("\n"); List outs =node.getOuts(); //获取条件的所有出口边 if(outs!=null && outs.size()>0) { for(int i=0;i methodNameCache,Parameter parameter,CommandSetNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//指令集").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//指令集").append("\n"); String commands =node.getCommands(); if(commands!=null && !commands.isEmpty()) { - sb.append("\t").append(ExpressionReplacer.groovy(commands,null)).append("\n"); + sb.append("\t").append(GroovyExpressionReplacer.groovy(commands,null)).append("\n"); //继续调用后续方法 List edges =node.getOuts(); //获取条件的所有出口边 if(edges!=null && edges.size()>0) { for(GraphNode edge : edges) { GraphNode nexNode =edge.getOuts().get(0); //出口边指向的节点 - sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(ExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); + sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); } } } @@ -212,7 +212,7 @@ public class ExecutionFlow { */ private String generateResourceAbstractGroovyCode(Map methodNameCache,Parameter parameter,ResourceAbstractNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); String code =node.getCode(); String version =node.getVersion(); if(version==null || version.trim().equals("")) { @@ -225,7 +225,7 @@ public class ExecutionFlow { if(edges!=null && edges.size()>0) { for(GraphNode edge : edges) { GraphNode nexNode =edge.getOuts().get(0); //出口边指向的节点 - sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(ExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); + sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); } } sb.append("}").append("\n\n"); @@ -251,7 +251,7 @@ public class ExecutionFlow { */ private String generateConfigurableResourceAbstractGroovyCode(Map methodNameCache,Parameter parameter,ConfigurableResourceAbstractNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//可配置资源").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//可配置资源").append("\n"); String code =node.getCode(); String version =node.getVersion(); String inputCommands =node.getInputCommands(); @@ -262,19 +262,19 @@ public class ExecutionFlow { sb.append("\t//准备调用资源的输入参数\n"); sb.append("\t").append("Map map =new HashMap();").append("\n"); - sb.append("\t").append(StringUtil.tabs(ExpressionReplacer.groovy(inputCommands,null),1)).append("\n"); + sb.append("\t").append(StringUtil.tabs(GroovyExpressionReplacer.groovy(inputCommands,null),1)).append("\n"); sb.append("\n"); sb.append("\t//调用资源\n"); sb.append("\t").append("ResourceResult result =executor.executeByCode(\"").append(code).append("\",").append(version).append(",map);").append("\n"); sb.append("\n"); sb.append("\t//处理资源调用完毕后的输出值\n"); - sb.append("\t").append(ExpressionReplacer.groovy(outputCommands,null).replace("\n", "\n\t\t")).append("\n"); + sb.append("\t").append(GroovyExpressionReplacer.groovy(outputCommands,null).replace("\n", "\n\t\t")).append("\n"); //继续调用后续方法 List edges =node.getOuts(); //获取条件的所有出口边 if(edges!=null && edges.size()>0) { for(GraphNode edge : edges) { GraphNode nexNode =edge.getOuts().get(0); //出口边指向的节点 - sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(ExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); + sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); } } sb.append("}").append("\n\n"); @@ -300,7 +300,7 @@ public class ExecutionFlow { */ private String generateModelAbstractGroovyCode(Map methodNameCache,Parameter parameter,SubModelAbstractNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//模型").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//模型").append("\n"); String code =node.getCode(); sb.append("\t").append("").append(code).append("(executor,arg);\n"); //继续调用后续方法 @@ -308,7 +308,7 @@ public class ExecutionFlow { if(edges!=null && edges.size()>0) { for(GraphNode edge : edges) { GraphNode nexNode =edge.getOuts().get(0); //出口边指向的节点 - sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(ExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); + sb.append("\t").append("Flow_").append(parameter.getCode()).append("_").append(nexNode.getId()).append("(").append("executor,").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(");").append("\n"); } } sb.append("}").append("\n\n"); diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 05a9171a..5f32c3cd 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.rule.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/controller/DictionaryWebController.java b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/controller/DictionaryWebController.java index b2dc76ba..ba3c16ed 100644 --- a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/controller/DictionaryWebController.java +++ b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/controller/DictionaryWebController.java @@ -158,7 +158,7 @@ public class DictionaryWebController extends RestCrudController addtions =new ArrayList<>(); + protected List additions =new ArrayList<>(); @Override public InOptionParameterVo toVo() { @@ -51,11 +51,11 @@ public class InOptionParameterEntity extends ParameterEntity { public void setOptions(List options) { this.options = options; } - public List getAddtions() { - return addtions; + public List getAdditions() { + return additions; } - public void setAddtions(List addtions) { - this.addtions = addtions; + public void setAdditions(List additions) { + this.additions = additions; } @Override @@ -93,12 +93,12 @@ public class InOptionParameterEntity extends ParameterEntity { } //additions - List additions =this.getAddtions(); + List additions =this.getAdditions(); if(additions!=null && additions.size()>0) { for(ParameterInOptionAdditionEntity addition : additions) { ParameterInOptionAdditionEntity clone =(ParameterInOptionAdditionEntity)addition.deepClone(); clone.setParameter(entity); - entity.getAddtions().add(clone); + entity.getAdditions().add(clone); } } return entity; @@ -115,7 +115,7 @@ public class InOptionParameterEntity extends ParameterEntity { } } //additions - List additions =this.getAddtions(); + List additions =this.getAdditions(); if(additions!=null && additions.size()>0) { for(ParameterInOptionAdditionEntity addition : additions) { addition.clearId(); diff --git a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/controller/ResourceWebController.java b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/controller/ResourceWebController.java index 4f2cdee0..dabc08f5 100644 --- a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/controller/ResourceWebController.java +++ b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/controller/ResourceWebController.java @@ -236,7 +236,7 @@ public class ResourceWebController extends RestCrudController { return this.doAutoCompletion(context); }; diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 143fe391..d1abf267 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.2.79", + "version": "8.2.80", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/AutoCompletionManager.ts b/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/AutoCompletionManager.ts index c2950e69..1203232e 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/AutoCompletionManager.ts +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/AutoCompletionManager.ts @@ -216,7 +216,6 @@ class AutoCompletionManager { } public autoCompletion(): any { - console.log('????'); return (context: any) => { return this.doAutoCompletion(context); }; diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index 9c3202f6..98f170e2 100644 --- a/io.sc.platform.developer.doc/package.json +++ b/io.sc.platform.developer.doc/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.doc", - "version": "8.2.17", + "version": "8.2.18", "description": "", "main": "index.js", "scripts": { @@ -28,7 +28,7 @@ "vuepress": "2.0.0-rc.15" }, "dependencies": { - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "vue": "3.5.13", "vue-i18n": "11.0.1" diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index d0b00cb2..192f1a51 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 987ba576..21213f8b 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.lcdp.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 184b9bb3..499c9756 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.license.keygen.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index a34f173f..7dca89e2 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.mvc.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index 33c06772..2051d94a 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.scheduler.manager.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 487ab8cd..a1072caf 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.system.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index 9d46a66a..dc4bcf1e 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.standard.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.website/package.json b/io.sc.website/package.json index e0a513c0..e72da2f8 100644 --- a/io.sc.website/package.json +++ b/io.sc.website/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.website", - "version": "8.2.17", + "version": "8.2.18", "description": "", "main": "index.js", "scripts": { @@ -28,6 +28,6 @@ }, "dependencies": { "vue": "3.5.13", - "platform-core": "8.2.79" + "platform-core": "8.2.80" } } \ No newline at end of file diff --git a/wra.report.frontend/package.json b/wra.report.frontend/package.json index 6a0c0661..ce1ac053 100644 --- a/wra.report.frontend/package.json +++ b/wra.report.frontend/package.json @@ -1,6 +1,6 @@ { "name": "wra.report.frontend", - "version": "8.2.17", + "version": "8.2.18", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.79", + "platform-core": "8.2.80", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7",