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/Web/PSAPPDATAENTITIES/TEST.json

@@ -6300,6 +6300,10 @@
     }
   } ],
   "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+    "viewType" : "DEEDITVIEW2"
+  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
     "viewType" : "DEEDITVIEW"

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

@@ -3,7 +3,6 @@
   "caption" : "测试实体",
   "codeName" : "TESTEditView2",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
-  "mOSFilePath" : "pssysapps/Web/psappdeviews/TESTEditView2",
   "name" : "TESTEditView2",
   "getPSAppDataEntity" : {
     "modelref" : true,
@@ -16,444 +15,27 @@
   "getPSAppViewEngines" : [ {
     "engineCat" : "VIEW",
     "engineType" : "EditView2",
-    "mOSFilePath" : "pssysapps/Web/psappdeviews/TESTEditView2/psappviewengines/engine",
-    "name" : "engine",
-    "getPSUIEngineParams" : [ {
-      "ctrlName" : "drbar",
-      "name" : "DRBAR",
-      "paramType" : "CTRL"
-    }, {
-      "ctrlName" : "form",
-      "name" : "FORM",
-      "paramType" : "CTRL"
-    }, {
-      "name" : "P2K",
-      "paramType" : "VALUE",
-      "value" : 0
-    } ]
-  } ],
-  "getPSAppViewLogics" : [ {
-    "eventArg" : "tbitem3",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem3_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem3"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem4",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem4_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem4"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem5",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem5_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem5"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem7",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem7_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem7"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem9",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem9_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem9"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem10",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem10_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem10"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem12",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem12_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem12"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem14",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem14_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem14"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem15",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem15_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem15"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem23",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem23_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem23"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem24",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem24_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem24"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem25",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem25_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem25"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem26",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem26_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem26"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  }, {
-    "eventArg" : "tbitem22",
-    "eventNames" : "CLICK",
-    "logicTrigger" : "CTRLEVENT",
-    "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem22_click",
-    "getPSAppViewUIAction" : {
-      "modelref" : true,
-      "id" : "toolbar_tbitem22"
-    },
-    "getPSViewCtrlName" : "toolbar"
-  } ],
-  "getPSAppViewUIActions" : [ {
-    "name" : "toolbar_tbitem3",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "Save"
-    },
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem4",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "SaveAndNew"
-    },
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem5",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "SaveAndExit"
-    },
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem7",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "RemoveAndExit"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem9",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "SaveAndStart"
-    },
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem10",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "ViewWFStep"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem12",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "New"
-    },
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem14",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "Copy"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem15",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "Print"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem23",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "FirstRecord"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem24",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "PrevRecord"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem25",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "NextRecord"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem26",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "LastRecord"
-    },
-    "uIActionTarget" : "SINGLEKEY",
-    "xDataControlName" : "form"
-  }, {
-    "name" : "toolbar_tbitem22",
-    "getPSUIAction" : {
-      "modelref" : true,
-      "id" : "Help"
-    },
-    "xDataControlName" : "form"
+    "name" : "engine"
   } ],
   "getPSControls" : [ {
     "codeName" : "EditView2toolbar",
     "controlType" : "TOOLBAR",
-    "hookEventNames" : [ "CLICK" ],
     "logicName" : "工具栏模板（默认编辑界面）",
-    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdetoolbars/EditView2toolbar",
     "name" : "toolbar",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     },
-    "getPSControlLogics" : [ {
-      "eventArg" : "tbitem3",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem3_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem3_click"
-      }
-    }, {
-      "eventArg" : "tbitem4",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem4_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem4_click"
-      }
-    }, {
-      "eventArg" : "tbitem5",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem5_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem5_click"
-      }
-    }, {
-      "eventArg" : "tbitem7",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem7_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem7_click"
-      }
-    }, {
-      "eventArg" : "tbitem9",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem9_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem9_click"
-      }
-    }, {
-      "eventArg" : "tbitem10",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem10_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem10_click"
-      }
-    }, {
-      "eventArg" : "tbitem12",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem12_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem12_click"
-      }
-    }, {
-      "eventArg" : "tbitem14",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem14_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem14_click"
-      }
-    }, {
-      "eventArg" : "tbitem15",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem15_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem15_click"
-      }
-    }, {
-      "eventArg" : "tbitem23",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem23_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem23_click"
-      }
-    }, {
-      "eventArg" : "tbitem24",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem24_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem24_click"
-      }
-    }, {
-      "eventArg" : "tbitem25",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem25_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem25_click"
-      }
-    }, {
-      "eventArg" : "tbitem26",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem26_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem26_click"
-      }
-    }, {
-      "eventArg" : "tbitem22",
-      "eventNames" : "CLICK",
-      "logicTag" : "toolbar",
-      "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem22_click",
-      "getPSAppViewLogic" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem22_click"
-      }
-    } ],
     "getPSControlParam" : {
       "id" : "TOOLBAR"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
+        "defaultContent" : "保存",
         "lanResTag" : "TBB.TEXT.*.SAVE",
-        "mOSFilePath" : "pslanguageres/Auto8",
-        "rTMOSFilePath" : "pslanguageres/Auto8"
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.SAVE]",
+        "refFlag" : true
       },
       "caption" : "保存",
       "groupExtractMode" : "ITEM",
@@ -470,26 +52,28 @@
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
+          "defaultContent" : "保存",
           "lanResTag" : "TBB.TEXT.*.SAVE",
