zhanghengfeng 发布系统代码 [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/PSSYSAPP.json

@@ -1398,16 +1398,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/ExpenseSheet/PSFORMS/Main2.json

@@ -289,7 +289,7 @@
           }
         } ],
         "getPSAppViewRefs" : [ {
-          "name" : "EDITDATA",
+          "name" : "NEWDATA",
           "realTitle" : "费用明细编辑视图",
           "getRealTitlePSLanguageRes" : {
             "defaultContent" : "费用明细编辑视图",
@@ -304,7 +304,7 @@
             "viewType" : "DEEDITVIEW"
           }
         }, {
-          "name" : "NEWDATA",
+          "name" : "EDITDATA",
           "realTitle" : "费用明细编辑视图",
           "getRealTitlePSLanguageRes" : {
             "defaultContent" : "费用明细编辑视图",

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

@@ -13,12 +13,693 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
   },
+  "getPSDEViewCodeName" : "EditView",
+  "getPSDEViewId" : "d8df8d4f474906670499181845919635",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr0822130808",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "Usr08220231EditViewDEEDITVIEW",
+    "memo" : "编辑视图",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "容器",
+      "cssStyle" : ".login-background{\n background-image: linear-gradient(#0089ED 50%,white 50%);\n}",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "heightMode" : "FULL",
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "容器",
+        "contentHeight" : 300.0,
+        "height" : 300.0,
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container1",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "height" : 300,
+          "heightMode" : "PX",
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "表单",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CTRLPOS",
+          "name" : "form",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "showCaption" : true
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container2",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "表格",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CTRLPOS",
+          "name" : "usr08226770grid",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "showCaption" : true
+        } ]
+      } ],
+      "getPSSysCss" : {
+        "cssName" : "bg-blue"
+      },
+      "predefinedType" : "CONTAINER_V_SPLIT"
+    }, {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container3",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "heightMode" : "FULL",
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "容器",
+        "contentHeight" : 40.0,
+        "height" : 40.0,
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container4",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "height" : 40,
+          "heightMode" : "PERCENTAGE",
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "搜索表单",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CTRLPOS",
+          "name" : "usr08224169searchform",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "showCaption" : true
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container5",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "分割线",
+          "contentType" : "DIVIDER",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "divider",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSRawItem" : {
+            "contentType" : "DIVIDER",
+            "name" : "divider",
+            "predefinedType" : "DIVIDER"
+          },
+          "showCaption" : true
+        }, {
+          "caption" : "表单",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CTRLPOS",
+          "name" : "usr08222078form",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "showCaption" : true
+        } ]
+      } ],
+      "predefinedType" : "CONTAINER_V_SPLIT"
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "8DA1284F-DC68-468D-91B7-CE64924820E8",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
     "getPSAppViewEngines" : [ {
       "engineCat" : "VIEW",
       "engineType" : "EditView",
       "name" : "engine"
     } ],
-  "getPSControls" : [ {
+    "getPSControls" : [ {
+      "codeName" : "Main",
+      "controlType" : "FORM",
+      "getCreatePSControlAction" : {
+        "modelref" : true,
+        "id" : "create",
+        "actionName" : "Create",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "CREATE",
+        "name" : "create",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Create"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+        }
+      },
+      "defaultLabelWidth" : 130,
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX/PSFORMS/Main.json",
+      "getGetDraftFromPSControlAction" : {
+        "modelref" : true,
+        "id" : "loaddraftfrom",
+        "actionName" : "GETDRAFTFROM",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "CREATE",
+        "name" : "loaddraftfrom",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+        }
+      },
+      "getGetDraftPSControlAction" : {
+        "modelref" : true,
+        "id" : "loaddraft",
+        "actionName" : "GetDraft",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "CREATE",
+        "name" : "loaddraft",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "GetDraft"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+        }
+      },
+      "getGetPSControlAction" : {
+        "modelref" : true,
+        "id" : "load",
+        "actionName" : "Get",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "READ",
+        "name" : "load",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Get"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+        }
+      },
+      "logicName" : "主编辑表单",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+      },
+      "getPSControlHandler" : {
+        "getPSHandlerActions" : [ {
+          "actionName" : "GetDraft",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "CREATE",
+          "name" : "loaddraft",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "GetDraft"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          }
+        }, {
+          "actionName" : "GETDRAFTFROM",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "CREATE",
+          "name" : "loaddraftfrom",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          }
+        }, {
+          "actionName" : "Get",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "READ",
+          "name" : "load",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Get"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          }
+        }, {
+          "actionName" : "Create",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "CREATE",
+          "name" : "create",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Create"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          }
+        }, {
+          "actionName" : "Update",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "UPDATE",
+          "name" : "update",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Update"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          }
+        }, {
+          "actionName" : "Remove",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "DELETE",
+          "name" : "remove",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Remove"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          }
+        } ],
+        "enableDEFieldPrivilege" : false,
+        "id" : "编辑表单处理器"
+      },
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true,
+        "id" : "FORM"
+      },
+      "getPSDEFormItems" : [ {
+        "id" : "srfupdatedate",
+        "hidden" : true,
+        "dataType" : 5,
+        "getPSAppDEField" : {
+          "name" : "UPDATEDATE",
+          "codeName" : "UpdateDate"
+        }
+      }, {
+        "id" : "srforikey",
+        "hidden" : true,
+        "dataType" : 25
+      }, {
+        "id" : "srfkey",
+        "hidden" : true,
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "BXDMXID",
+          "codeName" : "BXDMXId"
+        }
+      }, {
+        "id" : "srfmajortext",
+        "hidden" : true,
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "BXDMXNAME",
+          "codeName" : "BXDMXName"
+        }
+      }, {
+        "id" : "srftempmode",
+        "hidden" : true,
+        "dataType" : 25
+      }, {
+        "id" : "srfuf",
+        "hidden" : true,
+        "dataType" : 25
+      }, {
+        "id" : "srfdeid",
+        "hidden" : true,
+        "dataType" : 25
+      }, {
+        "id" : "srfsourcekey",
+        "hidden" : true,
+        "dataType" : 25
+      }, {
+        "id" : "bxdid",
+        "hidden" : true,
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "BXDID",
+          "codeName" : "BXDId"
+        }
+      }, {
+        "id" : "bxdmxid",
+        "hidden" : true,
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "BXDMXID",
+          "codeName" : "BXDMXId"
+        }
+      }, {
+        "id" : "bxdname",
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "BXDNAME",
+          "codeName" : "BXDName"
+        }
+      }, {
+        "id" : "bxdmxname",
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "BXDMXNAME",
+          "codeName" : "BXDMXName"
+        }
+      }, {
+        "id" : "formitem1",
+        "dataType" : 25
+      }, {
+        "id" : "formitem2",
+        "dataType" : 25
+      } ],
+      "getPSDEFormPages" : [ {
+        "caption" : "基本信息",
+        "codeName" : "formpage1",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMPAGE",
+        "name" : "formpage1",
+        "getPSDEFormDetails" : [ {
+          "actionGroupExtractMode" : "ITEM",
+          "caption" : "报销单明细基本信息",
+          "codeName" : "group1",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "GROUPPANEL",
+          "name" : "group1",
+          "getPSDEFormDetails" : [ {
+            "caption" : "报销单标识",
+            "codeName" : "bxdid",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "bxdid",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "BXDID",
+              "codeName" : "BXDId"
+            },
+            "getPSEditor" : {
+              "editorType" : "HIDDEN",
+              "name" : "bxdid"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "hidden" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "报销单明细标识",
+            "codeName" : "bxdmxid",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "bxdmxid",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "BXDMXID",
+              "codeName" : "BXDMXId"
+            },
+            "getPSEditor" : {
+              "editorType" : "HIDDEN",
+              "name" : "bxdmxid"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "hidden" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "报销单名称",
+            "codeName" : "bxdname",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "bxdname",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "BXDNAME",
+              "codeName" : "BXDName"
+            },
+            "getPSEditor" : {
+              "cssStyle" : "background: red;\r\n",
+              "dynaClass" : "{\r\n    \"color\": \"red\"\r\n}",
+              "editorParams" : {
+                "AC" : "TRUE",
+                "PICKUPVIEW" : "TRUE"
+              },
+              "editorType" : "PICKER",
+              "handlerType" : "PickupText",
+              "name" : "bxdname",
+              "getPSAppDEACMode" : {
+                "modelref" : true,
+                "id" : "Default"
+              },
+              "getPSAppDEDataSet" : {
+                "modelref" : true,
+                "id" : "FetchDefault"
+              },
+              "getPSAppDataEntity" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+              },
+              "getPSEditorItems" : [ {
+                "name" : "bxdid"
+              } ],
+              "getPickupPSAppView" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",
+                "viewType" : "DEPICKUPVIEW"
+              },
+              "valueItemName" : "bxdid",
+              "enableAC" : true,
+              "enablePickupView" : true,
+              "forceSelection" : true,
+              "showTrigger" : true,
+              "singleSelect" : true
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "valueItemName" : "bxdid",
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "报销单明细名称",
+            "codeName" : "bxdmxname",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "bxdmxname",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "BXDMXNAME",
+              "codeName" : "BXDMXName"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "maxLength" : 200,
+              "name" : "bxdmxname"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "unitName" : "元",
+            "allowEmpty" : true,
+            "enableUnitName" : true,
+            "showCaption" : true
+          }, {
+            "codeName" : "formitem1",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "formitem1",
+            "noPrivDisplayMode" : 1,
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "name" : "formitem1"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          } ],
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "infoGroupMode" : false,
+          "showCaption" : false
+        }, {
+          "codeName" : "formitem2",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "formitem2",
+          "noPrivDisplayMode" : 1,
+          "getPSEditor" : {
+            "editorType" : "PICTURE",
+            "maxFileCount" : -1,
+            "maxFileSize" : -1,
+            "minFileCount" : 0,
+            "name" : "formitem2"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : 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"
+      },
+      "getRemovePSControlAction" : {
+        "modelref" : true,
+        "id" : "remove",
+        "actionName" : "Remove",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "DELETE",
+        "name" : "remove",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Remove"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+        }
+      },
+      "tabHeaderPos" : "TOP",
+      "getUpdatePSControlAction" : {
+        "modelref" : true,
+        "id" : "update",
+        "actionName" : "Update",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "UPDATE",
+        "name" : "update",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Update"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+        }
+      },
+      "noTabHeader" : true,
+      "name" : "form",
+      "modelid" : "998f310b6b5e8def1b8a02172d417a1e",
+      "modeltype" : "PSDEFORM_EDITFORM"
+    }, {
       "codeName" : "EditViewtoolbar",
       "controlType" : "TOOLBAR",
       "logicName" : "工具栏模板（默认编辑界面）",
@@ -592,118 +1273,53 @@
             "name" : "工具栏按钮提示[*.HELP]",
             "refFlag" : true
           },
-        "uIActionMode" : "SYS",
-        "uIActionTag" : "Help",
-        "uIActionType" : "DEUIACTION"
-      },
-      "tooltip" : "帮助",
-      "getTooltipPSLanguageRes" : {
-        "defaultContent" : "帮助",
-        "lanResTag" : "TBB.TOOLTIP.*.HELP",
-        "lanResType" : "TBB.TOOLTIP",
-        "name" : "工具栏按钮提示[*.HELP]",
-        "refFlag" : true
-      },
-      "showCaption" : true,
-      "showIcon" : true
-    } ],
-    "xDataControlName" : "form",
-    "modelid" : "a4eb00b17f8652bdf677cb4ed5231e63",
-    "modeltype" : "PSDETOOLBAR"
-  }, {
-    "codeName" : "Main",
-    "controlType" : "FORM",
-    "getCreatePSControlAction" : {
-      "modelref" : true,
-      "id" : "create",
-      "actionName" : "Create",
-      "actionType" : "DEACTION",
-      "dataAccessAction" : "CREATE",
-      "name" : "create",
-      "getPSAppDEMethod" : {
-        "modelref" : true,
-        "id" : "Create"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-      }
-    },
-    "defaultLabelWidth" : 130,
-    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX/PSFORMS/Main.json",
-    "getGetDraftFromPSControlAction" : {
-      "modelref" : true,
-      "id" : "loaddraftfrom",
-      "actionName" : "GETDRAFTFROM",
-      "actionType" : "DEACTION",
-      "dataAccessAction" : "CREATE",
-      "name" : "loaddraftfrom",
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-      }
-    },
-    "getGetDraftPSControlAction" : {
-      "modelref" : true,
-      "id" : "loaddraft",
-      "actionName" : "GetDraft",
-      "actionType" : "DEACTION",
-      "dataAccessAction" : "CREATE",
-      "name" : "loaddraft",
-      "getPSAppDEMethod" : {
-        "modelref" : true,
-        "id" : "GetDraft"
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Help",
+          "uIActionType" : "DEUIACTION"
         },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-      }
