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

config.xml

@@ -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/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json

@@ -36,9 +36,168 @@
     }
   } ],
   "getPSControlRenders" : [ {
-    "layoutPanelModel" : "{\r\n    \"codename\": \"Usr1127834506\",\r\n    \"mobflag\": 0,\r\n    \"layoutmode\": \"FLEX\",\r\n    \"publicflag\": 1,\r\n    \"viewlayoutflag\": 1,\r\n    \"bodyonlyflag\": 0,\r\n    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n    \"pssysviewpanelitems\": [\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_content\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 1,\r\n            \"flexdir\": \"row\",\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"CONTAINER\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"容器\",\r\n                    \"ppssysviewpanelitemname\": \"control_content\",\r\n                    \"layoutmode\": \"FLEX\",\r\n                    \"pssysviewpanelitemname\": \"control_searchform\",\r\n                    \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                    \"showcaption\": 0,\r\n                    \"flexgrow\": 1,\r\n                    \"pssysviewpanelitems\": [\r\n                        {\r\n                            \"itemtype\": \"CTRLPOS\",\r\n                            \"predefinedtype\": \"SEARCHFORM\",\r\n                            \"custommode\": 0,\r\n                            \"caption\": \"搜索表单\",\r\n                            \"ppssysviewpanelitemname\": \"control_searchform\",\r\n                            \"pssysviewpanelitemname\": \"SEARCHFORM\",\r\n                            \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                            \"predefinedtypetext\": \"搜索表单\"\r\n                        }\r\n                    ]\r\n                }\r\n            ]\r\n        },\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_buttons_bottom\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 0,\r\n            \"flexdir\": \"row-reverse\",\r\n            \"flexshrink\": 0,\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"重置\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"reset\",\r\n                    \"btnactiontype\": \"UTIL_RESET\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                },\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"搜索\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"ok\",\r\n                    \"btnactiontype\": \"UTIL_SEARCH\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                }\r\n            ]\r\n        }\r\n    ]\r\n}",
     "name" : "layout",
-    "renderType" : "LAYOUTPANEL_MODEL"
+    "getPSLayoutPanel" : {
+      "codeName" : "Usr1127834506",
+      "controlType" : "PANEL",
+      "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json",
+      "layoutMode" : "FLEX",
+      "logicName" : "搜索表单自定义布局",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
+      },
+      "getPSAppViewLogics" : [ {
+        "logicTrigger" : "CUSTOM",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "layout_reset_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "layout_reset"
+        }
+      }, {
+        "logicTrigger" : "CUSTOM",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "layout_ok_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "layout_ok"
+        }
+      } ],
+      "getPSAppViewUIActions" : [ {
+        "name" : "layout_reset",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Reset"
+        },
+        "xDataControlName" : "layout"
+      }, {
+        "name" : "layout_ok",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Search"
+        },
+        "xDataControlName" : "layout"
+      } ],
+      "getPSControlParam" : { },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getRootPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "control_content",
+        "getPSLayout" : {
+          "dir" : "row",
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "control_searchform",
+          "getPSLayout" : {
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 1,
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "搜索表单",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "searchform",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "showCaption" : true
+          } ]
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "control_buttons_bottom",
+        "getPSLayout" : {
+          "dir" : "row-reverse",
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 0,
+          "layout" : "FLEX",
+          "shrink" : 0
+        },
+        "getPSPanelItems" : [ {
+          "actionType" : "UIACTION",
+          "buttonStyle" : "DEFAULT",
+          "caption" : "重置",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "BUTTON",
+          "name" : "reset",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "layout_reset"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSUIAction" : {
+            "caption" : "重置",
+            "codeName" : "Reset",
+            "fullCodeName" : "Reset",
+            "name" : "重置（搜索栏）",
+            "predefinedType" : "UTIL_RESET",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Reset",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "重置",
+          "showCaption" : true
+        }, {
+          "actionType" : "UIACTION",
+          "buttonStyle" : "DEFAULT",
+          "caption" : "搜索",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "BUTTON",
+          "name" : "ok",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "layout_ok"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSUIAction" : {
+            "caption" : "搜索",
+            "codeName" : "Search",
+            "fullCodeName" : "Search",
+            "name" : "搜索（搜索栏）",
+            "predefinedType" : "UTIL_SEARCH",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Search",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "搜索",
+          "showCaption" : true
+        } ]
+      } ],
+      "layoutPanel" : true,
+      "name" : "layout",
+      "modelid" : "CC424120-520E-4BE6-8521-295B6DE0F76F",
+      "modeltype" : "PSSYSVIEWPANEL"
+    },
+    "renderType" : "LAYOUTPANEL"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json

+{
+  "codeName" : "Usr1127834506",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json",
+  "layoutMode" : "FLEX",
+  "logicName" : "搜索表单自定义布局",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
+  },
+  "getPSAppViewLogics" : [ {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "layout_reset_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "layout_reset"
+    }
+  }, {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "layout_ok_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "layout_ok"
+    }
+  } ],
+  "getPSAppViewUIActions" : [ {
+    "name" : "layout_reset",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Reset"
+    },
+    "xDataControlName" : "layout"
+  }, {
+    "name" : "layout_ok",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Search"
+    },
+    "xDataControlName" : "layout"
+  } ],
+  "getPSLayout" : {
+    "layout" : "FLEX"
+  },
+  "getRootPSPanelItems" : [ {
+    "caption" : "容器",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "control_content",
+    "getPSLayout" : {
+      "dir" : "row",
+      "layout" : "FLEX"
+    },
+    "getPSLayoutPos" : {
+      "grow" : 1,
+      "layout" : "FLEX"
+    },
+    "getPSPanelItems" : [ {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "control_searchform",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : 1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "搜索表单",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CTRLPOS",
+        "name" : "searchform",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "showCaption" : true
+      } ]
+    } ]
+  }, {
+    "caption" : "容器",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "control_buttons_bottom",
+    "getPSLayout" : {
+      "dir" : "row-reverse",
+      "layout" : "FLEX"
+    },
+    "getPSLayoutPos" : {
+      "grow" : 0,
+      "layout" : "FLEX",
+      "shrink" : 0
+    },
+    "getPSPanelItems" : [ {
+      "actionType" : "UIACTION",
+      "buttonStyle" : "DEFAULT",
+      "caption" : "重置",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "BUTTON",
+      "name" : "reset",
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "layout_reset"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSUIAction" : {
+        "caption" : "重置",
+        "codeName" : "Reset",
+        "fullCodeName" : "Reset",
+        "name" : "重置（搜索栏）",
+        "predefinedType" : "UTIL_RESET",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Reset",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "重置",
+      "showCaption" : true
+    }, {
+      "actionType" : "UIACTION",
+      "buttonStyle" : "DEFAULT",
+      "caption" : "搜索",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "BUTTON",
+      "name" : "ok",
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "layout_ok"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSUIAction" : {
+        "caption" : "搜索",
+        "codeName" : "Search",
+        "fullCodeName" : "Search",
+        "name" : "搜索（搜索栏）",
+        "predefinedType" : "UTIL_SEARCH",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Search",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "搜索",
+      "showCaption" : true
+    } ]
+  } ],
+  "layoutPanel" : true,
+  "modelid" : "CC424120-520E-4BE6-8521-295B6DE0F76F",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoEditView.json

