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/Test/PSDATAENTITIES/TEST.json

@@ -790,6 +790,15 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem0621767095.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111161424.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111577321.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111950860.json"
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1211291549.json"
@@ -1021,6 +1030,9 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/DataRelation3.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/DataRelation4.json"
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Default.json"
@@ -6583,6 +6595,12 @@
     "name" : "测试实体实体编辑视图(功能确认-基本功能-非模态弹出)",
     "realModelSubType" : "DEEDITVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr11115326EditView",
+    "logicName" : "分页面板关系测试",
+    "name" : "分页面板关系测试",
+    "realModelSubType" : "DEEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Usr11279815MobCustomView",
     "logicName" : "面板容器测试",
@@ -8049,6 +8067,13 @@
     "name" : "编辑视图-访问控制相关",
     "realModelSubType" : "EDITFORM",
     "realModelType" : "PSDEFORM"
+  }, {
+    "codeName" : "Main4",
+    "logicName" : "分页面板关系表单",
+    "modelTag2" : "0",
+    "name" : "分页面板关系表单",
+    "realModelSubType" : "EDITFORM",
+    "realModelType" : "PSDEFORM"
   }, {
     "codeName" : "ORG_FORM",
     "logicName" : "单位选择表单",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/DataRelation4.json

+{
+  "codeName" : "DataRelation4",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/DataRelation4.json",
+  "getFormCapPSLanguageRes" : {
+    "lanResTag" : "DE.LNAME.TEST"
+  },
+  "formCaption" : "测试实体",
+  "name" : "分页面板关系界面组",
+  "getPSDEDRDetails" : [ {
+    "caption" : "测试编辑视图",
+    "detailType" : "DRITEM",
+    "name" : "item",
+    "orderValue" : 100,
+    "getPSDEDRItem" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111577321.json"
+    }
+  }, {
+    "caption" : "模态编辑（2）",
+    "detailType" : "DRITEM",
+    "name" : "adsad",
+    "orderValue" : 110,
+    "getPSDEDRItem" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111950860.json"
+    }
+  } ]
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111161424.json

+{
+  "codeName" : "UsrDRItem1111161424",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111161424.json",
+  "itemType" : "CUSTOM",
+  "name" : "测试AAA实体编辑视图",
+  "parentDataJO" : {
+    "srfparentdename" : "TEST",
+    "SRFPARENTTYPE" : "CUSTOM"
+  },
+  "viewCodeName" : "EditView",
+  "getViewPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/Test_aaa.json"
+  }
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111577321.json

+{
+  "codeName" : "UsrDRItem1111577321",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111577321.json",
+  "itemType" : "CUSTOM",
+  "name" : "测试编辑视图",
+  "parentDataJO" : {
+    "srfparentdename" : "TEST",
+    "SRFPARENTTYPE" : "CUSTOM"
+  },
+  "viewCodeName" : "TestEditView",
+  "getViewPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/TESTGRID.json"
+  }
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111950860.json

+{
+  "codeName" : "UsrDRItem1111950860",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1111950860.json",
+  "itemType" : "DER1N",
+  "name" : "模态编辑（2）",
+  "getPSDER" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDERS/DER1N_SUBTEST_TEST_TESTID.json"
+  },
+  "parentDataJO" : {
+    "srfparentdefname" : "TESTID",
+    "srfparentdename" : "TEST",
+    "SRFPARENTTYPE" : "DER1N",
+    "srfparentmode" : "DER1N_SUBTEST_TEST_TESTID",
+    "SRFDER1NID" : "DER1N_SUBTEST_TEST_TESTID"
+  },
+  "viewCodeName" : "EditView",
+  "getViewPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/SubTest.json"
+  },
+  "viewParamJO" : {
+    "SRFPARENTTYPE" : "DER1N",
+    "SRFDER1NID" : "DER1N_SUBTEST_TEST_TESTID"
+  }
+}
\ No newline at end of file

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

@@ -520,6 +520,10 @@
         } ]
       },
       "ruleInfo" : "ce值规则",
+      "ruleInfoLanResTag" : "CTRL.FORMAH.FORMAH.INPUTERROR2",
+      "getRuleInfoPSLanguageRes" : {
+        "lanResTag" : "CTRL.FORMAH.FORMAH.INPUTERROR2"
+      },
       "checkDefault" : true,
       "defaultMode" : true,
       "enableBackend" : true,

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

