Skip to content

T
TrainSys
提交 6b078fbe 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhujiamin 发布系统代码 [TrainSys，网页端]

上级 10de9967
显示空白字符变更
内嵌 并排
正在显示 包含 480 行增加 和 455 行删除
config.xml
浏览文件 @ 6b078fbe
......@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mvn clean package -Ptrainsys
mvn install -Ptrainsys
cd trainsys-provider
mvn -Ptrainsys docker:build
mvn -Ptrainsys docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ 6b078fbe
......@@ -1209,16 +1209,16 @@
"mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ],
"rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
浏览文件 @ 6b078fbe
......@@ -45,17 +45,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field17"
}, {
"name" : "field13"
}, {
"name" : "field11"
"name" : "field17"
}, {
"name" : "field8"
}, {
"name" : "field14"
}, {
"name" : "type"
}, {
"name" : "field8"
"name" : "field11"
} ],
"rTMOSFilePath" : "psdefiupdates/updateA"
} ],
......@@ -208,6 +208,9 @@
}, {
"id" : "formitem4",
"dataType" : 25
}, {
"id" : "formitem5",
"dataType" : 25
}, {
"id" : "date",
"dataType" : 5,
......@@ -853,6 +856,38 @@
"rTMOSFilePath" : "psdeformdetail_formitems/formitem4",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "滑动输入条",
"codeName" : "formitem5",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"mOSFilePath" : "psdeformdetail_formitems/formitem5",
"name" : "formitem5",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorParams" : {
"minvalue" : "0",
"maxvalue" : "200",
"showinput" : "true",
"stepvalue" : "2",
"showstops" : "true"
},
"editorType" : "SLIDER",
"name" : "formitem5",
"stepValue" : 1.0
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"rTMOSFilePath" : "psdeformdetail_formitems/formitem5",
"allowEmpty" : true,
"showCaption" : true
}, {
"actionGroupExtractMode" : "ITEM",
"caption" : "时间选择器",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
浏览文件 @ 6b078fbe
......@@ -40,32 +40,104 @@
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"codeName" : "ValueRule9",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"name" : "field8值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (20)",
"paramValue" : "20"
}, {
"condOp" : "NOTEQ",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 不等于(<>) (30)",
"paramValue" : "30"
} ]
}, {
"condOp" : "OR",
"condType" : "GROUP",
"name" : "[条件组]OR",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (35)",
"paramValue" : "35"
}, {
"condOp" : "LIKE",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 文本包含(%) (2)",
"paramValue" : "2"
} ]
} ],
"ruleInfo" : "amount等于100"
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"getPSDEFormItemName" : "field8",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
......@@ -114,35 +186,6 @@
},
"getPSDEFormItemName" : "field7",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -183,69 +226,6 @@
},
"getPSDEFormItemName" : "field4",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule9",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"name" : "field8值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (20)",
"paramValue" : "20"
}, {
"condOp" : "NOTEQ",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 不等于(<>) (30)",
"paramValue" : "30"
} ]
}, {
"condOp" : "OR",
"condType" : "GROUP",
"name" : "[条件组]OR",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (35)",
"paramValue" : "35"
}, {
"condOp" : "LIKE",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 文本包含(%) (2)",
"paramValue" : "2"
} ]
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field8",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -355,41 +335,61 @@
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "脚本校验"
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
} ],
"getPSDEFormItems" : [ {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
浏览文件 @ 6b078fbe
......@@ -169,32 +169,104 @@
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"codeName" : "ValueRule9",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"name" : "field8值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (20)",
"paramValue" : "20"
}, {
"condOp" : "NOTEQ",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 不等于(<>) (30)",
"paramValue" : "30"
} ]
}, {
"condOp" : "OR",
"condType" : "GROUP",
"name" : "[条件组]OR",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (35)",
"paramValue" : "35"
}, {
"condOp" : "LIKE",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 文本包含(%) (2)",
"paramValue" : "2"
} ]
} ],
"ruleInfo" : "amount等于100"
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"getPSDEFormItemName" : "field8",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
......@@ -243,35 +315,6 @@
},
"getPSDEFormItemName" : "field7",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -312,69 +355,6 @@
},
"getPSDEFormItemName" : "field4",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule9",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"name" : "field8值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (20)",
"paramValue" : "20"
}, {
"condOp" : "NOTEQ",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 不等于(<>) (30)",
"paramValue" : "30"
} ]
}, {
"condOp" : "OR",
"condType" : "GROUP",
"name" : "[条件组]OR",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (35)",
"paramValue" : "35"
}, {
"condOp" : "LIKE",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 文本包含(%) (2)",
"paramValue" : "2"
} ]
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field8",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -484,41 +464,61 @@
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "脚本校验"
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
} ],
"getPSDEFormItems" : [ {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
浏览文件 @ 6b078fbe
......@@ -1381,17 +1381,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field17"
}, {
"name" : "field13"
}, {
"name" : "field11"
"name" : "field17"
}, {
"name" : "field8"
}, {
"name" : "field14"
}, {
"name" : "type"
}, {
"name" : "field8"
"name" : "field11"
} ],
"rTMOSFilePath" : "psdefiupdates/updateA"
} ],
......@@ -1544,6 +1544,9 @@
}, {
"id" : "formitem4",
"dataType" : 25
}, {
"id" : "formitem5",
"dataType" : 25
}, {
"id" : "date",
"dataType" : 5,
......@@ -2189,6 +2192,38 @@
"rTMOSFilePath" : "psdeformdetail_formitems/formitem4",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "滑动输入条",
"codeName" : "formitem5",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"mOSFilePath" : "psdeformdetail_formitems/formitem5",
"name" : "formitem5",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorParams" : {
"minvalue" : "0",
"maxvalue" : "200",
"showinput" : "true",
"stepvalue" : "2",
"showstops" : "true"
},
"editorType" : "SLIDER",
"name" : "formitem5",
"stepValue" : 1.0
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"rTMOSFilePath" : "psdeformdetail_formitems/formitem5",
"allowEmpty" : true,
"showCaption" : true
}, {
"actionGroupExtractMode" : "ITEM",
"caption" : "时间选择器",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 6b078fbe
......@@ -2239,16 +2239,16 @@
"mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ],
"rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"
......@@ -16828,32 +16828,104 @@
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"codeName" : "ValueRule9",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"name" : "field8值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (20)",
"paramValue" : "20"
}, {
"condOp" : "NOTEQ",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 不等于(<>) (30)",
"paramValue" : "30"
} ]
}, {
"condOp" : "OR",
"condType" : "GROUP",
"name" : "[条件组]OR",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (35)",
"paramValue" : "35"
}, {
"condOp" : "LIKE",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 文本包含(%) (2)",
"paramValue" : "2"
} ]
} ],
"ruleInfo" : "amount等于100"
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"getPSDEFormItemName" : "field8",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
......@@ -16902,35 +16974,6 @@
},
"getPSDEFormItemName" : "field7",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -16971,69 +17014,6 @@
},
"getPSDEFormItemName" : "field4",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule9",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"name" : "field8值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "[条件组]AND",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (20)",
"paramValue" : "20"
}, {
"condOp" : "NOTEQ",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 不等于(<>) (30)",
"paramValue" : "30"
} ]
}, {
"condOp" : "OR",
"condType" : "GROUP",
"name" : "[条件组]OR",
"getPSDEFVRConditions" : [ {
"condOp" : "GT",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 大于(>) (35)",
"paramValue" : "35"
}, {
"condOp" : "LIKE",
"condType" : "SIMPLE",
"dEFName" : "FIELD8",
"name" : "[常规条件] 文本包含(%) (2)",
"paramValue" : "2"
} ]
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
} ],
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
"ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field8",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -17143,41 +17123,61 @@
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "脚本校验"
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
} ],
"getPSDEFormItems" : [ {
......
trainsys-provider/pom.xml
浏览文件 @ 6b078fbe
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 6b078fbe
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 50000
EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 6b078fbe
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- containerPort: 50000
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.240.140"
- name: SERVER_PORT
value: "50000"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.240.140:8848"
- name: SPRING_REDIS_HOST
value: "127.0.0.1"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_LAB01_d23cc850e"
- name: SPRING_DATASOURCE_PASSWORD
value: "f9Df4556"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_LAB01_d23cc850e"
- name: NACOS
value: "172.16.240.140:8848"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 6b078fbe
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "50000:50000"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
- SERVER_PORT=50000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
- SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
- SPRING_REDIS_HOST=127.0.0.1
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
- SPRING_DATASOURCE_PASSWORD=f9Df4556
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
- NACOS=172.16.240.140:8848
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或