| 
					
				 | 
			
			
				@@ -15,22 +15,21 @@ let rptPrintHelper = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             sessionStorage.currentPageData = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    print: function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     buildSvgArr: function (pagesData, offsetX, offsetY) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let me = this; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let styles = pagesData[JV.NODE_STYLE_COLLECTION], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             fonts = pagesData[JV.NODE_FONT_COLLECTION], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             controls = pagesData[JV.NODE_CONTROL_COLLECTION] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let rst = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let canvas = document.getElementById("chkCanvas"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (let idx = 0; idx < pagesData.items.length; idx++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             let page = pagesData.items[idx]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             let svgPageArr = [], pixelSize = getPixelSize(pagesData); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             svgPageArr.push("<svg width='" + pixelSize[0] + "' height='" + pixelSize[1] + "'>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             let adjustY = 0.5 * ((idx + 1) % 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (let cell of page.cells) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                svgPageArr.push(buildCellSvg(cell, fonts, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND], offsetX, offsetY, adjustY)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                svgPageArr.push(buildCellSvg(cell, fonts, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND], offsetX, offsetY, adjustY, canvas)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             svgPageArr.push("</svg>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             rst.push(svgPageArr); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -59,7 +58,7 @@ function getActualBorderStyle(cell, styles, mergeBorderStyle, pageBorderArea, bo 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return rst; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-function buildCellSvg(cell, fonts, styles, controls, pageMergeBorder, rptMergeBorder, offsetX, offsetY, adjustY) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+function buildCellSvg(cell, fonts, styles, controls, pageMergeBorder, rptMergeBorder, offsetX, offsetY, adjustY, canvas) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let rst = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let style = styles[cell[JV.PROP_STYLE]]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let mergeBandStyle = null; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -105,14 +104,15 @@ function buildCellSvg(cell, fonts, styles, controls, pageMergeBorder, rptMergeBo 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "' style='stroke:rgb(0,0,0);stroke-width:" + bottomBS[JV.PROP_LINE_WEIGHT] +"'/>") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    buildText(rst, cell, font, controls[cell[JV.PROP_CONTROL]], offsetX, offsetY, adjustY); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    buildText(rst, cell, font, controls[cell[JV.PROP_CONTROL]], offsetX, offsetY, adjustY, canvas); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return rst.join(""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    let fontsize = Math.round(parseInt(font[JV.FONT_PROPS[JV.FONT_PROP_IDX_HEIGHT]]) * 3 / 4); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY, canvas) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let orgFontHeight = parseInt(font[JV.FONT_PROPS[JV.FONT_PROP_IDX_HEIGHT]]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let fontWeight = (font[JV.FONT_PROPS[JV.FONT_PROP_IDX_BOLD]] === 'T')?"bold":"normal"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let fontStyle = (font[JV.FONT_PROPS[JV.FONT_PROP_IDX_ITALIC]] === 'T')?"italic":"normal"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     let left = parseInt(cell[JV.PROP_AREA][JV.PROP_LEFT]) + offsetX + 0.5, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         right = parseInt(cell[JV.PROP_AREA][JV.PROP_RIGHT]) + offsetX + 0.5, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         top = parseInt(cell[JV.PROP_AREA][JV.PROP_TOP]) + offsetY + adjustY, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -143,14 +143,27 @@ function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             x = Math.round((left + right) / 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    for (let i = 0; i < values.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    for (let vidx = 0; vidx < values.length; vidx++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //check whether need to adjust the font size 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let ctx = canvas.getContext("2d"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let dftFontHeight = orgFontHeight; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ctx.font = ((font[JV.FONT_PROPS[JV.FONT_PROP_IDX_BOLD]] === 'T')?"bold ":"") + ((font[JV.FONT_PROPS[JV.FONT_PROP_IDX_ITALIC]] === 'T')?"italic":"") + dftFontHeight + "px " + font[JV.PROP_NAME]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        while ((right - left) <= ctx.measureText(values[vidx]).width) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (dftFontHeight > 6) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                dftFontHeight--; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ctx.font = ((font[JV.FONT_PROPS[JV.FONT_PROP_IDX_BOLD]] === 'T')?"bold ":"") + ((font[JV.FONT_PROPS[JV.FONT_PROP_IDX_ITALIC]] === 'T')?"italic":"") + dftFontHeight + "px " + font[JV.PROP_NAME]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                break; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        dftFontHeight = (dftFontHeight * 3 / 4); //SVG的字体与canvas的字体大小的切换, 不用考虑取整 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (control) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "top") { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                y = Math.round((top + i * stepHeight) + JV.OUTPUT_OFFSET[JV.OFFSET_IDX_TOP]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                y = Math.round((top + vidx * stepHeight) + JV.OUTPUT_OFFSET[JV.OFFSET_IDX_TOP]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "bottom") { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                y = Math.round((top + (i + 1) * stepHeight) - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                y = Math.round((top + (vidx + 1) * stepHeight) - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "center") { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                y = Math.round(((top + i * stepHeight) + (top + (i + 1) * stepHeight) + fontsize) / 2 ); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                y = Math.round(((top + vidx * stepHeight) + (top + (vidx + 1) * stepHeight) + dftFontHeight) / 2 ); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (font[JV.PROP_NAME] === "宋体") { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -158,8 +171,9 @@ function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         destRst.push("<text style='fill:black;font-family:" + font[JV.PROP_NAME] + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ";font-weight:" + fontWeight + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ";font-size:" + fontsize + "pt' x='" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            x +"' y='" + y + "' text-anchor='" + text_anchor + "'>" + values[i] + "</text>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ";font-style:" + fontStyle + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ";font-size:" + dftFontHeight + "pt' x='" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            x +"' y='" + y + "' text-anchor='" + text_anchor + "' xml:space='preserve'>" + values[vidx] + "</text>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |