Merge branch 'fix/note_current' into 'wrdp'

修复流程、表单设计图标选择显示位置的问题

See merge request o2oa/o2oa!6283

o2web/source/x_component_process_FormDesigner/Property.js

@@ -834,7 +834,11 @@ MWF.xApplication.process.FormDesigner.Property = MWF.FCProperty = new Class({
     },
     selectIcon: function(node){
         if (!node.iconMenu){
-            var iconSelectMenu = new MWF.widget.Menu(node, {"event": "click", "style": "processIcon"});
+            var tr = node.getParent("tr");
+            var p = tr.getPosition(this.form.designer.content);
+            var iconSelectMenu = new MWF.widget.Menu(node, {"left": p.x-330, "top": p.y, "event": "click", "style": "processIcon"});
+
+            //var iconSelectMenu = new MWF.widget.Menu(node, {"event": "click", "style": "processIcon"});
             iconSelectMenu.load();
             node.iconMenu = iconSelectMenu;
             var _self = this;

o2web/source/x_component_process_ProcessDesigner/Property.js

@@ -913,7 +913,9 @@ MWF.xApplication.process.ProcessDesigner.Property = new Class({
 
     selectIcon: function(node){
         if (!node.iconMenu){
-            var iconSelectMenu = new MWF.widget.Menu(node, {"event": "click", "style": "processIcon"});
+            var tr = node.getParent("tr");
+            var p = tr.getPosition(this.process.designer.paperInNode.getNext());
+            var iconSelectMenu = new MWF.widget.Menu(node, {"left": p.x-330, "top": p.y, "event": "click", "style": "processIcon"});
             iconSelectMenu.load();
             node.iconMenu = iconSelectMenu;
             var _self = this;