@@ -133,6 +133,13 @@
       "name" : "SUBTESTNAME",
       "codeName" : "SubTestName"
     }
+  }, {
+    "id" : "updateman",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
   }, {
     "id" : "createman",
     "dataType" : 25,
@@ -141,33 +148,33 @@
       "codeName" : "CreateMan"
     }
   }, {
-    "id" : "createdate",
+    "id" : "updatedate",
     "dataType" : 5,
     "getPSAppDEField" : {
-      "name" : "CREATEDATE",
-      "codeName" : "CreateDate"
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
     }
   }, {
-    "id" : "updateman",
+    "id" : "subtestid",
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "SUBTESTID",
+      "codeName" : "SubTestId"
     }
   }, {
-    "id" : "updatedate",
+    "id" : "createdate",
     "dataType" : 5,
     "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
-      "codeName" : "UpdateDate"
+      "name" : "CREATEDATE",
+      "codeName" : "CreateDate"
     }
   }, {
-    "id" : "subtestid",
+    "id" : "testid",
     "hidden" : true,
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "SUBTESTID",
-      "codeName" : "SubTestId"
+      "name" : "TESTID",
+      "codeName" : "TESTId"
     }
   } ],
   "getPSDEFormPages" : [ {
@@ -285,60 +292,47 @@
       "infoGroupMode" : false,
       "showCaption" : true
     }, {
-      "getCapPSLanguageRes" : {
-        "lanResTag" : "DEF.LNAME.SUBTESTID"
-      },
-      "caption" : "子测试实体标识",
-      "codeName" : "subtestid",
-      "dataType" : 25,
-      "detailStyle" : "DEFAULT",
-      "detailType" : "FORMITEM",
-      "enableCond" : 3,
-      "ignoreInput" : 0,
-      "labelPos" : "LEFT",
-      "labelWidth" : 130,
-      "name" : "subtestid",
-      "noPrivDisplayMode" : 1,
-      "getPSAppDEField" : {
-        "name" : "SUBTESTID",
-        "codeName" : "SubTestId"
-      },
-      "getPSEditor" : {
-        "editorType" : "HIDDEN",
-        "name" : "subtestid"
-      },
-      "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "allowEmpty" : true,
-      "hidden" : true
-    } ],
-    "getPSLayout" : {
-      "childColMD" : 24,
-      "columnCount" : 24,
-      "layout" : "TABLE_24COL"
-    },
-    "infoGroupMode" : false
-  }, {
-    "getCapPSLanguageRes" : {
-      "lanResTag" : "CONTROL.DEFORM.SUBTEST.MAIN.FORMPAGE.FORMPAGE2"
-    },
-    "caption" : "其它",
-    "codeName" : "formpage2",
-    "detailStyle" : "DEFAULT",
-    "detailType" : "FORMPAGE",
-    "name" : "formpage2",
-    "getPSDEFormDetails" : [ {
-      "getCapPSLanguageRes" : {
-        "lanResTag" : "CONTROL.DEFORM.SUBTEST.MAIN.GROUPPANEL.GROUP2"
-      },
-      "caption" : "操作信息",
-      "codeName" : "group2",
+      "caption" : "分组23123123",
+      "codeName" : "grouppanel1",
       "detailStyle" : "DEFAULT",
       "detailType" : "GROUPPANEL",
-      "name" : "group2",
+      "name" : "grouppanel1",
       "getPSDEFormDetails" : [ {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "DEF.LNAME.UPDATEMAN"
+        },
+        "caption" : "更新人",
+        "codeName" : "updateman",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 3,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "updateman",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "UPDATEMAN",
+          "codeName" : "UpdateMan"
+        },
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "updateman",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+          },
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "convertToCodeItemText" : true,
+        "showCaption" : true
+      }, {
         "getCapPSLanguageRes" : {
           "lanResTag" : "DEF.LNAME.CREATEMAN"
         },
@@ -375,10 +369,10 @@
         "showCaption" : true
       }, {
         "getCapPSLanguageRes" : {
-          "lanResTag" : "DEF.LNAME.CREATEDATE"
+          "lanResTag" : "DEF.LNAME.UPDATEDATE"
         },
-        "caption" : "建立时间",
-        "codeName" : "createdate",
+        "caption" : "更新时间",
+        "codeName" : "updatedate",
         "dataType" : 5,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -386,15 +380,15 @@
         "ignoreInput" : 3,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "createdate",
+        "name" : "updatedate",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "CREATEDATE",
-          "codeName" : "CreateDate"
+          "name" : "UPDATEDATE",
+          "codeName" : "UpdateDate"
         },
         "getPSEditor" : {
           "editorType" : "SPAN",
-          "name" : "createdate",
+          "name" : "updatedate",
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
@@ -406,30 +400,26 @@
         "showCaption" : true
       }, {
         "getCapPSLanguageRes" : {
-          "lanResTag" : "DEF.LNAME.UPDATEMAN"
+          "lanResTag" : "DEF.LNAME.SUBTESTID"
         },
-        "caption" : "更新人",
-        "codeName" : "updateman",
+        "caption" : "子测试实体标识",
+        "codeName" : "subtestid",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
-        "ignoreInput" : 3,
+        "ignoreInput" : 0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "updateman",
+        "name" : "subtestid",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "UPDATEMAN",
-          "codeName" : "UpdateMan"
+          "name" : "SUBTESTID",
+          "codeName" : "SubTestId"
         },
         "getPSEditor" : {
           "editorType" : "SPAN",
-          "name" : "updateman",
-          "getPSAppCodeList" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-          },
+          "name" : "subtestid",
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
@@ -437,14 +427,13 @@
           "layout" : "TABLE_24COL"
         },
         "allowEmpty" : true,
-        "convertToCodeItemText" : true,
         "showCaption" : true
       }, {
         "getCapPSLanguageRes" : {
-          "lanResTag" : "DEF.LNAME.UPDATEDATE"
+          "lanResTag" : "DEF.LNAME.CREATEDATE"
         },
-        "caption" : "更新时间",
-        "codeName" : "updatedate",
+        "caption" : "建立时间",
+        "codeName" : "createdate",
         "dataType" : 5,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -452,15 +441,15 @@
         "ignoreInput" : 3,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "updatedate",
+        "name" : "createdate",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "UPDATEDATE",
-          "codeName" : "UpdateDate"
+          "name" : "CREATEDATE",
+          "codeName" : "CreateDate"
         },
         "getPSEditor" : {
           "editorType" : "SPAN",
-          "name" : "updatedate",
+          "name" : "createdate",
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
@@ -470,6 +459,32 @@
         "valueFormat" : "YYYY-MM-DD HH:mm:ss",
         "allowEmpty" : true,
         "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
       } ],
       "getPSLayout" : {
         "childColMD" : 24,
@@ -528,7 +543,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest.json"
     }
   },
-  "noTabHeader" : false,
+  "noTabHeader" : true,
   "modelid" : "7a077d2d08c3eff6e21a6024d11660a2",
   "modeltype" : "PSDEFORM_EDITFORM"
 }
\ No newline at end of file

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

@@ -10137,6 +10137,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2GridExpView_4265.json",
     "viewType" : "DEGRIDEXPVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr11115326EditView.json",
+    "viewType" : "DEEDITVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr15EditView.json",

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

@@ -389,7 +389,6 @@
               "logicType" : "PREDEFINED",
               "name" : "新建数据",
               "getNewDataPSAppView" : {
-                "openMode" : "POPUPMODAL",
                 "getRefPSAppView" : {
                   "modelref" : true,
                   "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -397,7 +396,6 @@
                 }
               },
               "getPSAppUILogicRefViews" : [ {
-                "openMode" : "POPUPMODAL",
                 "getRefPSAppView" : {
                   "modelref" : true,
                   "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -417,7 +415,6 @@
               "logicType" : "PREDEFINED",
               "name" : "打开数据",
               "getOpenDataPSAppView" : {
-                "openMode" : "POPUPMODAL",
                 "getRefPSAppView" : {
                   "modelref" : true,
                   "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -425,7 +422,6 @@
                 }
               },
               "getPSAppUILogicRefViews" : [ {
-                "openMode" : "POPUPMODAL",
                 "getRefPSAppView" : {
                   "modelref" : true,
                   "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -438,7 +434,6 @@
           } ],
           "getPSAppViewRefs" : [ {
             "name" : "NEWDATA",
-            "realOpenMode" : "POPUPMODAL",
             "realTitle" : "子测试实体编辑视图",
             "getRealTitlePSLanguageRes" : {
               "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW"
@@ -450,7 +445,6 @@
             }
           }, {
             "name" : "EDITDATA",
-            "realOpenMode" : "POPUPMODAL",
             "realTitle" : "子测试实体编辑视图",
             "getRealTitlePSLanguageRes" : {
               "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW"

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

@@ -1603,240 +1603,6 @@
     "globalUIAction" : true,
     "id" : "import_test_grid_default@TESTGRID"
   } ],
-  "getAllPSAppDEUILogics" : [ {
-    "codeName" : "panel_item_update_view",
-    "defaultParamName" : "Default",
-    "logicName" : "测试面板项逻辑更新视图",
-    "name" : "测试面板项逻辑更新视图",
-    "getPSDEUILogicNodes" : [ {
-      "codeName" : "Begin",
-      "leftPos" : 860,
-      "logicNodeType" : "BEGIN",
-      "name" : "开始",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "Begin"
-        }
-      } ],
-      "topPos" : 180,
-      "parallelOutput" : true
-    }, {
-      "codeName" : "END1",
-      "leftPos" : 860,
-      "logicNodeType" : "END",
-      "name" : "结束",
-      "topPos" : 620
-    }, {
-      "codeName" : "VIEWCTRLINVOKE1",
-      "getInvokeCtrl" : {
-        "modelref" : true,
-        "id" : "view"
-      },
-      "invokeMethod" : "refresh",
-      "getInvokeParam" : {
-        "modelref" : true,
-        "id" : "view_params"
-      },
-      "leftPos" : 622,
-      "logicNodeType" : "VIEWCTRLINVOKE",
-      "name" : "视图部件调用",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "END1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "VIEWCTRLINVOKE1"
-        }
-      } ],
-      "topPos" : 495
-    }, {
-      "code" : "console.log('测试', view)",
-      "codeName" : "RAWJSCODE1",
-      "leftPos" : 1084,
-      "logicNodeType" : "RAWJSCODE",
-      "name" : "注入脚本代码",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "END1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "RAWJSCODE1"
-        }
-      } ],
-      "topPos" : 495
-    }, {
-      "codeName" : "DEACTION1",
-      "getDstPSAppDEAction" : {
-        "modelref" : true,
-        "id" : "Update"
-      },
-      "getDstPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json"
-      },
-      "getDstPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "commit_object"
-      },
-      "leftPos" : 820,
-      "logicNodeType" : "DEACTION",
-      "name" : "保存更改",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "RAWJSCODE1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "DEACTION1"
-        }
-      }, {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "VIEWCTRLINVOKE1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "DEACTION1"
-        }
-      } ],
-      "topPos" : 495
-    }, {
-      "codeName" : "PREPAREJSPARAM2",
-      "leftPos" : 820,
-      "logicNodeType" : "PREPAREJSPARAM",
-      "name" : "项合并",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "DEACTION1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "PREPAREJSPARAM2"
-        }
-      } ],
-      "getPSDEUILogicNodeParams" : [ {
-        "dstFieldName" : "id",
-        "getDstPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "commit_object"
-        },
-        "name" : "ctx[testgrid] ==> commit_object[id]",
-        "paramAction" : "SETPARAMVALUE",
-        "srcFieldName" : "testgrid",
-        "getSrcPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "ctx"
-        },
-        "srcValueType" : "SRCDLPARAM"
-      } ],
-      "topPos" : 400
-    }, {
-      "codeName" : "PREPAREJSPARAM1",
-      "leftPos" : 820,
-      "logicNodeType" : "PREPAREJSPARAM",
-      "name" : "获取名字",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "PREPAREJSPARAM2"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
-        }
-      } ],
-      "getPSDEUILogicNodeParams" : [ {
-        "getDstPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "container_singledata"
-        },
-        "name" : "view[layoutPanel.panelItems.container_singledata] ==> container_singledata",
-        "paramAction" : "SETPARAMVALUE",
-        "srcFieldName" : "layoutPanel.panelItems.container_singledata",
-        "getSrcPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "view"
-        },
-        "srcValueType" : "SRCDLPARAM"
-      }, {
-        "dstFieldName" : "testgridname",
-        "getDstPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "commit_object"
-        },
-        "name" : "container_singledata[panelItems.testgridname.value] ==> commit_object[testgridname]",
-        "paramAction" : "SETPARAMVALUE",
-        "srcFieldName" : "panelItems.testgridname.value",
-        "getSrcPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "container_singledata"
-        },
-        "srcValueType" : "SRCDLPARAM"
-      } ],
-      "topPos" : 300
-    } ],
-    "getPSDEUILogicParams" : [ {
-      "codeName" : "ctx",
-      "logicName" : "当前上下文",
-      "name" : "当前上下文",
-      "navContextParam" : true
-    }, {
-      "codeName" : "view",
-      "logicName" : "当前视图",
-      "name" : "当前视图",
-      "activeViewParam" : true
-    }, {
-      "codeName" : "view_params",
-      "logicName" : "视图参数",
-      "name" : "视图参数",
-      "entityParam" : true
-    }, {
-      "codeName" : "Default",
-      "logicName" : "传入变量",
-      "name" : "传入变量",
-      "default" : true,
-      "entityParam" : true
-    }, {
-      "codeName" : "commit_object",
-      "logicName" : "提交对象",
-      "name" : "提交对象",
-      "entityParam" : true
-    }, {
-      "codeName" : "container_singledata",
-      "logicName" : "单数据容器变量",
-      "name" : "单数据容器变量",
-      "entityParam" : true
-    } ],
-    "getStartPSDEUILogicNode" : {
-      "modelref" : true,
-      "id" : "Begin"
-    }
-  } ],
   "getAllPSAppViews" : [ {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDRedirectView.json",

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

@@ -31,7 +31,6 @@
       "logicType" : "PREDEFINED",
       "name" : "新建数据",
       "getNewDataPSAppView" : {
-        "openMode" : "POPUPMODAL",
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -39,7 +38,6 @@
         }
       },
       "getPSAppUILogicRefViews" : [ {
-        "openMode" : "POPUPMODAL",
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -59,7 +57,6 @@
       "logicType" : "PREDEFINED",
       "name" : "打开数据",
       "getOpenDataPSAppView" : {
-        "openMode" : "POPUPMODAL",
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -67,7 +64,6 @@
         }
       },
       "getPSAppUILogicRefViews" : [ {
-        "openMode" : "POPUPMODAL",
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -80,7 +76,6 @@
   } ],
   "getPSAppViewRefs" : [ {
     "name" : "NEWDATA",
-    "realOpenMode" : "POPUPMODAL",
     "realTitle" : "子测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW"
@@ -92,7 +87,6 @@
     }
   }, {
     "name" : "EDITDATA",
-    "realOpenMode" : "POPUPMODAL",
     "realTitle" : "子测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW"

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

@@ -510,7 +510,6 @@
                 "logicType" : "PREDEFINED",
                 "name" : "新建数据",
                 "getNewDataPSAppView" : {
-                  "openMode" : "POPUPMODAL",
                   "getRefPSAppView" : {
                     "modelref" : true,
                     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -518,7 +517,6 @@
                   }
                 },
                 "getPSAppUILogicRefViews" : [ {
-                  "openMode" : "POPUPMODAL",
                   "getRefPSAppView" : {
                     "modelref" : true,
                     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -538,7 +536,6 @@
                 "logicType" : "PREDEFINED",
                 "name" : "打开数据",
                 "getOpenDataPSAppView" : {
-                  "openMode" : "POPUPMODAL",
                   "getRefPSAppView" : {
                     "modelref" : true,
                     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -546,7 +543,6 @@
                   }
                 },
                 "getPSAppUILogicRefViews" : [ {
-                  "openMode" : "POPUPMODAL",
                   "getRefPSAppView" : {
                     "modelref" : true,
                     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTestEditView.json",
@@ -559,7 +555,6 @@
             } ],
             "getPSAppViewRefs" : [ {
               "name" : "NEWDATA",
-              "realOpenMode" : "POPUPMODAL",
               "realTitle" : "子测试实体编辑视图",
               "getRealTitlePSLanguageRes" : {
                 "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW"
@@ -571,7 +566,6 @@
               }
             }, {
               "name" : "EDITDATA",
-              "realOpenMode" : "POPUPMODAL",
               "realTitle" : "子测试实体编辑视图",
               "getRealTitlePSLanguageRes" : {
                 "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW"

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

@@ -7248,6 +7248,60 @@
           "layout" : "TABLE_24COL"
         },
         "seperator" : true
+      }, {
+        "accUserMode" : 0,
+        "caption" : "表单分页关系测试",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem352",
+        "getPSAppMenuItems" : [ {
+          "accUserMode" : 2,
+          "caption" : "分页面板关系测试",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem353",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc1111459743"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "分页面板关系测试"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "分页部件关系界面组",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem354",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc1111630758"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "分页部件关系界面组"
+        } ],
+        "getPSLayout" : {
+          "childColMD" : 24,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "表单分页关系测试"
       } ],
       "getPSControlHandler" : {
         "enableDEFieldPrivilege" : false,