+        "tooltip" : "帮助",
+        "getTooltipPSLanguageRes" : {
+          "defaultContent" : "帮助",
+          "lanResTag" : "TBB.TOOLTIP.*.HELP",
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.HELP]",
+          "refFlag" : true
         },
-    "getGetPSControlAction" : {
+        "showCaption" : true,
+        "showIcon" : true
+      } ],
+      "xDataControlName" : "form",
+      "modelid" : "a4eb00b17f8652bdf677cb4ed5231e63",
+      "modeltype" : "PSDETOOLBAR"
+    }, {
+      "aggMode" : "NONE",
+      "codeName" : "Main",
+      "columnEnableFilter" : 2,
+      "columnEnableLink" : 2,
+      "controlType" : "GRID",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg/PSGRIDS/Main.json",
+      "getFetchPSControlAction" : {
         "modelref" : true,
-      "id" : "load",
-      "actionName" : "Get",
-      "actionType" : "DEACTION",
-      "dataAccessAction" : "READ",
-      "name" : "load",
+        "id" : "fetch",
+        "actionType" : "DEDATASET",
+        "name" : "fetch",
         "getPSAppDEMethod" : {
           "modelref" : true,
-        "id" : "Get"
+          "id" : "FetchDefault"
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
         }
       },
-    "logicName" : "主编辑表单",
+      "groupMode" : "NONE",
+      "logicName" : "主表格",
       "getPSAppDataEntity" : {
         "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
       },
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
-        "actionName" : "GetDraft",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "CREATE",
-        "name" : "loaddraft",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "GetDraft"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-        }
-      }, {
-        "actionName" : "GETDRAFTFROM",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "CREATE",
-        "name" : "loaddraftfrom",
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-        }
-      }, {
           "actionName" : "Get",
           "actionType" : "DEACTION",
           "dataAccessAction" : "READ",
@@ -714,7 +1330,7 @@
           },
           "getPSAppDataEntity" : {
             "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
           }
         }, {
           "actionName" : "Create",
@@ -727,362 +1343,290 @@
           },
           "getPSAppDataEntity" : {
             "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-        }
-      }, {
-        "actionName" : "Update",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "UPDATE",
-        "name" : "update",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "Update"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-        }
-      }, {
-        "actionName" : "Remove",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "DELETE",
-        "name" : "remove",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "Remove"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-        }
-      } ],
-      "enableDEFieldPrivilege" : false,
-      "id" : "编辑表单处理器"
-    },
-    "getPSControlParam" : {
-      "autoLoad" : true,
-      "showBusyIndicator" : true,
-      "id" : "FORM"
-    },
-    "getPSDEFormItems" : [ {
-      "id" : "srfupdatedate",
-      "hidden" : true,
-      "dataType" : 5,
-      "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
-        "codeName" : "UpdateDate"
-      }
-    }, {
-      "id" : "srforikey",
-      "hidden" : true,
-      "dataType" : 25
-    }, {
-      "id" : "srfkey",
-      "hidden" : true,
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "BXDMXID",
-        "codeName" : "BXDMXId"
-      }
-    }, {
-      "id" : "srfmajortext",
-      "hidden" : true,
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "BXDMXNAME",
-        "codeName" : "BXDMXName"
-      }
-    }, {
-      "id" : "srftempmode",
-      "hidden" : true,
-      "dataType" : 25
-    }, {
-      "id" : "srfuf",
-      "hidden" : true,
-      "dataType" : 25
-    }, {
-      "id" : "srfdeid",
-      "hidden" : true,
-      "dataType" : 25
-    }, {
-      "id" : "srfsourcekey",
-      "hidden" : true,
-      "dataType" : 25
-    }, {
-      "id" : "bxdid",
-      "hidden" : true,
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "BXDID",
-        "codeName" : "BXDId"
-      }
-    }, {
-      "id" : "bxdmxid",
-      "hidden" : true,
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "BXDMXID",
-        "codeName" : "BXDMXId"
-      }
-    }, {
-      "id" : "bxdname",
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "BXDNAME",
-        "codeName" : "BXDName"
-      }
-    }, {
-      "id" : "bxdmxname",
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "BXDMXNAME",
-        "codeName" : "BXDMXName"
-      }
-    }, {
-      "id" : "formitem1",
-      "dataType" : 25
-    }, {
-      "id" : "formitem2",
-      "dataType" : 25
-    } ],
-    "getPSDEFormPages" : [ {
-      "caption" : "基本信息",
-      "codeName" : "formpage1",
-      "detailStyle" : "DEFAULT",
-      "detailType" : "FORMPAGE",
-      "name" : "formpage1",
-      "getPSDEFormDetails" : [ {
-        "actionGroupExtractMode" : "ITEM",
-        "caption" : "报销单明细基本信息",
-        "codeName" : "group1",
-        "detailStyle" : "DEFAULT",
-        "detailType" : "GROUPPANEL",
-        "name" : "group1",
-        "getPSDEFormDetails" : [ {
-          "caption" : "报销单标识",
-          "codeName" : "bxdid",
-          "dataType" : 25,
-          "detailStyle" : "DEFAULT",
-          "detailType" : "FORMITEM",
-          "enableCond" : 3,
-          "ignoreInput" : 0,
-          "labelPos" : "LEFT",
-          "labelWidth" : 130,
-          "name" : "bxdid",
-          "noPrivDisplayMode" : 1,
-          "getPSAppDEField" : {
-            "name" : "BXDID",
-            "codeName" : "BXDId"
-          },
-          "getPSEditor" : {
-            "editorType" : "HIDDEN",
-            "name" : "bxdid"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "allowEmpty" : true,
-          "hidden" : true,
-          "showCaption" : true
-        }, {
-          "caption" : "报销单明细标识",
-          "codeName" : "bxdmxid",
-          "dataType" : 25,
-          "detailStyle" : "DEFAULT",
-          "detailType" : "FORMITEM",
-          "enableCond" : 3,
-          "ignoreInput" : 0,
-          "labelPos" : "LEFT",
-          "labelWidth" : 130,
-          "name" : "bxdmxid",
-          "noPrivDisplayMode" : 1,
-          "getPSAppDEField" : {
-            "name" : "BXDMXID",
-            "codeName" : "BXDMXId"
-          },
-          "getPSEditor" : {
-            "editorType" : "HIDDEN",
-            "name" : "bxdmxid"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "allowEmpty" : true,
-          "hidden" : true,
-          "showCaption" : true
-        }, {
-          "caption" : "报销单名称",
-          "codeName" : "bxdname",
-          "dataType" : 25,
-          "detailStyle" : "DEFAULT",
-          "detailType" : "FORMITEM",
-          "enableCond" : 3,
-          "ignoreInput" : 0,
-          "labelPos" : "LEFT",
-          "labelWidth" : 130,
-          "name" : "bxdname",
-          "noPrivDisplayMode" : 1,
-          "getPSAppDEField" : {
-            "name" : "BXDNAME",
-            "codeName" : "BXDName"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
+          }
+        }, {
+          "actionName" : "Update",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "UPDATE",
+          "name" : "update",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Update"
           },
-          "getPSEditor" : {
-            "cssStyle" : "background: red;\r\n",
-            "dynaClass" : "{\r\n    \"color\": \"red\"\r\n}",
-            "editorParams" : {
-              "AC" : "TRUE",
-              "PICKUPVIEW" : "TRUE"
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
+          }
+        }, {
+          "actionName" : "Remove",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "DELETE",
+          "name" : "remove",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Remove"
           },
-            "editorType" : "PICKER",
-            "handlerType" : "PickupText",
-            "name" : "bxdname",
-            "getPSAppDEACMode" : {
+          "getPSAppDataEntity" : {
             "modelref" : true,
-              "id" : "Default"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
+          }
+        }, {
+          "actionName" : "GetDraft",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "CREATE",
+          "name" : "loaddraft",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "GetDraft"
           },
-            "getPSAppDEDataSet" : {
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
+          }
+        }, {
+          "actionType" : "DEDATASET",
+          "name" : "fetch",
+          "getPSAppDEMethod" : {
             "modelref" : true,
             "id" : "FetchDefault"
           },
           "getPSAppDataEntity" : {
             "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
-            },
-            "getPSEditorItems" : [ {
-              "name" : "bxdid"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
+          }
         } ],
-            "getPickupPSAppView" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",
-              "viewType" : "DEPICKUPVIEW"
+        "userDRAction" : "READ",
+        "enableDEFieldPrivilege" : false,
+        "id" : "数据表格处理器"
       },
-            "valueItemName" : "bxdid",
-            "enableAC" : true,
-            "enablePickupView" : true,
-            "forceSelection" : true,
-            "showTrigger" : true,
-            "singleSelect" : true
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true,
+        "id" : "USR08226770GRID"
+      },
+      "getPSDEGridColumns" : [ {
+        "align" : "LEFT",
+        "cLConvertMode" : "NONE",
+        "caption" : "标题",
+        "codeName" : "title",
+        "columnType" : "DEFGRIDCOLUMN",
+        "dataItemName" : "title",
+        "excelCaption" : "标题",
+        "name" : "title",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TITLE",
+          "codeName" : "Title"
         },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+        "width" : 100,
+        "widthUnit" : "PX",
+        "enableSort" : true
+      }, {
+        "align" : "LEFT",
+        "cLConvertMode" : "NONE",
+        "caption" : "标题语言资源",
+        "codeName" : "titlelanres",
+        "columnType" : "DEFGRIDCOLUMN",
+        "dataItemName" : "titlelanres",
+        "excelCaption" : "标题语言资源",
+        "name" : "titlelanres",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TITLELANRES",
+          "codeName" : "TitleLanRes"
         },
-          "valueItemName" : "bxdid",
-          "allowEmpty" : true,
-          "showCaption" : true
+        "width" : 100,
+        "widthUnit" : "PX",
+        "enableSort" : true
       }, {
-          "caption" : "报销单明细名称",
-          "codeName" : "bxdmxname",
-          "dataType" : 25,
-          "detailStyle" : "DEFAULT",
-          "detailType" : "FORMITEM",
-          "enableCond" : 3,
-          "ignoreInput" : 0,
-          "labelPos" : "LEFT",
-          "labelWidth" : 130,
-          "name" : "bxdmxname",
+        "align" : "LEFT",
+        "cLConvertMode" : "FRONT",
+        "caption" : "消息位置",
+        "codeName" : "position",
+        "columnType" : "DEFGRIDCOLUMN",
+        "dataItemName" : "position",
+        "excelCaption" : "消息位置",
+        "name" : "position",
         "noPrivDisplayMode" : 1,
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ViewMsgPosition.json"
+        },
         "getPSAppDEField" : {
-            "name" : "BXDMXNAME",
-            "codeName" : "BXDMXName"
+          "name" : "POSITION",
+          "codeName" : "Position"
         },
-          "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 200,
-            "name" : "bxdmxname"
+        "width" : 100,
+        "widthUnit" : "PX",
+        "enableSort" : true
+      }, {
+        "align" : "LEFT",
+        "cLConvertMode" : "NONE",
+        "caption" : "内容",
+        "codeName" : "message",
+        "columnType" : "DEFGRIDCOLUMN",
+        "dataItemName" : "message",
+        "excelCaption" : "内容",
+        "name" : "message",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "MESSAGE",
+          "codeName" : "Message"
         },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+        "width" : 100,
+        "widthUnit" : "PX",
+        "enableSort" : true
+      }, {
+        "align" : "LEFT",
+        "cLConvertMode" : "FRONT",
+        "caption" : "消息类型",
+        "codeName" : "messagetype",
+        "columnType" : "DEFGRIDCOLUMN",
+        "dataItemName" : "messagetype",
+        "excelCaption" : "消息类型",
+        "name" : "messagetype",
+        "noPrivDisplayMode" : 1,
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ViewMsgType.json"
         },
-          "unitName" : "元",
-          "allowEmpty" : true,
-          "enableUnitName" : true,
-          "showCaption" : true
+        "getPSAppDEField" : {
+          "name" : "MESSAGETYPE",
+          "codeName" : "MessageType"
+        },
+        "width" : 100,
+        "widthUnit" : "PX",
+        "enableSort" : true
       }, {
-          "codeName" : "formitem1",
-          "dataType" : 25,
-          "detailStyle" : "DEFAULT",
-          "detailType" : "FORMITEM",
-          "enableCond" : 3,
-          "ignoreInput" : 0,
-          "labelPos" : "LEFT",
-          "labelWidth" : 130,
-          "name" : "formitem1",
+        "align" : "LEFT",
+        "cLConvertMode" : "FRONT",
+        "caption" : "删除模式",
+        "codeName" : "removemode",
+        "columnType" : "DEFGRIDCOLUMN",
+        "dataItemName" : "removemode",
+        "excelCaption" : "删除模式",
+        "name" : "removemode",
         "noPrivDisplayMode" : 1,
-          "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "name" : "formitem1"
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ViewMsgRemoveMode.json"
         },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+        "getPSAppDEField" : {
+          "name" : "REMOVEMODE",
+          "codeName" : "RemoveMode"
         },
