Merge branch 'fix/documenteditor_position2' into 'develop'

修复请求reject

See merge request o2oa/o2oa!484

o2web/source/o2_core/o2.js

@@ -2203,7 +2203,8 @@ if (!window.o2) {
                     if (!loadAsync) return err;
                     resPromise.err = err;
                     var r = o2.runCallback(callback, "failure", [err.xhr, err.text, err.error], null);
-                    if (r) return r;
+                    if (r) return Promise.reject(r);
+                    return Promise.reject(err);
                 }).catch(function (err) { throw err;});
                 resPromise.res = res;
 

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -2328,7 +2328,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
         debugger;
         this._contentNodeWitdh();
 
-        var w = this.contentNode.getSize().x;
+        var w = this.contentNode.offsetWidth.toFloat();
         w = (this.scale) ? this.scale*w : w;
         var count = 1;
         var docPageFullWidth = (this.scale) ? this.scale*this.options.docPageFullWidth : this.options.docPageFullWidth;