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

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

@@ -464,7 +464,8 @@
             "itemType" : "GROUP",
             "name" : "group2",
             "width" : 0.0,
-            "addSeparator" : false
+            "addSeparator" : false,
+            "defaultGroup" : true
           }, {
             "caption" : "分组3",
             "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/testSearchBar.json

@@ -136,7 +136,8 @@
     "itemType" : "GROUP",
     "name" : "group2",
     "width" : 0.0,
-    "addSeparator" : false
+    "addSeparator" : false,
+    "defaultGroup" : true
   }, {
     "caption" : "分组3",
     "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobEditView3.json

@@ -567,7 +567,8 @@
               "itemType" : "GROUP",
               "name" : "group2",
               "width" : 0.0,
-              "addSeparator" : false
+              "addSeparator" : false,
+              "defaultGroup" : true
             }, {
               "caption" : "分组3",
               "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobEditViewLayoutPart.json

@@ -771,7 +771,8 @@
                 "itemType" : "GROUP",
                 "name" : "group2",
                 "width" : 0.0,
-                "addSeparator" : false
+                "addSeparator" : false,
+                "defaultGroup" : true
               }, {
                 "caption" : "分组3",
                 "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView.json

@@ -562,7 +562,8 @@
               "itemType" : "GROUP",
               "name" : "group2",
               "width" : 0.0,
-              "addSeparator" : false
+              "addSeparator" : false,
+              "defaultGroup" : true
             }, {
               "caption" : "分组3",
               "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json

@@ -562,7 +562,8 @@
               "itemType" : "GROUP",
               "name" : "group2",
               "width" : 0.0,
-              "addSeparator" : false
+              "addSeparator" : false,
+              "defaultGroup" : true
             }, {
               "caption" : "分组3",
               "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobEditView9.json

@@ -567,7 +567,8 @@
               "itemType" : "GROUP",
               "name" : "group2",
               "width" : 0.0,
-              "addSeparator" : false
+              "addSeparator" : false,
+              "defaultGroup" : true
             }, {
               "caption" : "分组3",
               "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMPickupView.json

@@ -733,7 +733,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",
@@ -950,7 +951,8 @@
           "itemType" : "GROUP",
           "name" : "group2",
           "width" : 0.0,
-          "addSeparator" : false
+          "addSeparator" : false,
+          "defaultGroup" : true
         }, {
           "caption" : "分组3",
           "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupView.json

@@ -205,7 +205,8 @@
           "itemType" : "GROUP",
           "name" : "group2",
           "width" : 0.0,
-          "addSeparator" : false
+          "addSeparator" : false,
+          "defaultGroup" : true
         }, {
           "caption" : "分组3",
           "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobTreeView.json

@@ -159,7 +159,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTTestMobEditView.json

@@ -567,7 +567,8 @@
               "itemType" : "GROUP",
               "name" : "group2",
               "width" : 0.0,
-              "addSeparator" : false
+              "addSeparator" : false,
+              "defaultGroup" : true
             }, {
               "caption" : "分组3",
               "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTTestMobMDView.json

@@ -182,7 +182,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/testSearchBar.json

@@ -136,7 +136,8 @@
     "itemType" : "GROUP",
     "name" : "group2",
     "width" : 0.0,
-    "addSeparator" : false
+    "addSeparator" : false,
+    "defaultGroup" : true
   }, {
     "caption" : "分组3",
     "itemType" : "GROUP",

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

@@ -734,7 +734,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",
@@ -952,7 +953,8 @@
           "itemType" : "GROUP",
           "name" : "group2",
           "width" : 0.0,
-          "addSeparator" : false
+          "addSeparator" : false,
+          "defaultGroup" : true
         }, {
           "caption" : "分组3",
           "itemType" : "GROUP",

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

@@ -207,7 +207,8 @@
           "itemType" : "GROUP",
           "name" : "group2",
           "width" : 0.0,
-          "addSeparator" : false
+          "addSeparator" : false,
+          "defaultGroup" : true
         }, {
           "caption" : "分组3",
           "itemType" : "GROUP",

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

@@ -183,7 +183,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",

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

@@ -2170,6 +2170,7 @@
     "id" : "DataImportTest"
   },
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json",
+  "dynaSysMode" : 1,
   "enableUIActions" : 15,
   "getKeyPSAppDEField" : {
     "name" : "BXD2ID",

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

@@ -136,7 +136,8 @@
     "itemType" : "GROUP",
     "name" : "group2",
     "width" : 0.0,
-    "addSeparator" : false
+    "addSeparator" : false,
+    "defaultGroup" : true
   }, {
     "caption" : "分组3",
     "itemType" : "GROUP",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSTREEVIEWS/Usr12264106CustomTreeNodesExpView_TreeView.json

@@ -152,45 +152,37 @@
     "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
     "controlType" : "CONTEXTMENU",
-    "logicName" : "分组树导航栏",
-    "name" : "root_cm",
+    "logicName" : "分组树节点上下文菜单",
+    "name" : "item_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "root_cm"
+      "id" : "item_cm"
     },
     "getPSDEToolbarItems" : [ {
-      "caption" : "更多",
-      "itemType" : "ITEMS",
-      "name" : "items1",
-      "getPSDEToolbarItems" : [ {
-        "caption" : "新建分组",
+      "caption" : "编辑",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-        "name" : "deuiaction2",
+      "name" : "deuiaction1",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-          "id" : "root_cm_deuiaction2"
-        },
-        "getPSSysImage" : {
-          "glyph" : "xf101@FontAwesome",
-          "cssClass" : "fa fa-angle-double-right"
+        "id" : "item_cm_deuiaction1"
       },
       "getPSUIAction" : {
         "actionTarget" : "SINGLEDATA",
-          "caption" : "新建分组",
-          "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+        "caption" : "编辑",
+        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
         "frontProcessType" : "OTHER",
-          "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
-          "name" : "新建分组",
+        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+        "name" : "编辑",
         "getPSAppDEUILogic" : {
           "modelref" : true,
-            "id" : "newTreeGroupNode"
+          "id" : "updateTreeNode"
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
@@ -198,40 +190,36 @@
         },
         "timeout" : 60000,
         "uIActionMode" : "FRONT",
-          "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
         "uIActionType" : "DEUIACTION",
         "uILogicAttachMode" : "REPLACE",
         "uILogicType" : "DELOGIC",
-          "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click@WORKITEM"
+        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
       },
-        "tooltip" : "新建分组",
+      "tooltip" : "编辑",
       "uIActionTarget" : "SINGLEDATA",
       "showCaption" : true,
       "showIcon" : true
     }, {
-        "caption" : "新建分组项",
+      "caption" : "删除",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-        "name" : "deuiaction1",
+      "name" : "deuiaction2",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-          "id" : "root_cm_deuiaction1"
-        },
-        "getPSSysImage" : {
-          "glyph" : "xf0c9@FontAwesome",
-          "cssClass" : "fa fa-reorder"
+        "id" : "item_cm_deuiaction2"
       },
       "getPSUIAction" : {
         "actionTarget" : "SINGLEDATA",
-          "caption" : "新建分组项",
-          "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+        "caption" : "删除",
+        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
         "frontProcessType" : "OTHER",
-          "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
-          "name" : "新建分组项",
+        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+        "name" : "删除",
         "getPSAppDEUILogic" : {
           "modelref" : true,
-            "id" : "newTreeNode"
+          "id" : "removeTreeNode"
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
@@ -239,59 +227,59 @@
         },
         "timeout" : 60000,
         "uIActionMode" : "FRONT",
-          "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
         "uIActionType" : "DEUIACTION",
         "uILogicAttachMode" : "REPLACE",
         "uILogicType" : "DELOGIC",
-          "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click@WORKITEM"
+        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
       },
-        "tooltip" : "新建分组项",
+      "tooltip" : "删除",
       "uIActionTarget" : "SINGLEDATA",
       "showCaption" : true,
       "showIcon" : true
     } ],
