tony001 发布系统代码 [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/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -515,6 +515,12 @@
     "tableType" : "MAIN"
   } ],
   "getAllPSDEDRGroups" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRGROUPS/UsrDRGroup0829303274.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRGROUPS/UsrDRGroup0829079880.json"
+  }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRGROUPS/DRGroup.json"
   } ],
@@ -536,6 +542,9 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816439309.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0829030507.json"
   } ],
   "getAllPSDEDataExports" : [ {
     "codeName" : "DataExport",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03117794TabExpView_DR.json

@@ -2,34 +2,5 @@
   "codeName" : "Usr03117794TabExpView_DR",
   "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03117794TabExpView_DR.json",
   "formCaption" : "书",
-  "name" : "表格图表测试_关系界面组",
-  "getPSDEDRDetails" : [ {
-    "caption" : "书实体表格视图",
-    "detailType" : "DRITEM",
-    "name" : "test1",
-    "orderValue" : 100,
-    "getPSDEDRItem" : {
-      "modelref" : true,
-      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0311726913.json"
-    }
-  }, {
-    "caption" : "书实体测试(表格)",
-    "detailType" : "DRITEM",
-    "name" : "test2",
-    "orderValue" : 110,
-    "getPSDEDRItem" : {
-      "modelref" : true,
-      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0311302519.json"
-    }
-  }, {
-    "caption" : "学员信息清单",
-    "counterId" : "num1",
-    "detailType" : "DRITEM",
-    "name" : "test3",
-    "orderValue" : 120,
-    "getPSDEDRItem" : {
-      "modelref" : true,
-      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/DRItem.json"
-    }
-  } ]
+  "name" : "表格图表测试_关系界面组"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/test2024815.json

@@ -4,24 +4,14 @@
   "formCaption" : "书",
   "name" : "测试关系界面组",
   "getPSDEDRDetails" : [ {
-    "caption" : "测试",
+    "caption" : "测试1",
     "detailType" : "DRITEM",
-    "name" : "test2",
+    "name" : "ces123",
     "orderValue" : 100,
-    "originCaption" : "测试",
+    "originCaption" : "测试1",
     "getPSDEDRItem" : {
       "modelref" : true,
-      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816439309.json"
-    }
-  }, {
-    "caption" : "测试3",
-    "detailType" : "DRITEM",
-    "name" : "test3",
-    "orderValue" : 110,
-    "originCaption" : "测试3",
-    "getPSDEDRItem" : {
-      "modelref" : true,
-      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0816048233.json"
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0829030507.json"
     }
   } ],
   "hideEditItem" : true

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDRGROUPS/UsrDRGroup0829079880.json

+{
+  "caption" : "详细分组2",
+  "codeName" : "UsrDRGroup0829079880",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRGROUPS/UsrDRGroup0829079880.json",
+  "name" : "详细分组2",
+  "hidden" : false
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDRGROUPS/UsrDRGroup0829303274.json

+{
+  "caption" : "详细分组3",
+  "codeName" : "UsrDRGroup0829303274",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRGROUPS/UsrDRGroup0829303274.json",
+  "name" : "详细分组3",
+  "hidden" : false
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0829030507.json

+{
+  "codeName" : "UsrDRItem0829030507",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0829030507.json",
+  "itemType" : "DER1N",
+  "name" : "书实体表格视图（2）",
+  "getPSDER" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDERS/DER1N_BOOK_BOOK_PBOOKID.json"
+  },
+  "parentDataJO" : {
+    "srfparentdefname" : "PBOOKID",
+    "srfparentdename" : "BOOK",
+    "SRFPARENTTYPE" : "DER1N",
+    "srfparentmode" : "DER1N_BOOK_BOOK_PBOOKID",
+    "SRFDER1NID" : "DER1N_BOOK_BOOK_PBOOKID"
+  },
+  "viewCodeName" : "GridView",
+  "getViewPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "viewParamJO" : {
+    "SRFPARENTTYPE" : "DER1N",
+    "SRFDER1NID" : "DER1N_BOOK_BOOK_PBOOKID"
+  }
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json

@@ -316,6 +316,12 @@
   "getAllPSDEDRGroups" : [ {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDRGROUPS/DRGroup.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDRGROUPS/UsrDRGroup0829752397.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDRGROUPS/UsrDRGroup0829192001.json"
   } ],
   "getAllPSDEDataQueries" : [ {
     "getAllPSDEDataQueryCodes" : [ {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDRGROUPS/UsrDRGroup0829192001.json

+{
+  "caption" : "详细信息2",
+  "codeName" : "UsrDRGroup0829192001",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDRGROUPS/UsrDRGroup0829192001.json",
+  "name" : "详细信息2",
+  "hidden" : false
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDRGROUPS/UsrDRGroup0829752397.json

+{
+  "caption" : "详细信息3",
+  "codeName" : "UsrDRGroup0829752397",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDRGROUPS/UsrDRGroup0829752397.json",
+  "name" : "详细信息3",
+  "hidden" : false
+}
\ No newline at end of file

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

@@ -233,7 +233,6 @@
         "logicType" : "PREDEFINED",
         "name" : "新建数据",
         "getNewDataPSAppView" : {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -241,7 +240,6 @@
           }
         },
         "getPSAppUILogicRefViews" : [ {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -261,7 +259,6 @@
         "logicType" : "PREDEFINED",
         "name" : "打开数据",
         "getOpenDataPSAppView" : {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -269,7 +266,6 @@
           }
         },
         "getPSAppUILogicRefViews" : [ {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -282,7 +278,6 @@
     } ],
     "getPSAppViewRefs" : [ {
       "name" : "NEWDATA",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,
@@ -291,7 +286,6 @@
       }
     }, {
       "name" : "EDITDATA",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,
@@ -300,7 +294,6 @@
       }
     }, {
       "name" : "OPENDATA",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -5,7 +5,6 @@
   "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
   "memo" : "系统自动添加",
   "name" : "ReginfoUsr0423209603EditView",
-  "openMode" : "POPUPMODAL",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
@@ -14,17 +13,162 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPMODULES/common.json"
   },
-  "getPSAppViewEngines" : [ {
-    "engineCat" : "VIEW",
-    "engineType" : "EditView",
-    "name" : "engine"
-  } ],
   "getPSAppViewNavParams" : [ {
     "key" : "testval",
     "name" : "testval",
     "value" : "testval",
     "rawValue" : false
   } ],
+  "getPSDEViewCodeName" : "Usr0423209603EditView",
+  "getPSDEViewId" : "7809BDA1-85FA-4CED-97F5-3DB821CCF074",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr0829941692",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "Usr0423209603EditView编辑视图布局面板",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "view_header",
+      "getPSLayout" : {
+        "align" : "space-between",
+        "dir" : "row",
+        "layout" : "FLEX",
+        "vAlign" : "center"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX",
+        "shrink" : 0
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "view_header_left",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "heightMode" : "FULL",
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "view_captionbar",
+          "getPSLayout" : {
+            "align" : "center",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "heightMode" : "FULL",
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "页面标题",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "captionbar",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "showCaption" : true
+          } ]
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "view_header_right",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "heightMode" : "FULL",
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "view_toolbar",
+          "getPSLayout" : {
+            "align" : "center",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "heightMode" : "FULL",
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "工具栏",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "toolbar",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "showCaption" : true
+          } ]
+        } ]
+      } ],
+      "predefinedType" : "VIEWHEADER"
+    }, {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "view_content",
+      "getPSLayout" : {
+        "dir" : "row",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : 1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "表单",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CTRLPOS",
+        "name" : "form",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX",
+          "shrink" : 0
+        },
+        "showCaption" : true
+      } ],
+      "predefinedType" : "VIEWCONTENT"
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "406F172B-9FAD-408D-A902-F0F1AA820659",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
+    "getPSAppViewEngines" : [ {
+      "engineCat" : "VIEW",
+      "engineType" : "EditView",
+      "name" : "engine"
+    } ],
     "getPSControls" : [ {
       "codeName" : "Usr0423209603EditViewtoolbar",
       "controlType" : "TOOLBAR",
@@ -685,22 +829,7 @@
         "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
       },
       "getPSControlParam" : { }
-  } ],
-  "getPSDEViewCodeName" : "Usr0423209603EditView",
-  "getPSDEViewId" : "7809BDA1-85FA-4CED-97F5-3DB821CCF074",
-  "getPSViewLayoutPanel" : {
-    "codeName" : "Layoutpanel",
-    "controlStyle" : "APPDEEDITVIEW",
-    "controlType" : "VIEWLAYOUTPANEL",
-    "name" : "layoutpanel",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
-    },
-    "getPSControlParam" : { },
-    "layoutBodyOnly" : true,
-    "layoutPanel" : true,
-    "useDefaultLayout" : true
+    } ]
   },
   "refFlag" : false,
   "title" : "学生信息编辑视图",

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

@@ -998,12 +998,40 @@
       "modelid" : "95A84A82-F14C-405F-9ED5-7C25ACFCE7DC",
       "modeltype" : "PSDELIST"
     }, {
-      "codeName" : "test2024815",
+      "codeName" : "Default",
       "controlStyle" : "DRTAB_NAV",
       "controlType" : "DRTAB",
-      "dataRelationTag" : "test2024815",
+      "dataRelationTag" : "Default",
       "editItemCaption" : "书",
       "name" : "pickupviewpanel",
+      "getPSAppCounterRef" : {
+        "modelref" : true,
+        "id" : "2a4e8cfc484b5a67e5fe2019cc99c92c"
+      },
+      "getPSAppCounterRefs" : [ {
+        "getPSAppCounter" : {
+          "codeName" : "bookCustom",
+          "counterType" : "DEDR",
+          "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/bookCustom.json",
+          "getGetPSAppDEAction" : {
+            "modelref" : true,
+            "id" : "Counter"
+          },
+          "name" : "书实体计数器",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+          },
+          "timer" : 1000,
+          "uniqueTag" : "bookCustom"
+        },
+        "refMode" : {
+          "srfdeid" : "BOOK"
+        },
+        "tag" : "2a4e8cfc484b5a67e5fe2019cc99c92c",
+        "uniqueTag" : "bookCustom",
+        "id" : "2a4e8cfc484b5a67e5fe2019cc99c92c"
+      } ],
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
@@ -1018,20 +1046,22 @@
         "id" : "PICKUPVIEWPANEL"
       },
       "getPSDEDRTabPages" : [ {
-        "caption" : "测试",
-        "name" : "test2",
+        "caption" : "清单",
+        "counterId" : "num1",
+        "name" : "dritem1",
         "getPSAppView" : {
           "modelref" : true,
-          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookPickupTreeView.json",
-          "viewType" : "DEPICKUPTREEVIEW"
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoStuInfoList.json",
+          "viewType" : "DEGRIDVIEW"
         }
       }, {
-        "caption" : "测试3",
-        "name" : "test3",
+        "caption" : "表格",
+        "counterId" : "num2",
+        "name" : "dritem2",
         "getPSAppView" : {
           "modelref" : true,
-          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookTEST2PickupTreeView.json",
-          "viewType" : "DEPICKUPTREEVIEW"
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoREGINFOGridExpView.json",
+          "viewType" : "DEGRIDEXPVIEW"
         }
       } ],
       "getPSSysPFPlugin" : {
@@ -1039,8 +1069,7 @@
         "pluginCode" : "DRTAB_NAV"
       },
       "uniqueTag" : "bookUsr2TestMPickupView__pickupviewpanel",