-          "allowEmpty" : true,
-          "showCaption" : true
-        } ],
-        "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+        "width" : 100,
+        "widthUnit" : "PX",
+        "enableSort" : true
+      }, {
+        "align" : "LEFT",
+        "cLConvertMode" : "NONE",
+        "caption" : "排序值",
+        "codeName" : "order",
+        "columnType" : "DEFGRIDCOLUMN",
+        "dataItemName" : "order",
+        "excelCaption" : "排序值",
+        "name" : "order",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "ORDER",
+          "codeName" : "Order"
         },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+        "width" : 100,
+        "widthUnit" : "PX",
+        "enableSort" : true
+      } ],
+      "getPSDEGridDataItems" : [ {
+        "dataType" : 25,
+        "name" : "title",
+        "getPSAppDEField" : {
+          "name" : "TITLE",
+          "codeName" : "Title"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "titlelanres",
+        "getPSAppDEField" : {
+          "name" : "TITLELANRES",
+          "codeName" : "TitleLanRes"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "position",
+        "getPSAppDEField" : {
+          "name" : "POSITION",
+          "codeName" : "Position"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "message",
+        "getPSAppDEField" : {
+          "name" : "MESSAGE",
+          "codeName" : "Message"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "messagetype",
+        "getPSAppDEField" : {
+          "name" : "MESSAGETYPE",
+          "codeName" : "MessageType"
+        }
+      }, {
+        "dataType" : 9,
+        "name" : "removemode",
+        "getPSAppDEField" : {
+          "name" : "REMOVEMODE",
+          "codeName" : "RemoveMode"
+        }
+      }, {
+        "dataType" : 9,
+        "name" : "order",
+        "getPSAppDEField" : {
+          "name" : "ORDER",
+          "codeName" : "Order"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "srfkey",
+        "getPSAppDEField" : {
+          "name" : "VIEWMSGID",
+          "codeName" : "ViewMsgId"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "srfdataaccaction",
+        "getPSAppDEField" : {
+          "name" : "VIEWMSGID",
+          "codeName" : "ViewMsgId"
         },
-        "infoGroupMode" : false,
-        "showCaption" : false
+        "dataAccessAction" : true
       }, {
-        "codeName" : "formitem2",
         "dataType" : 25,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
+        "name" : "srfmajortext",
+        "getPSAppDEField" : {
+          "name" : "VIEWMSGNAME",
+          "codeName" : "ViewMsgName"
+        }
+      } ],
+      "getPSDEGridEditItems" : [ {
+        "caption" : "视图消息标识",
+        "codeName" : "srfkey",
         "enableCond" : 3,
         "ignoreInput" : 0,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "formitem2",
-        "noPrivDisplayMode" : 1,
-        "getPSEditor" : {
-          "editorType" : "PICTURE",
-          "maxFileCount" : -1,
-          "maxFileSize" : -1,
-          "minFileCount" : 0,
-          "name" : "formitem2"
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+        "name" : "srfkey",
+        "getPSAppDEField" : {
+          "name" : "VIEWMSGID",
+          "codeName" : "ViewMsgId"
         },
-        "allowEmpty" : true,
-        "showCaption" : true
-      } ],
-      "getPSLayout" : {
-        "childColLG" : -1,
-        "childColMD" : 24,
-        "childColSM" : -1,
-        "childColXS" : -1,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
+        "getPSEditor" : {
+          "editorType" : "HIDDEN",
+          "name" : "srfkey"
         },
-      "infoGroupMode" : false
+        "allowEmpty" : true
       } ],
-    "getPSLayout" : {
-      "childColLG" : -1,
-      "childColMD" : 24,
-      "childColSM" : -1,
-      "childColXS" : -1,
-      "columnCount" : 24,
-      "layout" : "TABLE_24COL"
-    },
+      "pagingSize" : 20,
       "getRemovePSControlAction" : {
-      "modelref" : true,
-      "id" : "remove",
         "actionName" : "Remove",
         "actionType" : "DEACTION",
         "dataAccessAction" : "DELETE",
@@ -1093,30 +1637,25 @@
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-      }
-    },
-    "tabHeaderPos" : "TOP",
-    "getUpdatePSControlAction" : {
-      "modelref" : true,
-      "id" : "update",
-      "actionName" : "Update",
-      "actionType" : "DEACTION",
-      "dataAccessAction" : "UPDATE",
-      "name" : "update",
-      "getPSAppDEMethod" : {
-        "modelref" : true,
-        "id" : "Update"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
         }
       },
-    "noTabHeader" : true,
-    "name" : "form",
-    "modelid" : "998f310b6b5e8def1b8a02172d417a1e",
-    "modeltype" : "PSDEFORM_EDITFORM"
+      "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,
+      "name" : "usr08226770grid",
+      "modelid" : "3d3aaa976f055344759206b675945027",
+      "modeltype" : "PSDEGRID"
     }, {
       "codeName" : "EditViewdatainfobar",
       "controlType" : "DATAINFOBAR",
@@ -1138,22 +1677,7 @@
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
       },
       "getPSControlParam" : { }
-  } ],
-  "getPSDEViewCodeName" : "EditView",
-  "getPSDEViewId" : "d8df8d4f474906670499181845919635",
-  "getPSViewLayoutPanel" : {
-    "codeName" : "Layoutpanel",
-    "controlStyle" : "APPDEEDITVIEW",
-    "controlType" : "VIEWLAYOUTPANEL",
-    "name" : "layoutpanel",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
-    },
-    "getPSControlParam" : { },
-    "layoutBodyOnly" : true,
-    "layoutPanel" : true,
-    "useDefaultLayout" : true
+    } ]
   },
   "title" : "报销单明细编辑视图",
   "viewStyle" : "DEFAULT",

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

