Merge branch 'fix/javascript_load' into 'develop'

Merge of fix/javascript_load to develop 版式文件更新

See merge request o2oa/o2oa!1102

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html

@@ -95,7 +95,7 @@
  mso-position-horizontal-relative:text;mso-position-vertical:absolute;
  mso-position-vertical-relative:bottom-margin-area;mso-width-percent:0;
  mso-height-percent:0;mso-width-relative:page;mso-height-relative:page' from="0,42.55pt"
-            to="481.9pt,42.55pt" o:gfxdata="UEsDBBQABgAIAAAAIQC2gziS/gAAAOEBAAATAAAAW0NvbnRlbnRfVHlwZXNdLnhtbJSRQU7DMBBF
+            to="449.9pt,42.55pt" o:gfxdata="UEsDBBQABgAIAAAAIQC2gziS/gAAAOEBAAATAAAAW0NvbnRlbnRfVHlwZXNdLnhtbJSRQU7DMBBF
 90jcwfIWJU67QAgl6YK0S0CoHGBkTxKLZGx5TGhvj5O2G0SRWNoz/78nu9wcxkFMGNg6quQqL6RA
 0s5Y6ir5vt9lD1JwBDIwOMJKHpHlpr69KfdHjyxSmriSfYz+USnWPY7AufNIadK6MEJMx9ApD/oD
 OlTrorhX2lFEilmcO2RdNtjC5xDF9pCuTyYBB5bi6bQ4syoJ3g9WQ0ymaiLzg5KdCXlKLjvcW893
@@ -135,15 +135,16 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
         </b></p>
     </div>
 
-    <!--[if gte vml 1]><v:line id="Line_x0020_24" o:spid="_x0000_s1026"
-                               style='left:0;text-align:left;z-index:251659264;
+    <!--[if gte vml 1]>
+    <v:line id="Line_x0020_24" o:spid="_x0000_s1026"
+            style='position:absolute; left:0;text-align:left;z-index:251659264;
  visibility:visible;mso-wrap-style:square;mso-width-percent:0;
  mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;
  mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:0;
  mso-position-horizontal:center;mso-position-horizontal-relative:page;
  mso-position-vertical:absolute;mso-position-vertical-relative:top-margin-area;
  mso-width-percent:0;mso-height-percent:0;mso-width-relative:page;
- mso-height-relative:page' from="0,212.65pt" to="481.9pt,212.65pt" o:gfxdata="UEsDBBQABgAIAAAAIQC2gziS/gAAAOEBAAATAAAAW0NvbnRlbnRfVHlwZXNdLnhtbJSRQU7DMBBF
+ mso-height-relative:page' from="0pt,212.65pt" to="449.9pt,212.65pt" o:gfxdata="UEsDBBQABgAIAAAAIQC2gziS/gAAAOEBAAATAAAAW0NvbnRlbnRfVHlwZXNdLnhtbJSRQU7DMBBF
 90jcwfIWJU67QAgl6YK0S0CoHGBkTxKLZGx5TGhvj5O2G0SRWNoz/78nu9wcxkFMGNg6quQqL6RA
 0s5Y6ir5vt9lD1JwBDIwOMJKHpHlpr69KfdHjyxSmriSfYz+USnWPY7AufNIadK6MEJMx9ApD/oD
 OlTrorhX2lFEilmcO2RdNtjC5xDF9pCuTyYBB5bi6bQ4syoJ3g9WQ0ymaiLzg5KdCXlKLjvcW893
@@ -172,9 +173,10 @@ AAAAAAAAAC8BAABfcmVscy8ucmVsc1BLAQItABQABgAIAAAAIQC06krdywEAAHwDAAAOAAAAAAAA
 AAAAAAAAAC4CAABkcnMvZTJvRG9jLnhtbFBLAQItABQABgAIAAAAIQD77zOk2wAAAAgBAAAPAAAA
 AAAAAAAAAAAAACUEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAALQUAAAAA
 " strokecolor="red" strokeweight="4.5pt">
-    <v:stroke linestyle="thickThin"/>
-    <w:wrap anchorx="page" anchory="margin"/>
-</v:line><![endif]-->
+        <v:stroke linestyle="thickThin"/>
+        <w:wrap anchorx="page" anchory="margin"/>
+    </v:line>
+    <![endif]-->
 
     <![if !vml]>
     <div style='mso-ignore:vglayout;'>
@@ -189,17 +191,17 @@ AAAAAAAAAAAAACUEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAALQUAAAAA
 
     <!--    -->
 
-<!--    <p class="doc_block MsoNormal" align=left style='line-height:8.0pt'>-->
-        <!--    <div style="height: 2px; border-top: 1.13pt solid red; border-bottom: 0.1pt solid red"></div>-->
-<!--                <hr class="doc_layout_redline" style="height: 1.13pt;line-height:8.0pt; backgroud-color: red;" color=red>-->
-<!--    <img width=595 height=7 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA8QAAAAJCAIAAAB7UHJXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0U4NDA2RDQyN0IwMTFFQTk4QzJCRUIwQTdCMkQzMzYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0U4NDA2RDUyN0IwMTFFQTk4QzJCRUIwQTdCMkQzMzYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3RTg0MDZEMjI3QjAxMUVBOThDMkJFQjBBN0IyRDMzNiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3RTg0MDZEMzI3QjAxMUVBOThDMkJFQjBBN0IyRDMzNiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrWYXe4AAABNSURBVHja7NyhEQBACANBYL7/lnmPjN4tAXUTQW8BAACJcQIAABDTAAAgpgEAQEwDAICYBgAArlfrnwcAACQs0wAAEGq7NAAAZL4AAwBQkgQPNa/bYgAAAABJRU5ErkJggg==">-->
+    <!--    <p class="doc_block MsoNormal" align=left style='line-height:8.0pt'>-->
+    <!--    <div style="height: 2px; border-top: 1.13pt solid red; border-bottom: 0.1pt solid red"></div>-->
+    <!--                <hr class="doc_layout_redline" style="height: 1.13pt;line-height:8.0pt; backgroud-color: red;" color=red>-->
+    <!--    <img width=595 height=7 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA8QAAAAJCAIAAAB7UHJXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0U4NDA2RDQyN0IwMTFFQTk4QzJCRUIwQTdCMkQzMzYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0U4NDA2RDUyN0IwMTFFQTk4QzJCRUIwQTdCMkQzMzYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3RTg0MDZEMjI3QjAxMUVBOThDMkJFQjBBN0IyRDMzNiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3RTg0MDZEMzI3QjAxMUVBOThDMkJFQjBBN0IyRDMzNiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrWYXe4AAABNSURBVHja7NyhEQBACANBYL7/lnmPjN4tAXUTQW8BAACJcQIAABDTAAAgpgEAQEwDAICYBgAArlfrnwcAACQs0wAAEGq7NAAAZL4AAwBQkgQPNa/bYgAAAABJRU5ErkJggg==">-->
 
-        <!--        <hr class="doc_layout_redline" style="height: 0.1pt;line-height:8.0pt; margin-top:0.5pt;backgroud-color: red;" color=red>-->
-        <!--    <div class="doc_layout_redline">-->
-        <!--    &lt;!&ndash;[if gte vml 1]><v:line id="_x0000_s1027" style='position:absolute;left:0;text-align:left;z-index:251657728' from="-18pt,78.45pt" to="463.9pt,78.45pt" strokecolor="red" strokeweight="4.5pt">-->
-        <!--    <v:stroke linestyle="thickThin"/></v:line><![endif]&ndash;&gt;-->
-        <!--    <![if !vml]><img width=546 height=7 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA84AAAAKAQMAAABfSpUkAAAAAXNSR0ICQMB9xQAAAAZQTFRFAAAA/wAAG/+NIgAAAAF0Uk5TAEDm2GYAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAAZdEVYdFNvZnR3YXJlAE1pY3Jvc29mdCBPZmZpY2V/7TVxAAAAG0lEQVQ4y2Ng/z9AoIFh1OpRq+lg9cgEIzLAARUnSJeh8eGSAAAAAElFTkSuQmCC">-->
-        <!--    <![endif]>-->
+    <!--        <hr class="doc_layout_redline" style="height: 0.1pt;line-height:8.0pt; margin-top:0.5pt;backgroud-color: red;" color=red>-->
+    <!--    <div class="doc_layout_redline">-->
+    <!--    &lt;!&ndash;[if gte vml 1]><v:line id="_x0000_s1027" style='position:absolute;left:0;text-align:left;z-index:251657728' from="-18pt,78.45pt" to="463.9pt,78.45pt" strokecolor="red" strokeweight="4.5pt">-->
+    <!--    <v:stroke linestyle="thickThin"/></v:line><![endif]&ndash;&gt;-->
+    <!--    <![if !vml]><img width=546 height=7 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA84AAAAKAQMAAABfSpUkAAAAAXNSR0ICQMB9xQAAAAZQTFRFAAAA/wAAG/+NIgAAAAF0Uk5TAEDm2GYAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAAZdEVYdFNvZnR3YXJlAE1pY3Jvc29mdCBPZmZpY2V/7TVxAAAAG0lEQVQ4y2Ng/z9AoIFh1OpRq+lg9cgEIzLAARUnSJeh8eGSAAAAAElFTkSuQmCC">-->
+    <!--    <![endif]>-->
 
     <div class="doc_block">
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
@@ -328,16 +330,16 @@ AAAAAAAAAAAAACUEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAALQUAAAAA
         </table>
     </div>
 
-<!--    <div class="doc_block">-->
-<!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
-<!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
-<!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
-<!--    </div>-->
+    <!--    <div class="doc_block">-->
+    <!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
+    <!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
+    <!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
+    <!--    </div>-->
 
-<!--    <![if !vml]>-->
-<!--    <div style='mso-ignore:vglayout;'>-->
-<!--        <img width=649 height=6 src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_bottom_line.png" v:shapes="Line_x0020_25">-->
-<!--    </div>-->
-<!--    <![endif]>-->
+    <!--    <![if !vml]>-->
+    <!--    <div style='mso-ignore:vglayout;'>-->
+    <!--        <img width=649 height=6 src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_bottom_line.png" v:shapes="Line_x0020_25">-->
+    <!--    </div>-->
+    <!--    <![endif]>-->
 
 </div>

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html

@@ -170,7 +170,7 @@
 
     <div class="doc_block">
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
-        <p class=MsoNormal align=center style='text-align:center'><span class="doc_layout_subject" style='font-size:22.0pt; font-weight:bold;font-family:方正小标宋简体,serif;letter-spacing:normal'>文件标题</span></p>
+        <p class=MsoNormal align=center style='text-align:center'><span class="doc_layout_subject" style='font-size:22.0pt; font-weight:bold;font-family:宋体,serif;letter-spacing:normal'>文件标题</span></p>
         <P class=MsoNormal style='font-size:12.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
     </div>
 

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -831,21 +831,26 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
 	_copyFormJson: function(initial, final){
 		var data = final || {};
 		Object.keys(initial).each(function(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];
+			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];
 			}
+
 		}.bind(this));
 		return data;
 	},