-      "hideEditItem" : true,
-      "modelid" : "F92082C1-2210-454A-85F8-0D597196B4BE",
+      "modelid" : "fa1370490e24654b68f76899ff0a5688",
       "modeltype" : "PSDEDRTAB"
     }, {
       "caption" : "书",

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

@@ -49,7 +49,6 @@
       "parentDataJO" : {
         "testval" : "%age%"
       },
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,
@@ -64,7 +63,6 @@
       "parentDataJO" : {
         "testval" : "%age%"
       },
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -233,7 +233,6 @@
         "logicType" : "PREDEFINED",
         "name" : "新建数据",
         "getNewDataPSAppView" : {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -241,7 +240,6 @@
           }
         },
         "getPSAppUILogicRefViews" : [ {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -261,7 +259,6 @@
         "logicType" : "PREDEFINED",
         "name" : "打开数据",
         "getOpenDataPSAppView" : {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -269,7 +266,6 @@
           }
         },
         "getPSAppUILogicRefViews" : [ {
-          "openMode" : "POPUPMODAL",
           "getRefPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
@@ -282,7 +278,6 @@
     } ],
     "getPSAppViewRefs" : [ {
       "name" : "NEWDATA",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,
@@ -291,7 +286,6 @@
       }
     }, {
       "name" : "EDITDATA",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,
@@ -300,7 +294,6 @@
       }
     }, {
       "name" : "OPENDATA",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -4,7 +4,6 @@
   "codeName" : "ReginfoUsr0423209603EditView",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
   "name" : "ReginfoUsr0423209603EditView",
-  "openMode" : "POPUPMODAL",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
@@ -13,17 +12,162 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
   },
