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

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

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

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

@@ -1648,44 +1648,48 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
     },
     "getPSAppViewRefs" : [ {
-      "name" : "EXPITEM:tabviewpanel",
+      "name" : "EXPITEM:dritem1",
       "parentDataJO" : {
-        "srfparentdefname" : "PHONEID",
+        "srfparentdefname" : "PPHONEID3",
         "srfparentdename" : "PHONE",
-        "srfparentmode" : "DER1N_BOOK_PHONE_PHONEID"
+        "srfparentmode" : "DER1N_PHONE_PHONE_PPHONEID3"
       },
-      "realTitle" : "手机树导航视图",
+      "realTitle" : "手机编辑视图",
       "getRefPSAppView" : {
         "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneTreeExpView.json",
-        "viewType" : "DETREEEXPVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneEditView.json",
+        "viewType" : "DEEDITVIEW"
       }
     }, {
-      "name" : "EXPITEM:tabviewpanel2",
-      "realTitle" : "书分页导航视图",
+      "name" : "EXPITEM:dritem2",
+      "parentDataJO" : {
+        "srfparentdefname" : "PPHONEID3",
+        "srfparentdename" : "PHONE",
+        "srfparentmode" : "DER1N_PHONE_PHONE_PPHONEID3"
+      },
+      "realTitle" : "手机普通表格",
       "getRefPSAppView" : {
         "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTabExpView.json",
-        "viewType" : "DETABEXPVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneGridView.json",
+        "viewType" : "DEGRIDVIEW"
       }
     } ],
     "getPSControlParam" : { },
     "getPSControls" : [ {
-      "caption" : "分页1",
-      "codeName" : "TabExpViewtabviewpanel",
+      "caption" : "手机实体编辑视图",
+      "codeName" : "TabExpViewdritem1",
       "controlType" : "TABVIEWPANEL",
       "getEmbeddedPSAppDEView" : {
         "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneTreeExpView.json",
-        "viewType" : "DETREEEXPVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneEditView.json",
+        "viewType" : "DEEDITVIEW"
       },
-      "name" : "tabviewpanel",
-      "navFilter" : "test1",
+      "name" : "dritem1",
       "getNavPSDER" : {
-        "codeName" : "Phone",
+        "codeName" : "Phone3",
         "dERType" : "DER1N",
-        "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDERS/DER1N_BOOK_PHONE_PHONEID.json",
-        "fKeyName" : "FEF1508FD80241821E",
+        "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDERS/DER1N_PHONE_PHONE_PPHONEID3.json",
+        "fKeyName" : "F86A28EC314DAF1538",
         "logicName" : "名称",
         "getMajorPSDataEntity" : {
           "modelref" : true,
@@ -1693,18 +1697,18 @@
         },
         "masterOrder" : -1,
         "masterRS" : 0,
-        "minorCodeName" : "books",
+        "minorCodeName" : "phones3",
         "getMinorPSDataEntity" : {
           "modelref" : true,
-          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
         },
-        "name" : "DER1N_BOOK_PHONE_PHONEID",
+        "name" : "DER1N_PHONE_PHONE_PPHONEID3",
         "orderValue" : 100,
         "getPSPickupDEField" : {
-          "name" : "PHONEID",
-          "codeName" : "PhoneId"
+          "name" : "PPHONEID3",
+          "codeName" : "Pphoneid3"
         },
-        "pickupDEFName" : "PHONEID",
+        "pickupDEFName" : "PPHONEID3",
         "removeActionType" : -1,
         "removeOrder" : 0,
         "enableFKey" : true
@@ -1714,44 +1718,77 @@
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
       },
       "getPSControlParam" : {
-        "navFilter" : "test1",
-        "navPSDERName" : "DER1N_BOOK_PHONE_PHONEID",
-        "id" : "TABVIEWPANEL"
+        "navPSDERName" : "DER1N_PHONE_PHONE_PPHONEID3",
+        "id" : "dritem1"
       },
       "parentDataJO" : {
-        "srfparentdefname" : "PHONEID",
+        "srfparentdefname" : "PPHONEID3",
         "srfparentdename" : "PHONE",
-        "srfparentmode" : "DER1N_BOOK_PHONE_PHONEID"
+        "srfparentmode" : "DER1N_PHONE_PHONE_PPHONEID3"
       },
-      "modelid" : "ce6b7952d59604f041810a73b43824dc_tabviewpanel",
+      "modelid" : "ce6b7952d59604f041810a73b43824dc_dritem1",
       "modeltype" : "PSVIEWPANEL"
     }, {
-      "caption" : "分页2",
-      "codeName" : "TabExpViewtabviewpanel2",
+      "caption" : "手机普通表格",
+      "codeName" : "TabExpViewdritem2",
       "controlType" : "TABVIEWPANEL",
       "getEmbeddedPSAppDEView" : {
         "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTabExpView.json",
-        "viewType" : "DETABEXPVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneGridView.json",
+        "viewType" : "DEGRIDVIEW"
+      },
+      "name" : "dritem2",
+      "getNavPSDER" : {
+        "codeName" : "Phone3",
+        "dERType" : "DER1N",
+        "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDERS/DER1N_PHONE_PHONE_PPHONEID3.json",
+        "fKeyName" : "F86A28EC314DAF1538",
+        "logicName" : "名称",
+        "getMajorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "masterOrder" : -1,
+        "masterRS" : 0,
+        "minorCodeName" : "phones3",
+        "getMinorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "name" : "DER1N_PHONE_PHONE_PPHONEID3",
+        "orderValue" : 100,
+        "getPSPickupDEField" : {
+          "name" : "PPHONEID3",
+          "codeName" : "Pphoneid3"
+        },
+        "pickupDEFName" : "PPHONEID3",
+        "removeActionType" : -1,
+        "removeOrder" : 0,
+        "enableFKey" : true
       },
-      "name" : "tabviewpanel2",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
       },
       "getPSControlParam" : {
-        "id" : "TABVIEWPANEL2"
+        "navPSDERName" : "DER1N_PHONE_PHONE_PPHONEID3",
+        "id" : "dritem2"
       },
-      "modelid" : "ce6b7952d59604f041810a73b43824dc_tabviewpanel2",
+      "parentDataJO" : {
+        "srfparentdefname" : "PPHONEID3",
+        "srfparentdename" : "PHONE",
+        "srfparentmode" : "DER1N_PHONE_PHONE_PPHONEID3"
+      },
+      "modelid" : "ce6b7952d59604f041810a73b43824dc_dritem2",
       "modeltype" : "PSVIEWPANEL"
     } ],
     "getPSSysCss" : {
       "cssName" : "bg-blue"
     },
     "getPSTabExpPages" : [ {
-      "name" : "tabviewpanel"
+      "name" : "dritem1"
     }, {
-      "name" : "tabviewpanel2"
+      "name" : "dritem2"
     } ],
     "tabLayout" : "TOP",
     "uniqueTag" : "phoneTabExpView__tabexppanel",

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

@@ -9614,16 +9614,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {
@@ -9641,22 +9641,22 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       }
     } ]
   }, {
@@ -9673,16 +9673,16 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图上方",
@@ -9691,39 +9691,44 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg8"
+      }
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
@@ -9734,34 +9739,23 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
       "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9773,6 +9767,12 @@
         "modelref" : true,
         "id" : "ViewMsg11"
       }
+    }, {
+      "name" : "关闭模式-默认删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
     } ]
   }, {
     "codeName" : "VMGroup6",