Merge branch 'feature/Process.log_expand_handwring' into 'develop'

Merge of feature/Process.log_expand_handwring to develop

See merge request o2oa/o2oa!132

o2web/source/x_component_process_FormDesigner/Module/Log/log.html

@@ -56,6 +56,12 @@
 
 		<table id="text{$.pid}handwritingSize" style=""
 			   width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+			<tr>
+				<td class="editTableValue"><b>展开手写意见:</b>
+					<input class="editTableRadio" name="handwritingExpanded" text{($.handwritingExpanded)?'checked':''} type="radio" value="true"/>是
+					<input class="editTableRadio" name="handwritingExpanded" text{(!$.handwritingExpanded)?'checked':''} type="radio" value="false"/>否
+				</td>
+			</tr>
 			<tr>
 				<td class="editTableValue"><b>手写意见宽度:</b>
 					<input type="text" name="handwritingWidth" value="text{$.handwritingWidth}" class="editTableInputNoWidth" style="width: 50px;;margin-right:5px;" />px

o2web/source/x_component_process_Xform/Log.js

@@ -1044,7 +1044,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class({
                         imgNode.setStyles(size);
                     }else{
                         var x = Math.min(nw, width);
-                        img.setStyles({"width": ""+ x +"px"}); //���յĿ��
+                        img.setStyles({"width": ""+ x +"px"});
                         imgNode.setStyles({"width": ""+ x +"px"});
                     }
                 }.bind(this)
@@ -1550,7 +1550,9 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class({
         atts.each(function(att){
             if (!att.type) att.type = "image";
             if (att.type.indexOf("image")!==-1){
-                if( type === "table" && !layout.mobile ){
+                if( this.json.handwritingExpanded ){
+                    this.loadMediaOpinion_image_show(att, null, node, true)
+                }else if( type === "table" && !layout.mobile ){
                     this.loadMediaOpinion_image_tooltip(att, node);
                 }else{
                     this.loadMediaOpinion_image(att, node);
@@ -1559,8 +1561,10 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class({
                 this.loadMediaOpinion_video(att, node);
             }else if(att.type.indexOf("audio")!==-1){
                 this.loadMediaOpinion_voice(att, node);
-            }else{
-                if( type === "table" && !layout.mobile ){
+            }else {
+                if (this.json.handwritingExpanded){
+                    this.loadMediaOpinion_image_show(att, null, node, true)
+                }else if( type === "table" && !layout.mobile ){
                     this.loadMediaOpinion_image_tooltip(att, node);
                 }else{
                     this.loadMediaOpinion_image(att, node);
@@ -1651,7 +1655,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class({
 
                 var img = new Element("img", {
                     "src": url,
-                    "styles" : { width : width+"px" }, //�ʼ�޶�һ�¿�ȣ���Ҫ��ҳ�涶��
+                    "styles" : { width : width+"px" },
                     "events" : {
                         load : function(ev){
                             var nh = ev.target.naturalHeight;
@@ -1662,7 +1666,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class({
                                 imgNode.setStyles(size);
                             }else{
                                 var x = Math.min(nw, width);
-                                img.setStyles({"width": ""+ x +"px"}); //���յĿ��
+                                img.setStyles({"width": ""+ x +"px"});
                                 imgNode.setStyles({"width": ""+ x +"px"});
                             }
                         }.bind(this)