-          "mOSFilePath" : "pslanguageres/Auto8",
-          "rTMOSFilePath" : "pslanguageres/Auto8"
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.SAVE]",
+          "refFlag" : true
         },
         "caption" : "保存",
         "codeName" : "Save",
         "fullCodeName" : "Save",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Save",
         "name" : "编辑界面_保存操作",
         "getPSSysImage" : {
           "glyph" : "xf0c7@FontAwesome",
           "cssClass" : "fa fa-save"
         },
         "predefinedType" : "EDITVIEW_SAVEACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Save",
         "timeout" : 60000,
         "getTooltipPSLanguageRes" : {
+          "defaultContent" : "保存",
           "lanResTag" : "TBB.TOOLTIP.*.SAVE",
-          "mOSFilePath" : "pslanguageres/Auto261",
-          "rTMOSFilePath" : "pslanguageres/Auto261"
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.SAVE]",
+          "refFlag" : true
         },
         "uIActionMode" : "SYS",
         "uIActionTag" : "Save",
@@ -497,17 +81,21 @@
       },
       "tooltip" : "保存",
       "getTooltipPSLanguageRes" : {
+        "defaultContent" : "保存",
         "lanResTag" : "TBB.TOOLTIP.*.SAVE",
-        "mOSFilePath" : "pslanguageres/Auto261",
-        "rTMOSFilePath" : "pslanguageres/Auto261"
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.SAVE]",
+        "refFlag" : true
       },
       "showCaption" : true,
       "showIcon" : true
     }, {
       "getCapPSLanguageRes" : {
+        "defaultContent" : "保存并新建",
         "lanResTag" : "TBB.TEXT.EDITVIEW.SAVEANDNEW",
-        "mOSFilePath" : "pslanguageres/Auto68",
-        "rTMOSFilePath" : "pslanguageres/Auto68"
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[EDITVIEW.SAVEANDNEW]",
+        "refFlag" : true
       },
       "caption" : "保存并新建",
       "groupExtractMode" : "ITEM",
@@ -523,25 +111,27 @@
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
+          "defaultContent" : "保存并新建",
           "lanResTag" : "TBB.TEXT.EDITVIEW.SAVEANDNEW",
-          "mOSFilePath" : "pslanguageres/Auto68",
-          "rTMOSFilePath" : "pslanguageres/Auto68"
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[EDITVIEW.SAVEANDNEW]",
+          "refFlag" : true
         },
         "caption" : "保存并新建",
         "codeName" : "SaveAndNew",
         "fullCodeName" : "SaveAndNew",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/SaveAndNew",
         "name" : "编辑界面_保存并新建操作",
         "getPSSysImage" : {
           "cssClass" : "sx-tb-saveandnew"
         },
         "predefinedType" : "EDITVIEW_SAVEANDNEWACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/SaveAndNew",
         "timeout" : 60000,
         "getTooltipPSLanguageRes" : {
+          "defaultContent" : "保存并新建",
           "lanResTag" : "TBB.TOOLTIP.EDITVIEW.SAVEANDNEW",
-          "mOSFilePath" : "pslanguageres/Auto82",
-          "rTMOSFilePath" : "pslanguageres/Auto82"
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[EDITVIEW.SAVEANDNEW]",
+          "refFlag" : true
         },
         "uIActionMode" : "SYS",
         "uIActionTag" : "SaveAndNew",
@@ -549,17 +139,21 @@
       },
       "tooltip" : "保存并新建",
       "getTooltipPSLanguageRes" : {
+        "defaultContent" : "保存并新建",
         "lanResTag" : "TBB.TOOLTIP.EDITVIEW.SAVEANDNEW",
-        "mOSFilePath" : "pslanguageres/Auto82",
-        "rTMOSFilePath" : "pslanguageres/Auto82"
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[EDITVIEW.SAVEANDNEW]",
+        "refFlag" : true
       },
       "showCaption" : true,
       "showIcon" : true
     }, {
       "getCapPSLanguageRes" : {
+        "defaultContent" : "保存并关闭",
         "lanResTag" : "TBB.TEXT.EDITVIEW.SAVEANDCLOSE",
-        "mOSFilePath" : "pslanguageres/Auto97",
-        "rTMOSFilePath" : "pslanguageres/Auto97"
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[EDITVIEW.SAVEANDCLOSE]",
+        "refFlag" : true
       },
       "caption" : "保存并关闭",
       "groupExtractMode" : "ITEM",
@@ -575,25 +169,27 @@
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
+          "defaultContent" : "保存并关闭",
           "lanResTag" : "TBB.TEXT.EDITVIEW.SAVEANDCLOSE",
-          "mOSFilePath" : "pslanguageres/Auto97",
-          "rTMOSFilePath" : "pslanguageres/Auto97"
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[EDITVIEW.SAVEANDCLOSE]",
+          "refFlag" : true
         },
         "caption" : "保存并关闭",
         "codeName" : "SaveAndExit",
         "fullCodeName" : "SaveAndExit",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/SaveAndExit",
         "name" : "编辑界面_保存并退出操作",
         "getPSSysImage" : {
           "cssClass" : "sx-tb-saveandclose"
         },
         "predefinedType" : "EDITVIEW_SAVEANDEXITACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/SaveAndExit",
         "timeout" : 60000,
         "getTooltipPSLanguageRes" : {
+          "defaultContent" : "保存并关闭",
           "lanResTag" : "TBB.TOOLTIP.EDITVIEW.SAVEANDCLOSE",
-          "mOSFilePath" : "pslanguageres/Auto43",
-          "rTMOSFilePath" : "pslanguageres/Auto43"
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[EDITVIEW.SAVEANDCLOSE]",
+          "refFlag" : true
         },
         "uIActionMode" : "SYS",
         "uIActionTag" : "SaveAndExit",
@@ -601,9 +197,11 @@
       },
       "tooltip" : "保存并关闭",
       "getTooltipPSLanguageRes" : {
+        "defaultContent" : "保存并关闭",
         "lanResTag" : "TBB.TOOLTIP.EDITVIEW.SAVEANDCLOSE",
-        "mOSFilePath" : "pslanguageres/Auto43",
-        "rTMOSFilePath" : "pslanguageres/Auto43"
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[EDITVIEW.SAVEANDCLOSE]",
+        "refFlag" : true
       },
       "showCaption" : true,
       "showIcon" : true
@@ -613,9 +211,11 @@
       "spanMode" : false
     }, {
       "getCapPSLanguageRes" : {
+        "defaultContent" : "删除并关闭",
         "lanResTag" : "TBB.TEXT.EDITVIEW.REMOVEANDCLOSE",
-        "mOSFilePath" : "pslanguageres/Auto101",
-        "rTMOSFilePath" : "pslanguageres/Auto101"
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[EDITVIEW.REMOVEANDCLOSE]",
+        "refFlag" : true
       },
       "caption" : "删除并关闭",
       "groupExtractMode" : "ITEM",
@@ -633,26 +233,28 @@
       "getPSUIAction" : {
         "actionTarget" : "SINGLEKEY",
         "getCapPSLanguageRes" : {
+          "defaultContent" : "删除并关闭",
           "lanResTag" : "TBB.TEXT.EDITVIEW.REMOVEANDCLOSE",
-          "mOSFilePath" : "pslanguageres/Auto101",
-          "rTMOSFilePath" : "pslanguageres/Auto101"
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[EDITVIEW.REMOVEANDCLOSE]",
+          "refFlag" : true
         },
         "caption" : "删除并关闭",
         "codeName" : "RemoveAndExit",
         "fullCodeName" : "RemoveAndExit",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/RemoveAndExit",
         "name" : "编辑界面_删除并退出操作",
         "getPSSysImage" : {
           "glyph" : "xf00d@FontAwesome",
           "cssClass" : "fa fa-remove"
         },
         "predefinedType" : "EDITVIEW_REMOVEANDEXITACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/RemoveAndExit",
         "timeout" : 60000,
         "getTooltipPSLanguageRes" : {
+          "defaultContent" : "删除并关闭",
           "lanResTag" : "TBB.TOOLTIP.EDITVIEW.REMOVEANDCLOSE",
-          "mOSFilePath" : "pslanguageres/Auto191",
-          "rTMOSFilePath" : "pslanguageres/Auto191"
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[EDITVIEW.REMOVEANDCLOSE]",
+          "refFlag" : true
         },
         "uIActionMode" : "SYS",
         "uIActionTag" : "RemoveAndExit",
@@ -660,10 +262,13 @@
       },
       "tooltip" : "删除并关闭",
       "getTooltipPSLanguageRes" : {
+        "defaultContent" : "删除并关闭",
         "lanResTag" : "TBB.TOOLTIP.EDITVIEW.REMOVEANDCLOSE",
-        "mOSFilePath" : "pslanguageres/Auto191",
-        "rTMOSFilePath" : "pslanguageres/Auto191"
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[EDITVIEW.REMOVEANDCLOSE]",
+        "refFlag" : true
       },
+      "uIActionTarget" : "SINGLEKEY",
       "showCaption" : true,
       "showIcon" : true
     }, {
@@ -672,9 +277,11 @@
       "spanMode" : false
     }, {
       "getCapPSLanguageRes" : {
+        "defaultContent" : "新建",
         "lanResTag" : "TBB.TEXT.*.NEW",
-        "mOSFilePath" : "pslanguageres/Auto275",
-        "rTMOSFilePath" : "pslanguageres/Auto275"
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.NEW]",
+        "refFlag" : true
       },
       "caption" : "新建",
       "groupExtractMode" : "ITEM",
@@ -691,26 +298,28 @@
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
+          "defaultContent" : "新建",
           "lanResTag" : "TBB.TEXT.*.NEW",
-          "mOSFilePath" : "pslanguageres/Auto275",
-          "rTMOSFilePath" : "pslanguageres/Auto275"
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.NEW]",
+          "refFlag" : true
         },
         "caption" : "新建",
         "codeName" : "New",
         "fullCodeName" : "New",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/New",
         "name" : "编辑界面_新建操作",
         "getPSSysImage" : {
           "glyph" : "xf0f6@FontAwesome",
           "cssClass" : "fa fa-file-text-o"
         },
         "predefinedType" : "EDITVIEW_NEWACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/New",
         "timeout" : 60000,
         "getTooltipPSLanguageRes" : {
+          "defaultContent" : "新建",
           "lanResTag" : "TBB.TOOLTIP.*.NEW",
-          "mOSFilePath" : "pslanguageres/Auto44",
-          "rTMOSFilePath" : "pslanguageres/Auto44"
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.NEW]",
+          "refFlag" : true
         },
         "uIActionMode" : "SYS",
         "uIActionTag" : "New",
