|
|
@@ -1571,8 +1571,10 @@ const excelExportUtil = {
|
|
|
mergeBand[JV.PROP_TOP] = [];
|
|
|
mergeBand[JV.PROP_BOTTOM] = [];
|
|
|
newPagePos.push(mergeBand);
|
|
|
- mergeBand[JV.PROP_LEFT].push(pageDataArray[i][JV.BAND_PROP_MERGE_BAND][JV.PROP_LEFT]);
|
|
|
- mergeBand[JV.PROP_RIGHT].push(pageDataArray[i][JV.BAND_PROP_MERGE_BAND][JV.PROP_RIGHT]);
|
|
|
+ if (pageDataArray[i][JV.BAND_PROP_MERGE_BAND]) {
|
|
|
+ mergeBand[JV.PROP_LEFT].push(pageDataArray[i][JV.BAND_PROP_MERGE_BAND][JV.PROP_LEFT]);
|
|
|
+ mergeBand[JV.PROP_RIGHT].push(pageDataArray[i][JV.BAND_PROP_MERGE_BAND][JV.PROP_RIGHT]);
|
|
|
+ }
|
|
|
sheetNames.push(pageDataArray[i][JV.NODE_PAGE_INFO][JV.NODE_MAIN_INFO_RPT_NAME]);
|
|
|
|
|
|
// 加分页符(分页符要在外部处理好)-------------------
|
|
|
@@ -1615,7 +1617,7 @@ const excelExportUtil = {
|
|
|
mergeBand[JV.PROP_TOP].push(pos);
|
|
|
pos = pageDataArray[i].items[j][JV.PROP_PAGE_MERGE_BORDER][JV.PROP_BOTTOM] + offsetY;
|
|
|
mergeBand[JV.PROP_BOTTOM].push(pos);
|
|
|
- } else {
|
|
|
+ } else if (pageDataArray[i][JV.BAND_PROP_MERGE_BAND]) {
|
|
|
mergeBand[JV.PROP_TOP].push(pageDataArray[i][JV.BAND_PROP_MERGE_BAND][JV.PROP_TOP] + offsetY);
|
|
|
mergeBand[JV.PROP_BOTTOM].push(pageDataArray[i][JV.BAND_PROP_MERGE_BAND][JV.PROP_BOTTOM] + offsetY);
|
|
|
}
|
