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

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

@@ -1658,6 +1658,18 @@
     "name" : "目录树",
     "realModelSubType" : "DETREEVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "TreeExpView",
+    "logicName" : "目录树",
+    "name" : "目录树",
+    "realModelSubType" : "DETREEEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "FileExpView",
+    "logicName" : "目录树导航",
+    "name" : "目录树导航",
+    "realModelSubType" : "DETREEEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Main",
     "logicName" : "主编辑表单",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json

@@ -33,91 +33,91 @@
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_05"
+      "id" : "EMBED_01"
     },
-    "logicName" : "交互连接",
-    "name" : "IAACTION4",
-    "nextCondition" : "ANY",
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "START_01"
+      "id" : "END_01"
     },
-    "wFLinkType" : "IAACTION"
+    "wFLinkType" : "WFRETURN"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_02"
+      "id" : "EMBED_01"
     },
-    "logicName" : "交互连接",
-    "name" : "IAACTION1",
-    "nextCondition" : "ANY",
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN1",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_03"
+      "id" : "INTERACTIVE_04"
     },
-    "wFLinkType" : "IAACTION"
+    "wFLinkType" : "WFRETURN"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_02"
+      "id" : "EMBED_01"
     },
-    "logicName" : "交互连接",
-    "name" : "IAACTION3",
-    "nextCondition" : "ANY",
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN2",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_05"
+      "id" : "INTERACTIVE_01"
     },
-    "wFLinkType" : "IAACTION"
+    "wFLinkType" : "WFRETURN"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_03"
+      "id" : "INTERACTIVE_05"
     },
     "logicName" : "交互连接",
-    "name" : "IAACTION2",
+    "name" : "IAACTION4",
     "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_04"
+      "id" : "START_01"
     },
     "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "EMBED_01"
+      "id" : "INTERACTIVE_02"
     },
-    "logicName" : "嵌套流程返回",
-    "name" : "WFRETURN",
+    "logicName" : "交互连接",
+    "name" : "IAACTION1",
+    "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "END_01"
+      "id" : "INTERACTIVE_03"
     },
-    "wFLinkType" : "WFRETURN"
+    "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "EMBED_01"
+      "id" : "INTERACTIVE_02"
     },
-    "logicName" : "嵌套流程返回",
-    "name" : "WFRETURN1",
+    "logicName" : "交互连接",
+    "name" : "IAACTION3",
+    "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_04"
+      "id" : "INTERACTIVE_05"
     },
-    "wFLinkType" : "WFRETURN"
+    "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "EMBED_01"
+      "id" : "INTERACTIVE_03"
     },
-    "logicName" : "嵌套流程返回",
-    "name" : "WFRETURN2",
+    "logicName" : "交互连接",
+    "name" : "IAACTION2",
+    "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_01"
+      "id" : "INTERACTIVE_04"
     },
-    "wFLinkType" : "WFRETURN"
+    "wFLinkType" : "IAACTION"
   } ],
   "getPSWFProcesses" : [ {
     "codeName" : "START_01",
@@ -138,18 +138,6 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "startProcess" : true
-  }, {
-    "codeName" : "TIMEREVENT_01",
-    "height" : 80,
-    "leftPos" : 150,
-    "logicName" : "中间定时器捕获事件",
-    "name" : "中间定时器捕获事件",
-    "timeout" : -1,
-    "topPos" : 380,
-    "wFProcessType" : "TIMEREVENT",
-    "width" : 100,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false
   }, {
     "codeName" : "INTERACTIVE_01",
     "formCodeName" : "ApprovalForm",
@@ -190,42 +178,42 @@
     "enableTimeout" : false,
     "sendInform" : false
   }, {
-    "codeName" : "INTERACTIVE_05",
+    "codeName" : "EMBED_01",
     "height" : 80,
-    "leftPos" : 280,
-    "logicName" : "用户任务",
-    "msgType" : 0,
-    "multiInstMode" : "NONE",
-    "name" : "用户任务",
+    "leftPos" : 580,
+    "logicName" : "子流程",
+    "name" : "子流程",
     "getPSWFLinks" : [ {
       "modelref" : true,
-      "id" : "IAACTION4"
+      "id" : "WFRETURN"
+    }, {
+      "modelref" : true,
+      "id" : "WFRETURN1"
+    }, {
+      "modelref" : true,
+      "id" : "WFRETURN2"
     } ],
     "timeout" : -1,
-    "topPos" : 20,
-    "wFProcessType" : "INTERACTIVE",
-    "wFStepValue" : "用户任务",
+    "topPos" : 580,
+    "wFProcessType" : "EMBED",
+    "wFStepValue" : "子流程",
     "width" : 100,
     "asynchronousProcess" : false,
-    "enableTimeout" : false,
-    "sendInform" : false
+    "enableTimeout" : false
   }, {
-    "codeName" : "INTERACTIVE_02",
+    "codeName" : "INTERACTIVE_05",
     "height" : 80,
-    "leftPos" : 260,
+    "leftPos" : 280,
     "logicName" : "用户任务",
     "msgType" : 0,
     "multiInstMode" : "NONE",
     "name" : "用户任务",
     "getPSWFLinks" : [ {
       "modelref" : true,
-      "id" : "IAACTION1"
-    }, {
-      "modelref" : true,
-      "id" : "IAACTION3"
+      "id" : "IAACTION4"
     } ],
     "timeout" : -1,
-    "topPos" : 210,
+    "topPos" : 20,
     "wFProcessType" : "INTERACTIVE",
     "wFStepValue" : "用户任务",
     "width" : 100,
@@ -261,6 +249,29 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "terminalProcess" : true
+  }, {
+    "codeName" : "INTERACTIVE_02",
+    "height" : 80,
+    "leftPos" : 260,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "IAACTION1"
+    }, {
+      "modelref" : true,
+      "id" : "IAACTION3"
+    } ],
+    "timeout" : -1,
+    "topPos" : 210,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
   }, {
     "codeName" : "INTERACTIVE_03",
     "height" : 80,
@@ -282,25 +293,14 @@
     "enableTimeout" : false,
     "sendInform" : false
   }, {
-    "codeName" : "EMBED_01",
+    "codeName" : "TIMEREVENT_01",
     "height" : 80,
-    "leftPos" : 580,
-    "logicName" : "子流程",
-    "name" : "子流程",
-    "getPSWFLinks" : [ {
-      "modelref" : true,
-      "id" : "WFRETURN"
-    }, {
-      "modelref" : true,
-      "id" : "WFRETURN1"
-    }, {
-      "modelref" : true,
-      "id" : "WFRETURN2"
-    } ],
+    "leftPos" : 150,
+    "logicName" : "中间定时器捕获事件",
+    "name" : "中间定时器捕获事件",
     "timeout" : -1,
-    "topPos" : 580,
-    "wFProcessType" : "EMBED",
-    "wFStepValue" : "子流程",
+    "topPos" : 380,
+    "wFProcessType" : "TIMEREVENT",
     "width" : 100,
     "asynchronousProcess" : false,
     "enableTimeout" : false

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

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

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

@@ -1338,6 +1338,10 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEFileExpView.json",
+    "viewType" : "DETREEEXPVIEW"
+  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
     "viewType" : "DEEDITVIEW"

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

@@ -45,13 +45,25 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
     }
   },
+  "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
   "logicName" : "目录树_树视图",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
   },
+  "getPSControlLogics" : [ {
+    "eventNames" : "SELECTIONCHANGE",
+    "logicTag" : "treeexpbar_tree",
+    "logicType" : "CUSTOM",
+    "name" : "treeexpbar_selectionchange"
+  }, {
+    "eventNames" : "LOAD",
+    "logicTag" : "treeexpbar_tree",
+    "logicType" : "CUSTOM",
+    "name" : "treeexpbar_load"
+  } ],
   "getPSControls" : [ {
-    "codeName" : "FileTreeViewnode_cm",
+    "codeName" : "FileExpViewnode_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树节点上下文菜单测试",
     "name" : "node_cm",
@@ -335,6 +347,11 @@
     },
     "maxSize" : -1,
     "name" : "测试节点",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
+      "viewType" : "DEEDITVIEW"
+    },
     "nodeType" : "node",
     "getPSAppDEDataSet" : {
       "modelref" : true,
@@ -345,7 +362,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
     },
     "getPSDEContextMenu" : {
-      "codeName" : "FileTreeViewnode_cm",
+      "codeName" : "FileExpViewnode_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树节点上下文菜单测试",
       "name" : "node_cm",
@@ -514,6 +531,11 @@
     },
     "maxSize" : -1,
     "name" : "顶层节点",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
+      "viewType" : "DEEDITVIEW"
+    },
     "nodeType" : "top",
     "getPSAppDEDataSet" : {
       "modelref" : true,

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

@@ -425,6 +425,11 @@
       },
       "maxSize" : -1,
       "name" : "测试节点",
+      "getNavPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
+        "viewType" : "DEEDITVIEW"
+      },
       "nodeType" : "node",
       "getPSAppDEDataSet" : {
         "modelref" : true,
@@ -604,6 +609,11 @@
       },
       "maxSize" : -1,
       "name" : "顶层节点",
+      "getNavPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
+        "viewType" : "DEEDITVIEW"
+      },
       "nodeType" : "top",
       "getPSAppDEDataSet" : {
         "modelref" : true,

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

@@ -3431,6 +3431,28 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "文件树"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "文件树导航",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem160",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1206916961"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "文件树导航"
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -1523,6 +1523,16 @@
         "id" : "UsrAppFunc1204818030"
       },
       "tooltip" : "文件树"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "文件树导航",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem160",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1206916961"
+      },
+      "tooltip" : "文件树导航"
     } ],
     "tooltip" : "文件管理"
   }, {

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

@@ -3436,6 +3436,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_drawer.json",
       "viewType" : "DEGRIDVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1206916961",
+    "name" : "文件树导航",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEFileExpView.json",
+      "viewType" : "DETREEEXPVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc27",
@@ -11489,16 +11499,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {
@@ -11559,16 +11569,16 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -11577,10 +11587,10 @@
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
@@ -11592,6 +11602,12 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
     }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
@@ -11599,6 +11615,13 @@
         "id" : "ViewMsg6"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
@@ -11612,25 +11635,12 @@
         "id" : "ViewMsg4"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
         "id" : "ViewMsg12"
       }
-    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
@@ -11642,12 +11652,6 @@
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
-    }, {
       "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -11659,6 +11663,12 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
+    }, {
+      "name" : "关闭模式-无删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
     } ]
   }, {
     "codeName" : "VMGroup6",
@@ -12218,6 +12228,12 @@
     "viewType" : "DECUSTOMVIEW",
     "resource" : "TEST",
     "view" : "PanelDataContainerTest"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEFileExpView.json",
+    "viewType" : "DETREEEXPVIEW",
+    "resource" : "FILE",
+    "view" : "FileExpView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEEditViewLayout.json",
@@ -17781,6 +17797,28 @@
               "layout" : "TABLE_24COL"
             },
             "tooltip" : "文件树"
+          }, {
+            "accUserMode" : 2,
+            "caption" : "文件树导航",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem160",
+            "getPSAppFunc" : {
+              "modelref" : true,
+              "id" : "UsrAppFunc1206916961"
+            },
+            "getPSLayout" : {
+              "childColLG" : -1,
+              "childColMD" : 24,
+              "childColSM" : -1,
+              "childColXS" : -1,
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "文件树导航"
           } ],
           "getPSLayout" : {
             "childColLG" : -1,
@@ -60507,6 +60545,10 @@
         "builtinMethod" : false
       } ],
       "getAllPSAppViews" : [ {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEFileExpView.json",
+        "viewType" : "DETREEEXPVIEW"
+      }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
         "viewType" : "DEEDITVIEW"