@@ -718,9 +327,11 @@
       },
       "tooltip" : "新建",
       "getTooltipPSLanguageRes" : {
+        "defaultContent" : "新建",
         "lanResTag" : "TBB.TOOLTIP.*.NEW",
-        "mOSFilePath" : "pslanguageres/Auto44",
-        "rTMOSFilePath" : "pslanguageres/Auto44"
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.NEW]",
+        "refFlag" : true
       },
       "showCaption" : true,
       "showIcon" : true
@@ -730,9 +341,11 @@
       "spanMode" : false
     }, {
       "getCapPSLanguageRes" : {
+        "defaultContent" : "拷贝",
         "lanResTag" : "TBB.TEXT.*.COPY",
-        "mOSFilePath" : "pslanguageres/Auto83",
-        "rTMOSFilePath" : "pslanguageres/Auto83"
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.COPY]",
+        "refFlag" : true
       },
       "caption" : "拷贝",
       "groupExtractMode" : "ITEM",
@@ -750,26 +363,28 @@
       "getPSUIAction" : {
         "actionTarget" : "SINGLEKEY",
         "getCapPSLanguageRes" : {
+          "defaultContent" : "拷贝",
           "lanResTag" : "TBB.TEXT.*.COPY",
-          "mOSFilePath" : "pslanguageres/Auto83",
-          "rTMOSFilePath" : "pslanguageres/Auto83"
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.COPY]",
+          "refFlag" : true
         },
         "caption" : "拷贝",
         "codeName" : "Copy",
         "fullCodeName" : "Copy",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Copy",
         "name" : "编辑界面_拷贝操作",
         "getPSSysImage" : {
           "glyph" : "xf0c5@FontAwesome",
           "cssClass" : "fa fa-copy"
         },
         "predefinedType" : "EDITVIEW_COPYACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Copy",
         "timeout" : 60000,
         "getTooltipPSLanguageRes" : {
+          "defaultContent" : "拷贝",
           "lanResTag" : "TBB.TOOLTIP.*.COPY",
-          "mOSFilePath" : "pslanguageres/Auto243",
-          "rTMOSFilePath" : "pslanguageres/Auto243"
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.COPY]",
+          "refFlag" : true
         },
         "uIActionMode" : "SYS",
         "uIActionTag" : "Copy",
@@ -777,10 +392,13 @@
       },
       "tooltip" : "拷贝",
       "getTooltipPSLanguageRes" : {
+        "defaultContent" : "拷贝",
         "lanResTag" : "TBB.TOOLTIP.*.COPY",
-        "mOSFilePath" : "pslanguageres/Auto243",
-        "rTMOSFilePath" : "pslanguageres/Auto243"
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.COPY]",
+        "refFlag" : true
       },
+      "uIActionTarget" : "SINGLEKEY",
       "showCaption" : true,
       "showIcon" : true
     }, {
@@ -806,20 +424,19 @@
         "caption" : "第一个记录",
         "codeName" : "FirstRecord",
         "fullCodeName" : "FirstRecord",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/FirstRecord",
         "name" : "编辑界面_第一个记录",
         "getPSSysImage" : {
           "glyph" : "xf049@FontAwesome",
           "cssClass" : "fa fa-fast-backward"
         },
         "predefinedType" : "EDITVIEW_FIRSTRECORDACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/FirstRecord",
         "timeout" : 60000,
         "uIActionMode" : "SYS",
         "uIActionTag" : "FirstRecord",
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "第一个记录",
+      "uIActionTarget" : "SINGLEKEY",
       "showCaption" : false,
       "showIcon" : true
     }, {
@@ -841,20 +458,19 @@
         "caption" : "上一个记录",
         "codeName" : "PrevRecord",
         "fullCodeName" : "PrevRecord",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/PrevRecord",
         "name" : "编辑界面_上一个记录",
         "getPSSysImage" : {
           "glyph" : "xf048@FontAwesome",
           "cssClass" : "fa fa-step-backward"
         },
         "predefinedType" : "EDITVIEW_PREVRECORDACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/PrevRecord",
         "timeout" : 60000,
         "uIActionMode" : "SYS",
         "uIActionTag" : "PrevRecord",
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "上一个记录",
+      "uIActionTarget" : "SINGLEKEY",
       "showCaption" : false,
       "showIcon" : true
     }, {
@@ -876,20 +492,19 @@
         "caption" : "下一个记录",
         "codeName" : "NextRecord",
         "fullCodeName" : "NextRecord",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/NextRecord",
         "name" : "编辑界面_下一个记录",
         "getPSSysImage" : {
           "glyph" : "xf051@FontAwesome",
           "cssClass" : "fa fa-step-forward"
         },
         "predefinedType" : "EDITVIEW_NEXTRECORDACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/NextRecord",
         "timeout" : 60000,
         "uIActionMode" : "SYS",
         "uIActionTag" : "NextRecord",
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "下一个记录",
+      "uIActionTarget" : "SINGLEKEY",
       "showCaption" : false,
       "showIcon" : true
     }, {
@@ -911,20 +526,19 @@
         "caption" : "最后一个记录",
         "codeName" : "LastRecord",
         "fullCodeName" : "LastRecord",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/LastRecord",
         "name" : "编辑界面_最后一个记录",
         "getPSSysImage" : {
           "glyph" : "xf050@FontAwesome",
           "cssClass" : "fa fa-fast-forward"
         },
         "predefinedType" : "EDITVIEW_LASTRECORDACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/LastRecord",
         "timeout" : 60000,
         "uIActionMode" : "SYS",
         "uIActionTag" : "LastRecord",
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "最后一个记录",
+      "uIActionTarget" : "SINGLEKEY",
       "showCaption" : false,
       "showIcon" : true
     }, {
@@ -933,9 +547,11 @@
       "spanMode" : false
     }, {
       "getCapPSLanguageRes" : {
+        "defaultContent" : "帮助",
         "lanResTag" : "TBB.TEXT.*.HELP",
-        "mOSFilePath" : "pslanguageres/Auto276",
-        "rTMOSFilePath" : "pslanguageres/Auto276"
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.HELP]",
+        "refFlag" : true
       },
       "caption" : "帮助",
       "groupExtractMode" : "ITEM",
@@ -952,26 +568,28 @@
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
+          "defaultContent" : "帮助",
           "lanResTag" : "TBB.TEXT.*.HELP",
-          "mOSFilePath" : "pslanguageres/Auto276",
-          "rTMOSFilePath" : "pslanguageres/Auto276"
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.HELP]",
+          "refFlag" : true
         },
         "caption" : "帮助",
         "codeName" : "Help",
         "fullCodeName" : "Help",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Help",
         "name" : "编辑界面_帮助操作",
         "getPSSysImage" : {
           "glyph" : "xf128@FontAwesome",
           "cssClass" : "fa fa-question"
         },
         "predefinedType" : "EDITVIEW_HELPACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Help",
         "timeout" : 60000,
         "getTooltipPSLanguageRes" : {
+          "defaultContent" : "帮助",
           "lanResTag" : "TBB.TOOLTIP.*.HELP",
-          "mOSFilePath" : "pslanguageres/Auto259",
-          "rTMOSFilePath" : "pslanguageres/Auto259"
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.HELP]",
+          "refFlag" : true
         },
         "uIActionMode" : "SYS",
         "uIActionTag" : "Help",
@@ -979,14 +597,16 @@
       },
       "tooltip" : "帮助",
       "getTooltipPSLanguageRes" : {
+        "defaultContent" : "帮助",
         "lanResTag" : "TBB.TOOLTIP.*.HELP",
-        "mOSFilePath" : "pslanguageres/Auto259",
-        "rTMOSFilePath" : "pslanguageres/Auto259"
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.HELP]",
+        "refFlag" : true
       },
       "showCaption" : true,
       "showIcon" : true
     } ],
-    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/TESTEditView2/psappviewctrls/toolbar",
+    "xDataControlName" : "form",
     "modelid" : "a4eb00b17f8652bdf677cb4ed5231e63",
     "modeltype" : "PSDETOOLBAR"
   }, {
@@ -994,25 +614,67 @@
     "controlType" : "FORM",
     "getCreatePSControlAction" : {
       "modelref" : true,
-      "id" : "create"
+      "id" : "create",
+      "actionName" : "Create",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "CREATE",
+      "name" : "create",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "Create"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      }
     },
     "defaultLabelWidth" : 130,
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/NoTabForm.json",
     "getGetDraftFromPSControlAction" : {
       "modelref" : true,
-      "id" : "loaddraftfrom"
+      "id" : "loaddraftfrom",
+      "actionName" : "GETDRAFTFROM",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "CREATE",
+      "name" : "loaddraftfrom",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      }
     },
     "getGetDraftPSControlAction" : {
       "modelref" : true,
-      "id" : "loaddraft"
+      "id" : "loaddraft",
+      "actionName" : "GetDraft",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "CREATE",
+      "name" : "loaddraft",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "GetDraft"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      }
     },
     "getGetPSControlAction" : {
       "modelref" : true,
-      "id" : "load"
+      "id" : "load",
+      "actionName" : "Get",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "READ",
+      "name" : "load",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "Get"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      }
     },
-    "hookEventNames" : [ "LOAD", "SAVE", "REMOVE" ],
     "logicName" : "无分页表单",
-    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdeform_editforms/NoTabForm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
@@ -1096,16 +758,6 @@
       "enableDEFieldPrivilege" : false,
       "id" : "编辑表单处理器"
     },