-      "getPSSysImage" : {
-        "glyph" : "xf067@FontAwesome",
-        "cssClass" : "fa fa-plus"
-      },
-      "tooltip" : "更多",
-      "showCaption" : false,
-      "showIcon" : true
-    } ],
-    "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+    "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
     "controlType" : "CONTEXTMENU",
-    "logicName" : "分组树节点上下文菜单",
-    "name" : "item_cm",
+    "logicName" : "分组树导航栏",
+    "name" : "root_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "item_cm"
+      "id" : "root_cm"
     },
     "getPSDEToolbarItems" : [ {
-      "caption" : "编辑",
+      "caption" : "更多",
+      "itemType" : "ITEMS",
+      "name" : "items1",
+      "getPSDEToolbarItems" : [ {
+        "caption" : "新建分组",
         "groupExtractMode" : "ITEM",
         "itemType" : "DEUIACTION",
-      "name" : "deuiaction1",
+        "name" : "deuiaction2",
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-        "id" : "item_cm_deuiaction1"
+          "id" : "root_cm_deuiaction2"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf101@FontAwesome",
+          "cssClass" : "fa fa-angle-double-right"
         },
         "getPSUIAction" : {
           "actionTarget" : "SINGLEDATA",
-        "caption" : "编辑",
-        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+          "caption" : "新建分组",
+          "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
           "frontProcessType" : "OTHER",
-        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
-        "name" : "编辑",
+          "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+          "name" : "新建分组",
           "getPSAppDEUILogic" : {
             "modelref" : true,
-          "id" : "updateTreeNode"
+            "id" : "newTreeGroupNode"
           },
           "getPSAppDataEntity" : {
             "modelref" : true,
@@ -299,36 +287,40 @@
           },
           "timeout" : 60000,
           "uIActionMode" : "FRONT",
-        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+          "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
           "uIActionType" : "DEUIACTION",
           "uILogicAttachMode" : "REPLACE",
           "uILogicType" : "DELOGIC",
-        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
+          "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click@WORKITEM"
         },
-      "tooltip" : "编辑",
+        "tooltip" : "新建分组",
         "uIActionTarget" : "SINGLEDATA",
         "showCaption" : true,
         "showIcon" : true
       }, {
-      "caption" : "删除",
+        "caption" : "新建分组项",
         "groupExtractMode" : "ITEM",
         "itemType" : "DEUIACTION",
-      "name" : "deuiaction2",
+        "name" : "deuiaction1",
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-        "id" : "item_cm_deuiaction2"
+          "id" : "root_cm_deuiaction1"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf0c9@FontAwesome",
+          "cssClass" : "fa fa-reorder"
         },
         "getPSUIAction" : {
           "actionTarget" : "SINGLEDATA",
-        "caption" : "删除",
-        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+          "caption" : "新建分组项",
+          "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
           "frontProcessType" : "OTHER",
-        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
-        "name" : "删除",
+          "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+          "name" : "新建分组项",
           "getPSAppDEUILogic" : {
             "modelref" : true,
-          "id" : "removeTreeNode"
+            "id" : "newTreeNode"
           },
           "getPSAppDataEntity" : {
             "modelref" : true,
@@ -336,33 +328,29 @@
           },
           "timeout" : 60000,
           "uIActionMode" : "FRONT",
-        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+          "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
           "uIActionType" : "DEUIACTION",
           "uILogicAttachMode" : "REPLACE",
           "uILogicType" : "DELOGIC",
-        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
+          "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click@WORKITEM"
         },
-      "tooltip" : "删除",
+        "tooltip" : "新建分组项",
         "uIActionTarget" : "SINGLEDATA",
         "showCaption" : true,
         "showIcon" : true
       } ],
-    "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
+      "getPSSysImage" : {
+        "glyph" : "xf067@FontAwesome",
+        "cssClass" : "fa fa-plus"
+      },
+      "tooltip" : "更多",
+      "showCaption" : false,
+      "showIcon" : true
+    } ],
+    "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
     "modeltype" : "PSDETOOLBAR"
   } ],
   "getPSDETreeNodeRSs" : [ {
-    "getChildPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "node"
-    },
-    "name" : "计划 - 全部计划",
-    "getParentPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "ROOT"
-    },
-    "parentValueLevel" : 1,
-    "searchMode" : 3
-  }, {
     "getChildPSDETreeNode" : {
       "modelref" : true,
       "id" : "item"
@@ -412,42 +400,6 @@
     },
     "parentValueLevel" : 1,
     "searchMode" : 3
-  }, {
-    "getChildPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "node_1"
-    },
-    "name" : "计划 - 普通测试",
-    "getParentPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "ROOT"
-    },
-    "parentValueLevel" : 1,
-    "searchMode" : 3
-  }, {
-    "getChildPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "node_2"
-    },
-    "name" : "计划 - 迭代测试",
-    "getParentPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "ROOT"
-    },
-    "parentValueLevel" : 1,
-    "searchMode" : 3
-  }, {
-    "getChildPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "node_3"
-    },
-    "name" : "计划 - 发布测试",
-    "getParentPSDETreeNode" : {
-      "modelref" : true,
-      "id" : "ROOT"
-    },
-    "parentValueLevel" : 1,
-    "searchMode" : 3
   }, {
     "getChildPSDETreeNode" : {
       "modelref" : true,

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

@@ -1557,7 +1557,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",

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

@@ -183,7 +183,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",

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

@@ -739,7 +739,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",
@@ -957,7 +958,8 @@
           "itemType" : "GROUP",
           "name" : "group2",
           "width" : 0.0,
-          "addSeparator" : false
+          "addSeparator" : false,
+          "defaultGroup" : true
         }, {
           "caption" : "分组3",
           "itemType" : "GROUP",

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

@@ -207,7 +207,8 @@
           "itemType" : "GROUP",
           "name" : "group2",
           "width" : 0.0,
-          "addSeparator" : false
+          "addSeparator" : false,
+          "defaultGroup" : true
         }, {
           "caption" : "分组3",
           "itemType" : "GROUP",

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

@@ -637,7 +637,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",

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

@@ -183,7 +183,8 @@
       "itemType" : "GROUP",
       "name" : "group2",
       "width" : 0.0,
-      "addSeparator" : false
+      "addSeparator" : false,
+      "defaultGroup" : true
     }, {
       "caption" : "分组3",
       "itemType" : "GROUP",

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

@@ -365,45 +365,37 @@
         "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
         "controlType" : "CONTEXTMENU",
-        "logicName" : "分组树导航栏",
-        "name" : "root_cm",
+        "logicName" : "分组树节点上下文菜单",
+        "name" : "item_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "root_cm"
+          "id" : "item_cm"
         },
         "getPSDEToolbarItems" : [ {
-          "caption" : "更多",
-          "itemType" : "ITEMS",
-          "name" : "items1",
-          "getPSDEToolbarItems" : [ {
-            "caption" : "新建分组",
+          "caption" : "编辑",
           "groupExtractMode" : "ITEM",
           "itemType" : "DEUIACTION",
-            "name" : "deuiaction2",
+          "name" : "deuiaction1",
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-              "id" : "root_cm_deuiaction2"
-            },
-            "getPSSysImage" : {
-              "glyph" : "xf101@FontAwesome",
-              "cssClass" : "fa fa-angle-double-right"
+            "id" : "item_cm_deuiaction1"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEDATA",
-              "caption" : "新建分组",
-              "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+            "caption" : "编辑",
+            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
             "frontProcessType" : "OTHER",
-              "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
-              "name" : "新建分组",
+            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+            "name" : "编辑",
             "getPSAppDEUILogic" : {
               "modelref" : true,
-                "id" : "newTreeGroupNode"
+              "id" : "updateTreeNode"
             },
             "getPSAppDataEntity" : {
               "modelref" : true,
@@ -411,40 +403,36 @@
             },
             "timeout" : 60000,
             "uIActionMode" : "FRONT",
-              "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
             "uIActionType" : "DEUIACTION",
             "uILogicAttachMode" : "REPLACE",
             "uILogicType" : "DELOGIC",
-              "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click@WORKITEM"
+            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
           },
-            "tooltip" : "新建分组",
+          "tooltip" : "编辑",
           "uIActionTarget" : "SINGLEDATA",
           "showCaption" : true,
           "showIcon" : true
         }, {
-            "caption" : "新建分组项",
+          "caption" : "删除",
           "groupExtractMode" : "ITEM",
           "itemType" : "DEUIACTION",
-            "name" : "deuiaction1",
+          "name" : "deuiaction2",
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-              "id" : "root_cm_deuiaction1"
-            },
-            "getPSSysImage" : {
-              "glyph" : "xf0c9@FontAwesome",
-              "cssClass" : "fa fa-reorder"
+            "id" : "item_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEDATA",
-              "caption" : "新建分组项",
-              "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+            "caption" : "删除",
+            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
             "frontProcessType" : "OTHER",
-              "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
-              "name" : "新建分组项",
+            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+            "name" : "删除",
             "getPSAppDEUILogic" : {
               "modelref" : true,
-                "id" : "newTreeNode"
+              "id" : "removeTreeNode"
             },
             "getPSAppDataEntity" : {
               "modelref" : true,
@@ -452,59 +440,59 @@
             },
             "timeout" : 60000,
             "uIActionMode" : "FRONT",
-              "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
             "uIActionType" : "DEUIACTION",
             "uILogicAttachMode" : "REPLACE",
             "uILogicType" : "DELOGIC",
-              "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click@WORKITEM"
+            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
           },
-            "tooltip" : "新建分组项",
+          "tooltip" : "删除",
           "uIActionTarget" : "SINGLEDATA",
           "showCaption" : true,
           "showIcon" : true
         } ],
-          "getPSSysImage" : {
-            "glyph" : "xf067@FontAwesome",
-            "cssClass" : "fa fa-plus"
-          },
-          "tooltip" : "更多",
-          "showCaption" : false,
-          "showIcon" : true
-        } ],
-        "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+        "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
         "controlType" : "CONTEXTMENU",
-        "logicName" : "分组树节点上下文菜单",
-        "name" : "item_cm",
+        "logicName" : "分组树导航栏",
+        "name" : "root_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "item_cm"
+          "id" : "root_cm"
         },
         "getPSDEToolbarItems" : [ {
-          "caption" : "编辑",
+          "caption" : "更多",
+          "itemType" : "ITEMS",
+          "name" : "items1",
+          "getPSDEToolbarItems" : [ {
+            "caption" : "新建分组",
             "groupExtractMode" : "ITEM",
             "itemType" : "DEUIACTION",
-          "name" : "deuiaction1",
+            "name" : "deuiaction2",
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-            "id" : "item_cm_deuiaction1"
+              "id" : "root_cm_deuiaction2"
+            },
+            "getPSSysImage" : {
+              "glyph" : "xf101@FontAwesome",
+              "cssClass" : "fa fa-angle-double-right"
             },
             "getPSUIAction" : {
               "actionTarget" : "SINGLEDATA",
-            "caption" : "编辑",
-            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+              "caption" : "新建分组",
+              "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
               "frontProcessType" : "OTHER",
-            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
-            "name" : "编辑",
+              "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+              "name" : "新建分组",
               "getPSAppDEUILogic" : {
                 "modelref" : true,
-              "id" : "updateTreeNode"
+                "id" : "newTreeGroupNode"
               },
               "getPSAppDataEntity" : {
                 "modelref" : true,
@@ -512,36 +500,40 @@
               },
               "timeout" : 60000,
               "uIActionMode" : "FRONT",
-            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+              "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
               "uIActionType" : "DEUIACTION",
               "uILogicAttachMode" : "REPLACE",
               "uILogicType" : "DELOGIC",
-            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
+              "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click@WORKITEM"
             },
-          "tooltip" : "编辑",
+            "tooltip" : "新建分组",
             "uIActionTarget" : "SINGLEDATA",
             "showCaption" : true,
             "showIcon" : true
           }, {
-          "caption" : "删除",
+            "caption" : "新建分组项",
             "groupExtractMode" : "ITEM",
             "itemType" : "DEUIACTION",
-          "name" : "deuiaction2",
+            "name" : "deuiaction1",
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-            "id" : "item_cm_deuiaction2"
+              "id" : "root_cm_deuiaction1"
+            },
+            "getPSSysImage" : {
+              "glyph" : "xf0c9@FontAwesome",
+              "cssClass" : "fa fa-reorder"
             },
             "getPSUIAction" : {
               "actionTarget" : "SINGLEDATA",
-            "caption" : "删除",
-            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+              "caption" : "新建分组项",
+              "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
               "frontProcessType" : "OTHER",
-            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
-            "name" : "删除",
+              "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+              "name" : "新建分组项",
               "getPSAppDEUILogic" : {
                 "modelref" : true,
-              "id" : "removeTreeNode"
+                "id" : "newTreeNode"
               },
               "getPSAppDataEntity" : {
                 "modelref" : true,
@@ -549,33 +541,29 @@
               },
               "timeout" : 60000,
               "uIActionMode" : "FRONT",
-            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+              "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
               "uIActionType" : "DEUIACTION",
               "uILogicAttachMode" : "REPLACE",
               "uILogicType" : "DELOGIC",
-            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
+              "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click@WORKITEM"
             },
-          "tooltip" : "删除",
+            "tooltip" : "新建分组项",
             "uIActionTarget" : "SINGLEDATA",
             "showCaption" : true,
             "showIcon" : true
           } ],
-        "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
+          "getPSSysImage" : {
+            "glyph" : "xf067@FontAwesome",
+            "cssClass" : "fa fa-plus"
+          },
+          "tooltip" : "更多",
+          "showCaption" : false,
+          "showIcon" : true
+        } ],
+        "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
         "modeltype" : "PSDETOOLBAR"
       } ],
       "getPSDETreeNodeRSs" : [ {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node"
-        },
-        "name" : "计划 - 全部计划",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "ROOT"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
-      }, {
         "getChildPSDETreeNode" : {
           "modelref" : true,
           "id" : "item"
@@ -625,42 +613,6 @@
         },
         "parentValueLevel" : 1,
         "searchMode" : 3
-      }, {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node_1"
-        },
-        "name" : "计划 - 普通测试",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "ROOT"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
-      }, {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node_2"
-        },
-        "name" : "计划 - 迭代测试",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "ROOT"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
-      }, {
-        "getChildPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "node_3"
-        },
-        "name" : "计划 - 发布测试",
-        "getParentPSDETreeNode" : {
-          "modelref" : true,
-          "id" : "ROOT"
-        },
-        "parentValueLevel" : 1,
-        "searchMode" : 3
       }, {
         "getChildPSDETreeNode" : {
           "modelref" : true,

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

@@ -12886,95 +12886,89 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg13"
+      }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
       "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12986,21 +12980,27 @@
         "modelref" : true,
         "id" : "ViewMsg11"
       }
+    }, {
+      "name" : "关闭模式-默认删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],
@@ -49025,45 +49025,37 @@
             "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
             "controlType" : "CONTEXTMENU",
-            "logicName" : "分组树导航栏",
-            "name" : "root_cm",
+            "logicName" : "分组树节点上下文菜单",
+            "name" : "item_cm",
             "getPSAppDataEntity" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
             },
             "getPSControlParam" : {
-              "id" : "root_cm"
+              "id" : "item_cm"
             },
             "getPSDEToolbarItems" : [ {
-              "caption" : "更多",
-              "itemType" : "ITEMS",
-              "name" : "items1",
-              "getPSDEToolbarItems" : [ {
-                "caption" : "新建分组",
+              "caption" : "编辑",
               "groupExtractMode" : "ITEM",
               "itemType" : "DEUIACTION",
-                "name" : "deuiaction2",
+              "name" : "deuiaction1",
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                  "id" : "root_cm_deuiaction2"
-                },
-                "getPSSysImage" : {
-                  "glyph" : "xf101@FontAwesome",
-                  "cssClass" : "fa fa-angle-double-right"
+                "id" : "item_cm_deuiaction1"
               },
               "getPSUIAction" : {
                 "actionTarget" : "SINGLEDATA",
-                  "caption" : "新建分组",
-                  "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+                "caption" : "编辑",
+                "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
                 "frontProcessType" : "OTHER",
-                  "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
-                  "name" : "新建分组",
+                "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+                "name" : "编辑",
                 "getPSAppDEUILogic" : {
                   "modelref" : true,
-                    "id" : "newTreeGroupNode"
+                  "id" : "updateTreeNode"
                 },
                 "getPSAppDataEntity" : {
                   "modelref" : true,
@@ -49071,40 +49063,36 @@
                 },
                 "timeout" : 60000,
                 "uIActionMode" : "FRONT",
-                  "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+                "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
                 "uIActionType" : "DEUIACTION",
                 "uILogicAttachMode" : "REPLACE",
                 "uILogicType" : "DELOGIC",
-                  "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click@WORKITEM"
+                "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
               },
-                "tooltip" : "新建分组",
+              "tooltip" : "编辑",
               "uIActionTarget" : "SINGLEDATA",
               "showCaption" : true,
               "showIcon" : true
             }, {
-                "caption" : "新建分组项",
+              "caption" : "删除",
               "groupExtractMode" : "ITEM",
               "itemType" : "DEUIACTION",
-                "name" : "deuiaction1",
+              "name" : "deuiaction2",
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                  "id" : "root_cm_deuiaction1"
-                },
-                "getPSSysImage" : {
-                  "glyph" : "xf0c9@FontAwesome",
-                  "cssClass" : "fa fa-reorder"
+                "id" : "item_cm_deuiaction2"
               },
               "getPSUIAction" : {
                 "actionTarget" : "SINGLEDATA",
-                  "caption" : "新建分组项",
-                  "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+                "caption" : "删除",
+                "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
                 "frontProcessType" : "OTHER",
-                  "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
-                  "name" : "新建分组项",
+                "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+                "name" : "删除",
                 "getPSAppDEUILogic" : {
                   "modelref" : true,
-                    "id" : "newTreeNode"
+                  "id" : "removeTreeNode"
                 },
                 "getPSAppDataEntity" : {
                   "modelref" : true,
@@ -49112,59 +49100,59 @@
                 },
                 "timeout" : 60000,
                 "uIActionMode" : "FRONT",
-                  "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+                "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
                 "uIActionType" : "DEUIACTION",
                 "uILogicAttachMode" : "REPLACE",
                 "uILogicType" : "DELOGIC",
-                  "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click@WORKITEM"
+                "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
               },
-                "tooltip" : "新建分组项",
+              "tooltip" : "删除",
               "uIActionTarget" : "SINGLEDATA",
               "showCaption" : true,
               "showIcon" : true
             } ],
-              "getPSSysImage" : {
-                "glyph" : "xf067@FontAwesome",
-                "cssClass" : "fa fa-plus"
-              },
-              "tooltip" : "更多",
-              "showCaption" : false,
-              "showIcon" : true
-            } ],
-            "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+            "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
             "controlType" : "CONTEXTMENU",
-            "logicName" : "分组树节点上下文菜单",
-            "name" : "item_cm",
+            "logicName" : "分组树导航栏",
+            "name" : "root_cm",
             "getPSAppDataEntity" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
             },
             "getPSControlParam" : {
-              "id" : "item_cm"
+              "id" : "root_cm"
             },
             "getPSDEToolbarItems" : [ {
-              "caption" : "编辑",
+              "caption" : "更多",
+              "itemType" : "ITEMS",
+              "name" : "items1",
+              "getPSDEToolbarItems" : [ {
+                "caption" : "新建分组",
                 "groupExtractMode" : "ITEM",
                 "itemType" : "DEUIACTION",
-              "name" : "deuiaction1",
+                "name" : "deuiaction2",
                 "noPrivDisplayMode" : 2,
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                "id" : "item_cm_deuiaction1"
+                  "id" : "root_cm_deuiaction2"
+                },
+                "getPSSysImage" : {
+                  "glyph" : "xf101@FontAwesome",
+                  "cssClass" : "fa fa-angle-double-right"
                 },
                 "getPSUIAction" : {
                   "actionTarget" : "SINGLEDATA",
-                "caption" : "编辑",
-                "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+                  "caption" : "新建分组",
+                  "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
                   "frontProcessType" : "OTHER",
-                "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
-                "name" : "编辑",
+                  "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
+                  "name" : "新建分组",
                   "getPSAppDEUILogic" : {
                     "modelref" : true,
-                  "id" : "updateTreeNode"
+                    "id" : "newTreeGroupNode"
                   },
                   "getPSAppDataEntity" : {
                     "modelref" : true,
@@ -49172,36 +49160,40 @@
                   },
                   "timeout" : 60000,
                   "uIActionMode" : "FRONT",
-                "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+                  "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click",
                   "uIActionType" : "DEUIACTION",
                   "uILogicAttachMode" : "REPLACE",
                   "uILogicType" : "DELOGIC",
-                "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
+                  "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction2_click@WORKITEM"
                 },
-              "tooltip" : "编辑",
+                "tooltip" : "新建分组",
                 "uIActionTarget" : "SINGLEDATA",
                 "showCaption" : true,
                 "showIcon" : true
               }, {
-              "caption" : "删除",
+                "caption" : "新建分组项",
                 "groupExtractMode" : "ITEM",
                 "itemType" : "DEUIACTION",
-              "name" : "deuiaction2",
+                "name" : "deuiaction1",
                 "noPrivDisplayMode" : 2,
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                "id" : "item_cm_deuiaction2"
+                  "id" : "root_cm_deuiaction1"
+                },
+                "getPSSysImage" : {
+                  "glyph" : "xf0c9@FontAwesome",
+                  "cssClass" : "fa fa-reorder"
                 },
                 "getPSUIAction" : {
                   "actionTarget" : "SINGLEDATA",
-                "caption" : "删除",
-                "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+                  "caption" : "新建分组项",
+                  "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
                   "frontProcessType" : "OTHER",
-                "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
-                "name" : "删除",
+                  "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
+                  "name" : "新建分组项",
                   "getPSAppDEUILogic" : {
                     "modelref" : true,
-                  "id" : "removeTreeNode"
+                    "id" : "newTreeNode"
                   },
                   "getPSAppDataEntity" : {
                     "modelref" : true,
@@ -49209,33 +49201,29 @@
                   },
                   "timeout" : 60000,
                   "uIActionMode" : "FRONT",
-                "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+                  "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click",
                   "uIActionType" : "DEUIACTION",
                   "uILogicAttachMode" : "REPLACE",
                   "uILogicType" : "DELOGIC",
-                "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
+                  "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewroot_cm_deuiaction1_click@WORKITEM"
                 },
-              "tooltip" : "删除",
+                "tooltip" : "新建分组项",
                 "uIActionTarget" : "SINGLEDATA",
                 "showCaption" : true,
                 "showIcon" : true
               } ],
-            "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
+              "getPSSysImage" : {
+                "glyph" : "xf067@FontAwesome",
+                "cssClass" : "fa fa-plus"
+              },
+              "tooltip" : "更多",
+              "showCaption" : false,
+              "showIcon" : true
+            } ],
+            "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
             "modeltype" : "PSDETOOLBAR"
           } ],
           "getPSDETreeNodeRSs" : [ {
-            "getChildPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "node"
-            },
-            "name" : "计划 - 全部计划",
-            "getParentPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "ROOT"
-            },
-            "parentValueLevel" : 1,
-            "searchMode" : 3
-          }, {
             "getChildPSDETreeNode" : {
               "modelref" : true,
               "id" : "item"
@@ -49285,42 +49273,6 @@
             },
             "parentValueLevel" : 1,
             "searchMode" : 3
-          }, {
-            "getChildPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "node_1"
-            },
-            "name" : "计划 - 普通测试",
-            "getParentPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "ROOT"
-            },
-            "parentValueLevel" : 1,
-            "searchMode" : 3
-          }, {
-            "getChildPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "node_2"
-            },
-            "name" : "计划 - 迭代测试",
-            "getParentPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "ROOT"
-            },
-            "parentValueLevel" : 1,
-            "searchMode" : 3
-          }, {
-            "getChildPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "node_3"
-            },
-            "name" : "计划 - 发布测试",
-            "getParentPSDETreeNode" : {
-              "modelref" : true,
-              "id" : "ROOT"
-            },
-            "parentValueLevel" : 1,
-            "searchMode" : 3
           }, {
             "getChildPSDETreeNode" : {
               "modelref" : true,
@@ -68619,6 +68571,7 @@
         "id" : "DataImportTest"
       },
       "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json",
+      "dynaSysMode" : 1,
       "enableUIActions" : 15,
       "getKeyPSAppDEField" : {
         "name" : "BXD2ID",