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

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

@@ -1579,16 +1579,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/bookBookMPickupView2.json

@@ -12,448 +12,6 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
   },
-  "getPSDEViewCodeName" : "BookMPickupView2",
-  "getPSDEViewId" : "10623916-03FC-406C-B569-F4B7BA6EF906",
-  "getPSViewLayoutPanel" : {
-    "codeName" : "Usr0102204212",
-    "controlType" : "VIEWLAYOUTPANEL",
-    "layoutMode" : "FLEX",
-    "logicName" : "BookMPickupView2多项选择视图(左右关系)布局面板",
-    "memo" : "多项选择视图(左右关系)",
-    "name" : "layoutpanel",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.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" : "CONTAINER",
-        "name" : "container3",
-        "getPSLayout" : {
-          "dir" : "row",
-          "layout" : "FLEX"
-        },
-        "getPSLayoutPos" : {
-          "grow" : 1,
-          "layout" : "FLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container6",
-          "getPSLayout" : {
-            "layout" : "FLEX"
-          },
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX",
-            "shrink" : 0
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "树导航栏",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "treeexpbar",
-            "getPSLayoutPos" : {
-              "grow" : -1,
-              "layout" : "FLEX"
-            },
-            "showCaption" : true
-          } ]
-        }, {
-          "caption" : "容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container7",
-          "getPSLayout" : {
-            "layout" : "FLEX"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 1,
-            "layout" : "FLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "控件占位",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "pickupviewpanel",
-            "getPSLayoutPos" : {
-              "grow" : 1,
-              "layout" : "FLEX"
-            },
-            "showCaption" : true
-          } ],
-          "predefinedType" : "VIEWCONTENT"
-        } ]
-      }, {
-        "caption" : "容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container4",
-        "getPSLayout" : {
-          "align" : "center",
-          "dir" : "column",
-          "layout" : "FLEX"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX",
-          "shrink" : 0,
-          "spacingLeft" : "OUTERMEDIUM",
-          "spacingRight" : "OUTERMEDIUM"
-        },
-        "getPSPanelItems" : [ {
-          "actionType" : "UIACTION",
-          "buttonStyle" : "DEFAULT",
-          "caption" : "添加全部数据",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "BUTTON",
-          "name" : "button_addall",
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "layoutpanel_button_addall"
-          },
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX",
-            "spacingBottom" : "OUTERMEDIUM"
-          },
-          "getPSSysImage" : {
-            "glyph" : "xf105@FontAwesome",
-            "cssClass" : "fa fa-angle-right"
-          },
-          "getPSUIAction" : {
-            "caption" : "添加全部",
-            "codeName" : "AddAll",
-            "fullCodeName" : "AddAll",
-            "name" : "添加全部数据（数据选择）",
-            "predefinedType" : "UTIL_ADDALL",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "AddAll",
-            "uIActionType" : "DEUIACTION"
-          },
-          "tooltip" : "添加全部数据"
-        }, {
-          "actionType" : "UIACTION",
-          "buttonStyle" : "DEFAULT",
-          "caption" : "移除全部数据",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "BUTTON",
-          "name" : "button_removeall",
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "layoutpanel_button_removeall"
-          },
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX",
-            "spacingBottom" : "OUTERMEDIUM"
-          },
-          "getPSSysImage" : {
-            "glyph" : "xf101@FontAwesome",
-            "cssClass" : "fa fa-angle-double-right"
-          },
-          "getPSUIAction" : {
-            "caption" : "移除全部",
-            "codeName" : "RemoveAll",
-            "fullCodeName" : "RemoveAll",
-            "name" : "移除全部数据（数据选择）",
-            "predefinedType" : "UTIL_REMOVEALL",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "RemoveAll",
-            "uIActionType" : "DEUIACTION"
-          },
-          "tooltip" : "移除全部数据"
-        }, {
-          "actionType" : "UIACTION",
-          "buttonStyle" : "DEFAULT",
-          "caption" : "移除选中数据",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "BUTTON",
-          "name" : "button_removeselection",
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "layoutpanel_button_removeselection"
-          },
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
-          },
-          "getPSSysImage" : {
-            "glyph" : "xf100@FontAwesome",
-            "cssClass" : "fa fa-angle-double-left"
-          },
-          "getPSUIAction" : {
-            "caption" : "移除选中",
-            "codeName" : "RemoveSelection",
-            "fullCodeName" : "RemoveSelection",
-            "name" : "移除选中数据（数据选择）",
-            "predefinedType" : "UTIL_REMOVESELECTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "RemoveSelection",
-            "uIActionType" : "DEUIACTION"
-          },
-          "tooltip" : "移除选中数据"
-        }, {
-          "actionType" : "UIACTION",
-          "buttonStyle" : "DEFAULT",
-          "caption" : "添加选中数据",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "BUTTON",
-          "name" : "button_addselection",
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "layoutpanel_button_addselection"
-          },
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX",
-            "spacingBottom" : "OUTERMEDIUM"
-          },
-          "getPSSysImage" : {
-            "glyph" : "xf104@FontAwesome",
-            "cssClass" : "fa fa-angle-left"
-          },
-          "getPSUIAction" : {
-            "caption" : "添加选中",
-            "codeName" : "AddSelection",
-            "fullCodeName" : "AddSelection",
-            "name" : "添加选中数据（数据选择）",
-            "predefinedType" : "UTIL_ADDSELECTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "AddSelection",
-            "uIActionType" : "DEUIACTION"
-          },
-          "tooltip" : "添加选中数据"
-        } ]
-      }, {
-        "caption" : "容器",
-        "contentWidth" : 300.0,
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container5",
-        "getPSLayout" : {
-          "layout" : "FLEX"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX",
-          "shrink" : 0,
-          "width" : 300,
-          "widthMode" : "PX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "列表",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CTRLPOS",
-          "name" : "simplelist",
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
-          },
-          "showCaption" : true
-        } ],
-        "width" : 300.0
-      } ],
-      "predefinedType" : "VIEWCONTENT"
-    }, {
-      "caption" : "容器",
-      "itemStyle" : "DEFAULT",
-      "itemType" : "CONTAINER",
-      "name" : "view_footer",
-      "getPSLayout" : {
-        "dir" : "row-reverse",
-        "layout" : "FLEX",
-        "vAlign" : "center"
-      },
-      "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX",
-        "shrink" : 0
-      },
-      "getPSPanelItems" : [ {
-        "actionType" : "UIACTION",
-        "buttonStyle" : "PRIMARY",
-        "caption" : "确定",
-        "itemStyle" : "PRIMARY",
-        "itemType" : "BUTTON",
-        "name" : "button_okaction",
-        "getPSAppViewUIAction" : {
-          "modelref" : true,
-          "id" : "layoutpanel_button_okaction"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
-        },
-        "getPSUIAction" : {
-          "caption" : "确定",
-          "codeName" : "Ok",
-          "fullCodeName" : "Ok",
-          "name" : "视图_确定",
-          "predefinedType" : "VIEW_OKACTION",
-          "timeout" : 60000,
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Ok",
-          "uIActionType" : "DEUIACTION"
-        },
-        "tooltip" : "确定",
-        "showCaption" : true
-      }, {
-        "actionType" : "UIACTION",
-        "buttonStyle" : "INFO",
-        "caption" : "取消",
-        "itemStyle" : "INFO",
-        "itemType" : "BUTTON",
-        "name" : "button_cancelaction",
-        "getPSAppViewUIAction" : {
-          "modelref" : true,
-          "id" : "layoutpanel_button_cancelaction"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
-        },
-        "getPSUIAction" : {
-          "caption" : "取消",
-          "codeName" : "Cancel",
-          "fullCodeName" : "Cancel",
-          "name" : "视图_取消",
-          "predefinedType" : "VIEW_CANCELACTION",
-          "timeout" : 60000,
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Cancel",
-          "uIActionType" : "DEUIACTION"
-        },
-        "tooltip" : "取消",
-        "showCaption" : true
-      } ]
-    } ],
-    "layoutBodyOnly" : false,
-    "layoutPanel" : true,
-    "useDefaultLayout" : false,
-    "viewProxyMode" : true,
-    "modelid" : "6D2D09C1-D46E-47FA-8323-41313B1F0F50",
-    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
   "getPSControls" : [ {
     "codeName" : "BookMPickupView2pickupviewpanel",
     "controlType" : "PICKUPVIEWPANEL",
@@ -1435,7 +993,22 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
     },
     "getPSControlParam" : { }
-    } ]
+  } ],
+  "getPSDEViewCodeName" : "BookMPickupView2",
+  "getPSDEViewId" : "10623916-03FC-406C-B569-F4B7BA6EF906",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEMPICKUPVIEW2",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
   },
   "title" : "书实体多项数据选择视图（左右关系）",
   "viewStyle" : "DEFAULT",

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

@@ -12873,16 +12873,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"
       }
     } ]
   }, {
@@ -12911,12 +12911,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
       "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12928,6 +12922,12 @@
         "modelref" : true,
         "id" : "ViewMsg6"
       }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
     } ]
   }, {
     "codeName" : "VMGroup7",
@@ -12943,22 +12943,22 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -12971,28 +12971,29 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg13"
       }
     }, {
       "name" : "消息类型-错误信息",
@@ -13002,12 +13003,11 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg11"
+      }
     }, {
       "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
@@ -13016,10 +13016,10 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
@@ -13048,16 +13048,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],