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

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

@@ -1633,6 +1633,12 @@
     "name" : "文件实体选择表格视图（部件视图）",
     "realModelSubType" : "DEPICKUPGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr12064666TreeView",
+    "logicName" : "树测试",
+    "name" : "树测试",
+    "realModelSubType" : "DETREEVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "EditView2",
     "logicName" : "文件实体编辑视图（左右关系）",

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

@@ -30,6 +30,94 @@
     },
     "viewCodeName" : "WFDynaActionView",
     "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_05"
+    },
+    "logicName" : "交互连接",
+    "name" : "IAACTION4",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "START_01"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_02"
+    },
+    "logicName" : "交互连接",
+    "name" : "IAACTION1",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_03"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_02"
+    },
+    "logicName" : "交互连接",
+    "name" : "IAACTION3",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_05"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_03"
+    },
+    "logicName" : "交互连接",
+    "name" : "IAACTION2",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_04"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "EMBED_01"
+    },
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "END_01"
+    },
+    "wFLinkType" : "WFRETURN"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "EMBED_01"
+    },
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN1",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_04"
+    },
+    "wFLinkType" : "WFRETURN"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "EMBED_01"
+    },
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN2",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_01"
+    },
+    "wFLinkType" : "WFRETURN"
   } ],
   "getPSWFProcesses" : [ {
     "codeName" : "START_01",
@@ -62,19 +150,6 @@
     "width" : 100,
     "asynchronousProcess" : false,
     "enableTimeout" : false
-  }, {
-    "codeName" : "END_01",
-    "height" : 30,
-    "leftPos" : 740,
-    "logicName" : "结束事件",
-    "name" : "结束事件",
-    "timeout" : -1,
-    "topPos" : 420,
-    "wFProcessType" : "END",
-    "width" : 30,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false,
-    "terminalProcess" : true
   }, {
     "codeName" : "INTERACTIVE_01",
     "formCodeName" : "ApprovalForm",
@@ -114,6 +189,121 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "sendInform" : false
+  }, {
+    "codeName" : "INTERACTIVE_05",
+    "height" : 80,
+    "leftPos" : 280,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "IAACTION4"
+    } ],
+    "timeout" : -1,
+    "topPos" : 20,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "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_04",
+    "height" : 80,
+    "leftPos" : 260,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "timeout" : -1,
+    "topPos" : 610,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "END_01",
+    "height" : 30,
+    "leftPos" : 740,
+    "logicName" : "结束事件",
+    "name" : "结束事件",
+    "timeout" : -1,
+    "topPos" : 420,
+    "wFProcessType" : "END",
+    "width" : 30,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "terminalProcess" : true
+  }, {
+    "codeName" : "INTERACTIVE_03",
+    "height" : 80,
+    "leftPos" : 300,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "IAACTION2"
+    } ],
+    "timeout" : -1,
+    "topPos" : 410,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "EMBED_01",
+    "height" : 80,
+    "leftPos" : 580,
+    "logicName" : "子流程",
+    "name" : "子流程",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "WFRETURN"
+    }, {
+      "modelref" : true,
+      "id" : "WFRETURN1"
+    }, {
+      "modelref" : true,
+      "id" : "WFRETURN2"
+    } ],
+    "timeout" : -1,
+    "topPos" : 580,
+    "wFProcessType" : "EMBED",
+    "wFStepValue" : "子流程",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false
   } ],
   "getStartPSWFProcess" : {
     "modelref" : true,

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

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

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

@@ -1345,6 +1345,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEFileTreeView.json",
     "viewType" : "DETREEVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEUsr12064666TreeView.json",
+    "viewType" : "DETREEVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEGridView.json",

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

@@ -353,6 +353,7 @@
     "layoutPanel" : true,
     "useDefaultLayout" : true
   },
+  "refFlag" : false,
   "title" : "甘特图测试",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEGANTTVIEW",

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

@@ -3452,7 +3452,7 @@
       "name" : "menuitem159",
       "getPSAppFunc" : {
         "modelref" : true,
-        "id" : "UsrAppFunc1206589718"
+        "id" : "UsrAppFunc1206524540"
       },
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -1532,7 +1532,7 @@
     "name" : "menuitem159",
     "getPSAppFunc" : {
       "modelref" : true,
-      "id" : "UsrAppFunc1206589718"
+      "id" : "UsrAppFunc1206524540"
     },
     "tooltip" : "甘特图测试"
   } ],