-  "getPSAppViewEngines" : [ {
-    "engineCat" : "VIEW",
-    "engineType" : "EditView",
-    "name" : "engine"
-  } ],
   "getPSAppViewNavParams" : [ {
     "key" : "testval",
     "name" : "testval",
     "value" : "testval",
     "rawValue" : false
   } ],
+  "getPSDEViewCodeName" : "Usr0423209603EditView",
+  "getPSDEViewId" : "7809BDA1-85FA-4CED-97F5-3DB821CCF074",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr0829941692",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "Usr0423209603EditView编辑视图布局面板",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "view_header",
+      "getPSLayout" : {
+        "align" : "space-between",
+        "dir" : "row",
+        "layout" : "FLEX",
+        "vAlign" : "center"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX",
+        "shrink" : 0
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "view_header_left",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "heightMode" : "FULL",
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "view_captionbar",
+          "getPSLayout" : {
+            "align" : "center",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "heightMode" : "FULL",
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "页面标题",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "captionbar",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "showCaption" : true
+          } ]
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "view_header_right",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "heightMode" : "FULL",
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "view_toolbar",
+          "getPSLayout" : {
+            "align" : "center",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "heightMode" : "FULL",
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "工具栏",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "toolbar",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "showCaption" : true
+          } ]
+        } ]
+      } ],
+      "predefinedType" : "VIEWHEADER"
+    }, {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "view_content",
+      "getPSLayout" : {
+        "dir" : "row",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : 1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "表单",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CTRLPOS",
+        "name" : "form",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX",
+          "shrink" : 0
+        },
+        "showCaption" : true
+      } ],
+      "predefinedType" : "VIEWCONTENT"
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "406F172B-9FAD-408D-A902-F0F1AA820659",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
+    "getPSAppViewEngines" : [ {
+      "engineCat" : "VIEW",
+      "engineType" : "EditView",
+      "name" : "engine"
+    } ],
     "getPSControls" : [ {
       "codeName" : "Usr0423209603EditViewtoolbar",
       "controlType" : "TOOLBAR",
@@ -684,22 +828,7 @@
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
       },
       "getPSControlParam" : { }
-  } ],
-  "getPSDEViewCodeName" : "Usr0423209603EditView",
-  "getPSDEViewId" : "7809BDA1-85FA-4CED-97F5-3DB821CCF074",
-  "getPSViewLayoutPanel" : {
-    "codeName" : "Layoutpanel",
-    "controlStyle" : "APPDEEDITVIEW",
-    "controlType" : "VIEWLAYOUTPANEL",
-    "name" : "layoutpanel",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
-    },
-    "getPSControlParam" : { },
-    "layoutBodyOnly" : true,
-    "layoutPanel" : true,
-    "useDefaultLayout" : true
+    } ]
   },
   "title" : "学生信息编辑视图",
   "viewStyle" : "DEFAULT",

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

@@ -46,7 +46,6 @@
     },
     "getPSAppViewRefs" : [ {
       "name" : "EXPITEM:line",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -1057,7 +1057,6 @@
         }
       }, {
         "name" : "EXPITEM:node_3",
-        "realOpenMode" : "POPUPMODAL",
         "realTitle" : "学生信息编辑视图",
         "getRefPSAppView" : {
           "modelref" : true,

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

@@ -90,7 +90,6 @@
       }
     }, {
       "name" : "EXPITEM:node_3",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -90,7 +90,6 @@
       }
     }, {
       "name" : "EXPITEM:node_3",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -113,7 +113,6 @@
       }
     }, {
       "name" : "EXPITEM:node_3",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -84,7 +84,6 @@
       }
     }, {
       "name" : "EXPITEM:node_3",
-      "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,

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

@@ -525,6 +525,7 @@
     "layoutPanel" : true,
     "useDefaultLayout" : true
   },
+  "refFlag" : false,
   "title" : "书选择树视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEPICKUPTREEVIEW",

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

@@ -221,32 +221,6 @@
         "showBusyIndicator" : true,
         "id" : "TABEXPPANEL"
       },
