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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WORKITEM.json

@@ -2104,9 +2104,9 @@
     "name" : "UPDATE"
   } ],
   "getAllPSModelDatas" : [ {
-    "codeName" : "Usr12264106CustomTreeNodesExpView",
-    "logicName" : "自定义树节点导航视图",
-    "name" : "自定义树节点导航视图",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpView",
+    "logicName" : "自定义树表导航视图",
+    "name" : "自定义树表导航视图",
     "realModelSubType" : "DETREEEXPVIEW",
     "realModelType" : "PSDEVIEWBASE"
   }, {

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

@@ -1677,7 +1677,7 @@
     "viewType" : "DEINDEXVIEW"
   }, {
     "modelref" : true,
-    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12264106CustomTreeNodesExpView.json",
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12264106CustomTreeGridNodesExpView.json",
     "viewType" : "DETREEEXPVIEW"
   }, {
     "modelref" : true,

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

@@ -137,10 +137,6 @@
     "columnType" : "DEFGRIDCOLUMN",
     "dataItemName" : "name",
     "name" : "name",
-    "getRenderPSSysPFPlugin" : {
-      "pluginType" : "GRID_COLRENDER",
-      "pluginCode" : "GridColumnPlugin"
-    },
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
@@ -525,38 +521,38 @@
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "name",
+      "name" : "begin",
       "getPSAppDEField" : {
-        "name" : "WORKITEMNAME",
-        "codeName" : "WORKITEMName"
+        "name" : "BEGIN",
+        "codeName" : "BEGIN"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "name"
+        "id" : "begin"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "sn",
+      "name" : "name",
       "getPSAppDEField" : {
-        "name" : "BH",
-        "codeName" : "BH"
+        "name" : "WORKITEMNAME",
+        "codeName" : "WORKITEMName"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "sn"
+        "id" : "name"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "begin",
+      "name" : "sn",
       "getPSAppDEField" : {
-        "name" : "BEGIN",
-        "codeName" : "BEGIN"
+        "name" : "BH",
+        "codeName" : "BH"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "begin"
+        "id" : "sn"
       }
     } ],
     "getTextPSAppDEField" : {
@@ -746,50 +742,50 @@
     "getPSDETreeNodeDataItems" : [ {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "name",
+      "name" : "end",
       "getPSAppDEField" : {
-        "name" : "WORKITEMNAME",
-        "codeName" : "WORKITEMName"
+        "name" : "END",
+        "codeName" : "END"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "name"
+        "id" : "end"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "sn",
+      "name" : "begin",
       "getPSAppDEField" : {
-        "name" : "BH",
-        "codeName" : "BH"
+        "name" : "BEGIN",
+        "codeName" : "BEGIN"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "sn"
+        "id" : "begin"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "end",
+      "name" : "sn",
       "getPSAppDEField" : {
-        "name" : "END",
-        "codeName" : "END"
+        "name" : "BH",
+        "codeName" : "BH"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "end"
+        "id" : "sn"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "begin",
+      "name" : "name",
       "getPSAppDEField" : {
-        "name" : "BEGIN",
-        "codeName" : "BEGIN"
+        "name" : "WORKITEMNAME",
+        "codeName" : "WORKITEMName"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "begin"
+        "id" : "name"
       }
     } ],
     "getTextPSAppDEField" : {

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

@@ -19,6 +19,31 @@
     "logicType" : "CUSTOM",
     "name" : "treeexpbar_load"
   } ],
+  "getPSDETreeNodeRSs" : [ {
+    "getChildPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "grouping"
+    },
+    "name" : "分组 - 分组",
+    "getParentPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "grouping"
+    },
+    "parentValueLevel" : 1,
+    "searchMode" : 3
+  }, {
+    "getChildPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "groupingItem"
+    },
+    "name" : "分组项 - 分组项",
+    "getParentPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "groupingItem"
+    },
+    "parentValueLevel" : 1,
+    "searchMode" : 3
+  } ],
   "getPSDETreeNodes" : [ {
     "counterMode" : 0,
     "name" : "计划",
@@ -42,6 +67,87 @@
     "selectFirstOnly" : false,
     "selected" : false,
     "id" : "ROOT"
+  }, {
+    "counterMode" : 0,
+    "getIdPSAppDEField" : {
+      "name" : "WORKITEMID",
+      "codeName" : "WORKITEMId"
+    },
+    "maxSize" : -1,
+    "name" : "分组",
+    "nodeType" : "grouping",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchTOPQUERY"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "WORKITEMNAME",
+      "codeName" : "WORKITEMName"
+    },
+    "treeNodeType" : "DE",
+    "hasPSDETreeNodeRSs" : true,
+    "appendPNodeId" : false,
+    "disableSelect" : false,
+    "enableCheck" : false,
+    "enableEditData" : false,
+    "enableNewData" : false,
+    "enableQuickCreate" : false,
+    "enableQuickSearch" : false,
+    "enableRemoveData" : false,
+    "enableViewData" : false,
+    "expandFirstOnly" : false,
+    "expanded" : true,
+    "rootNode" : false,
+    "selectFirstOnly" : false,
+    "selected" : false,
+    "id" : "grouping"
+  }, {
+    "counterMode" : 0,
+    "getIdPSAppDEField" : {
+      "name" : "WORKITEMID",
+      "codeName" : "WORKITEMId"
+    },
+    "maxSize" : -1,
+    "name" : "分组项",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMGridView.json",
+      "viewType" : "DEGRIDVIEW"
+    },
+    "nodeType" : "groupingItem",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "WORKITEMNAME",
+      "codeName" : "WORKITEMName"
+    },
+    "treeNodeType" : "DE",
+    "hasPSDETreeNodeRSs" : true,
+    "appendPNodeId" : false,
+    "disableSelect" : false,
+    "enableCheck" : false,
+    "enableEditData" : false,
+    "enableNewData" : false,
+    "enableQuickCreate" : false,
+    "enableQuickSearch" : false,
+    "enableRemoveData" : false,
+    "enableViewData" : false,
+    "expandFirstOnly" : false,
+    "expanded" : false,
+    "rootNode" : false,
+    "selectFirstOnly" : false,
+    "selected" : false,
+    "id" : "groupingItem"
   }, {
     "counterMode" : 0,
     "name" : "全部计划",
@@ -146,6 +252,28 @@
     "selectFirstOnly" : false,
     "selected" : false,
     "id" : "node_3"
+  }, {
+    "counterMode" : 0,
+    "name" : "分组2",
+    "nodeType" : "node_5",
+    "text" : "分组2",
+    "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" : false,
+    "selectFirstOnly" : false,
+    "selected" : false,
+    "id" : "node_5"
   } ],
   "treeGridMode" : 1,
   "enableRootSelect" : false,

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

@@ -168,10 +168,6 @@
       "columnType" : "DEFGRIDCOLUMN",
       "dataItemName" : "name",
       "name" : "name",
-      "getRenderPSSysPFPlugin" : {
-        "pluginType" : "GRID_COLRENDER",
-        "pluginCode" : "GridColumnPlugin"
-      },
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
@@ -556,38 +552,38 @@
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "name",
+        "name" : "begin",
         "getPSAppDEField" : {
-          "name" : "WORKITEMNAME",
-          "codeName" : "WORKITEMName"
+          "name" : "BEGIN",
+          "codeName" : "BEGIN"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "name"
+          "id" : "begin"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "sn",
+        "name" : "name",
         "getPSAppDEField" : {
-          "name" : "BH",
-          "codeName" : "BH"
+          "name" : "WORKITEMNAME",
+          "codeName" : "WORKITEMName"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "sn"
+          "id" : "name"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "begin",
+        "name" : "sn",
         "getPSAppDEField" : {
-          "name" : "BEGIN",
-          "codeName" : "BEGIN"
+          "name" : "BH",
+          "codeName" : "BH"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "begin"
+          "id" : "sn"
         }
       } ],
       "getTextPSAppDEField" : {
@@ -777,50 +773,50 @@
       "getPSDETreeNodeDataItems" : [ {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "name",
+        "name" : "end",
         "getPSAppDEField" : {
-          "name" : "WORKITEMNAME",
-          "codeName" : "WORKITEMName"
+          "name" : "END",
+          "codeName" : "END"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "name"
+          "id" : "end"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "sn",
+        "name" : "begin",
         "getPSAppDEField" : {
-          "name" : "BH",
-          "codeName" : "BH"
+          "name" : "BEGIN",
+          "codeName" : "BEGIN"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "sn"
+          "id" : "begin"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "end",
+        "name" : "sn",
         "getPSAppDEField" : {
-          "name" : "END",
-          "codeName" : "END"
+          "name" : "BH",
+          "codeName" : "BH"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "end"
+          "id" : "sn"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "begin",
+        "name" : "name",
         "getPSAppDEField" : {
-          "name" : "BEGIN",
-          "codeName" : "BEGIN"
+          "name" : "WORKITEMNAME",
+          "codeName" : "WORKITEMName"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "begin"
+          "id" : "name"
         }
       } ],
       "getTextPSAppDEField" : {

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

@@ -5374,17 +5374,6 @@
     "refTag" : "GRID",
     "refTag2" : "DEFGRIDCOLUMN",
     "runtimeObject" : true
-  }, {
-    "name" : "表格列绘制插件",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_COLRENDER",
-      "pluginCode" : "GridColumnPlugin"
-    },
-    "pluginCode" : "GridColumnPlugin",
-    "pluginType" : "GRID_COLRENDER",
-    "refMode" : "CONTROLITEM",
-    "refTag" : "GANTT",
-    "refTag2" : "DEFGRIDCOLUMN"
   }, {
     "name" : "表格列绘制插件",
     "getPSSysPFPlugin" : {
@@ -12457,16 +12446,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -12489,10 +12478,10 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
       "name" : "消息位置-视图上方",
@@ -12501,38 +12490,38 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       },
       "position" : "POPUP"
     }, {
@@ -12543,18 +12532,11 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
@@ -12562,11 +12544,18 @@
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -12594,16 +12583,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],
@@ -13731,10 +13720,10 @@
     "view" : "MapView"
   }, {
     "modelref" : true,
-    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12264106CustomTreeNodesExpView.json",
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12264106CustomTreeGridNodesExpView.json",
     "viewType" : "DETREEEXPVIEW",
     "resource" : "WORKITEM",
-    "view" : "Usr12264106CustomTreeNodesExpView"
+    "view" : "Usr12264106CustomTreeGridNodesExpView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEGridExpViewLayout.json",
@@ -69056,7 +69045,7 @@
         "viewType" : "DEINDEXVIEW"
       }, {
         "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12264106CustomTreeNodesExpView.json",
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12264106CustomTreeGridNodesExpView.json",
         "viewType" : "DETREEEXPVIEW"
       }, {
         "modelref" : true,

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

@@ -473,17 +473,6 @@
     "refTag" : "GRID",
     "refTag2" : "DEFGRIDCOLUMN",
     "runtimeObject" : true
-  }, {
-    "name" : "表格列绘制插件",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_COLRENDER",
-      "pluginCode" : "GridColumnPlugin"
-    },
-    "pluginCode" : "GridColumnPlugin",
-    "pluginType" : "GRID_COLRENDER",
-    "refMode" : "CONTROLITEM",
-    "refTag" : "GANTT",
-    "refTag2" : "DEFGRIDCOLUMN"
   }, {
     "name" : "表格列绘制插件",
     "getPSSysPFPlugin" : {