diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/agent.html b/o2web/source/x_component_process_ProcessDesigner/$Process/agent.html index 6a82265be7bc3d29ef87fdcc1fa396122a1fbbd2..fe7a247e289b377ab5bc2c59fced9b6ac82048ed 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/agent.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/agent.html @@ -122,7 +122,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/begin.html b/o2web/source/x_component_process_ProcessDesigner/$Process/begin.html index b048dd1a7b471abb27f911cd4af41eeede7afc2d..1243a35386e1d8d19c2222ffcfe0b84fa7353741 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/begin.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/begin.html @@ -118,7 +118,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/cancel.html b/o2web/source/x_component_process_ProcessDesigner/$Process/cancel.html index 09d272d3e820cf8ea71419e54682f93185aecbdb..271fb943f5cd04131e6abb7e381b0c917cea07aa 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/cancel.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/cancel.html @@ -117,7 +117,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/choice.html b/o2web/source/x_component_process_ProcessDesigner/$Process/choice.html index 68a6628b356b79370431c64972819237aa333d3c..d5bee1e75488ee79e8bdc409f669ef3f106696f3 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/choice.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/choice.html @@ -120,7 +120,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/condition.html b/o2web/source/x_component_process_ProcessDesigner/$Process/condition.html index d959bac36f3f34fc1b515bb3eb99a70e9a35cd83..401a415ef5c76fecb44497ddb248605ce5fd7025 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/condition.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/condition.html @@ -120,11 +120,11 @@
-
+
工作到达前
-
+
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/delay.html b/o2web/source/x_component_process_ProcessDesigner/$Process/delay.html index 7535a729507c21ae8e518d7de1833f10675936c7..1b02f322f2d5baacdd39b407252433f6ff43c544 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/delay.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/delay.html @@ -87,11 +87,11 @@
-
+
工作到达前
-
+
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/embed.html b/o2web/source/x_component_process_ProcessDesigner/$Process/embed.html index 20d640a5661ad490184158645d18a3472f4cc50e..a65d4d3124c5f39535e3927ef8b8701f38b7a0fd 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/embed.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/embed.html @@ -202,7 +202,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/end.html b/o2web/source/x_component_process_ProcessDesigner/$Process/end.html index 8b4a1ada1cca369ad7142c88be26150c3ab246b7..dbd2c1812cf80700601267b3bd3fe0395884283e 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/end.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/end.html @@ -123,7 +123,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html b/o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html index 97afd00f3b382322d3352e6f0e1bb5fad2717ddf..d9787ba514b9c3b04bc284fa352ac25fbb63e758 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html @@ -257,7 +257,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/manual.html b/o2web/source/x_component_process_ProcessDesigner/$Process/manual.html index 812b4e8e1a10b0b18c2bac4f865a4752eb14f0a1..7632450bd7c9e6264835b6ca0b7b29d5928195f7 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/manual.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/manual.html @@ -30,36 +30,41 @@ 抢办 - - 给未处理待办的人发待阅： - 是 - 否 - - - - - 合并待办: - - 是 - 否 -
（ 如果选“是”，同一身份在此节点上的待办会被合并 ）
- - 表单:
- - 活动组: - - - - 意见组: - - + +
+ + + + + + + + + + + + + + + + +
给未处理待办的人发待阅： + 是 + 否
合并待办: + 是 + 否 +
（ 如果选“是”，同一身份在此节点上的待办会被合并 ）
+
活动组:
意见组:
+
+ +
@@ -190,7 +195,8 @@
-
+ +
@@ -337,193 +343,193 @@
流程超时:
-
+
-
工作到达前
+
工作到达前
-
-
- - - - - -
工作到达前: -
-
-
-
+
+
+ + + + + +
工作到达前: +
+
+
+
-
-
-
执行Arrive操作
活动属性设置，计算可能的活动所有者
-
+
+
+
执行Arrive操作
活动属性设置，计算可能的活动所有者
+
-
-
-
工作到达后
-
-
- - - - - -
工作到达后: -
-
-
-
+
+
+
工作到达后
+
+
+ + + + + +
工作到达后: +
+
+
+
-
-
-
+
+
+
-
-
-
活动执行前
-
-
- - - - - -
活动执行前: -
-
-
-
+
+
+
活动执行前
+
+
+ + + + + +
活动执行前: +
+
+
+
-
-
-
-
执行Execute操作
生成待办
-
+
+
+
+
执行Execute操作
生成待办
+
-
-
-
等待人工处理时
-
-
- - - - - -
等待人工处理时: -
-
-
-
-
-
-
用户流转待办
-
+
+
+
等待人工处理时
+
+
+ + + + + +
等待人工处理时: +
+
+
+
+
+
+
用户流转待办
+
-
-
-
待办处理前
-
-
- - - - - -
待办处理前: -
-
-
-
+
+
+
待办处理前
+
+
+ + + + + +
待办处理前: +
+
+
+
-
-
-
处理待办，转已办
-
+
+
+
处理待办，转已办
+
-
-
-
待办处理后
-
-
- - - - - -
待办处理后: -
-
-
-
+
+
+
待办处理后
+
+
+ + + + + +
待办处理后: +
+
+
+
-
-
-
判断是否满足条件进入下一个活动
-
+
+
+
判断是否满足条件进入下一个活动
+
-
+
-
-
-
活动执行后
-
-
- - - - - -
活动执行后: -
-
-
-
+
+
+
活动执行后
+
+
+ + + + + +
活动执行后: +
+
+
+
-
-
-
+
+
+
-
-
-
路由查询前
-
-
- - - - - -
路由查询前: -
-
-
-
+
+
+
路由查询前
+
+
+ + + + + +
路由查询前: +
+
+
+
-
-
-
执行Inquire操作
查询到达下一个活动的路由
-
+
+
+
执行Inquire操作
查询到达下一个活动的路由
+
-
-
-
路由查询后
-
-
+
+
+
路由查询后
+
+
- - - - - -
路由查询后: -
-
-
-
+ + + + + +
路由查询后: +
+
+
+
-
+
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/merge.html b/o2web/source/x_component_process_ProcessDesigner/$Process/merge.html index fce4850e06a731e617d4d505fb87caa569106648..7648f83083784a05f4c390fad03156e956a956b2 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/merge.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/merge.html @@ -124,7 +124,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/message.html b/o2web/source/x_component_process_ProcessDesigner/$Process/message.html index aa74c9d86f4ebdb85a2949f40aa4638d218aecd1..faeff120907a2d8b67a9aa1de48d34383c83af01 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/message.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/message.html @@ -45,7 +45,7 @@
消息
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/parallel.html b/o2web/source/x_component_process_ProcessDesigner/$Process/parallel.html index dc7d11dde0882fbbf0f479706c089182f4377934..db470ccdc3742bc2f47c838bf5487e794f95a398 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/parallel.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/parallel.html @@ -117,7 +117,7 @@
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/route.html b/o2web/source/x_component_process_ProcessDesigner/$Process/route.html index 143dd6d6dcb521eec2d9ee8f7fe58a5878c23ff6..ca31d5c14a0b46893ad977d6ac81c23fa80f7bd0 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/route.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/route.html @@ -41,53 +41,55 @@ - - - - - -
路由类型: - 默认路由 -
回退路由 -
转交（仅指向同活动时生效） -
转交活动不触发活动事件
-
- -
+
- +
转交人员:路由类型: - 根据路由选择 - 根据脚本 + 默认路由 +
回退路由 +
转交（仅指向同活动时生效） +
转交活动不触发活动事件
-
+ +
- - +
转交人脚本: -
+ 		转交人员: + 根据路由选择 + 根据脚本
-
+
+ + + + + +
转交人脚本: +
+
+
+
-
- - - - - -
异步返回: - 是 - 否 -
+ + + + + +
异步返回: + 是 + 否 +
+
-
+
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/service.html b/o2web/source/x_component_process_ProcessDesigner/$Process/service.html index ee5bb7260ca552c029e59953161d3f744f2422fc..e4daec386bf389ca1ff916009498c1d91d03bba8 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/service.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/service.html @@ -49,7 +49,7 @@
通过 this.request.getBody() 获取请求数据
返回 true，驱动流程继续流转
返回 false，表示不符合流转条件，等待下一次调用
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/$Process/split.html b/o2web/source/x_component_process_ProcessDesigner/$Process/split.html index cdb3ac35e996334dfcbea5a08ad89c646514bc9f..6f7a6a46f9e57a387c817fc7c3f6e01d6170f762 100644 --- a/o2web/source/x_component_process_ProcessDesigner/$Process/split.html +++ b/o2web/source/x_component_process_ProcessDesigner/$Process/split.html @@ -122,7 +122,7 @@
决策组:
-
+
工作到达前
diff --git a/o2web/source/x_component_process_ProcessDesigner/Process.js b/o2web/source/x_component_process_ProcessDesigner/Process.js index efd7875c7c5521c5a65eb7d857065a6b90614360..d93adf333a510b782db3cabdc5890a88465e9ddc 100644 --- a/o2web/source/x_component_process_ProcessDesigner/Process.js +++ b/o2web/source/x_component_process_ProcessDesigner/Process.js @@ -1687,16 +1687,46 @@ MWF.xApplication.process.ProcessDesigner.Process.Panel = new Class({ this.objectTabPage = this.propertyListTab.addTab(this.jsonObjectNode, "JSON", false); this.stringTabPage = this.propertyListTab.addTab(this.jsonStringNode, "Text", false); - var div = new Element("div", {"styles": { - "float": "right", - "margin-right": "10px" - }, "text": MWF.APPPD.LP.showAdvanced}).inject(this.propertyListTab.tabNodeContainer) - this.showAdvanced = new Element("input", { - "type": "checkbox", - "events": { - "mousedown": function(e){ e.stopPropagation(); } - } - }).inject(div, "top"); + var div = new Element("div", { + "styles": {"float": "right", "margin-right": "10px"}, + "html": ""+MWF.APPPD.LP.showAdvanced+"" + }).inject(this.propertyListTab.tabNodeContainer); + div.getElement("span").addEvents({ + "mousedown": function(e){ e.stopPropagation(); }, + "click": function(e){ + this.showAdvanced.click(); + e.stopPropagation(); + }.bind(this) + }); + + o2.UD.getDataJson("process-show-advanced", function(json){ + this.showAdvanced = new Element("input", { + "type": "checkbox", + "checked": (!json) ? false : json.show, + "events": { + "mousedown": function(e){ e.stopPropagation(); }, + "change": function(){ + if (this.showAdvanced.checked){ + var advs = this.propertyListNode.querySelectorAll("*[data-o2-advanced=\"yes\"]"); + if (advs && advs.length){ + for (var i=0; i