Skip to content

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

lxm1993 部署微服务接口 [TrainSys，默认服务接口]

上级 a97e29bd
隐藏空白字符变更
内嵌 并排
正在显示 包含 288 行增加 和 375 行删除
config.xml
浏览文件 @ 0e5f8602
......@@ -55,6 +55,12 @@
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/PSMODULES/Test/PSDATAENTITIES/TEST.json
浏览文件 @ 0e5f8602
......@@ -690,10 +690,10 @@
"name" : "[NUMBER1][数值1]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER1][数值1]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -701,10 +701,10 @@
"name" : "[NUMBER1][数值1]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER1][数值1]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -716,9 +716,20 @@
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组"
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "NUMBER1",
"maxValue" : 100,
"name" : "默认字符串长度",
"ruleInfo" : "内容长度必须小于等于[100]",
"includeMaxValue" : true,
"includeMinValue" : false,
"keyCond" : true
} ],
"ruleInfo" : "内容长度必须小于等于[100]"
},
"ruleInfo" : "默认规则",
"ruleInfo" : "内容长度必须小于等于[100]",
"checkDefault" : true,
"defaultMode" : true,
"enableBackend" : true,
......@@ -726,8 +737,9 @@
} ],
"codeName" : "Number1",
"dEFType" : 1,
"dataType" : "DATE",
"dataType" : "TEXT",
"importOrder" : 1000,
"length" : 100,
"logicName" : "数值1",
"name" : "NUMBER1",
"getPSDEDBTable" : {
......@@ -739,8 +751,9 @@
"id" : "NUMBER1"
},
"serviceCodeName" : "Number1",
"stdDataType" : 5,
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stdDataType" : 25,
"stringLength" : 100,
"valueFormat" : "%1$s"
}, {
"getAllPSDEFDTColumns" : [ {
"columnName" : "NUMBER2",
......@@ -893,10 +906,10 @@
"name" : "[NUMBER4][数值4]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER4][数值4]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -904,10 +917,10 @@
"name" : "[NUMBER4][数值4]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER4][数值4]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -919,9 +932,20 @@
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组"
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "NUMBER4",
"maxValue" : 100,
"name" : "默认字符串长度",
"ruleInfo" : "内容长度必须小于等于[100]",
"includeMaxValue" : true,
"includeMinValue" : false,
"keyCond" : true
} ],
"ruleInfo" : "内容长度必须小于等于[100]"
},
"ruleInfo" : "默认规则",
"ruleInfo" : "内容长度必须小于等于[100]",
"checkDefault" : true,
"defaultMode" : true,
"enableBackend" : true,
......@@ -929,8 +953,9 @@
} ],
"codeName" : "Number4",
"dEFType" : 1,
"dataType" : "DATE",
"dataType" : "TEXT",
"importOrder" : 1000,
"length" : 100,
"logicName" : "数值4",
"name" : "NUMBER4",
"getPSDEDBTable" : {
......@@ -942,8 +967,9 @@
"id" : "NUMBER4"
},
"serviceCodeName" : "Number4",
"stdDataType" : 5,
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stdDataType" : 25,
"stringLength" : 100,
"valueFormat" : "%1$s"
}, {
"getAllPSDEFDTColumns" : [ {
"columnName" : "ORDER",
......@@ -3395,7 +3421,6 @@
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值1",
"name" : "Number1",
"getPSDEField" : {
......@@ -3403,7 +3428,8 @@
"codeName" : "Number1"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "数值2",
......@@ -3427,7 +3453,6 @@
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值4",
"name" : "Number4",
"getPSDEField" : {
......@@ -3435,7 +3460,8 @@
"codeName" : "Number4"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "排序属性",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json
浏览文件 @ 0e5f8602
......@@ -710,10 +710,10 @@
"name" : "[NUMBER1][数值1]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER1][数值1]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -721,10 +721,10 @@
"name" : "[NUMBER1][数值1]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER1][数值1]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -733,8 +733,8 @@
"codeName" : "Number1",
"logicName" : "数值1",
"name" : "NUMBER1",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -800,10 +800,10 @@
"name" : "[NUMBER4][数值4]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER4][数值4]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -811,10 +811,10 @@
"name" : "[NUMBER4][数值4]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER4][数值4]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -823,8 +823,8 @@
"codeName" : "Number4",
"logicName" : "数值4",
"name" : "NUMBER4",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -2166,7 +2166,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number1",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值1",
"name" : "Number1",
"getPSAppDEField" : {
......@@ -2174,7 +2173,7 @@
"codeName" : "Number1"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Number2",
......@@ -2200,7 +2199,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number4",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值4",
"name" : "Number4",
"getPSAppDEField" : {
......@@ -2208,7 +2206,7 @@
"codeName" : "Number4"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Order",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
浏览文件 @ 0e5f8602
......@@ -204,14 +204,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1693,7 +1693,7 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
......@@ -1707,11 +1707,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
},
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1719,13 +1716,12 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
......@@ -1739,11 +1735,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
},
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1751,7 +1744,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTEditView.json
浏览文件 @ 0e5f8602
......@@ -311,14 +311,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1800,7 +1800,7 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
......@@ -1814,11 +1814,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
},
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1826,13 +1823,12 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
......@@ -1846,11 +1842,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
},
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1858,7 +1851,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json
浏览文件 @ 0e5f8602
......@@ -710,10 +710,10 @@
"name" : "[NUMBER1][数值1]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER1][数值1]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -721,10 +721,10 @@
"name" : "[NUMBER1][数值1]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER1][数值1]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -733,8 +733,8 @@
"codeName" : "Number1",
"logicName" : "数值1",
"name" : "NUMBER1",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -800,10 +800,10 @@
"name" : "[NUMBER4][数值4]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER4][数值4]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -811,10 +811,10 @@
"name" : "[NUMBER4][数值4]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER4][数值4]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -823,8 +823,8 @@
"codeName" : "Number4",
"logicName" : "数值4",
"name" : "NUMBER4",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -2166,7 +2166,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number1",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值1",
"name" : "Number1",
"getPSAppDEField" : {
......@@ -2174,7 +2173,7 @@
"codeName" : "Number1"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Number2",
......@@ -2200,7 +2199,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number4",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值4",
"name" : "Number4",
"getPSAppDEField" : {
......@@ -2208,7 +2206,7 @@
"codeName" : "Number4"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Order",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ 0e5f8602
......@@ -1398,16 +1398,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Usr0526356960EditView_Form.json
浏览文件 @ 0e5f8602
......@@ -473,14 +473,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1968,12 +1968,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -1983,12 +1982,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1996,18 +1991,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -2017,12 +2010,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -2030,7 +2019,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
浏览文件 @ 0e5f8602
......@@ -710,10 +710,10 @@
"name" : "[NUMBER1][数值1]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER1][数值1]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -721,10 +721,10 @@
"name" : "[NUMBER1][数值1]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER1][数值1]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -733,8 +733,8 @@
"codeName" : "Number1",
"logicName" : "数值1",
"name" : "NUMBER1",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -800,10 +800,10 @@
"name" : "[NUMBER4][数值4]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER4][数值4]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -811,10 +811,10 @@
"name" : "[NUMBER4][数值4]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER4][数值4]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -823,8 +823,8 @@
"codeName" : "Number4",
"logicName" : "数值4",
"name" : "NUMBER4",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -2166,7 +2166,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number1",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值1",
"name" : "Number1",
"getPSAppDEField" : {
......@@ -2174,7 +2173,7 @@
"codeName" : "Number1"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Number2",
......@@ -2200,7 +2199,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number4",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值4",
"name" : "Number4",
"getPSAppDEField" : {
......@@ -2208,7 +2206,7 @@
"codeName" : "Number4"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Order",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
浏览文件 @ 0e5f8602
......@@ -204,14 +204,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1699,12 +1699,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -1714,12 +1713,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1727,18 +1722,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -1748,12 +1741,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1761,7 +1750,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/PageAggGridView_Grid.json
浏览文件 @ 0e5f8602
......@@ -99,7 +99,6 @@
"name" : "NUMBER1",
"codeName" : "Number1"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -157,7 +156,6 @@
"name" : "NUMBER4",
"codeName" : "Number4"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -210,8 +208,7 @@
"codeName" : "TESTName"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number1",
"getPSAppDEField" : {
"name" : "NUMBER1",
......@@ -232,8 +229,7 @@
"codeName" : "Number3"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number4",
"getPSAppDEField" : {
"name" : "NUMBER4",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/RemoteAggGridView_Grid.json
浏览文件 @ 0e5f8602
......@@ -67,7 +67,6 @@
"name" : "NUMBER1",
"codeName" : "Number1"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -128,7 +127,6 @@
"name" : "NUMBER4",
"codeName" : "Number4"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -183,8 +181,7 @@
"codeName" : "TESTName"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number1",
"getPSAppDEField" : {
"name" : "NUMBER1",
......@@ -205,8 +202,7 @@
"codeName" : "Number3"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number4",
"getPSAppDEField" : {
"name" : "NUMBER4",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json
浏览文件 @ 0e5f8602
......@@ -310,14 +310,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1805,12 +1805,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -1820,12 +1819,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1833,18 +1828,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -1854,12 +1847,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1867,7 +1856,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json
浏览文件 @ 0e5f8602
......@@ -293,14 +293,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1788,12 +1788,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -1803,12 +1802,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1816,18 +1811,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -1837,12 +1830,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1850,7 +1839,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTIndexView.json
浏览文件 @ 0e5f8602
......@@ -286,14 +286,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1781,12 +1781,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -1796,12 +1795,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1809,18 +1804,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -1830,12 +1823,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1843,7 +1832,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPageAggGridView.json
浏览文件 @ 0e5f8602
......@@ -954,7 +954,6 @@
"name" : "NUMBER1",
"codeName" : "Number1"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -1012,7 +1011,6 @@
"name" : "NUMBER4",
"codeName" : "Number4"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -1065,8 +1063,7 @@
"codeName" : "TESTName"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number1",
"getPSAppDEField" : {
"name" : "NUMBER1",
......@@ -1087,8 +1084,7 @@
"codeName" : "Number3"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number4",
"getPSAppDEField" : {
"name" : "NUMBER4",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRemoteAggGridView.json
浏览文件 @ 0e5f8602
......@@ -819,7 +819,6 @@
"name" : "NUMBER1",
"codeName" : "Number1"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -880,7 +879,6 @@
"name" : "NUMBER4",
"codeName" : "Number4"
},
"valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
......@@ -935,8 +933,7 @@
"codeName" : "TESTName"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number1",
"getPSAppDEField" : {
"name" : "NUMBER1",
......@@ -957,8 +954,7 @@
"codeName" : "Number3"
}
}, {
"format" : "YYYY-MM-DD",
"dataType" : 5,
"dataType" : 25,
"name" : "number4",
"getPSAppDEField" : {
"name" : "NUMBER4",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json
浏览文件 @ 0e5f8602
......@@ -311,14 +311,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1806,12 +1806,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -1821,12 +1820,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1834,18 +1829,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -1855,12 +1848,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1868,7 +1857,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4EditView.json
浏览文件 @ 0e5f8602
......@@ -305,14 +305,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -1800,12 +1800,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -1815,12 +1814,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -1828,18 +1823,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -1849,12 +1842,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -1862,7 +1851,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0526356960EditView.json
浏览文件 @ 0e5f8602
......@@ -591,14 +591,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -2086,12 +2086,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -2101,12 +2100,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -2114,18 +2109,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -2135,12 +2128,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -2148,7 +2137,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08220231EditView.json
浏览文件 @ 0e5f8602
......@@ -1014,14 +1014,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -2509,12 +2509,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -2524,12 +2523,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -2537,18 +2532,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -2558,12 +2551,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -2571,7 +2560,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 0e5f8602
......@@ -3601,16 +3601,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......@@ -3650,12 +3650,6 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -3673,6 +3667,12 @@
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
} ]
}, {
"codeName" : "VMGroup5",
......@@ -25521,14 +25521,14 @@
}
}, {
"id" : "number1",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER1",
"codeName" : "Number1"
}
}, {
"id" : "number4",
"dataType" : 5,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "NUMBER4",
"codeName" : "Number4"
......@@ -27016,12 +27016,11 @@
"getPSDEFormDetails" : [ {
"caption" : "数值1",
"codeName" : "number1",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number1",
......@@ -27031,12 +27030,8 @@
"codeName" : "Number1"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number1"
},
"getPSLayoutPos" : {
......@@ -27044,18 +27039,16 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数值4",
"codeName" : "number4",
"dataType" : 5,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemWidth" : 230.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "number4",
......@@ -27065,12 +27058,8 @@
"codeName" : "Number4"
},
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "number4"
},
"getPSLayoutPos" : {
......@@ -27078,7 +27067,6 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true,
"showCaption" : true
} ],
......@@ -38357,10 +38345,10 @@
"name" : "[NUMBER1][数值1]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER1][数值1]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -38368,10 +38356,10 @@
"name" : "[NUMBER1][数值1]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER1][数值1]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -38380,8 +38368,8 @@
"codeName" : "Number1",
"logicName" : "数值1",
"name" : "NUMBER1",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -38447,10 +38435,10 @@
"name" : "[NUMBER4][数值4]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "DATEPICKEREX_NOTIME",
"editorType" : "TEXTBOX",
"name" : "[NUMBER4][数值4]",
"uIMode" : "DEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td"
"stringLength" : 100,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
......@@ -38458,10 +38446,10 @@
"name" : "[NUMBER4][数值4]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBDATE",
"editorType" : "MOBTEXT",
"name" : "[NUMBER4][数值4]移动端默认",
"stringLength" : 100,
"uIMode" : "MOBILEDEFAULT",
"valueFormat" : "%1$tY-%1$tm-%1$td",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
......@@ -38470,8 +38458,8 @@
"codeName" : "Number4",
"logicName" : "数值4",
"name" : "NUMBER4",
"stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD"
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
......@@ -39813,7 +39801,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number1",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值1",
"name" : "Number1",
"getPSAppDEField" : {
......@@ -39821,7 +39808,7 @@
"codeName" : "Number1"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Number2",
......@@ -39847,7 +39834,6 @@
"type" : "SIMPLE"
}, {
"codeName" : "Number4",
"jsonFormat" : "yyyy-MM-dd",
"logicName" : "数值4",
"name" : "Number4",
"getPSAppDEField" : {
......@@ -39855,7 +39841,7 @@
"codeName" : "Number4"
},
"sourceType" : "DEFIELD",
"stdDataType" : 5,
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "Order",
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
浏览文件 @ 0e5f8602
......@@ -3712,7 +3712,8 @@
"logicName" : "数值1",
"name" : "NUMBER1",
"orderValue" : 300,
"stdDataType" : 5,
"stdDataType" : 25,
"stringLength" : 100,
"allowEmpty" : true,
"enableCreate" : true,
"enableModify" : true,
......@@ -3749,7 +3750,8 @@
"logicName" : "数值4",
"name" : "NUMBER4",
"orderValue" : 330,
"stdDataType" : 5,
"stdDataType" : 25,
"stringLength" : 100,
"allowEmpty" : true,
"enableCreate" : true,
"enableModify" : true,
......
trainsys-provider/pom.xml
浏览文件 @ 0e5f8602
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>runtime</id>
<id>trainsys</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 0e5f8602
......@@ -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 8081
EXPOSE 50000
ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 0e5f8602
......@@ -22,7 +22,32 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- containerPort: 8081
- 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"
---
apiVersion: v1
......@@ -35,9 +60,9 @@ spec:
type: NodePort
ports:
- name: http
port: 8081
targetPort: 8081
nodePort: 8081
port: 50000
targetPort: 50000
nodePort: 50000
protocol: TCP
selector:
app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 0e5f8602
......@@ -3,9 +3,23 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "8081:8081"
- "50000:50000"
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或