Merge branch 'fix/Process.actionbar_action_icon_setting_execption' into 'develop'

Merge of fix/[流程管理]修复流程表单操作条组件设置操作图标的时候未及时关闭图标选择器的问题 to develop

See merge request o2oa/o2oa!575

o2web/source/o2_core/o2/widget/Menu.js

@@ -139,7 +139,7 @@ o2.widget.Menu = new Class({
 				}else{
 					this.pauseCount--;
 				}
-				this.fireEvent("postShow");
+				this.fireEvent("postShow", [e]);
 			}
 		}
 		

o2web/source/x_component_cms_FormDesigner/widget/ActionsEditor.js

@@ -218,28 +218,36 @@ MWF.xApplication.cms.FormDesigner.widget.ActionsEditor.ButtonAction = new Class(
         //this.setEditNode();
     },
     setEvent: function(){
-        this.iconMenu = new MWF.widget.Menu(this.iconNode, {"event": "click", "style": "actionbarIcon"});
+        this.iconMenu = new MWF.widget.Menu(this.iconNode, {
+            "event": "click",
+            "style": "actionbarIcon",
+            "onPostShow" : function (ev) {
+                ev.stopPropagation();
+            }
+        });
         this.iconMenu.load();
         var _self = this;
         for (var i=-6; i<0; i++){
             //var icon = this.editor.path+this.editor.options.style+"/tools/"+i+".png";
             var icon = "../x_component_cms_FormDesigner/Module/Actionbar/"+this.editor.options.style+"/custom/"+i+".png";
-            var item = this.iconMenu.addMenuItem("", "click", function(){
+            var item = this.iconMenu.addMenuItem("", "click", function(ev){
                 var src = this.item.getElement("img").get("src");
                 _self.data.img = src.substr(src.lastIndexOf("/")+1, src.length);
                 _self.iconNode.setStyle("background-image", "url("+src+")");
                 _self.editor.fireEvent("change");
+                ev.stopPropagation();
             }, icon);
             item.iconName = i+".png";
         }
         for (var i=1; i<=134; i++){
             //var icon = this.editor.path+this.editor.options.style+"/tools/"+i+".png";
             var icon = "../x_component_cms_FormDesigner/Module/Actionbar/"+this.editor.options.style+"/custom/"+i+".png";
-            var item = this.iconMenu.addMenuItem("", "click", function(){
+            var item = this.iconMenu.addMenuItem("", "click", function(ev){
                 var src = this.item.getElement("img").get("src");
                 _self.data.img = src.substr(src.lastIndexOf("/")+1, src.length);
                 _self.iconNode.setStyle("background-image", "url("+src+")");
                 _self.editor.fireEvent("change");
+                ev.stopPropagation();
             }, icon);
             item.iconName = i+".png";
         }

o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js

@@ -338,16 +338,23 @@ MWF.xApplication.process.FormDesigner.widget.ActionsEditor.ButtonAction = new Cl
         //this.setEditNode();
     },
     setEvent: function(){
-        this.iconMenu = new MWF.widget.Menu(this.iconNode, {"event": "click", "style": "actionbarIcon"});
+        this.iconMenu = new MWF.widget.Menu(this.iconNode, {
+            "event": "click",
+            "style": "actionbarIcon",
+            "onPostShow" : function (ev) {
+                ev.stopPropagation();
+            }
+        });
         this.iconMenu.load();
         var _self = this;
         for (var i=1; i<=136; i++){
             var icon = this.editor.path+this.editor.options.style+"/tools/"+i+".png";
-            var item = this.iconMenu.addMenuItem("", "click", function(){
+            var item = this.iconMenu.addMenuItem("", "click", function(ev){
                 var src = this.item.getElement("img").get("src");
                 _self.data.img = src.substr(src.lastIndexOf("/")+1, src.length);
                 _self.iconNode.setStyle("background-image", "url("+src+")");
                 _self.editor.fireEvent("change");
+                ev.stopPropagation();
             }, icon);
             item.iconName = i+".png";
         }
@@ -368,11 +375,11 @@ MWF.xApplication.process.FormDesigner.widget.ActionsEditor.ButtonAction = new Cl
             var action = actions[index_before];
             this.node.inject(action.node, "before");
 
-            actions[index_before] = actions.splice(index, 1, actions[index_before])[0]; //���齻��λ��
+            actions[index_before] = actions.splice(index, 1, actions[index_before])[0];
             this.editor.actions = actions;
 
             var dataIndex_before = dataIndex - 1;
-            dataList[dataIndex_before] = dataList.splice(dataIndex, 1, dataList[dataIndex_before])[0]; //���齻��λ��
+            dataList[dataIndex_before] = dataList.splice(dataIndex, 1, dataList[dataIndex_before])[0];
             this.editor.data = dataList;
 
             this.editor.fireEvent("change");