@@ -80,7 +80,7 @@
     }
   } ],
   "getPSAppViewRefs" : [ {
-    "name" : "EDITDATA",
+    "name" : "NEWDATA",
     "realTitle" : "费用明细编辑视图",
     "getRealTitlePSLanguageRes" : {
       "defaultContent" : "费用明细编辑视图",
@@ -95,7 +95,7 @@
       "viewType" : "DEEDITVIEW"
     }
   }, {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
     "realTitle" : "费用明细编辑视图",
     "getRealTitlePSLanguageRes" : {
       "defaultContent" : "费用明细编辑视图",

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

@@ -399,7 +399,7 @@
             }
           } ],
           "getPSAppViewRefs" : [ {
-            "name" : "EDITDATA",
+            "name" : "NEWDATA",
             "realTitle" : "费用明细编辑视图",
             "getRealTitlePSLanguageRes" : {
               "defaultContent" : "费用明细编辑视图",
@@ -414,7 +414,7 @@
               "viewType" : "DEEDITVIEW"
             }
           }, {
-            "name" : "NEWDATA",
+            "name" : "EDITDATA",
             "realTitle" : "费用明细编辑视图",
             "getRealTitlePSLanguageRes" : {
               "defaultContent" : "费用明细编辑视图",

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

@@ -9339,16 +9339,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"
       }
     } ]
   }, {
@@ -9398,38 +9398,45 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
@@ -9439,11 +9446,12 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
@@ -9451,10 +9459,10 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
@@ -9463,19 +9471,11 @@
         "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -9487,32 +9487,32 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],
@@ -14838,7 +14838,7 @@
                 }
               } ],
               "getPSAppViewRefs" : [ {
-                "name" : "EDITDATA",
+                "name" : "NEWDATA",
                 "realTitle" : "费用明细编辑视图",
                 "getRealTitlePSLanguageRes" : {
                   "defaultContent" : "费用明细编辑视图",
@@ -14853,7 +14853,7 @@
                   "viewType" : "DEEDITVIEW"
                 }
               }, {
-                "name" : "NEWDATA",
+                "name" : "EDITDATA",
                 "realTitle" : "费用明细编辑视图",
                 "getRealTitlePSLanguageRes" : {
                   "defaultContent" : "费用明细编辑视图",

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: