Skip to content

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

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

上级 cb0ff094
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1081 行增加 和 268 行删除
config.xml
浏览文件 @ faa18ffc
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/ git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
浏览文件 @ faa18ffc
...@@ -2768,6 +2768,12 @@ ...@@ -2768,6 +2768,12 @@
"name" : "测试实体实体编辑视图_模态", "name" : "测试实体实体编辑视图_模态",
"realModelSubType" : "DEEDITVIEW", "realModelSubType" : "DEEDITVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "GridViewPanel",
"logicName" : "视图布局面板（基础）",
"name" : "视图布局面板（基础）",
"realModelSubType" : "DEGRIDVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "noTabForm", "codeName" : "noTabForm",
"logicName" : "无分页表单", "logicName" : "无分页表单",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
浏览文件 @ faa18ffc
...@@ -2253,6 +2253,10 @@ ...@@ -2253,6 +2253,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_VIewPanel.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_VIewPanel.json",
"viewType" : "DEGRIDVIEW" "viewType" : "DEGRIDVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3KanbanView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3KanbanView.json",
...@@ -2289,6 +2293,10 @@ ...@@ -2289,6 +2293,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView3_drawer.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView3_drawer.json",
"viewType" : "DEEDITVIEW3" "viewType" : "DEEDITVIEW3"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridViewPanel.json",
"viewType" : "DEGRIDVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestControl.json
浏览文件 @ faa18ffc
...@@ -741,7 +741,7 @@ ...@@ -741,7 +741,7 @@
} }
} ], } ],
"getPSAppViewRefs" : [ { "getPSAppViewRefs" : [ {
"name" : "EDITDATA", "name" : "NEWDATA",
"realTitle" : "测试实体编辑视图", "realTitle" : "测试实体编辑视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
...@@ -749,7 +749,7 @@ ...@@ -749,7 +749,7 @@
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
} }
}, { }, {
"name" : "NEWDATA", "name" : "EDITDATA",
"realTitle" : "测试实体编辑视图", "realTitle" : "测试实体编辑视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
...@@ -2148,84 +2148,18 @@ ...@@ -2148,84 +2148,18 @@
"getPSDEViewCodeName" : "GridView", "getPSDEViewCodeName" : "GridView",
"getPSDEViewId" : "60afc41b220f5cb7035439d1522b1575", "getPSDEViewId" : "60afc41b220f5cb7035439d1522b1575",
"getPSViewLayoutPanel" : { "getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ { "codeName" : "Layoutpanel",
"id" : "visible", "controlStyle" : "APPDEGRIDVIEW",
"hidden" : true,
"viewFieldName" : "visible"
} ],
"codeName" : "Usr0605003933",
"controlType" : "VIEWLAYOUTPANEL", "controlType" : "VIEWLAYOUTPANEL",
"layoutMode" : "FLEX",
"logicName" : "测试视图面板11",
"name" : "layoutpanel", "name" : "layoutpanel",
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSControlParam" : { }, "getPSControlParam" : { },
"getPSLayout" : { "layoutBodyOnly" : true,
"layout" : "FLEX"
},
"getRootPSPanelItems" : [ {
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "搜索表单",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "searchform",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItemGroupLogics" : [ {
"groupOP" : "AND",
"logicCat" : "PANELVISIBLE",
"logicType" : "GROUP",
"name" : "面板成员[searchform][面板显示]逻辑",
"getPSPanelItemLogics" : [ {
"condOp" : "ISNOTNULL",
"dstModelField" : "visible",
"logicType" : "SINGLE",
"name" : "逻辑项"
} ],
"relatedItemNames" : [ "visible" ],
"notMode" : false
} ],
"showCaption" : true
} ]
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "visible",
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "visible",
"predefinedType" : "FIELD_TEXT_DYNAMIC"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"viewFieldName" : "visible",
"hidden" : true,
"showCaption" : false
} ],
"layoutBodyOnly" : false,
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : false, "useDefaultLayout" : true
"modelid" : "4B483886-7364-436A-8A1A-05381DC952AD",
"modeltype" : "PSSYSVIEWLAYOUTPANEL"
}, },
"title" : "测试实体表格视图", "title" : "测试实体表格视图",
"viewStyle" : "DEFAULT", "viewStyle" : "DEFAULT",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/GridViewPanel_Grid.json 0 → 100644
浏览文件 @ faa18ffc
{
"aggMode" : "NONE",
"codeName" : "GridViewPanel_Grid",
"columnEnableFilter" : 2,
"columnEnableLink" : 2,
"controlType" : "GRID",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/GridViewPanel_Grid.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"groupMode" : "NONE",
"hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
"logicName" : "视图布局面板（基础）_表格",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlLogics" : [ {
"eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
"logicTag" : "grid",
"logicType" : "APPVIEWENGINE",
"name" : "engine_grid",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "测试实体名称",
"codeName" : "testname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "testname",
"excelCaption" : "测试实体名称",
"name" : "testname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "FRONT",
"caption" : "更新人",
"codeName" : "updateman",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updateman",
"excelCaption" : "更新人",
"name" : "updateman",
"noPrivDisplayMode" : 1,
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "更新时间",
"codeName" : "updatedate",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate",
"excelCaption" : "更新时间",
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "testname",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"dataType" : 25,
"name" : "updateman",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"format" : "YYYY-MM-DD HH:mm:ss",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"dataType" : 25,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
}
}, {
"dataType" : 25,
"name" : "srfdataaccaction",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"dataAccessAction" : true
}, {
"dataType" : 25,
"name" : "srfmajortext",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
} ],
"getPSDEGridEditItems" : [ {
"caption" : "测试实体标识",
"codeName" : "srfkey",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "srfkey"
},
"allowEmpty" : true
} ],
"pagingSize" : 20,
"getRemovePSControlAction" : {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"sortMode" : "REMOTE",
"hasWFDataItems" : false,
"enableColFilter" : false,
"enableCustomized" : true,
"enableGroup" : false,
"enablePagingBar" : true,
"enableRowEdit" : false,
"enableRowEditOrder" : false,
"enableRowNew" : false,
"forceFit" : false,
"hideHeader" : false,
"noSort" : false,
"singleSelect" : false,
"modelid" : "D6759797-73E2-4635-87DB-08DD00BDAFA7",
"modeltype" : "PSDEGRID"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/GridViewPanel_SearchForm.json 0 → 100644
浏览文件 @ faa18ffc
{
"codeName" : "GridViewPanel_SearchForm",
"controlType" : "SEARCHFORM",
"defaultLabelWidth" : 130,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/GridViewPanel_SearchForm.json",
"hookEventNames" : [ "SEARCH", "LOAD", "SAVE" ],
"logicName" : "视图布局面板（基础）_搜索表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlLogics" : [ {
"eventNames" : "SEARCH;LOAD;SAVE",
"logicTag" : "searchform",
"logicType" : "APPVIEWENGINE",
"name" : "engine_searchform",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSDEFormItems" : [ {
"id" : "n_type_eq",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TYPE",
"codeName" : "Type"
}
} ],
"getPSDEFormPages" : [ {
"caption" : "常规条件",
"codeName" : "formpage1",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"caption" : "类型(=)",
"codeName" : "n_type_eq",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "n_type_eq",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TYPE",
"codeName" : "Type"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "n_type_eq"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"searchButtonStyle" : "DEFAULT",
"tabHeaderPos" : "TOP",
"enableAdvanceSearch" : false,
"enableAutoSearch" : false,
"enableFilterSave" : false,
"noTabHeader" : true,
"modelid" : "D448A138-AA20-47E7-8A32-1BFF467EB867",
"modeltype" : "PSDEFORM_SEARCHFORM"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json
浏览文件 @ faa18ffc
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
} }
} ], } ],
"getPSAppViewRefs" : [ { "getPSAppViewRefs" : [ {
"name" : "EDITDATA", "name" : "NEWDATA",
"realTitle" : "测试实体编辑视图", "realTitle" : "测试实体编辑视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
} }
}, { }, {
"name" : "NEWDATA", "name" : "EDITDATA",
"realTitle" : "测试实体编辑视图", "realTitle" : "测试实体编辑视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
...@@ -1496,84 +1496,18 @@ ...@@ -1496,84 +1496,18 @@
"getPSDEViewCodeName" : "GridView", "getPSDEViewCodeName" : "GridView",
"getPSDEViewId" : "60afc41b220f5cb7035439d1522b1575", "getPSDEViewId" : "60afc41b220f5cb7035439d1522b1575",
"getPSViewLayoutPanel" : { "getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ { "codeName" : "Layoutpanel",
"id" : "visible", "controlStyle" : "APPDEGRIDVIEW",
"hidden" : true,
"viewFieldName" : "visible"
} ],
"codeName" : "Usr0605003933",
"controlType" : "VIEWLAYOUTPANEL", "controlType" : "VIEWLAYOUTPANEL",
"layoutMode" : "FLEX",
"logicName" : "测试视图面板11",
"name" : "layoutpanel", "name" : "layoutpanel",
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSControlParam" : { }, "getPSControlParam" : { },
"getPSLayout" : { "layoutBodyOnly" : true,
"layout" : "FLEX"
},
"getRootPSPanelItems" : [ {
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "搜索表单",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "searchform",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItemGroupLogics" : [ {
"groupOP" : "AND",
"logicCat" : "PANELVISIBLE",
"logicType" : "GROUP",
"name" : "面板成员[searchform][面板显示]逻辑",
"getPSPanelItemLogics" : [ {
"condOp" : "ISNOTNULL",
"dstModelField" : "visible",
"logicType" : "SINGLE",
"name" : "逻辑项"
} ],
"relatedItemNames" : [ "visible" ],
"notMode" : false
} ],
"showCaption" : true
} ]
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "visible",
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "visible",
"predefinedType" : "FIELD_TEXT_DYNAMIC"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"viewFieldName" : "visible",
"hidden" : true,
"showCaption" : false
} ],
"layoutBodyOnly" : false,
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : false, "useDefaultLayout" : true
"modelid" : "4B483886-7364-436A-8A1A-05381DC952AD",
"modeltype" : "PSSYSVIEWLAYOUTPANEL"
}, },
"title" : "测试实体表格视图", "title" : "测试实体表格视图",
"viewStyle" : "DEFAULT", "viewStyle" : "DEFAULT",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json 0 → 100644
浏览文件 @ faa18ffc
{
"accUserMode" : 2,
"caption" : "测试实体",
"codeName" : "TESTRedirectView",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
"funcViewMode" : "REDIRECTVIEW",
"memo" : "系统自动添加",
"name" : "TESTRedirectView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
},
"getPSControls" : [ {
"caption" : "测试实体",
"codeName" : "RedirectViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "RedirectView",
"getPSDEViewId" : "1b5635ce755805322007ac92e8d5ae87",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEREDIRECTVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"getRedirectPSAppViewRefs" : [ {
"name" : "TEST:EDITVIEW",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"name" : "EDITVIEW",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"refFlag" : false,
"title" : "测试实体数据重定向视图",
"viewStyle" : "DEFAULT",
"viewType" : "DEREDIRECTVIEW",
"enableCustomGetDataAction" : false,
"enableDP" : true,
"enableWorkflow" : true,
"redirectView" : true,
"modelid" : "641451b0a069b3a12ab8d004632b593a",
"modeltype" : "PSAPPDEVIEW"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestControlEditView.json
浏览文件 @ faa18ffc
...@@ -867,7 +867,7 @@ ...@@ -867,7 +867,7 @@
} }
} ], } ],
"getPSAppViewRefs" : [ { "getPSAppViewRefs" : [ {
"name" : "EDITDATA", "name" : "NEWDATA",
"realTitle" : "测试实体编辑视图", "realTitle" : "测试实体编辑视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
...@@ -875,7 +875,7 @@ ...@@ -875,7 +875,7 @@
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
} }
}, { }, {
"name" : "NEWDATA", "name" : "EDITDATA",
"realTitle" : "测试实体编辑视图", "realTitle" : "测试实体编辑视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
...@@ -2274,84 +2274,18 @@ ...@@ -2274,84 +2274,18 @@
"getPSDEViewCodeName" : "GridView", "getPSDEViewCodeName" : "GridView",
"getPSDEViewId" : "60afc41b220f5cb7035439d1522b1575", "getPSDEViewId" : "60afc41b220f5cb7035439d1522b1575",
"getPSViewLayoutPanel" : { "getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ { "codeName" : "Layoutpanel",
"id" : "visible", "controlStyle" : "APPDEGRIDVIEW",
"hidden" : true,
"viewFieldName" : "visible"
} ],
"codeName" : "Usr0605003933",
"controlType" : "VIEWLAYOUTPANEL", "controlType" : "VIEWLAYOUTPANEL",
"layoutMode" : "FLEX",
"logicName" : "测试视图面板11",
"name" : "layoutpanel", "name" : "layoutpanel",
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSControlParam" : { }, "getPSControlParam" : { },
"getPSLayout" : { "layoutBodyOnly" : true,
"layout" : "FLEX"
},
"getRootPSPanelItems" : [ {
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "搜索表单",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "searchform",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItemGroupLogics" : [ {
"groupOP" : "AND",
"logicCat" : "PANELVISIBLE",
"logicType" : "GROUP",
"name" : "面板成员[searchform][面板显示]逻辑",
"getPSPanelItemLogics" : [ {
"condOp" : "ISNOTNULL",
"dstModelField" : "visible",
"logicType" : "SINGLE",
"name" : "逻辑项"
} ],
"relatedItemNames" : [ "visible" ],
"notMode" : false
} ],
"showCaption" : true
} ]
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "visible",
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "visible",
"predefinedType" : "FIELD_TEXT_DYNAMIC"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"viewFieldName" : "visible",
"hidden" : true,
"showCaption" : false
} ],
"layoutBodyOnly" : false,
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : false, "useDefaultLayout" : true
"modelid" : "4B483886-7364-436A-8A1A-05381DC952AD",
"modeltype" : "PSSYSVIEWLAYOUTPANEL"
}, },
"title" : "测试实体表格视图", "title" : "测试实体表格视图",
"viewStyle" : "DEFAULT", "viewStyle" : "DEFAULT",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ faa18ffc
...@@ -2664,6 +2664,12 @@ ...@@ -2664,6 +2664,12 @@
"viewType" : "DEDATAVIEWEXPVIEW", "viewType" : "DEDATAVIEWEXPVIEW",
"resource" : "Book", "resource" : "Book",
"view" : "Usr0815395468DataViewExpView" "view" : "Usr0815395468DataViewExpView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
"viewType" : "DEREDIRECTVIEW",
"resource" : "TEST",
"view" : "RedirectView"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
...@@ -2885,6 +2891,12 @@ ...@@ -2885,6 +2891,12 @@
"viewType" : "DEDATAVIEW", "viewType" : "DEDATAVIEW",
"resource" : "ViewLayoutModelRepository", "resource" : "ViewLayoutModelRepository",
"view" : "DEDataViewLayout" "view" : "DEDataViewLayout"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridViewPanel.json",
"viewType" : "DEGRIDVIEW",
"resource" : "TEST",
"view" : "GridViewPanel"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView3.json", "path" : "PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView3.json",
...@@ -25772,6 +25784,10 @@ ...@@ -25772,6 +25784,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_VIewPanel.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_VIewPanel.json",
"viewType" : "DEGRIDVIEW" "viewType" : "DEGRIDVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3KanbanView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3KanbanView.json",
...@@ -25808,6 +25824,10 @@ ...@@ -25808,6 +25824,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView3_drawer.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView3_drawer.json",
"viewType" : "DEEDITVIEW3" "viewType" : "DEEDITVIEW3"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridViewPanel.json",
"viewType" : "DEGRIDVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json",
......
trainsys-provider/pom.xml
浏览文件 @ faa18ffc
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ faa18ffc
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar 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 ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ faa18ffc
...@@ -22,32 +22,7 @@ spec: ...@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 50000 - containerPort: 8081
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 apiVersion: v1
...@@ -60,9 +35,9 @@ spec: ...@@ -60,9 +35,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 50000 port: 8081
targetPort: 50000 targetPort: 8081
nodePort: 50000 nodePort: 8081
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ faa18ffc
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports: ports:
- "50000:50000" - "8081:8081"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或