@@ -412,9 +412,168 @@
       "id" : "FORM"
     },
     "getPSControlRenders" : [ {
-      "layoutPanelModel" : "{\r\n    \"codename\": \"Usr1127834506\",\r\n    \"mobflag\": 0,\r\n    \"layoutmode\": \"FLEX\",\r\n    \"publicflag\": 1,\r\n    \"viewlayoutflag\": 1,\r\n    \"bodyonlyflag\": 0,\r\n    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n    \"pssysviewpanelitems\": [\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_content\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 1,\r\n            \"flexdir\": \"row\",\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"CONTAINER\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"容器\",\r\n                    \"ppssysviewpanelitemname\": \"control_content\",\r\n                    \"layoutmode\": \"FLEX\",\r\n                    \"pssysviewpanelitemname\": \"control_searchform\",\r\n                    \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                    \"showcaption\": 0,\r\n                    \"flexgrow\": 1,\r\n                    \"pssysviewpanelitems\": [\r\n                        {\r\n                            \"itemtype\": \"CTRLPOS\",\r\n                            \"predefinedtype\": \"SEARCHFORM\",\r\n                            \"custommode\": 0,\r\n                            \"caption\": \"搜索表单\",\r\n                            \"ppssysviewpanelitemname\": \"control_searchform\",\r\n                            \"pssysviewpanelitemname\": \"SEARCHFORM\",\r\n                            \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                            \"predefinedtypetext\": \"搜索表单\"\r\n                        }\r\n                    ]\r\n                }\r\n            ]\r\n        },\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_buttons_bottom\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 0,\r\n            \"flexdir\": \"row-reverse\",\r\n            \"flexshrink\": 0,\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"重置\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"reset\",\r\n                    \"btnactiontype\": \"UTIL_RESET\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                },\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"搜索\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"ok\",\r\n                    \"btnactiontype\": \"UTIL_SEARCH\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                }\r\n            ]\r\n        }\r\n    ]\r\n}",
       "name" : "layout",
-      "renderType" : "LAYOUTPANEL_MODEL"
+      "getPSLayoutPanel" : {
+        "codeName" : "Usr1127834506",
+        "controlType" : "PANEL",
+        "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json",
+        "layoutMode" : "FLEX",
+        "logicName" : "搜索表单自定义布局",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
+        },
+        "getPSAppViewLogics" : [ {
+          "logicTrigger" : "CUSTOM",
+          "logicType" : "APPVIEWUIACTION",
+          "name" : "layout_reset_click",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "layout_reset"
+          }
+        }, {
+          "logicTrigger" : "CUSTOM",
+          "logicType" : "APPVIEWUIACTION",
+          "name" : "layout_ok_click",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "layout_ok"
+          }
+        } ],
+        "getPSAppViewUIActions" : [ {
+          "name" : "layout_reset",
+          "getPSUIAction" : {
+            "modelref" : true,
+            "id" : "Reset"
+          },
+          "xDataControlName" : "layout"
+        }, {
+          "name" : "layout_ok",
+          "getPSUIAction" : {
+            "modelref" : true,
+            "id" : "Search"
+          },
+          "xDataControlName" : "layout"
+        } ],
+        "getPSControlParam" : { },
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getRootPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "control_content",
+          "getPSLayout" : {
+            "dir" : "row",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 1,
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "control_searchform",
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : 1,
+              "layout" : "FLEX"
+            },
+            "getPSPanelItems" : [ {
+              "caption" : "搜索表单",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CTRLPOS",
+              "name" : "searchform",
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "showCaption" : true
+            } ]
+          } ]
+        }, {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "control_buttons_bottom",
+          "getPSLayout" : {
+            "dir" : "row-reverse",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 0,
+            "layout" : "FLEX",
+            "shrink" : 0
+          },
+          "getPSPanelItems" : [ {
+            "actionType" : "UIACTION",
+            "buttonStyle" : "DEFAULT",
+            "caption" : "重置",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "BUTTON",
+            "name" : "reset",
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "layout_reset"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSUIAction" : {
+              "caption" : "重置",
+              "codeName" : "Reset",
+              "fullCodeName" : "Reset",
+              "name" : "重置（搜索栏）",
+              "predefinedType" : "UTIL_RESET",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Reset",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "重置",
+            "showCaption" : true
+          }, {
+            "actionType" : "UIACTION",
+            "buttonStyle" : "DEFAULT",
+            "caption" : "搜索",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "BUTTON",
+            "name" : "ok",
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "layout_ok"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSUIAction" : {
+              "caption" : "搜索",
+              "codeName" : "Search",
+              "fullCodeName" : "Search",
+              "name" : "搜索（搜索栏）",
+              "predefinedType" : "UTIL_SEARCH",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Search",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "搜索",
+            "showCaption" : true
+          } ]
+        } ],
+        "layoutPanel" : true,
+        "name" : "layout",
+        "modelid" : "CC424120-520E-4BE6-8521-295B6DE0F76F",
+        "modeltype" : "PSSYSVIEWPANEL"
+      },
+      "renderType" : "LAYOUTPANEL"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1475,16 +1475,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json

@@ -69,9 +69,136 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
   },
   "getPSControlRenders" : [ {
-    "layoutPanelModel" : "{\r\n    \"codename\": \"Usr1127834506\",\r\n    \"mobflag\": 0,\r\n    \"layoutmode\": \"FLEX\",\r\n    \"publicflag\": 1,\r\n    \"viewlayoutflag\": 1,\r\n    \"bodyonlyflag\": 0,\r\n    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n    \"pssysviewpanelitems\": [\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_content\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 1,\r\n            \"flexdir\": \"row\",\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"CONTAINER\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"容器\",\r\n                    \"ppssysviewpanelitemname\": \"control_content\",\r\n                    \"layoutmode\": \"FLEX\",\r\n                    \"pssysviewpanelitemname\": \"control_searchform\",\r\n                    \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                    \"showcaption\": 0,\r\n                    \"flexgrow\": 1,\r\n                    \"pssysviewpanelitems\": [\r\n                        {\r\n                            \"itemtype\": \"CTRLPOS\",\r\n                            \"predefinedtype\": \"SEARCHFORM\",\r\n                            \"custommode\": 0,\r\n                            \"caption\": \"搜索表单\",\r\n                            \"ppssysviewpanelitemname\": \"control_searchform\",\r\n                            \"pssysviewpanelitemname\": \"SEARCHFORM\",\r\n                            \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                            \"predefinedtypetext\": \"搜索表单\"\r\n                        }\r\n                    ]\r\n                }\r\n            ]\r\n        },\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_buttons_bottom\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 0,\r\n            \"flexdir\": \"row-reverse\",\r\n            \"flexshrink\": 0,\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"重置\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"reset\",\r\n                    \"btnactiontype\": \"UTIL_RESET\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                },\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"搜索\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"ok\",\r\n                    \"btnactiontype\": \"UTIL_SEARCH\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                }\r\n            ]\r\n        }\r\n    ]\r\n}",
     "name" : "layout",
-    "renderType" : "LAYOUTPANEL_MODEL"
+    "getPSLayoutPanel" : {
+      "codeName" : "Usr1127834506",
+      "controlType" : "PANEL",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json",
+      "layoutMode" : "FLEX",
+      "logicName" : "搜索表单自定义布局",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+      },
+      "getPSControlParam" : { },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getRootPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "control_content",
+        "getPSLayout" : {
+          "dir" : "row",
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "control_searchform",
+          "getPSLayout" : {
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 1,
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "搜索表单",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "searchform",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "showCaption" : true
+          } ]
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "control_buttons_bottom",
+        "getPSLayout" : {
+          "dir" : "row-reverse",
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 0,
+          "layout" : "FLEX",
+          "shrink" : 0
+        },
+        "getPSPanelItems" : [ {
+          "actionType" : "UIACTION",
+          "buttonStyle" : "DEFAULT",
+          "caption" : "重置",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "BUTTON",
+          "name" : "reset",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "layout_reset"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSUIAction" : {
+            "caption" : "重置",
+            "codeName" : "Reset",
+            "fullCodeName" : "Reset",
+            "name" : "重置（搜索栏）",
+            "predefinedType" : "UTIL_RESET",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Reset",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "重置",
+          "showCaption" : true
+        }, {
+          "actionType" : "UIACTION",
+          "buttonStyle" : "DEFAULT",
+          "caption" : "搜索",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "BUTTON",
+          "name" : "ok",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "layout_ok"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSUIAction" : {
+            "caption" : "搜索",
+            "codeName" : "Search",
+            "fullCodeName" : "Search",
+            "name" : "搜索（搜索栏）",
+            "predefinedType" : "UTIL_SEARCH",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Search",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "搜索",
+          "showCaption" : true
+        } ]
+      } ],
+      "layoutPanel" : true,
+      "name" : "layout",
+      "modelid" : "CC424120-520E-4BE6-8521-295B6DE0F76F",
+      "modeltype" : "PSSYSVIEWPANEL"
+    },
+    "renderType" : "LAYOUTPANEL"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json

+{
+  "codeName" : "Usr1127834506",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json",
+  "layoutMode" : "FLEX",
+  "logicName" : "搜索表单自定义布局",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+  },
+  "getPSLayout" : {
+    "layout" : "FLEX"
+  },
+  "getRootPSPanelItems" : [ {
+    "caption" : "容器",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "control_content",
+    "getPSLayout" : {
+      "dir" : "row",
+      "layout" : "FLEX"
+    },
+    "getPSLayoutPos" : {
+      "grow" : 1,
+      "layout" : "FLEX"
+    },
+    "getPSPanelItems" : [ {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "control_searchform",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : 1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "搜索表单",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CTRLPOS",
+        "name" : "searchform",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "showCaption" : true
+      } ]
+    } ]
+  }, {
+    "caption" : "容器",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "control_buttons_bottom",
+    "getPSLayout" : {
+      "dir" : "row-reverse",
+      "layout" : "FLEX"
+    },
+    "getPSLayoutPos" : {
+      "grow" : 0,
+      "layout" : "FLEX",
+      "shrink" : 0
+    },
+    "getPSPanelItems" : [ {
+      "actionType" : "UIACTION",
+      "buttonStyle" : "DEFAULT",
+      "caption" : "重置",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "BUTTON",
+      "name" : "reset",
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "layout_reset"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSUIAction" : {
+        "caption" : "重置",
+        "codeName" : "Reset",
+        "fullCodeName" : "Reset",
+        "name" : "重置（搜索栏）",
+        "predefinedType" : "UTIL_RESET",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Reset",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "重置",
+      "showCaption" : true
+    }, {
+      "actionType" : "UIACTION",
+      "buttonStyle" : "DEFAULT",
+      "caption" : "搜索",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "BUTTON",
+      "name" : "ok",
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "layout_ok"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSUIAction" : {
+        "caption" : "搜索",
+        "codeName" : "Search",
+        "fullCodeName" : "Search",
+        "name" : "搜索（搜索栏）",
+        "predefinedType" : "UTIL_SEARCH",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Search",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "搜索",
+      "showCaption" : true
+    } ]
+  } ],
+  "layoutPanel" : true,
+  "modelid" : "CC424120-520E-4BE6-8521-295B6DE0F76F",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json

