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

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

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

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

@@ -15,7 +15,7 @@
   "getPSDEViewCodeName" : "Usr02058437MPickupView",
   "getPSDEViewId" : "2B295648-F1DC-4E87-897E-7F44E13DD765",
   "getPSViewLayoutPanel" : {
-    "codeName" : "Usr0205807553",
+    "codeName" : "Usr0205587938",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
     "logicName" : "Usr02058437MPickupView多项选择视图布局面板",
@@ -29,41 +29,36 @@
       "layout" : "FLEX"
     },
     "getRootPSPanelItems" : [ {
-      "caption" : "树视图",
+      "caption" : "容器",
       "itemStyle" : "DEFAULT",
-      "itemType" : "CTRLPOS",
-      "name" : "tree",
-      "getPSLayoutPos" : {
-        "grow" : -1,
+      "itemType" : "CONTAINER",
+      "name" : "view_content",
+      "getPSLayout" : {
+        "dir" : "row",
         "layout" : "FLEX"
       },
-      "showCaption" : true
-    }, {
-      "caption" : "列表",
-      "itemStyle" : "DEFAULT",
-      "itemType" : "CTRLPOS",
-      "name" : "samplelist",
       "getPSLayoutPos" : {
-        "grow" : -1,
+        "grow" : 1,
         "layout" : "FLEX"
       },
-      "showCaption" : true
-    }, {
-      "caption" : "列表",
-      "itemStyle" : "DEFAULT",
-      "itemType" : "CTRLPOS",
-      "name" : "simplelist",
-      "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
-      },
-      "showCaption" : true
+      "getPSPanelItems" : [ {
+        "caption" : "控件占位",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CTRLPOS",
+        "name" : "pickupviewpanel",
+        "getPSLayoutPos" : {
+          "grow" : 1,
+          "layout" : "FLEX"
+        },
+        "showCaption" : true
+      } ],
+      "predefinedType" : "VIEWCONTENT"
     } ],
     "layoutBodyOnly" : false,
     "layoutPanel" : true,
     "useDefaultLayout" : false,
     "viewProxyMode" : true,
-    "modelid" : "57EF1CC9-02DD-4812-AA5D-5F514A574102",
+    "modelid" : "5617190D-9E17-45C4-97D5-F4B74FC5EB53",
     "modeltype" : "PSSYSVIEWLAYOUTPANEL",
     "getPSAppViewEngines" : [ {
       "engineCat" : "VIEW",
@@ -524,355 +519,6 @@
       "getPSControlParam" : {
         "id" : "PICKUPVIEWPANEL"
       }
-    }, {
-      "codeName" : "Usr02053578PickupTreeView_TreeView",
-      "controlType" : "TREEVIEW",
-      "getCreatePSControlAction" : {
-        "modelref" : true,
-        "id" : "create",
-        "actionName" : "Create",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "CREATE",
-        "name" : "create",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "Create"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        }
-      },
-      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/Usr02053578PickupTreeView_TreeView.json",
-      "getFetchPSControlAction" : {
-        "modelref" : true,
-        "id" : "fetch",
-        "actionType" : "DEDATASET",
-        "name" : "fetch",
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        }
-      },
-      "getGetPSControlAction" : {
-        "modelref" : true,
-        "id" : "load",
-        "actionName" : "Get",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "READ",
-        "name" : "load",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "Get"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        }
-      },
-      "logicName" : "下拉树多选测试树视图_树视图",
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      },
-      "getPSControlHandler" : {
-        "getPSHandlerActions" : [ {
-          "actionName" : "Get",
-          "actionType" : "DEACTION",
-          "dataAccessAction" : "READ",
-          "name" : "load",
-          "getPSAppDEMethod" : {
-            "modelref" : true,
-            "id" : "Get"
-          },
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-          }
-        }, {
-          "actionName" : "Create",
-          "actionType" : "DEACTION",
-          "dataAccessAction" : "CREATE",
-          "name" : "create",
-          "getPSAppDEMethod" : {
-            "modelref" : true,
-            "id" : "Create"
-          },
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-          }
-        }, {
-          "actionName" : "Update",
-          "actionType" : "DEACTION",
-          "dataAccessAction" : "UPDATE",
-          "name" : "update",
-          "getPSAppDEMethod" : {
-            "modelref" : true,
-            "id" : "Update"
-          },
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-          }
-        }, {
-          "actionName" : "Remove",
-          "actionType" : "DEACTION",
-          "dataAccessAction" : "DELETE",
-          "name" : "remove",
-          "getPSAppDEMethod" : {
-            "modelref" : true,
-            "id" : "Remove"
-          },
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-          }
-        }, {
-          "actionType" : "DEDATASET",
-          "name" : "fetch",
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-          }
-        } ],
-        "userDRAction" : "READ",
-        "enableDEFieldPrivilege" : false,
-        "id" : "树视图处理器"
-      },
-      "getPSControlParam" : {
-        "autoLoad" : true,
-        "showBusyIndicator" : true,
-        "id" : "TREE"
-      },
-      "getPSDEDataImport" : {
-        "modelref" : true,
-        "id" : "DataImport"
-      },
-      "getPSDETreeNodeRSs" : [ {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node"
-        },
-        "name" : "默认根节点 - 静态（测试）",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "ROOT"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
-      }, {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node_2"
-        },
-        "name" : "静态（测试） - 测试实体",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
-      }, {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node_3"
-        },
-        "name" : "静态（学生） - 学生",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node_1"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
-      }, {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node_1"
-        },
-        "name" : "默认根节点 - 静态（学生）",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "ROOT"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
-      } ],
-      "getPSDETreeNodes" : [ {
-        "counterMode" : 0,
-        "name" : "默认根节点",
-        "nodeType" : "ROOT",
-        "nodeValue" : "root",
-        "text" : "默认根节点",
-        "treeNodeType" : "STATIC",
-        "hasPSDETreeNodeRSs" : true,
-        "appendPNodeId" : false,
-        "disableSelect" : false,
-        "enableCheck" : false,
-        "enableEditData" : false,
-        "enableNewData" : false,
-        "enableQuickCreate" : false,
-        "enableQuickSearch" : false,
-        "enableRemoveData" : false,
-        "enableViewData" : false,
-        "expandFirstOnly" : false,
-        "expanded" : false,
-        "rootNode" : true,
-        "selectFirstOnly" : false,
-        "selected" : false,
-        "id" : "ROOT"
-      }, {
-        "counterMode" : 0,
-        "name" : "静态（测试）",
-        "nodeType" : "node",
-        "text" : "静态（测试）",
-        "treeNodeType" : "STATIC",
-        "hasPSDETreeNodeRSs" : true,
-        "appendPNodeId" : false,
-        "disableSelect" : false,
-        "enableCheck" : false,
-        "enableEditData" : false,
-        "enableNewData" : false,
-        "enableQuickCreate" : false,
-        "enableQuickSearch" : false,
-        "enableRemoveData" : false,
-        "enableViewData" : false,
-        "expandFirstOnly" : false,
-        "expanded" : false,
-        "rootNode" : false,
-        "selectFirstOnly" : false,
-        "selected" : false,
-        "id" : "node"
-      }, {
-        "counterMode" : 0,
-        "name" : "静态（学生）",
-        "nodeType" : "node_1",
-        "text" : "静态（学生）",
-        "treeNodeType" : "STATIC",
-        "hasPSDETreeNodeRSs" : true,
-        "appendPNodeId" : false,
-        "disableSelect" : false,
-        "enableCheck" : false,
-        "enableEditData" : false,
-        "enableNewData" : false,
-        "enableQuickCreate" : false,
-        "enableQuickSearch" : false,
-        "enableRemoveData" : false,
-        "enableViewData" : false,
-        "expandFirstOnly" : false,
-        "expanded" : false,
-        "rootNode" : false,
-        "selectFirstOnly" : false,
-        "selected" : false,
-        "id" : "node_1"
-      }, {
-        "counterMode" : 0,
-        "name" : "测试实体",
-        "nodeType" : "node_2",
-        "getPSCodeList" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__TestAll.json"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        },
-        "treeNodeType" : "CODELIST",
-        "hasPSDETreeNodeRSs" : false,
-        "appendCaption" : false,
-        "appendPNodeId" : false,
-        "disableSelect" : false,
-        "enableCheck" : false,
-        "enableEditData" : false,
-        "enableNewData" : false,
-        "enableQuickCreate" : false,
-        "enableQuickSearch" : false,
-        "enableRemoveData" : false,
-        "enableViewData" : false,
-        "expandFirstOnly" : false,
-        "expanded" : false,
-        "rootNode" : false,
-        "selectFirstOnly" : false,
-        "selected" : false,
-        "id" : "node_2"
-      }, {
-        "counterMode" : 0,
-        "getIdPSAppDEField" : {
-          "name" : "REGINFOID",
-          "codeName" : "ReginfoId"
-        },
-        "maxSize" : -1,
-        "name" : "学生",
-        "nodeType" : "node_3",
-        "getPSAppDEDataSet" : {
-          "modelref" : true,
-          "id" : "FetchDefault"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
-        },
-        "getTextPSAppDEField" : {
-          "name" : "REGINFONAME",
-          "codeName" : "ReginfoName"
-        },
-        "treeNodeType" : "DE",
-        "hasPSDETreeNodeRSs" : false,
-        "appendPNodeId" : false,
-        "disableSelect" : false,
-        "enableCheck" : false,
-        "enableEditData" : false,
-        "enableNewData" : false,
-        "enableQuickCreate" : false,
-        "enableQuickSearch" : false,
-        "enableRemoveData" : false,
-        "enableViewData" : false,
-        "expandFirstOnly" : false,
-        "expanded" : false,
-        "rootNode" : false,
-        "selectFirstOnly" : false,
-        "selected" : false,
-        "id" : "node_3"
-      } ],
-      "getRemovePSControlAction" : {
-        "modelref" : true,
-        "id" : "remove",
-        "actionName" : "Remove",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "DELETE",
-        "name" : "remove",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "Remove"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        }
-      },
-      "treeGridMode" : 0,
-      "getUpdatePSControlAction" : {
-        "modelref" : true,
-        "id" : "update",
-        "actionName" : "Update",
-        "actionType" : "DEACTION",
-        "dataAccessAction" : "UPDATE",
-        "name" : "update",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "Update"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        }
-      },
-      "enableRootSelect" : false,
-      "outputIconDefault" : true,
-      "rootVisible" : false,
-      "name" : "tree",
-      "modelid" : "557E0793-8394-4C2C-8923-B3DFB3201878",
-      "modeltype" : "PSDETREEVIEW"
     }, {
       "codeName" : "Test_List",
       "controlType" : "LIST",

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

@@ -13546,16 +13546,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {
@@ -13584,16 +13584,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -13622,10 +13622,10 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图下方",
@@ -13634,20 +13634,27 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
@@ -13657,10 +13664,10 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       },
       "position" : "POPUP"
     }, {
@@ -13675,12 +13682,6 @@
         "modelref" : true,
         "id" : "ViewMsg9"
       }
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -13688,12 +13689,11 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg13"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -13705,16 +13705,16 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     } ]
   }, {