-    "getPSControlLogics" : [ {
-      "eventNames" : "LOAD;SAVE;REMOVE",
-      "logicTag" : "form",
-      "logicType" : "APPVIEWENGINE",
-      "name" : "engine_form",
-      "getPSAppViewEngine" : {
-        "modelref" : true,
-        "id" : "engine"
-      }
-    } ],
     "getPSControlParam" : {
       "autoLoad" : true,
       "showBusyIndicator" : true,
@@ -1204,7 +856,6 @@
       "codeName" : "formpage1",
       "detailStyle" : "DEFAULT",
       "detailType" : "FORMPAGE",
-      "mOSFilePath" : "psdeformdetail_formpages/formpage1",
       "name" : "formpage1",
       "getPSDEFormDetails" : [ {
         "actionGroupExtractMode" : "ITEM",
@@ -1212,7 +863,6 @@
         "codeName" : "group1",
         "detailStyle" : "DEFAULT",
         "detailType" : "GROUPPANEL",
-        "mOSFilePath" : "psdeformdetail_grouppanels/group1",
         "name" : "group1",
         "getPSDEFormDetails" : [ {
           "caption" : "测试实体名称",
@@ -1224,7 +874,6 @@
           "ignoreInput" : 0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "mOSFilePath" : "psdeformdetail_formitems/testname",
           "name" : "testname",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
@@ -1233,16 +882,162 @@
           },
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
-            "maxLength" : 200,
+            "maxLength" : 50,
+            "minLength" : 3,
             "name" : "testname"
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "rTMOSFilePath" : "psdeformdetail_formitems/testname",
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "codeName" : "rawitem2",
+          "contentType" : "HTML",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "htmlContent" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+          "name" : "rawitem2",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "content" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+            "contentType" : "HTML",
+            "name" : "rawitem2",
+            "rawItemHeight" : -1.0,
+            "rawItemWidth" : -1.0
+          },
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem1",
+          "contentType" : "RAW",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "name" : "rawitem1",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "caption" : "test直接内容拉",
+            "contentType" : "RAW",
+            "name" : "rawitem1",
+            "rawItemHeight" : -1.0,
+            "rawItemWidth" : -1.0
+          },
+          "rawContent" : "test直接内容拉",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem3",
+          "contentType" : "VIDEO",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "name" : "rawitem3",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "VIDEO",
+            "name" : "rawitem3",
+            "rawItemHeight" : -1.0,
+            "rawItemWidth" : -1.0
+          },
+          "rawContent" : "{\"mute\":true,\"autoplay\":true,\"replay\":true,\"showcontrols\":true}",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem4",
+          "contentType" : "DIVIDER",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "name" : "rawitem4",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "DIVIDER",
+            "name" : "rawitem4",
+            "rawContent" : "{\"contentPosition\":\"center\",\"html\":\"测试分割线\"}",
+            "rawItemHeight" : -1.0,
+            "rawItemWidth" : -1.0
+          },
+          "rawContent" : "{\"contentPosition\":\"center\",\"html\":\"测试分割线\"}",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem5",
+          "contentType" : "INFO",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "name" : "rawitem5",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "INFO",
+            "name" : "rawitem5",
+            "rawContent" : "{\"title\":\"常规啦\",\"closeabled\":true,\"showIcon\":true}",
+            "rawItemHeight" : -1.0,
+            "rawItemWidth" : -1.0
+          },
+          "rawContent" : "{\"title\":\"常规啦\",\"closeabled\":true,\"showIcon\":true}",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem6",
+          "contentType" : "WARNING",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "name" : "rawitem6",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "WARNING",
+            "name" : "rawitem6",
+            "rawContent" : "{\"title\":\"警告啦\",\"closeabled\":true,\"showIcon\":true}",
+            "rawItemHeight" : -1.0,
+            "rawItemWidth" : -1.0
+          },
+          "rawContent" : "{\"title\":\"警告啦\",\"closeabled\":true,\"showIcon\":true}",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem7",
+          "contentType" : "ERROR",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "name" : "rawitem7",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "ERROR",
+            "name" : "rawitem7",
+            "rawContent" : "{\"title\":\"错误啦\",\"closeabled\":false,\"showIcon\":false}",
+            "rawItemHeight" : -1.0,
+            "rawItemWidth" : -1.0
+          },
+          "rawContent" : "{\"title\":\"错误啦\",\"closeabled\":false,\"showIcon\":false}",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "childColLG" : -1,
@@ -1256,7 +1051,6 @@
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
-        "rTMOSFilePath" : "psdeformdetail_grouppanels/group1",
         "infoGroupMode" : false,
         "showCaption" : true
       }, {
@@ -1265,7 +1059,6 @@
         "codeName" : "group2",
         "detailStyle" : "DEFAULT",
         "detailType" : "GROUPPANEL",
-        "mOSFilePath" : "psdeformdetail_grouppanels/group2",
         "name" : "group2",
         "getPSDEFormDetails" : [ {
           "caption" : "建立人",
@@ -1277,7 +1070,6 @@
           "ignoreInput" : 3,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "mOSFilePath" : "psdeformdetail_formitems/createman",
           "name" : "createman",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
@@ -1297,7 +1089,6 @@
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "rTMOSFilePath" : "psdeformdetail_formitems/createman",
           "allowEmpty" : true,
           "convertToCodeItemText" : true,
           "showCaption" : true
@@ -1311,7 +1102,6 @@
           "ignoreInput" : 3,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "mOSFilePath" : "psdeformdetail_formitems/createdate",
           "name" : "createdate",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
@@ -1327,7 +1117,6 @@
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "rTMOSFilePath" : "psdeformdetail_formitems/createdate",
           "valueFormat" : "YYYY-MM-DD HH:mm:ss",
           "allowEmpty" : true,
           "showCaption" : true
@@ -1341,7 +1130,6 @@
           "ignoreInput" : 3,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "mOSFilePath" : "psdeformdetail_formitems/updateman",
           "name" : "updateman",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
@@ -1361,7 +1149,6 @@
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "rTMOSFilePath" : "psdeformdetail_formitems/updateman",
           "allowEmpty" : true,
           "convertToCodeItemText" : true,
           "showCaption" : true
@@ -1375,7 +1162,6 @@
           "ignoreInput" : 3,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "mOSFilePath" : "psdeformdetail_formitems/updatedate",
           "name" : "updatedate",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
@@ -1391,7 +1177,6 @@
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "rTMOSFilePath" : "psdeformdetail_formitems/updatedate",
           "valueFormat" : "YYYY-MM-DD HH:mm:ss",
           "allowEmpty" : true,
           "showCaption" : true
@@ -1408,9 +1193,35 @@
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
-        "rTMOSFilePath" : "psdeformdetail_grouppanels/group2",
         "infoGroupMode" : false,
         "showCaption" : true
+      }, {
+        "caption" : "测试实体标识",
+        "codeName" : "testid",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "testid",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TESTID",
+          "codeName" : "TESTId"
+        },
+        "getPSEditor" : {
+          "editorType" : "HIDDEN",
+          "name" : "testid"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "hidden" : true,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "childColLG" : -1,
@@ -1420,7 +1231,6 @@
         "columnCount" : 24,
         "layout" : "TABLE_24COL"
       },
-      "rTMOSFilePath" : "psdeformdetail_formpages/formpage1",
       "infoGroupMode" : false
     } ],
     "getPSLayout" : {
@@ -1431,15 +1241,38 @@
       "columnCount" : 24,
       "layout" : "TABLE_24COL"
     },
-    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/TESTEditView2/psappviewctrls/form",
     "getRemovePSControlAction" : {
       "modelref" : true,
-      "id" : "remove"
+      "id" : "remove",
+      "actionName" : "Remove",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "DELETE",
+      "name" : "remove",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "Remove"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      }
     },
     "tabHeaderPos" : "TOP",
     "getUpdatePSControlAction" : {
       "modelref" : true,
-      "id" : "update"
+      "id" : "update",
+      "actionName" : "Update",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "UPDATE",
+      "name" : "update",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "Update"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      }
     },
     "noTabHeader" : true,
     "name" : "form",
@@ -1449,9 +1282,33 @@
     "codeName" : "Default",
     "controlType" : "DRBAR",
     "editItemCaption" : "测试实体",
-    "hookEventNames" : [ "LOAD", "SELECTIONCHANGE" ],
-    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdedrbars/Default",
     "name" : "drbar",
+    "getPSAppCounterRef" : {
+      "modelref" : true,
+      "id" : "c0738c9dec0bd355f3062df0532aeb37"
+    },
+    "getPSAppCounterRefs" : [ {
+      "getPSAppCounter" : {
+        "codeName" : "Custom",
+        "counterType" : "DEDR",
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCOUNTERS/Custom.json",
+        "getGetPSAppDEAction" : {
+          "modelref" : true,
+          "id" : "Counter"
+        },
+        "name" : "自定义计数器",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+        },
+        "timer" : 1000
+      },
+      "refMode" : {
+        "srfdeid" : "TEST"
+      },
+      "tag" : "c0738c9dec0bd355f3062df0532aeb37",
+      "id" : "c0738c9dec0bd355f3062df0532aeb37"
+    } ],
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
@@ -1460,16 +1317,6 @@
       "enableDEFieldPrivilege" : false,
       "id" : "drbar"
     },
-    "getPSControlLogics" : [ {
-      "eventNames" : "LOAD;SELECTIONCHANGE",
-      "logicTag" : "drbar",
-      "logicType" : "APPVIEWENGINE",
-      "name" : "engine_drbar",
-      "getPSAppViewEngine" : {
-        "modelref" : true,
-        "id" : "engine"
-      }
-    } ],
     "getPSControlParam" : {
       "autoLoad" : true,
       "showBusyIndicator" : true,
@@ -1477,14 +1324,13 @@
     },
     "getPSDEDRBarGroups" : [ {
       "caption" : "详细信息",
-      "mOSFilePath" : "psdedrbargroups/DRGroup",
       "name" : "详细信息",
-      "rTMOSFilePath" : "psdedrbargroups/DRGroup",
       "hidden" : false,
       "id" : "DRGroup"
     } ],
     "getPSDEDRCtrlItems" : [ {
       "caption" : "测试实体实体表格视图",
+      "counterId" : "num1",
       "name" : "dritem1",
       "getPSAppView" : {
         "modelref" : true,
@@ -1495,11 +1341,71 @@
         "modelref" : true,
         "id" : "DRGroup"
       }
+    }, {
+      "caption" : "模拟表格视图",
+      "counterId" : "num2",
+      "name" : "dritem2",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCustomGridView.json",
+        "viewType" : "DECUSTOMVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "书实体数据视图测试",
+      "counterId" : "num3",
+      "name" : "dritem3",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json",
+        "viewType" : "DEDATAVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "测试实体实体编辑视图(简单表单)",
+      "counterId" : "num4",
+      "name" : "dritem4",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr6EditView.json",
+        "viewType" : "DEEDITVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
     } ],
-    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/TESTEditView2/psappviewctrls/drbar",
+    "uniqueTag" : "TESTEditView2__drbar",
     "showTitle" : true,
     "modelid" : "385f739a768b73a1e3a307bfeafb80b7",
     "modeltype" : "PSDEDRBAR"
+  }, {
+    "codeName" : "EditView2datainfobar",
+    "controlType" : "DATAINFOBAR",
+    "name" : "datainfobar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : {
+      "id" : "datainfobar"
+    }
+  }, {
+    "caption" : "测试实体",
+    "codeName" : "EditView2captionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { }
   } ],
   "getPSDEViewCodeName" : "EditView2",
   "getPSDEViewId" : "b61c76d014eddb0884db34ab6d9f2aec",
