Merge branch 'fix/scroll' into 'develop'

修正流程属性滚动条偶尔失效的bug

See merge request o2oa/o2oa!495

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

@@ -472,7 +472,7 @@ o2.widget.ScrollBar = new Class({
 
 				//		this.node.tween("margin-right", margin-scrollVNodeSize.x);
 			}
-			this.node.removeEvent("mousewheel", this.mousewheel);
+			//this.node.removeEvent("mousewheel", this.mousewheel);
 			this.node.removeEvent("touchmove", this.touchmove);
 			if (Browser.name=="firefox"){
 				this.node.removeEventListener("DOMMouseScroll", this.domMousewheel, false);