unit test revise

modules/reports/util/rpt_excel_util.js

@@ -186,7 +186,9 @@ function writeStyles(stylesObj){
     }
     rst.push('</cellXfs>');
     //6. others (xfl style / dxfs / tableStyles)
-    //..
+    rst.push('<cellStyles count="1"><cellStyle name="常规" xfId="0" builtinId="0"/></cellStyles>');
+    rst.push('<dxfs count="0"/>');
+    rst.push('<tableStyles count="0" defaultTableStyle="TableStyleMedium9" defaultPivotStyle="PivotStyleLight16"/>');
     rst.push('</styleSheet>');
     return rst;
 }
@@ -205,11 +207,11 @@ function writeSharedString(sharedStrList){
 function writeSheets(pageData, sharedStrList, stylesObj){
     var rst = [];
     for (var i = 0; i < pageData.items.length; i++) {
-        rst.push(writeSheet(pageData.items[i], sharedStrList, stylesObj));
+        rst.push(writeSheet(pageData, pageData.items[i], sharedStrList, stylesObj));
     }
     return rst;
 }
-function writeSheet(sheetData, sharedStrList, stylesObj){
+function writeSheet(pageData, sheetData, sharedStrList, stylesObj){
     var rst = [], xPos = [], yPos = [], headerStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     xPos.push(0);
     yPos.push(0);
@@ -277,7 +279,7 @@ function writeSheet(sheetData, sharedStrList, stylesObj){
             stylesObj.fonts = [];
             //for (var i = 0; i < sheetData.font_collection)
         }
-        var sheetFont = sheetData.font_collection[cell.font];
+        var sheetFont = pageData.font_collection[cell.font];
         for (var i = 0; i < stylesObj.fonts.length; i++) {
             var font = stylesObj.fonts[i];
             if (sheetFont) {
@@ -341,7 +343,7 @@ function writeSheet(sheetData, sharedStrList, stylesObj){
         if (!(stylesObj.borders)) {
             stylesObj.borders = [];
         }
-        var sheetBorder = sheetData.style_collection[cell.style];
+        var sheetBorder = pageData.style_collection[cell.style];
         for (var i = 0; i < stylesObj.borders.length; i++) {
             var border = stylesObj.borders[i];
             if (private_checkBorder(border, sheetBorder)) {
@@ -392,7 +394,7 @@ function writeSheet(sheetData, sharedStrList, stylesObj){
         if (!(stylesObj.cellXfs)) stylesObj.cellXfs = [];
         var fontId = private_getFontId(cell);
         var borderId = private_getBorderId(cell);
-        var cellControl = sheetData[JV.NODE_CONTROL_COLLECTION][cell[JV.PROP_CONTROL]];
+        var cellControl = pageData[JV.NODE_CONTROL_COLLECTION][cell[JV.PROP_CONTROL]];
         for (var i = 0; i < stylesObj.cellXfs.length; i++) {
             var sheetControl = stylesObj.cellXfs[i];
             if (sheetControl.fontId == fontId && sheetControl.borderId == borderId) {

test/unit/excel_export/rpt_excel_export_test.js

@@ -44,7 +44,7 @@ test('check excel output', function(t){
     t.pass('pass shared string');
 
     var styleStr = rpt_xl_util.testWriteStyles(stylesObj);
-    fsUtil.writeArrayToFile(sharedStr, '../../../tmp/styles.xml');
+    fsUtil.writeArrayToFile(styleStr, '../../../tmp/styles.xml');
     t.pass('pass styles');
 
     var theme = rpt_xl_util.testWriteTheme();

tmp/07_1.page.js

@@ -1,4 +1,5 @@
-var testReport07_1 = {
+var
+	testReport07_1 = {
 	"control_collection": {
 		"Default": {
 			"Shrink": "T",

tmp/excel_test_raw_data/08-2/xl/styles.xml

@@ -199,9 +199,7 @@
 			<protection locked="0"/>
 		</xf>
 	</cellXfs>
-	<cellStyles count="1">
-		<cellStyle name="常规" xfId="0" builtinId="0"/>
-	</cellStyles>
+	<cellStyles count="1"><cellStyle name="常规" xfId="0" builtinId="0"/></cellStyles>
 	<dxfs count="0"/>
 	<tableStyles count="0" defaultTableStyle="TableStyleMedium9" defaultPivotStyle="PivotStyleLight16"/>
 </styleSheet>