-      "getPSDEDRTabPages" : [ {
-        "caption" : "书实体表格视图",
-        "name" : "test1",
-        "getPSAppView" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView.json",
-          "viewType" : "DEGRIDVIEW"
-        }
-      }, {
-        "caption" : "书实体测试(表格)",
-        "name" : "test2",
-        "getPSAppView" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView_Test.json",
-          "viewType" : "DEGRIDVIEW"
-        }
-      }, {
-        "caption" : "学员信息清单",
-        "counterId" : "num1",
-        "name" : "test3",
-        "getPSAppView" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json",
-          "viewType" : "DEGRIDVIEW"
-        }
-      } ],
       "getPSSysPFPlugin" : {
         "pluginType" : "CUSTOM",
         "pluginCode" : "GC_TABNAV"

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

@@ -999,12 +999,40 @@
       "modelid" : "95A84A82-F14C-405F-9ED5-7C25ACFCE7DC",
       "modeltype" : "PSDELIST"
     }, {
-      "codeName" : "test2024815",
+      "codeName" : "Default",
       "controlStyle" : "DRTAB_NAV",
       "controlType" : "DRTAB",
-      "dataRelationTag" : "test2024815",
+      "dataRelationTag" : "Default",
       "editItemCaption" : "书",
       "name" : "pickupviewpanel",
+      "getPSAppCounterRef" : {
+        "modelref" : true,
+        "id" : "2a4e8cfc484b5a67e5fe2019cc99c92c"
+      },
+      "getPSAppCounterRefs" : [ {
+        "getPSAppCounter" : {
+          "codeName" : "bookCustom",
+          "counterType" : "DEDR",
+          "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCOUNTERS/bookCustom.json",
+          "getGetPSAppDEAction" : {
+            "modelref" : true,
+            "id" : "Counter"
+          },
+          "name" : "书实体计数器",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+          },
+          "timer" : 1000,
+          "uniqueTag" : "bookCustom"
+        },
+        "refMode" : {
+          "srfdeid" : "BOOK"
+        },
+        "tag" : "2a4e8cfc484b5a67e5fe2019cc99c92c",
+        "uniqueTag" : "bookCustom",
+        "id" : "2a4e8cfc484b5a67e5fe2019cc99c92c"
+      } ],
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1019,20 +1047,22 @@
         "id" : "PICKUPVIEWPANEL"
       },
       "getPSDEDRTabPages" : [ {
-        "caption" : "测试",
-        "name" : "test2",
+        "caption" : "清单",
+        "counterId" : "num1",
+        "name" : "dritem1",
         "getPSAppView" : {
           "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupTreeView.json",
-          "viewType" : "DEPICKUPTREEVIEW"
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json",
+          "viewType" : "DEGRIDVIEW"
         }
       }, {
-        "caption" : "测试3",
-        "name" : "test3",
+        "caption" : "表格",
+        "counterId" : "num2",
+        "name" : "dritem2",
         "getPSAppView" : {
           "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTEST2PickupTreeView.json",
-          "viewType" : "DEPICKUPTREEVIEW"
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoREGINFOGridExpView.json",
+          "viewType" : "DEGRIDEXPVIEW"
         }
       } ],
       "getPSSysPFPlugin" : {
@@ -1040,8 +1070,7 @@
         "pluginCode" : "DRTAB_NAV"
       },
       "uniqueTag" : "bookUsr2TestMPickupView__pickupviewpanel",
-      "hideEditItem" : true,
-      "modelid" : "F92082C1-2210-454A-85F8-0D597196B4BE",
+      "modelid" : "fa1370490e24654b68f76899ff0a5688",
       "modeltype" : "PSDEDRTAB"
     }, {
       "caption" : "书",

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

@@ -66832,32 +66832,6 @@
             "showBusyIndicator" : true,
             "id" : "TABEXPPANEL"
           },
-          "getPSDEDRTabPages" : [ {
-            "caption" : "书实体表格视图",
-            "name" : "test1",
-            "getPSAppView" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView.json",
-              "viewType" : "DEGRIDVIEW"
-            }
-          }, {
-            "caption" : "书实体测试(表格)",
-            "name" : "test2",
-            "getPSAppView" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView_Test.json",
-              "viewType" : "DEGRIDVIEW"
-            }
-          }, {
-            "caption" : "学员信息清单",
-            "counterId" : "num1",
-            "name" : "test3",
-            "getPSAppView" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json",
-              "viewType" : "DEGRIDVIEW"
-            }
-          } ],
           "getPSSysPFPlugin" : {
             "pluginType" : "CUSTOM",
             "pluginCode" : "GC_TABNAV"

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: