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

8992cefd · ibizdev · d5997dbc · 8992cefd · 8992cefd · 8992cefd
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
@@ -7432,6 +7432,12 @@
    "name" : "书实体编辑视图(测试编辑器插件专用)",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr01028976MPickupView2_PickupGridView",
+    "logicName" : "测试多项数据选择视图_选择数据视图",
+    "name" : "测试多项数据选择视图_选择数据视图",
+    "realModelSubType" : "DEPICKUPGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "GridView",
    "logicName" : "书实体表格视图",
@@ -7619,6 +7625,12 @@
    "name" : "书实体选择表格视图（部件视图）",
    "realModelSubType" : "DEPICKUPGRIDVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr01028976MPickupView2",
+    "logicName" : "测试多项数据选择视图",
+    "name" : "测试多项数据选择视图",
+    "realModelSubType" : "DEMPICKUPVIEW2",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "BookPickupDataView",
    "logicName" : "书实体选择数据视图（部件视图）",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1517,16 +1517,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"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
@@ -4655,6 +4655,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookDefaultDataView.json",
    "viewType" : "DEDATAVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json",
+    "viewType" : "DEMPICKUPVIEW2"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2RedirectView.json",
@@ -4807,6 +4811,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookWFDynaActionView.json",
    "viewType" : "DEWFDYNAACTIONVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2_PickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupTreeView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Usr07257969EditView_Form.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Usr07257969EditView_Form.json
@@ -119,6 +119,13 @@
      "name" : "BOOKNAME",
      "codeName" : "BookName"
    }
+  }, {
+    "id" : "formitem2",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD27",
+      "codeName" : "Field27"
+    }
  }, {
    "id" : "bookid",
    "hidden" : true,
@@ -1382,6 +1389,47 @@
        },
        "infoGroupMode" : false,
        "showCaption" : true
+      }, {
+        "caption" : "属性27",
+        "codeName" : "formitem2",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem2",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD27",
+          "codeName" : "Field27"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "AC" : "TRUE",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "PICKER",
+          "handlerType" : "PickupText",
+          "name" : "formitem2",
+          "getPickupPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json",
+            "viewType" : "DEMPICKUPVIEW2"
+          },
+          "enableAC" : true,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/Usr01028976MPickupView2_PickupGridView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/Usr01028976MPickupView2_PickupGridView_Grid.json
+{
+  "aggMode" : "NONE",
+  "codeName" : "Usr01028976MPickupView2_PickupGridView_Grid",
+  "columnEnableFilter" : 2,
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/Usr01028976MPickupView2_PickupGridView_Grid.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    }
+  },
+  "groupMode" : "NONE",
+  "logicName" : "测试多项数据选择视图_选择数据视图_表格",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "书名称",
+    "codeName" : "bookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "bookname",
+    "excelCaption" : "书名称",
+    "name" : "bookname",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "caption" : "更新人",
+    "codeName" : "updateman",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updateman",
+    "excelCaption" : "更新人",
+    "name" : "updateman",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "更新时间",
+    "codeName" : "updatedate",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updatedate",
+    "excelCaption" : "更新时间",
+    "name" : "updatedate",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  } ],
+  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "bookname",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "updateman",
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "updatedate",
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "phoneid",
+    "getPSAppDEField" : {
+      "name" : "PHONEID",
+      "codeName" : "PhoneId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pbookid",
+    "getPSAppDEField" : {
+      "name" : "PBOOKID",
+      "codeName" : "Pbookid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "书标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getPSEditor" : {
+      "editorType" : "HIDDEN",
+      "name" : "srfkey"
+    },
+    "allowEmpty" : true
+  } ],
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    }
+  },
+  "sortMode" : "REMOTE",
+  "hasWFDataItems" : false,
+  "enableColFilter" : false,
+  "enableCustomized" : true,
+  "enableGroup" : false,
+  "enablePagingBar" : true,
+  "enableRowEdit" : false,
+  "enableRowEditOrder" : false,
+  "enableRowNew" : false,
+  "forceFit" : false,
+  "hideHeader" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "208ECCBB-FA14-4ECF-A3DC-3BC6ACD8B113",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr01022418_SearchForm.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr01022418_SearchForm.json
+{
+  "codeName" : "Usr01022418_SearchForm",
+  "controlType" : "SEARCHFORM",
+  "defaultLabelWidth" : 130,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr01022418_SearchForm.json",
+  "logicName" : "测试多项数据选择视图_选择数据视图_搜索表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSDEFormPages" : [ {
+    "caption" : "常规条件",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
+  } ],
+  "getPSLayout" : {
+    "childColLG" : -1,
+    "childColMD" : 24,
+    "childColSM" : -1,
+    "childColXS" : -1,
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "searchButtonStyle" : "DEFAULT",
+  "tabHeaderPos" : "TOP",
+  "enableAdvanceSearch" : false,
+  "enableAutoSearch" : false,
+  "enableFilterSave" : false,
+  "noTabHeader" : true,
+  "modelid" : "034415A2-4D36-4B5E-8D82-861EBFE1C35F",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/Usr01028976MPickupView2_TreeView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/Usr01028976MPickupView2_TreeView.json
+{
+  "codeName" : "Usr01028976MPickupView2_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/Book.json"
+    }
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/Usr01028976MPickupView2_TreeView.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.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/Book.json"
+    }
+  },
+  "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
+  "logicName" : "测试多项数据选择视图_树视图",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "SELECTIONCHANGE",
+    "logicTag" : "treeexpbar_tree",
+    "logicType" : "CUSTOM",
+    "name" : "treeexpbar_selectionchange"
+  }, {
+    "eventNames" : "LOAD",
+    "logicTag" : "treeexpbar_tree",
+    "logicType" : "CUSTOM",
+    "name" : "treeexpbar_load"
+  } ],
+  "getPSDETreeNodes" : [ {
+    "counterMode" : 0,
+    "name" : "默认根节点",
+    "nodeType" : "ROOT",
+    "nodeValue" : "root",
+    "text" : "默认根节点",
+    "treeNodeType" : "STATIC",
+    "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" : true,
+    "selectFirstOnly" : false,
+    "selected" : false,
+    "id" : "ROOT"
+  } ],
+  "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/Book.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/Book.json"
+    }
+  },
+  "enableRootSelect" : false,
+  "outputIconDefault" : true,
+  "rootVisible" : false,
+  "modelid" : "8805DBF8-4535-41F3-896C-67F38559D7D5",
+  "modeltype" : "PSDETREEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2_PickupGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2_PickupGridView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr07257969EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr07257969EditView.json
@@ -298,6 +298,13 @@
        "name" : "BOOKNAME",
        "codeName" : "BookName"
      }
+    }, {
+      "id" : "formitem2",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD27",
+        "codeName" : "Field27"
+      }
    }, {
      "id" : "bookid",
      "hidden" : true,
@@ -1561,6 +1568,47 @@
          },
          "infoGroupMode" : false,
          "showCaption" : true
+        }, {
+          "caption" : "属性27",
+          "codeName" : "formitem2",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "formitem2",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD27",
+            "codeName" : "Field27"
+          },
+          "getPSEditor" : {
+            "editorParams" : {
+              "AC" : "TRUE",
+              "PICKUPVIEW" : "TRUE"
+            },
+            "editorType" : "PICKER",
+            "handlerType" : "PickupText",
+            "name" : "formitem2",
+            "getPickupPSAppView" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json",
+              "viewType" : "DEMPICKUPVIEW2"
+            },
+            "enableAC" : true,
+            "enablePickupView" : true,
+            "forceSelection" : true,
+            "showTrigger" : true,
+            "singleSelect" : true
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
        } ],
        "getPSLayout" : {
          "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -12453,16 +12453,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"
      }
    } ]
  }, {
@@ -12497,16 +12497,16 @@
        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    } ]
  }, {
@@ -12523,45 +12523,53 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg11"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -12569,38 +12577,30 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -12612,32 +12612,32 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ]
  } ],
@@ -13632,6 +13632,12 @@
    "viewType" : "DEDATAVIEW",
    "resource" : "Book",
    "view" : "DefaultDataView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json",
+    "viewType" : "DEMPICKUPVIEW2",
+    "resource" : "Book",
+    "view" : "Usr01028976MPickupView2"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json",
@@ -15133,6 +15139,12 @@
    "viewType" : "DEGRIDVIEW",
    "resource" : "TEST",
    "view" : "QuickGroupGridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2_PickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "Book",
+    "view" : "Usr01028976MPickupView2_PickupGridView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json",
@@ -58191,6 +58203,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookDefaultDataView.json",
        "viewType" : "DEDATAVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json",
+        "viewType" : "DEMPICKUPVIEW2"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2RedirectView.json",
@@ -58343,6 +58359,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookWFDynaActionView.json",
        "viewType" : "DEWFDYNAACTIONVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2_PickupGridView.json",
+        "viewType" : "DEPICKUPGRIDVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupTreeView.json",