Merge branch 'fix/decumenteditor_date' into 'develop'

Merge of fix/decumenteditor_date to develop 修正主页日历高度在小分辨率时没有对齐的问题

See merge request o2oa/o2oa!812

o2web/source/x_component_Homepage/Main.js

@@ -15,7 +15,7 @@ MWF.xApplication.Homepage.Main = new Class({
 		"isResize": true,
 		"isMax": true,
 		"title": MWF.xApplication.Homepage.LP.title,
-		"minHeight": 600
+		"minHeight": 700
 	},
 	onQueryLoad: function(){
 		this.lp = MWF.xApplication.Homepage.LP;
@@ -78,6 +78,7 @@ MWF.xApplication.Homepage.Main = new Class({
 		if (height<this.options.minHeight) height = this.options.minHeight;
 		this.node.setStyle("height", ""+height+"px");
 
+
 		var rightHeight = height - this.calendarContentNode.getEdgeHeight();
 		var leftHeight = this.ltlLayout.getSize().y - this.taskContentNode.getEdgeHeight();