@@ -1507,19 +1413,16 @@
     "codeName" : "Layoutpanel",
     "controlStyle" : "APPDEEDITVIEW2",
     "controlType" : "VIEWLAYOUTPANEL",
-    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/pssysviewlayoutpanels/Layoutpanel",
     "name" : "layoutpanel",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     },
     "getPSControlParam" : { },
-    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/TESTEditView2/psappviewctrls/layoutpanel",
     "layoutBodyOnly" : true,
     "layoutPanel" : true,
     "useDefaultLayout" : true
   },
-  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/TESTEditView2",
   "title" : "测试实体编辑视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEEDITVIEW2",

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

@@ -1737,6 +1737,91 @@
         "layout" : "TABLE_24COL"
       },
       "tooltip" : "N对N"
+    }, {
+      "accUserMode" : 0,
+      "caption" : "计数器",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem78",
+      "getPSAppMenuItems" : [ {
+        "accUserMode" : 2,
+        "caption" : "左右关系",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem79",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc0118314491"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "左右关系"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "分页关系",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem80",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc27"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "分页关系"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "树节点",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem81",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc57"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "树节点"
+      } ],
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "tooltip" : "计数器"
     } ],
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,

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

@@ -760,6 +760,43 @@
       "tooltip" : "关联表"
     } ],
     "tooltip" : "N对N"
+  }, {
+    "accUserMode" : 0,
+    "caption" : "计数器",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem78",
+    "getPSAppMenuItems" : [ {
+      "accUserMode" : 2,
+      "caption" : "左右关系",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem79",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc0118314491"
+      },
+      "tooltip" : "左右关系"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "分页关系",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem80",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc27"
+      },
+      "tooltip" : "分页关系"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "树节点",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem81",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc57"
+      },
+      "tooltip" : "树节点"
+    } ],
+    "tooltip" : "计数器"
   } ],
   "name" : "apptestindexview",
   "modelid" : "89E33DEF-F919-4067-A6F1-4FBB67232FC6",

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

@@ -1255,6 +1255,113 @@
     "uniqueTag" : "WorkFlow__Usr0710265893"
   } ],
   "getAllPSDEDRControls" : [ {
+    "codeName" : "Default",
+    "controlType" : "DRBAR",
+    "editItemCaption" : "测试实体",
+    "name" : "drbar",
+    "getPSAppCounterRef" : {
+      "modelref" : true,
+      "id" : "c0738c9dec0bd355f3062df0532aeb37"
+    },
+    "getPSAppCounterRefs" : [ {
+      "getPSAppCounter" : {
+        "codeName" : "Custom",
+        "counterType" : "DEDR",
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCOUNTERS/Custom.json",
+        "getGetPSAppDEAction" : {
+          "modelref" : true,
+          "id" : "Counter"
+        },
+        "name" : "自定义计数器",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+        },
+        "timer" : 1000
+      },
+      "refMode" : {
+        "srfdeid" : "TEST"
+      },
+      "tag" : "c0738c9dec0bd355f3062df0532aeb37",
+      "id" : "c0738c9dec0bd355f3062df0532aeb37"
+    } ],
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "drbar"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "DRBAR"
+    },
+    "getPSDEDRBarGroups" : [ {
+      "caption" : "详细信息",
+      "name" : "详细信息",
+      "hidden" : false,
+      "id" : "DRGroup"
+    } ],
+    "getPSDEDRCtrlItems" : [ {
+      "caption" : "测试实体实体表格视图",
+      "counterId" : "num1",
+      "name" : "dritem1",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
+        "viewType" : "DEGRIDVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "模拟表格视图",
+      "counterId" : "num2",
+      "name" : "dritem2",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCustomGridView.json",
+        "viewType" : "DECUSTOMVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "书实体数据视图测试",
+      "counterId" : "num3",
+      "name" : "dritem3",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json",
+        "viewType" : "DEDATAVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "测试实体实体编辑视图(简单表单)",
+      "counterId" : "num4",
+      "name" : "dritem4",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr6EditView.json",
+        "viewType" : "DEEDITVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    } ],
+    "uniqueTag" : "TESTEditView2__drbar",
+    "showTitle" : true,
+    "modelid" : "385f739a768b73a1e3a307bfeafb80b7",
+    "modeltype" : "PSDEDRBAR"
+  }, {
     "codeName" : "TabExpViewtabexppanel",
     "controlType" : "TABEXPPANEL",
     "name" : "tabexppanel",

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

@@ -4705,6 +4705,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDGridTestArrangePView.json",
       "viewType" : "DEGRIDVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc0118314491",
+    "name" : "测试实体实体编辑视图（左右关系）",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+      "viewType" : "DEEDITVIEW2"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc73",
@@ -13219,6 +13229,12 @@
     "enableRemove" : false
   } ],
   "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+    "viewType" : "DEEDITVIEW2",
+    "resource" : "TEST",
+    "view" : "EditView2"
+  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
     "viewType" : "DEEDITVIEW",
@@ -65882,6 +65898,10 @@
         }
       } ],
       "getAllPSAppViews" : [ {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+        "viewType" : "DEEDITVIEW2"
+      }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
         "viewType" : "DEEDITVIEW"

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: