Merge branch 'fix/documenteditor_page' into 'develop'

Merge of fix/documenteditor_page to develop 版式文件自定义模板页码

See merge request o2oa/o2oa!1138

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -832,23 +832,23 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
 		var data = final || {};
 		Object.keys(initial).each(function(k){
 			if (k!="defaultValue"){
-				var t = typeOf(initial[k]);
-				switch (t) {
-					case "object":
-						var s = JSON.stringify(initial[k], null, "\t");
-						if (/((?:\:\s*)((\".+\")|(\d+)|(\[.+\])))/.test(s)){
-							//data[k] = {};
-							data[k] = this._copyFormJson(initial[k], data[k]);
-						}
-						break;
-					case "boolean":
-						data[k] = initial[k];
-						break;
-					default :
-						if (initial[k]) data[k] = initial[k];
-				}
-			}else{
-				data[k] = initial[k];
+					var t = typeOf(initial[k]);
+					switch (t) {
+						case "object":
+							var s = JSON.stringify(initial[k], null, "\t");
+							if (/((?:\:\s*)((\".+\")|(\d+)|(\[.+\])))/.test(s)){
+								//data[k] = {};
+								data[k] = this._copyFormJson(initial[k], data[k]);
+							}
+							break;
+						case "boolean":
+							data[k] = initial[k];
+							break;
+						default :
+							if (initial[k]) data[k] = initial[k];
+					}
+				}else{
+					data[k] = initial[k];
 			}
 
 		}.bind(this));

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -149,6 +149,8 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
 
         if (this.json.documentTempleteType=="cus"){
             pageContentNode.loadHtml(o2.filterUrl(this.json.documentTempleteUrl), function(){
+                if (this.json.toWordPageNumber!="n") this.doPageStyles(pageContentNode);
+
                 if (this.attachmentTemplete){
                     var attNode = pageContentNode.getElement(".doc_layout_attachment_content");
                     if (attNode) attNode.empty();