@@ -173,9 +173,136 @@
       "id" : "FORM"
     },
     "getPSControlRenders" : [ {
-      "layoutPanelModel" : "{\r\n    \"codename\": \"Usr1127834506\",\r\n    \"mobflag\": 0,\r\n    \"layoutmode\": \"FLEX\",\r\n    \"publicflag\": 1,\r\n    \"viewlayoutflag\": 1,\r\n    \"bodyonlyflag\": 0,\r\n    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n    \"pssysviewpanelitems\": [\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_content\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 1,\r\n            \"flexdir\": \"row\",\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"CONTAINER\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"容器\",\r\n                    \"ppssysviewpanelitemname\": \"control_content\",\r\n                    \"layoutmode\": \"FLEX\",\r\n                    \"pssysviewpanelitemname\": \"control_searchform\",\r\n                    \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                    \"showcaption\": 0,\r\n                    \"flexgrow\": 1,\r\n                    \"pssysviewpanelitems\": [\r\n                        {\r\n                            \"itemtype\": \"CTRLPOS\",\r\n                            \"predefinedtype\": \"SEARCHFORM\",\r\n                            \"custommode\": 0,\r\n                            \"caption\": \"搜索表单\",\r\n                            \"ppssysviewpanelitemname\": \"control_searchform\",\r\n                            \"pssysviewpanelitemname\": \"SEARCHFORM\",\r\n                            \"pssysviewpanelname\": \"部件-搜索表单布局面板\",\r\n                            \"predefinedtypetext\": \"搜索表单\"\r\n                        }\r\n                    ]\r\n                }\r\n            ]\r\n        },\r\n        {\r\n            \"itemtype\": \"CONTAINER\",\r\n            \"custommode\": 0,\r\n            \"caption\": \"容器\",\r\n            \"layoutmode\": \"FLEX\",\r\n            \"pssysviewpanelitemname\": \"control_buttons_bottom\",\r\n            \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n            \"showcaption\": 0,\r\n            \"flexgrow\": 0,\r\n            \"flexdir\": \"row-reverse\",\r\n            \"flexshrink\": 0,\r\n            \"pssysviewpanelitems\": [\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"重置\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"reset\",\r\n                    \"btnactiontype\": \"UTIL_RESET\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                },\r\n                {\r\n                    \"itemtype\": \"BUTTON\",\r\n                    \"predefinedtype\": \"BUTTON_CALLUILOGIC\",\r\n                    \"custommode\": 0,\r\n                    \"caption\": \"搜索\",\r\n                    \"ppssysviewpanelitemname\": \"control_buttons_bottom\",\r\n                    \"pssysviewpanelitemname\": \"ok\",\r\n                    \"btnactiontype\": \"UTIL_SEARCH\",\r\n                    \"pssysviewpanelname\": \"搜索表单自定义布局\",\r\n                    \"predefinedtypetext\": \"按钮\"\r\n                }\r\n            ]\r\n        }\r\n    ]\r\n}",
       "name" : "layout",
-      "renderType" : "LAYOUTPANEL_MODEL"
+      "getPSLayoutPanel" : {
+        "codeName" : "Usr1127834506",
+        "controlType" : "PANEL",
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSPANELS/Usr1127834506.json",
+        "layoutMode" : "FLEX",
+        "logicName" : "搜索表单自定义布局",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+        },
+        "getPSControlParam" : { },
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getRootPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "control_content",
+          "getPSLayout" : {
+            "dir" : "row",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 1,
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "control_searchform",
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : 1,
+              "layout" : "FLEX"
+            },
+            "getPSPanelItems" : [ {
+              "caption" : "搜索表单",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CTRLPOS",
+              "name" : "searchform",
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "showCaption" : true
+            } ]
+          } ]
+        }, {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "control_buttons_bottom",
+          "getPSLayout" : {
+            "dir" : "row-reverse",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 0,
+            "layout" : "FLEX",
+            "shrink" : 0
+          },
+          "getPSPanelItems" : [ {
+            "actionType" : "UIACTION",
+            "buttonStyle" : "DEFAULT",
+            "caption" : "重置",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "BUTTON",
+            "name" : "reset",
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "layout_reset"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSUIAction" : {
+              "caption" : "重置",
+              "codeName" : "Reset",
+              "fullCodeName" : "Reset",
+              "name" : "重置（搜索栏）",
+              "predefinedType" : "UTIL_RESET",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Reset",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "重置",
+            "showCaption" : true
+          }, {
+            "actionType" : "UIACTION",
+            "buttonStyle" : "DEFAULT",
+            "caption" : "搜索",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "BUTTON",
+            "name" : "ok",
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "layout_ok"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSUIAction" : {
+              "caption" : "搜索",
+              "codeName" : "Search",
+              "fullCodeName" : "Search",
+              "name" : "搜索（搜索栏）",
+              "predefinedType" : "UTIL_SEARCH",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Search",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "搜索",
+            "showCaption" : true
+          } ]
+        } ],
+        "layoutPanel" : true,
+        "name" : "layout",
+        "modelid" : "CC424120-520E-4BE6-8521-295B6DE0F76F",
+        "modeltype" : "PSSYSVIEWPANEL"
+      },
+      "renderType" : "LAYOUTPANEL"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -11303,16 +11303,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {
@@ -11341,10 +11341,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -11353,10 +11353,10 @@
         "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     } ]
   }, {
@@ -11373,10 +11373,10 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
       }
     }, {
       "name" : "消息位置-弹出",
@@ -11385,81 +11385,81 @@
         "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg7"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     }, {
       "name" : "关闭模式-默认删除",
@@ -11468,26 +11468,26 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -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

@@ -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

@@ -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: