Merge branch 'fix/embeded_view_execption' into 'develop'

Merge of fix/[数据中心]修复表单中的视图加载完成后loading不消失的问题

See merge request o2oa/o2oa!202

o2web/source/x_component_query_Query/Viewer.js

@@ -346,7 +346,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
                 this.loadCurrentPageData();
             }.bind(this),
             onPostLoad : function () {
-                this.setContentHeightFun();
+                if(this.setContentHeightFun)this.setContentHeightFun();
             }.bind(this)
         });
         this.paging.load();