增加流程活动的自定义属性，并可通过脚本this.workContext.getActivity().customData获取

eb5f5c14 · NoSubject · 3287dc19 · eb5f5c14 · eb5f5c14 · eb5f5c14
20 changed file
--- a/o2web/source/o2_core/o2/widget/$Maplist/default/css.wcss
+++ b/o2web/source/o2_core/o2/widget/$Maplist/default/css.wcss
@@ -10,11 +10,13 @@
 		"line-height": "20px",
 		"background": "#EEE"
 	},
+
 	"titleTextNode": {
 		"line-height": "20px",
 		"font-size": "12px",
-		"padding-left": "5px",
-		"cursor": "pointer"
+		"padding": "0 5px",
+		"cursor": "pointer",
+		"font-weight": "bold"
 	},
 	"titleActionNode": {
 		"float": "right",

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/agent.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/agent.html
@@ -42,6 +42,7 @@
                </tr>
            </table>
        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.script}}" class="MWFTab">
        <div class="editTableHeadTitle">{{$.lp.runScript}}</div>

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/begin.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/begin.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.person}}"  class="MWFTab">
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/cancel.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/cancel.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.person}}"  class="MWFTab">
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/choice.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/choice.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.person}}"  class="MWFTab">
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/condition.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/condition.html
@@ -41,6 +41,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>否</td>
            </tr>
        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <!--<div title="路由" class="MWFTab">
        <div class="MWFCondition" name="script"></div>

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/delay.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/delay.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.timer}}" class="MWFTab">
        <div class="editTableHeadTitle">{{$.lp.timerType}}</div>

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/embed.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/embed.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.embed}}"  class="MWFTab">
 <!--        <div class="MWFApplicationSelect" title="选择应用"></div>-->

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/end.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/end.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.person}}"  class="MWFTab">
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.invoke}}" class="MWFTab">
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/manual.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/manual.html
@@ -61,6 +61,8 @@
                    <td class="editTableValue"><input type="text" name="opinionGroup" value="text{$.opinionGroup}" class="editTableInput"/></td>
                </tr>
            </table>
+            <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}"></div>
+
        </div>
    </div>

@@ -349,11 +351,11 @@
        </table>

    </div>
+
    <div title="{{$.lp.event}}"  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;">{{$.lp.beforeWorkArrive}}</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">
@@ -375,8 +377,8 @@
        <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;">{{$.lp.afterArriveActivity}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+        </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">{{$.lp.afterArriveActivity}}:</td>
@@ -386,17 +388,17 @@
                </tr>
            </table>
            <div class="MWFScriptText" name="afterArriveScriptText"></div><hr />
-</div>
+        </div>

-<div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC">
+        <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>

-<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 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;">{{$.lp.beforeExecute}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+            <div style="margin-left: 20px; padding: 0px 5px;">{{$.lp.beforeExecute}}</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">{{$.lp.beforeExecute}}:</td>
@@ -406,9 +408,9 @@
                </tr>
            </table>
            <div class="MWFScriptText" name="beforeExecuteScriptText"></div><hr />
-</div>
+        </div>

-<div style="border-left: 20px solid #eeeeee;">
+        <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;">{{$.lp.eventInfo7}}</div>
@@ -418,8 +420,8 @@
            <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;">{{$.lp.manualStay}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+            </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">{{$.lp.manualStay}}:</td>
@@ -429,17 +431,17 @@
                    </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>
+            <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;">{{$.lp.eventInfo8}}</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 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;">{{$.lp.manualBeforeTask}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+                <div style="margin-left: 20px; padding: 0px 5px;">{{$.lp.manualBeforeTask}}</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">{{$.lp.manualBeforeTask}}:</td>
@@ -449,18 +451,18 @@
                    </tr>
                </table>
                <div class="MWFScriptText" name="manualBeforeTaskScriptText"></div><hr />
-</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="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;">{{$.lp.eventInfo9}}</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 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;">{{$.lp.manualAfterTask}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+                <div style="margin-left: 20px; padding: 0px 5px;">{{$.lp.manualAfterTask}}</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">{{$.lp.manualAfterTask}}:</td>
@@ -470,20 +472,20 @@
                    </tr>
                </table>
                <div class="MWFScriptText" name="manualAfterTaskScriptText"></div><hr />
-</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="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;">{{$.lp.eventInfo10}}</div>
-</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 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;">{{$.lp.afterExecute}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+            <div style="margin-left: 20px; padding: 0px 5px;">{{$.lp.afterExecute}}</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">{{$.lp.afterExecute}}:</td>
@@ -493,17 +495,17 @@
                </tr>
            </table>
            <div class="MWFScriptText" name="afterExecuteScriptText"></div><hr />
-</div>
+        </div>

-<div style="line-height: 20px; height: 26px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC">
+        <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>

-<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 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;">{{$.lp.beforeInquire}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+            <div style="margin-left: 20px; padding: 0px 5px;">{{$.lp.beforeInquire}}</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">{{$.lp.beforeInquire}}:</td>
@@ -513,18 +515,18 @@
                </tr>
            </table>
            <div class="MWFScriptText" name="beforeInquireScriptText"></div><hr />
-</div>
+        </div>

-<div style="line-height: 20px; height: 46px; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; background-color:#f6f6f6;">
+        <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;">{{$.lp.eventInfo4}}</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 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;">{{$.lp.afterInquire}}</div>
-</div>
-<div style="display: none; overflow:hidden; border-left: 10px solid #EEEEEE; border-bottom: 10px solid #EEEEEE;">
+            <div style="margin-left: 20px; padding: 0px 5px;">{{$.lp.afterInquire}}</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>
@@ -535,7 +537,7 @@
                </tr>
            </table>
            <div class="MWFScriptText" name="afterInquireScriptText"></div><hr />
-</div>
+        </div>

-</div>
+    </div>
 </div>
--- a/o2web/source/x_component_process_ProcessDesigner/$Process/merge.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/merge.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.person}}"  class="MWFTab">
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/message.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/message.html
@@ -41,6 +41,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>否</td>
            </tr>
        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="消息" class="MWFTab">
        <div class="editTableHeadTitle">消息</div>

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/parallel.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/parallel.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.person}}"  class="MWFTab">
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/service.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/service.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>

    <div title="{{$.lp.service}}" class="MWFTab">

--- a/o2web/source/x_component_process_ProcessDesigner/$Process/split.html
+++ b/o2web/source/x_component_process_ProcessDesigner/$Process/split.html
@@ -31,6 +31,7 @@
                    <div class="MWFFormSelect" name="form"></div>
                </td>
            </tr>
+        </table>
        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
            <tr>
                <td class="editTableValue"  colspan="2"><b>{{$.lp.allowReroute}}: </b><input class="editTableRadio" name="allowReroute" text{($.allowReroute)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
@@ -41,7 +42,7 @@
                    <input class="editTeditTableRadioableInput" class="editTableInput" name="allowRerouteTo" text{(!$.allowRerouteTo)?'checked':''} type="radio" value="false"/>{{$.lp.no}}</td>
            </tr>
        </table>
-        </table>
+        <div class="MWFMaplist" name="customData" title="{{$.lp.customData}}" data-o2-advanced="yes"></div>
    </div>
    <div title="{{$.lp.split}}" class="MWFTab">
        <div class="editTableHeadTitle">{{$.lp.splitScript}}</div>

--- a/o2web/source/x_component_process_ProcessDesigner/Property.js
+++ b/o2web/source/x_component_process_ProcessDesigner/Property.js
@@ -67,6 +67,7 @@ MWF.xApplication.process.ProcessDesigner.Property = new Class({
                    this.loadIconSelect();
                    this.loadContextRoot();
                    this.loadProjection();
+                    this.loadMaplist();

                    this.hideAdvanced();
                }.bind(this));
@@ -417,6 +418,35 @@ MWF.xApplication.process.ProcessDesigner.Property = new Class({
            }.bind(this));
        }.bind(this));
    },
+    loadMaplist: function(){
+        var maplists = this.propertyContent.getElements(".MWFMaplist");
+        maplists.each(function(node){
+            var title = node.get("title");
+            var name = node.get("name");
+            var lName = name.toLowerCase();
+            var collapse = node.get("collapse");
+            var mapObj = this.data[name] || "{}";
+            //if (!mapObj) mapObj = {};
+            MWF.require("MWF.widget.Maplist", function(){
+                node.empty();
+                var maplist = new MWF.widget.Maplist(node, {
+                    "title": title,
+                    "collapse": (collapse) ? true : false,
+                    "onChange": function(){
+                        //this.data[name] = maplist.toJson();
+                        //
+                        //var oldData = this.data[name];
+                        this.setValue(name, JSON.stringify(maplist.toJson()));
+                        // this.changeStyle(name, oldData);
+                        // this.changeData(name);
+                    }.bind(this),
+                    "isProperty": (lName.contains("properties") || lName.contains("property") || lName.contains("attribute"))
+                });
+                maplist.load(JSON.parse(mapObj));
+                //this.maplists[name] = maplist;
+            }.bind(this));
+        }.bind(this));
+    },
    loadPersonInput: function(){
 	    debugger;
        var personIdentityNodes = this.propertyContent.getElements(".MWFPersonIdentity");

--- a/o2web/source/x_component_process_ProcessDesigner/lp/zh-cn.js
+++ b/o2web/source/x_component_process_ProcessDesigner/lp/zh-cn.js
@@ -356,6 +356,8 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 		"activityGroup": "活动组",
 		"opinionGroup": "意见组",
 		"taskPerson": "处理人",
+		"customData": "自定义属性",
+
 		"identity": "用户标识",
 		"group": "处理群组",
 		"readGroup": "待阅群组",
@@ -382,22 +384,22 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 		"eventInfo1": "启动流程生成work实例",
 		"afterBegin": "流程启动",
 		"beforeArrive": "活动到达前",
-		"eventInfo2": "执行Arrive操作<br/>活动属性设置",
+		"eventInfo2": "执行Arrive操作，活动属性设置",
 		"afterArrive": "活动到达后",
 		"beforeExecute": "活动执行前",
-		"eventInfo3": "执行Execute操作<br/>执行自动活动任务",
+		"eventInfo3": "执行Execute操作，执行自动活动任务",
 		"afterExecute": "活动执行后",
 		"beforeInquire": "路由查询前",
-		"eventInfo4": "执行Inquire操作<br/>查询到达下一个活动的路由",
+		"eventInfo4": "执行Inquire操作，查询到达下一个活动的路由",
 		"afterInquire": "路由查询后",
 		"beforeEnd": "流程结束前",
-		"eventInfo5": "结束流程<br/>生成workCompleted",
+		"eventInfo5": "结束流程,生成workCompleted",
 		"afterEnd": "流程结束",
 		"beforeWorkArrive": "工作到达前",
 		"beforeArriveActivity": "文件收到前",
 		"afterArriveActivity": "文件收到后",
-		"eventInfo6": "执行Arrive操作<br/>活动属性设置，计算可能的活动所有者",
-		"eventInfo7": "执行Execute操作<br/>生成待办",
+		"eventInfo6": "执行Arrive操作，活动属性设置，计算可能的活动所有者",
+		"eventInfo7": "执行Execute操作，生成待办",
 		"manualStay": "等待人工处理时",
 		"eventInfo8": "用户流转待办",
 		"manualBeforeTask": "待办处理前",

--- a/o2web/source/x_component_process_Work/Main.js
+++ b/o2web/source/x_component_process_Work/Main.js
@@ -498,7 +498,14 @@ MWF.xApplication.process.Work.Main = new Class({
        //        if( !task.routeDecisionOpinionList )task.routeDecisionOpinionList = task.properties.routeDecisionOpinionList;
        //    }
        //});
-
+        if (workData.activity.properties && workData.activity.properties.customData){
+            try{
+                var customData = JSON.parse(workData.activity.properties.customData);
+                workData.activity.customData = customData;
+            }catch(e){
+                console.error(e);
+            }
+        }
        this.activity = workData.activity;
        this.data = workData.data;
        this.taskList = workData.taskList;

--- a/o2web/source/x_desktop/js/initialScriptText.js
+++ b/o2web/source/x_desktop/js/initialScriptText.js
@@ -124,7 +124,16 @@ var wrapWorkContext = {

    "getTask": function(){return JSON.parse(workContext.getTaskOrTaskCompleted());},
    "getWork": function(){return JSON.parse(workContext.getWork());},
-    "getActivity": function(){return JSON.parse(workContext.getActivity());},
+    "getActivity": function(){
+            var act = JSON.parse(workContext.getActivity());
+            if (act.properties && act.properties.customData){
+                try{
+                    var customData = JSON.parse(act.properties.customData);
+                    act.customData = customData;
+                }catch(e){}
+            }
+            return act;
+        },
    "getTaskList": function(){return JSON.parse(workContext.getTaskList());},
    "getTaskCompletedList": function(){return JSON.parse(workContext.getTaskCompletedList());},
    "getReadList": function(){return JSON.parse(workContext.getReadList());},