From 2ca66b458c6ab7a2f1c68ad42dab0845110e57d9 Mon Sep 17 00:00:00 2001 From: canonical Date: Sun, 11 Aug 2024 22:21:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nop-cli-core/reflect-config.json | 41 +++++++++++++++++++ .../src/main/resources/nop-vfs-index.txt | 1 + .../nop/quarkus/core/QuarkusIntegration.java | 3 +- .../model/_gen/_RuleOutputDefineModel.java | 28 +++++++++++++ .../_templates/_NopRuleDefinition.json | 4 +- .../_templates/_NopRuleInput.json | 2 +- .../_templates/_NopRuleOutputValue.json | 2 +- .../testDecisionMatrix/output/response.json5 | 22 +++++----- .../output/tables/nop_rule_definition.csv | 4 +- .../testImport/output/response.json5 | 10 ++--- .../output/tables/nop_rule_definition.csv | 2 +- .../output/tables/nop_rule_node.csv | 22 +++++----- .../output/tables/nop_file_record.csv | 2 +- .../output/tables/nop_rule_definition.csv | 2 +- .../output/tables/nop_rule_node.csv | 24 +++++------ 15 files changed, 120 insertions(+), 49 deletions(-) diff --git a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json index 914a040c1..937e2a2e2 100644 --- a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json +++ b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json @@ -910,16 +910,31 @@ "allowWrite": false, "name": "PARAM_BIZ_OBJ_NAME" }, + { + "allowUnsafeAccess": false, + "allowWrite": false, + "name": "PARAM_DISPLAY_NAME" + }, { "allowUnsafeAccess": false, "allowWrite": false, "name": "PARAM_ENTITY_NAME" }, + { + "allowUnsafeAccess": false, + "allowWrite": false, + "name": "PARAM_FIELD_DISPLAY_NAME" + }, { "allowUnsafeAccess": false, "allowWrite": false, "name": "PARAM_FIELD_NAME" }, + { + "allowUnsafeAccess": false, + "allowWrite": false, + "name": "PARAM_OBJ_NAME" + }, { "allowUnsafeAccess": false, "allowWrite": false, @@ -15140,6 +15155,10 @@ "boolean" ] }, + { + "name": "getColExtendForSibling", + "parameterTypes": [] + }, { "name": "getColParent", "parameterTypes": [] @@ -15204,6 +15223,10 @@ "name": "getProcessExpr", "parameterTypes": [] }, + { + "name": "getRowExtendForSibling", + "parameterTypes": [] + }, { "name": "getRowParent", "parameterTypes": [] @@ -15260,6 +15283,12 @@ "boolean" ] }, + { + "name": "setColExtendForSibling", + "parameterTypes": [ + "java.lang.Boolean" + ] + }, { "name": "setColParent", "parameterTypes": [ @@ -15380,6 +15409,12 @@ "boolean" ] }, + { + "name": "setRowExtendForSibling", + "parameterTypes": [ + "java.lang.Boolean" + ] + }, { "name": "setRowParent", "parameterTypes": [ @@ -26165,6 +26200,12 @@ "io.nop.core.lang.eval.IEvalAction" ] }, + { + "name": "setValidator", + "parameterTypes": [ + "io.nop.core.lang.eval.IEvalFunction" + ] + }, { "name": "setValidator", "parameterTypes": [ diff --git a/nop-cli-core/src/main/resources/nop-vfs-index.txt b/nop-cli-core/src/main/resources/nop-vfs-index.txt index 157c137e8..c25d82b67 100644 --- a/nop-cli-core/src/main/resources/nop-vfs-index.txt +++ b/nop-cli-core/src/main/resources/nop-vfs-index.txt @@ -105,6 +105,7 @@ /nop/report/xlib/xpt-rt.xlib /nop/report/xlib/xpt.xlib /nop/rpc/imp/api.imp.xml +/nop/rpc/imp/api.imp.xml.rej /nop/rpc/imp/template.api.xlsx /nop/schema/action-auth.xdef /nop/schema/api.xdef diff --git a/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java b/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java index 5285182f8..aa782a01f 100644 --- a/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java +++ b/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java @@ -10,6 +10,7 @@ import io.micrometer.core.instrument.MeterRegistry; import io.nop.api.core.ApiConfigs; import io.nop.api.core.config.AppConfig; +import io.nop.api.core.convert.ConvertHelper; import io.nop.api.core.ioc.BeanContainer; import io.nop.commons.metrics.GlobalMeterRegistry; import io.nop.commons.util.StringHelper; @@ -38,7 +39,7 @@ public static void start() { if (parentProfile.isPresent()) { System.setProperty(ApiConfigs.CFG_PROFILE_PARENT.getName(), parentProfile.get()); - AppConfig.getConfigProvider().updateConfigValue(ApiConfigs.CFG_PROFILE_PARENT, parentProfile.get()); + AppConfig.getConfigProvider().updateConfigValue(ApiConfigs.CFG_PROFILE_PARENT, ConvertHelper.toCsvSet(parentProfile.get())); } BeanContainer.registerInstance(new NopQuarkusBeanContainer()); diff --git a/nop-rule/nop-rule-core/src/main/java/io/nop/rule/core/model/_gen/_RuleOutputDefineModel.java b/nop-rule/nop-rule-core/src/main/java/io/nop/rule/core/model/_gen/_RuleOutputDefineModel.java index a443221bd..ed8e1607f 100644 --- a/nop-rule/nop-rule-core/src/main/java/io/nop/rule/core/model/_gen/_RuleOutputDefineModel.java +++ b/nop-rule/nop-rule-core/src/main/java/io/nop/rule/core/model/_gen/_RuleOutputDefineModel.java @@ -23,6 +23,13 @@ public abstract class _RuleOutputDefineModel extends io.nop.xlang.xmeta.ObjVarDe */ private io.nop.rule.core.model.RuleAggregateMethod _aggregate ; + /** + * + * xml name: mandatory + * + */ + private boolean _mandatory = false; + /** * * xml name: useWeight @@ -49,6 +56,25 @@ public void setAggregate(io.nop.rule.core.model.RuleAggregateMethod value){ } + /** + * + * xml name: mandatory + * + */ + + public boolean isMandatory(){ + return _mandatory; + } + + + public void setMandatory(boolean value){ + checkAllowChange(); + + this._mandatory = value; + + } + + /** * * xml name: useWeight @@ -84,6 +110,7 @@ protected void outputJson(IJsonHandler out){ super.outputJson(out); out.putNotNull("aggregate",this.getAggregate()); + out.putNotNull("mandatory",this.isMandatory()); out.putNotNull("useWeight",this.isUseWeight()); } @@ -97,6 +124,7 @@ protected void copyTo(RuleOutputDefineModel instance){ super.copyTo(instance); instance.setAggregate(this.getAggregate()); + instance.setMandatory(this.isMandatory()); instance.setUseWeight(this.isUseWeight()); } diff --git a/nop-rule/nop-rule-meta/_templates/_NopRuleDefinition.json b/nop-rule/nop-rule-meta/_templates/_NopRuleDefinition.json index 3c8c73fb6..ff640a070 100644 --- a/nop-rule/nop-rule-meta/_templates/_NopRuleDefinition.json +++ b/nop-rule/nop-rule-meta/_templates/_NopRuleDefinition.json @@ -21,8 +21,8 @@ "modelTextXmlComponent": null, "ruleInputs": null, "ruleOutputs": null, - "beforeExecute": null, + "beforeExecute": "", "importFile": null, "rootRuleNodes": null, - "decisionMatrix": null + "decisionMatrix": "" } \ No newline at end of file diff --git a/nop-rule/nop-rule-meta/_templates/_NopRuleInput.json b/nop-rule/nop-rule-meta/_templates/_NopRuleInput.json index 7561a20d5..30e1ba939 100644 --- a/nop-rule/nop-rule-meta/_templates/_NopRuleInput.json +++ b/nop-rule/nop-rule-meta/_templates/_NopRuleInput.json @@ -4,7 +4,7 @@ "type": "", "mandatory": null, "computed": null, - "defaultExpr": null, + "defaultExpr": "", "description": "", "schema": null } \ No newline at end of file diff --git a/nop-rule/nop-rule-meta/_templates/_NopRuleOutputValue.json b/nop-rule/nop-rule-meta/_templates/_NopRuleOutputValue.json index 30910c82d..92ccf46e7 100644 --- a/nop-rule/nop-rule-meta/_templates/_NopRuleOutputValue.json +++ b/nop-rule/nop-rule-meta/_templates/_NopRuleOutputValue.json @@ -1,4 +1,4 @@ { "name": "", - "valueExpr": null + "valueExpr": "" } \ No newline at end of file diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/response.json5 b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/response.json5 index 9ec993990..303ae3831 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/response.json5 +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/response.json5 @@ -8,21 +8,21 @@ "ruleGroup": "default", "ruleType": "MATX", "ruleType_label": "MATX-决策矩阵", - "modelText": "\n \n \n \n \n \n 1\n \n \n \n \n \n \n 2\n \n \n \n \n \n \n 3\n \n \n \n \n \n \n 4\n \n \n \n \n \n \n 5\n \n \n \n \n \n \n 6\n \n \n \n \n \n \n 7\n \n \n \n \n \n \n 8\n \n \n \n \n \n \n 9\n \n \n \n \n \n \n 10\n \n \n \n \n \n \n 11\n \n \n \n \n \n \n 12\n \n \n \n \n \n \n 13\n \n \n \n \n \n \n 14\n \n \n 'A'\n \n \n \n \n \n \n 15\n \n \n \n \n \n \n 16\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n baseInfo.gender\n \n \n \n \n \n \n \n \n \n \n \n", + "modelText": "\n \n \n \n \n \n 1\n \n \n \n \n \n \n 2\n \n \n \n \n \n \n 3\n \n \n \n \n \n \n 4\n \n \n \n \n \n \n 5\n \n \n \n \n \n \n 6\n \n \n \n \n \n \n 7\n \n \n \n \n \n \n 8\n \n \n \n \n \n \n 9\n \n \n \n \n \n \n 10\n \n \n \n \n \n \n 11\n \n \n \n \n \n \n 12\n \n \n \n \n \n \n 13\n \n \n \n \n \n \n 14\n \n \n 'A'\n \n \n \n \n \n \n 15\n \n \n \n \n \n \n 16\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n baseInfo.gender\n \n \n \n \n \n \n \n \n \n \n \n", "status": 1, "status_label": "1-启用", "version": 0, "createdBy": "autotest-ref", - "createTime": "@var:NopRuleDefinition@createTime", + "createTime": "@var:NopRuleDefinition@updateTime", "updatedBy": "autotest-ref", - "updateTime": "@var:NopRuleDefinition@createTime", + "updateTime": "@var:NopRuleDefinition@updateTime", "ruleInputs": [ { "name": "是否有房", "displayName": "是否有房", "type": "Boolean", - "mandatory": "true", - "computed": "false", + "mandatory": true, + "computed": false, "defaultExpr": null, "description": null, "schema": {} @@ -31,8 +31,8 @@ "name": "是否已婚", "displayName": "是否已婚", "type": "String", - "mandatory": "true", - "computed": "false", + "mandatory": true, + "computed": false, "defaultExpr": null, "description": null, "schema": {} @@ -41,8 +41,8 @@ "name": "baseInfo", "displayName": "基础信息", "type": "Object", - "mandatory": "true", - "computed": "false", + "mandatory": true, + "computed": false, "defaultExpr": null, "description": null, "schema": { @@ -96,8 +96,8 @@ "name": "gender", "displayName": "性别", "type": "Integer", - "mandatory": "true", - "computed": "true", + "mandatory": true, + "computed": true, "defaultExpr": "<_>baseInfo.gender", "description": null, "schema": { diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_rule_definition.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_rule_definition.csv index 74ae39013..498908164 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_rule_definition.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_rule_definition.csv @@ -228,10 +228,10 @@ A,@var:NopRuleDefinition@ruleId,testMatrix,1,Test Matrix,default,MATX,," - + - + diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 index 6f27ef2b1..7aa6639f7 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 @@ -8,7 +8,7 @@ "ruleGroup": "default", "ruleType": "TREE", "ruleType_label": "TREE-决策树", - "modelText": "\n \n \n \n \n \n \n \n \n \n \n \n \n \n", + "modelText": "\n \n \n \n \n \n \n \n \n \n \n \n \n \n", "status": 1, "status_label": "1-启用", "version": 0, @@ -21,8 +21,8 @@ "name": "season", "displayName": "季度", "type": "String", - "mandatory": "true", - "computed": "false", + "mandatory": true, + "computed": false, "defaultExpr": null, "description": null, "schema": {} @@ -31,8 +31,8 @@ "name": "guestCount", "displayName": "客人数", "type": "Integer", - "mandatory": "true", - "computed": "false", + "mandatory": true, + "computed": false, "defaultExpr": null, "description": null, "schema": {} diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_definition.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_definition.csv index fd4b77bb7..30aa0fadb 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_definition.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_definition.csv @@ -9,7 +9,7 @@ A,@var:NopRuleDefinition@ruleId,test,1,Test Tree,default,TREE,," - + diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv index 44b61e621..aad4e7a95 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv @@ -1,24 +1,24 @@ _chgType,SID,RULE_ID,LABEL,SORT_NO,PREDICATE,OUTPUTS,PARENT_ID,IS_LEAF,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopRuleNode@sid_5,@var:NopRuleDefinition@ruleId,<= 4,1,"{""$type"":""le"",""name"":""guestCount"",""value"":4}","{ - ""dish"": ""\""Dry Aged Gourmet Steak\"""" -}",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_2,@var:NopRuleDefinition@ruleId,Winter,2,"{""$type"":""eq"",""name"":""season"",""value"":""Winter""}",,,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_8,@var:NopRuleDefinition@ruleId,> 8,1,"{""$type"":""gt"",""name"":""guestCount"",""value"":8}","{ - ""dish"": ""\""Stew\"""" -}",@var:NopRuleNode@sid_7,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_7,@var:NopRuleDefinition@ruleId,"in [""Fall"",""Winter"",""Spring""]",4,"{""$type"":""in"",""name"":""season"",""value"":[""Fall"",""Winter"",""Spring""]}",,,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ - ""dish"": ""\""Spareribs\"""" -}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_4,@var:NopRuleDefinition@ruleId,Spring,3,"{""$type"":""eq"",""name"":""season"",""value"":""Spring""}",,,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_10,@var:NopRuleDefinition@ruleId,-,1,"{""$type"":""alwaysTrue""}","{ ""dish"": ""\""Light Salad and nice Steak\"""" }",@var:NopRuleNode@sid_9,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_9,@var:NopRuleDefinition@ruleId,Summer,5,"{""$type"":""eq"",""name"":""season"",""value"":""Summer""}",,,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_8,@var:NopRuleDefinition@ruleId,> 8,1,"{""$type"":""gt"",""name"":""guestCount"",""value"":8}","{ + ""dish"": ""\""Stew\"""" +}",@var:NopRuleNode@sid_7,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_2,@var:NopRuleDefinition@ruleId,Winter,2,"{""$type"":""eq"",""name"":""season"",""value"":""Winter""}",,,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_5,@var:NopRuleDefinition@ruleId,<= 4,1,"{""$type"":""le"",""name"":""guestCount"",""value"":4}","{ + ""dish"": ""\""Dry Aged Gourmet Steak\"""" +}",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid,@var:NopRuleDefinition@ruleId,Fall,1,"{""$type"":""eq"",""name"":""season"",""value"":""Fall""}",,,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_6,@var:NopRuleDefinition@ruleId,<=8 and >= 5,2,"{""$type"":""and"",""$body"":[{""$type"":""le"",""name"":""guestCount"",""value"":8},{""$type"":""ge"",""name"":""guestCount"",""value"":5}]}","{ ""dish"": ""\""Steak\"""" }",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_9,@var:NopRuleDefinition@ruleId,Summer,5,"{""$type"":""eq"",""name"":""season"",""value"":""Summer""}",,,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_3,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ ""dish"": ""\""Roastbeef\"""" }",@var:NopRuleNode@sid_2,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ + ""dish"": ""\""Spareribs\"""" +}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv index 580530dda..bb3e5636b 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv @@ -1,3 +1,3 @@ _chgType,FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,ORIGIN_FILE_ID,IS_PUBLIC,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK -A,@var:NopFileRecord@fileId,decision-tree.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,11856,,NopRuleDefinition,@var:NopFileRecord@bizObjId_1,importFile,,@var:NopFileRecord@originFileId,false,1,autotest-ref,*, A,@var:NopFileRecord@fileId_1,decision-tree.rule.xlsx,@var:NopFileRecord@filePath_1,xlsx,binary,11856,,NopRuleDefinition,@var:NopFileRecord@bizObjId_1,importFile,,@var:NopFileRecord@originFileId_1,false,1,autotest-ref,*, +A,@var:NopFileRecord@fileId,decision-tree.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,11856,,NopRuleDefinition,@var:NopFileRecord@bizObjId_1,importFile,,@var:NopFileRecord@originFileId,false,1,autotest-ref,*, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_definition.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_definition.csv index fd4b77bb7..30aa0fadb 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_definition.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_definition.csv @@ -9,7 +9,7 @@ A,@var:NopRuleDefinition@ruleId,test,1,Test Tree,default,TREE,," - + diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv index f632faacd..38a13986c 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv @@ -1,24 +1,24 @@ _chgType,SID,RULE_ID,LABEL,SORT_NO,PREDICATE,OUTPUTS,PARENT_ID,IS_LEAF,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopRuleNode@sid_6,@var:NopRuleDefinition@ruleId,<=8 and >= 5,2,"{""$type"":""and"",""$body"":[{""$type"":""le"",""name"":""guestCount"",""value"":8},{""$type"":""ge"",""name"":""guestCount"",""value"":5}]}","{ - ""dish"": ""\""Steak\"""" -}",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_4,@var:NopRuleDefinition@ruleId,Spring,3,"{""$type"":""eq"",""name"":""season"",""value"":""Spring""}",,,false,1,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_3,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ ""dish"": ""\""Roastbeef\"""" }",@var:NopRuleNode@sid_2,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_7,@var:NopRuleDefinition@ruleId,"in [""Fall"",""Winter"",""Spring""]",4,"{""$type"":""in"",""name"":""season"",""value"":[""Fall"",""Winter"",""Spring""]}",,,false,1,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid,@var:NopRuleDefinition@ruleId,Fall,1,"{""$type"":""eq"",""name"":""season"",""value"":""Fall""}",,,false,1,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_10,@var:NopRuleDefinition@ruleId,-,1,"{""$type"":""alwaysTrue""}","{ + ""dish"": ""\""Light Salad and nice Steak\"""" +}",@var:NopRuleNode@sid_9,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ + ""dish"": ""\""Spareribs\"""" +}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_6,@var:NopRuleDefinition@ruleId,<=8 and >= 5,2,"{""$type"":""and"",""$body"":[{""$type"":""le"",""name"":""guestCount"",""value"":8},{""$type"":""ge"",""name"":""guestCount"",""value"":5}]}","{ + ""dish"": ""\""Steak\"""" +}",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_2,@var:NopRuleDefinition@ruleId,Winter,2,"{""$type"":""eq"",""name"":""season"",""value"":""Winter""}",,,false,1,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_5,@var:NopRuleDefinition@ruleId,<= 4,1,"{""$type"":""le"",""name"":""guestCount"",""value"":4}","{ ""dish"": ""\""Dry Aged Gourmet Steak\"""" }",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_9,@var:NopRuleDefinition@ruleId,Summer,5,"{""$type"":""eq"",""name"":""season"",""value"":""Summer""}",,,false,1,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_4,@var:NopRuleDefinition@ruleId,Spring,3,"{""$type"":""eq"",""name"":""season"",""value"":""Spring""}",,,false,1,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_8,@var:NopRuleDefinition@ruleId,> 8,1,"{""$type"":""gt"",""name"":""guestCount"",""value"":8}","{ ""dish"": ""\""Stew\"""" }",@var:NopRuleNode@sid_7,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ - ""dish"": ""\""Spareribs\"""" -}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_2,@var:NopRuleDefinition@ruleId,Winter,2,"{""$type"":""eq"",""name"":""season"",""value"":""Winter""}",,,false,1,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_10,@var:NopRuleDefinition@ruleId,-,1,"{""$type"":""alwaysTrue""}","{ - ""dish"": ""\""Light Salad and nice Steak\"""" -}",@var:NopRuleNode@sid_9,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid,@var:NopRuleDefinition@ruleId,Fall,1,"{""$type"":""eq"",""name"":""season"",""value"":""Fall""}",,,false,1,autotest-ref,*,autotest-ref,*,