流程隐藏高级属性

(cherry picked from commit bccf89f4307906105da7631bef6b964e496d9368)

o2web/source/x_component_process_ProcessDesigner/$Process/agent.html

@@ -122,7 +122,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/begin.html

@@ -118,7 +118,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/cancel.html

@@ -117,7 +117,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/choice.html

@@ -120,7 +120,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/condition.html

@@ -120,11 +120,11 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>
-        </div>
+        </>
 
         <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
             <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

o2web/source/x_component_process_ProcessDesigner/$Process/delay.html

@@ -87,11 +87,11 @@
         <div class="MWFScriptText" name="delayScriptText"></div>
 
     </div>
-    <div title="事件" class="MWFTab">
+    <div title="事件" class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>
-        </div>
+        </>
 
         <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
             <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

o2web/source/x_component_process_ProcessDesigner/$Process/embed.html

@@ -202,7 +202,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/end.html

@@ -123,7 +123,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html

@@ -257,7 +257,7 @@
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
 
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/manual.html

@@ -30,36 +30,41 @@
                     <input title="谁先打开待办就由谁处理" class="editTableRadio" name="manualMode" text{($.manualMode=='grab')?'checked':''} type="radio" value="grab"/>抢办
                 </td>
             </tr>
-            <tr>
-                <td class="editTableValue"  colspan="2"><b>给未处理待办的人发待阅：</b>
-                    <input class="editTableRadio" name="manualUncompletedTaskToRead" text{($.manualUncompletedTaskToRead)?'checked':''} type="radio" value="true"/>是
-                    <input class="editTableRadio" name="manualUncompletedTaskToRead" text{(!$.manualUncompletedTaskToRead)?'checked':''} type="radio" value="false"/>否</td>
-            </tr>
-
-
-            <tr>
-                <td class="editTableTitle">合并待办:</td>
-                <td class="editTableValue">
-                    <input class="editTableRadio" name="manualMergeSameJobActivity" text{($.manualMergeSameJobActivity)?'checked':''} type="radio" value="true"/>是
-                    <input class="editTableRadio" name="manualMergeSameJobActivity" text{(!$.manualMergeSameJobActivity)?'checked':''} type="radio" value="false"/>否
-                    <div style="color: #999999">（ 如果选“是”，同一身份在此节点上的待办会被合并 ）</div>
-                </td>
-            </tr>
             <tr>
                 <td class="editTableTitle">表单:</td>
                 <td class="editTableValue">
                     <div class="MWFFormSelect" name="form"></div></td>
             </tr>
-            <tr>
-                <td class="editTableTitle">活动组:</td>
-                <td class="editTableValue"><input type="text" name="group" value="text{$.group}" class="editTableInput"/></td>
-            </tr>
-            <tr>
-                <td class="editTableTitle">意见组:</td>
-                <td class="editTableValue"><input type="text" name="opinionGroup" value="text{$.opinionGroup}" class="editTableInput"/></td>
-            </tr>
         </table>
+
+        <div data-o2-advanced="yes">
+            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                <tr>
+                    <td class="editTableValue"  colspan="2"><b>给未处理待办的人发待阅：</b>
+                        <input class="editTableRadio" name="manualUncompletedTaskToRead" text{($.manualUncompletedTaskToRead)?'checked':''} type="radio" value="true"/>是
+                        <input class="editTableRadio" name="manualUncompletedTaskToRead" text{(!$.manualUncompletedTaskToRead)?'checked':''} type="radio" value="false"/>否</td>
+                </tr>
+                <tr>
+                    <td class="editTableTitle">合并待办:</td>
+                    <td class="editTableValue">
+                        <input class="editTableRadio" name="manualMergeSameJobActivity" text{($.manualMergeSameJobActivity)?'checked':''} type="radio" value="true"/>是
+                        <input class="editTableRadio" name="manualMergeSameJobActivity" text{(!$.manualMergeSameJobActivity)?'checked':''} type="radio" value="false"/>否
+                        <div style="color: #999999">（ 如果选“是”，同一身份在此节点上的待办会被合并 ）</div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="editTableTitle">活动组:</td>
+                    <td class="editTableValue"><input type="text" name="group" value="text{$.group}" class="editTableInput"/></td>
+                </tr>
+                <tr>
+                    <td class="editTableTitle">意见组:</td>
+                    <td class="editTableValue"><input type="text" name="opinionGroup" value="text{$.opinionGroup}" class="editTableInput"/></td>
+                </tr>
+            </table>
+        </div>
     </div>
+
+
     <div title="人员"  class="MWFTab">
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
             <tr>
@@ -190,7 +195,8 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="时效"  class="MWFTab">
+
+    <div title="时效"  class="MWFTab" data-o2-advanced="yes">
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
             <tr>
                 <td class="editTableTitle">流程超时:</td>
@@ -337,193 +343,193 @@
         </table>
 
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>
+        <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>
 
-        </div>
-        <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                <tr>
-                    <td class="editTableTitle">工作到达前:</td>
-                    <td class="editTableValue">
-                        <div class="MWFScript" name="beforeArriveScript"></div>
-                    </td>
-                </tr>
-            </table>
-            <div class="MWFScriptText" name="beforeArriveScriptText"></div><hr />
-        </div>
+    </div>
+    <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+            <tr>
+                <td class="editTableTitle">工作到达前:</td>
+                <td class="editTableValue">
+                    <div class="MWFScript" name="beforeArriveScript"></div>
+                </td>
+            </tr>
+        </table>
+        <div class="MWFScriptText" name="beforeArriveScriptText"></div><hr />
+    </div>
 
-        <div style="line-height: 20px; height: 46px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; background-color:#f6f6f6;">
-            <div style="height: 46px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">执行Arrive操作<br/>活动属性设置，计算可能的活动所有者</div>
-        </div>
+    <div style="line-height: 20px; height: 46px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; background-color:#f6f6f6;">
+        <div style="height: 46px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down.png) no-repeat center center;"></div>
+        <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">执行Arrive操作<br/>活动属性设置，计算可能的活动所有者</div>
+    </div>
 
-        <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-            <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.afterArriveScript || $.afterArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 0px 5px;">工作到达后</div>
-        </div>
-        <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                <tr>
-                    <td class="editTableTitle">工作到达后:</td>
-                    <td class="editTableValue">
-                        <div class="MWFScript" name="afterArriveScript"></div>
-                    </td>
-                </tr>
-            </table>
-            <div class="MWFScriptText" name="afterArriveScriptText"></div><hr />
-        </div>
+    <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+        <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.afterArriveScript || $.afterArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+    <div style="margin-left: 20px; padding: 0px 5px;">工作到达后</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">工作到达后:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="afterArriveScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="afterArriveScriptText"></div><hr />
+</div>
 
-        <div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC">
-            <div style="height: 26px; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
-        </div>
+<div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC">
+    <div style="height: 26px; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
+</div>
 
-        <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-            <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeExecuteScript || $.beforeExecuteScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 0px 5px;">活动执行前</div>
-        </div>
-        <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                <tr>
-                    <td class="editTableTitle">活动执行前:</td>
-                    <td class="editTableValue">
-                        <div class="MWFScript" name="beforeExecuteScript"></div>
-                    </td>
-                </tr>
-            </table>
-            <div class="MWFScriptText" name="beforeExecuteScriptText"></div><hr />
-        </div>
+<div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+    <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeExecuteScript || $.beforeExecuteScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+<div style="margin-left: 20px; padding: 0px 5px;">活动执行前</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">活动执行前:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="beforeExecuteScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="beforeExecuteScriptText"></div><hr />
+</div>
 
-        <div style="border-left: 20px solid #eeeeee;">
-            <div style="line-height: 20px; height: 46px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
-                <div style="height: 46px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down.png) no-repeat center center;"></div>
-                <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">执行Execute操作<br/>生成待办</div>
-            </div>
+<div style="border-left: 20px solid #eeeeee;">
+    <div style="line-height: 20px; height: 46px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
+        <div style="height: 46px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down.png) no-repeat center center;"></div>
+        <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">执行Execute操作<br/>生成待办</div>
+    </div>
 
 
-            <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-                <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.manualStayScript || $.manualStayScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-                <div style="margin-left: 20px; padding: 0px 5px;">等待人工处理时</div>
-            </div>
-            <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-                <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                    <tr>
-                        <td class="editTableTitle">等待人工处理时:</td>
-                        <td class="editTableValue">
-                            <div class="MWFScript" name="manualStayScript"></div>
-                        </td>
-                    </tr>
-                </table>
-                <div class="MWFScriptText" name="manualStayScriptText"></div><hr />
-            </div>
-            <div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
-                <div style="height: 26px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
-                <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">用户流转待办</div>
-            </div>
+    <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+        <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.manualStayScript || $.manualStayScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+    <div style="margin-left: 20px; padding: 0px 5px;">等待人工处理时</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">等待人工处理时:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="manualStayScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="manualStayScriptText"></div><hr />
+</div>
+<div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
+    <div style="height: 26px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
+    <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">用户流转待办</div>
+</div>
 
-            <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-                <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.manualBeforeTaskScript || $.manualBeforeTaskScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-                <div style="margin-left: 20px; padding: 0px 5px;">待办处理前</div>
-            </div>
-            <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-                <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                    <tr>
-                        <td class="editTableTitle">待办处理前:</td>
-                        <td class="editTableValue">
-                            <div class="MWFScript" name="manualBeforeTaskScript"></div>
-                        </td>
-                    </tr>
-                </table>
-                <div class="MWFScriptText" name="manualBeforeTaskScriptText"></div><hr />
-            </div>
+<div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+    <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.manualBeforeTaskScript || $.manualBeforeTaskScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+<div style="margin-left: 20px; padding: 0px 5px;">待办处理前</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">待办处理前:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="manualBeforeTaskScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="manualBeforeTaskScriptText"></div><hr />
+</div>
 
-            <div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
-                <div style="height: 26px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
-                <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">处理待办，转已办</div>
-            </div>
+<div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
+    <div style="height: 26px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
+    <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">处理待办，转已办</div>
+</div>
 
-            <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-                <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.manualAfterTaskScript || $.manualAfterTaskScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-                <div style="margin-left: 20px; padding: 0px 5px;">待办处理后</div>
-            </div>
-            <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-                <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                    <tr>
-                        <td class="editTableTitle">待办处理后:</td>
-                        <td class="editTableValue">
-                            <div class="MWFScript" name="manualAfterTaskScript"></div>
-                        </td>
-                    </tr>
-                </table>
-                <div class="MWFScriptText" name="manualAfterTaskScriptText"></div><hr />
-            </div>
+<div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+    <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.manualAfterTaskScript || $.manualAfterTaskScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+<div style="margin-left: 20px; padding: 0px 5px;">待办处理后</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">待办处理后:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="manualAfterTaskScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="manualAfterTaskScriptText"></div><hr />
+</div>
 
-            <div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
-                <div style="height: 26px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
-                <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">判断是否满足条件进入下一个活动</div>
-            </div>
+<div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; background-color:#f6f6f6;">
+    <div style="height: 26px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
+    <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">判断是否满足条件进入下一个活动</div>
+</div>
 
-        </div>
+</div>
 
-        <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-            <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.afterExecuteScript || $.afterExecuteScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 0px 5px;">活动执行后</div>
-        </div>
-        <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                <tr>
-                    <td class="editTableTitle">活动执行后:</td>
-                    <td class="editTableValue">
-                        <div class="MWFScript" name="afterExecuteScript"></div>
-                    </td>
-                </tr>
-            </table>
-            <div class="MWFScriptText" name="afterExecuteScriptText"></div><hr />
-        </div>
+<div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+    <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.afterExecuteScript || $.afterExecuteScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+<div style="margin-left: 20px; padding: 0px 5px;">活动执行后</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">活动执行后:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="afterExecuteScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="afterExecuteScriptText"></div><hr />
+</div>
 
-        <div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC">
-            <div style="height: 26px; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
-        </div>
+<div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC">
+    <div style="height: 26px; background: url(../x_component_process_ProcessDesigner/$Process/down16.png) no-repeat center center;"></div>
+</div>
 
-        <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-            <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeInquireScript || $.beforeInquireScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 0px 5px;">路由查询前</div>
-        </div>
-        <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
-            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                <tr>
-                    <td class="editTableTitle">路由查询前:</td>
-                    <td class="editTableValue">
-                        <div class="MWFScript" name="beforeInquireScript"></div>
-                    </td>
-                </tr>
-            </table>
-            <div class="MWFScriptText" name="beforeInquireScriptText"></div><hr />
-        </div>
+<div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+    <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeInquireScript || $.beforeInquireScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+<div style="margin-left: 20px; padding: 0px 5px;">路由查询前</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">路由查询前:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="beforeInquireScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="beforeInquireScriptText"></div><hr />
+</div>
 
-        <div style="line-height: 20px; height: 46px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; background-color:#f6f6f6;">
-            <div style="height: 46px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">执行Inquire操作<br/>查询到达下一个活动的路由</div>
-        </div>
+<div style="line-height: 20px; height: 46px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; background-color:#f6f6f6;">
+    <div style="height: 46px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/down.png) no-repeat center center;"></div>
+    <div style="margin-left: 20px; padding: 3px 10px; text-align: center; color: #666666;">执行Inquire操作<br/>查询到达下一个活动的路由</div>
+</div>
 
-        <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
-            <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.afterInquireScript || $.afterInquireScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
-            <div style="margin-left: 20px; padding: 0px 5px;">路由查询后</div>
-        </div>
-        <div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+<div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
+    <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.afterInquireScript || $.afterInquireScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
+<div style="margin-left: 20px; padding: 0px 5px;">路由查询后</div>
+</div>
+<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
 
-            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-                <tr>
-                    <td class="editTableTitle">路由查询后:</td>
-                    <td class="editTableValue">
-                        <div class="MWFScript" name="afterInquireScript"></div>
-                    </td>
-                </tr>
-            </table>
-            <div class="MWFScriptText" name="afterInquireScriptText"></div><hr />
-        </div>
+    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+        <tr>
+            <td class="editTableTitle">路由查询后:</td>
+            <td class="editTableValue">
+                <div class="MWFScript" name="afterInquireScript"></div>
+            </td>
+        </tr>
+    </table>
+    <div class="MWFScriptText" name="afterInquireScriptText"></div><hr />
+</div>
 
-    </div>
+</div>
 </div>

o2web/source/x_component_process_ProcessDesigner/$Process/merge.html

@@ -124,7 +124,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/message.html

@@ -45,7 +45,7 @@
     <div title="消息" class="MWFTab">
         <div class="editTableHeadTitle">消息</div>
     </div>
-    <div title="事件" class="MWFTab">
+    <div title="事件" class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/parallel.html

@@ -117,7 +117,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/route.html

@@ -41,53 +41,55 @@
                 </td>
             </tr>
         </table>
-        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-            <tr>
-                <td class="editTableTitle">路由类型:</td>
-                <td class="editTableValue" id="text{$.id}opinionRequired" >
-                    <input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskArea').setStyle('display', 'none');}" name="type" text{($.type!='appendTask' && $.type!='back')?'checked':''} type="radio" value="normal"/>默认路由
-                    <br><input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskArea').setStyle('display', 'none');}" name="type" text{($.type=='back')?'checked':''} type="radio" value="back"/>回退路由
-                    <br><input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskArea').setStyle('display', 'block');}" name="type" text{($.type=='appendTask')?'checked':''} type="radio" value="appendTask"/>转交（仅指向同活动时生效）
-                    <div style="color:#999999">转交活动不触发活动事件</div>
-                </td>
-            </tr>
-        </table>
-
-        <div id="text{$.id}appendTaskArea" style="display: text{($.type=='appendTask') ? 'block': 'none'}">
+        <div data-o2-advanced="yes">
             <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
                 <tr>
-                    <td class="editTableTitle">转交人员:</td>
+                    <td class="editTableTitle">路由类型:</td>
                     <td class="editTableValue" id="text{$.id}opinionRequired" >
-                        <input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskScriptArea').setStyle('display', 'none');}" name="appendTaskIdentityType" text{($.appendTaskIdentityType !='script')?'checked':''} type="radio" value="select"/>根据路由选择
-                        <input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskScriptArea').setStyle('display', 'block');}" name="appendTaskIdentityType" text{($.appendTaskIdentityType =='script')?'checked':''} type="radio" value="script"/>根据脚本
+                        <input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskArea').setStyle('display', 'none');}" name="type" text{($.type!='appendTask' && $.type!='back')?'checked':''} type="radio" value="normal"/>默认路由
+                        <br><input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskArea').setStyle('display', 'none');}" name="type" text{($.type=='back')?'checked':''} type="radio" value="back"/>回退路由
+                        <br><input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskArea').setStyle('display', 'block');}" name="type" text{($.type=='appendTask')?'checked':''} type="radio" value="appendTask"/>转交（仅指向同活动时生效）
+                        <div style="color:#999999">转交活动不触发活动事件</div>
                     </td>
                 </tr>
             </table>
-            <div id="text{$.id}appendTaskScriptArea" style="display: text{($.appendTaskIdentityType=='script') ? 'block': 'none'}">
+
+            <div id="text{$.id}appendTaskArea" style="display: text{($.type=='appendTask') ? 'block': 'none'}">
                 <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
                     <tr>
-                        <td class="editTableTitle">转交人脚本:</td>
-                        <td class="editTableValue">
-                            <div class="MWFScript" name="appendTaskIdentityScript"></div>
+                        <td class="editTableTitle">转交人员:</td>
+                        <td class="editTableValue" id="text{$.id}opinionRequired" >
+                            <input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskScriptArea').setStyle('display', 'none');}" name="appendTaskIdentityType" text{($.appendTaskIdentityType !='script')?'checked':''} type="radio" value="select"/>根据路由选择
+                            <input class="editTableRadio" onclick="if (this.checked){ $('text{$.id}appendTaskScriptArea').setStyle('display', 'block');}" name="appendTaskIdentityType" text{($.appendTaskIdentityType =='script')?'checked':''} type="radio" value="script"/>根据脚本
                         </td>
                     </tr>
                 </table>
-                <div class="MWFScriptText" name="appendTaskIdentityScriptText"></div><hr />
+                <div id="text{$.id}appendTaskScriptArea" style="display: text{($.appendTaskIdentityType=='script') ? 'block': 'none'}">
+                    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                        <tr>
+                            <td class="editTableTitle">转交人脚本:</td>
+                            <td class="editTableValue">
+                                <div class="MWFScript" name="appendTaskIdentityScript"></div>
+                            </td>
+                        </tr>
+                    </table>
+                    <div class="MWFScriptText" name="appendTaskIdentityScriptText"></div><hr />
+                </div>
             </div>
-        </div>
 
 
-        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-            <tr>
-                <td class="editTableTitle">异步返回:</td>
-                <td class="editTableValue">
-                    <input class="editTableRadio" name="asyncSupported" text{($.asyncSupported===true)?'checked':''} type="radio" value="true"/>是
-                    <input class="editTableRadio" name="asyncSupported" text{($.asyncSupported!==true)?'checked':''} type="radio" value="false"/>否
-                </td>
-            </tr>
-        </table>
+            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                <tr>
+                    <td class="editTableTitle">异步返回:</td>
+                    <td class="editTableValue">
+                        <input class="editTableRadio" name="asyncSupported" text{($.asyncSupported===true)?'checked':''} type="radio" value="true"/>是
+                        <input class="editTableRadio" name="asyncSupported" text{($.asyncSupported!==true)?'checked':''} type="radio" value="false"/>否
+                    </td>
+                </tr>
+            </table>
+        </div>
     </div>
-    <div title="扩展" class="MWFTab">
+    <div title="扩展" class="MWFTab" data-o2-advanced="yes">
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
             <tr>
                 <td class="editTableTitle">决策组:</td>

o2web/source/x_component_process_ProcessDesigner/$Process/service.html

@@ -49,7 +49,7 @@
         <div class="MWFScriptText" name="scriptText"></div><hr/>
         <div style="line-height: 24px; padding: 2px 5px;">通过 this.request.getBody() 获取请求数据<br/>返回 true，驱动流程继续流转<br/>返回 false，表示不符合流转条件，等待下一次调用</div>
     </div>
-    <div title="事件" class="MWFTab">
+    <div title="事件" class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

o2web/source/x_component_process_ProcessDesigner/$Process/split.html

@@ -122,7 +122,7 @@
         </table>
         <div class="MWFScriptText" name="reviewScriptText"></div>
     </div>
-    <div title="事件"  class="MWFTab">
+    <div title="事件"  class="MWFTab" data-o2-advanced="yes">
         <div onclick="var node = this.getNext(); if (node.getStyle('display')=='none'){node.setStyle('display', 'block');}else{node.setStyle('display', 'none');}" style="cursor: pointer; line-height: 28px; height: 30px; font-weight: bold; background-color: #EEEEEE;">
             <div style="height: 30px; width: 30px; float: left; background: url(../x_component_process_ProcessDesigner/$Process/text{($.beforeArriveScript || $.beforeArriveScriptText) ? "event_code" : "event"}.png) no-repeat center center;"></div>
             <div style="margin-left: 20px; padding: 0px 5px;">工作到达前</div>

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": "<span>"+MWF.APPPD.LP.showAdvanced+"</span>"
+			}).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<advs.length; i++){
+										advs[i].show();
+									}
+								}
+							}else{
+								var advs = this.propertyListNode.querySelectorAll("*[data-o2-advanced=\"yes\"]");
+								if (advs && advs.length){
+									for (var i=0; i<advs.length; i++){
+										advs[i].hide();
+									}
+								}
+							}
+							o2.UD.putData("process-show-advanced", {"show": !!this.showAdvanced.checked})
+						}.bind(this)
+					}
+				}).inject(div, "top");
+			}.bind(this));
+
 
 			// this.propertyListTab.tabNodeContainerArea
 			// showAdvanced

o2web/source/x_component_process_ProcessDesigner/Property.js

@@ -107,7 +107,6 @@ MWF.xApplication.process.ProcessDesigner.Property = new Class({
 				"styles": this.process.css.propertyTabNode
 			}).inject(tmpNode, "before");
 
-			debugger;
 			MWF.require("MWF.widget.Tab", function(){
 				var tab = new MWF.widget.Tab(tabAreaNode, {"style": "moduleList"});
 				tab.load();
@@ -117,7 +116,6 @@ MWF.xApplication.process.ProcessDesigner.Property = new Class({
 					tabPages.push(tabPage);
 					if (node.hasAttribute("data-o2-advanced") && node.dataset["o2Advanced"]=="yes"){
                         tabPage.tabNode.setAttribute("data-o2-advanced", "yes");
-                        tabPage.tabNode.hide();
                     }
 				}.bind(this));
 				tabPages[0].showTab();

o2web/source/x_component_process_ProcessDesigner/Route.js

@@ -1127,6 +1127,8 @@ MWF.xApplication.process.ProcessDesigner.Route.Property = new Class({
                 this.loadConditionInput();
                 this.loadFormSelect();
                 this.loadOrgEditor();
+
+                this.hideAdvanced();
             }else{
                 this.propertyContent.setStyle("display", "block");
             }
@@ -1170,4 +1172,4 @@ MWF.xApplication.process.ProcessDesigner.Route.Property = new Class({
     //        }.bind(this));
     //    }
     //}
-});
+});