|
@@ -444,13 +444,14 @@ let rptArchiveObj = {
|
|
|
let psInfo = [], psInfoStr = [];
|
|
|
let offsetX = 0, offsetY = 0; //这个跟导出pdf一致,以防万一有变化
|
|
|
let controls = pageData[JV.NODE_CONTROL_COLLECTION];
|
|
|
+ let ptChkHeight = A4_PIXEL_HEIGHT;
|
|
|
const _getAreasProperty = (srcArea) => {
|
|
|
const width = (srcArea[JV.IDX_RIGHT] - srcArea[JV.IDX_LEFT]);
|
|
|
const height = (srcArea[JV.IDX_BOTTOM] - srcArea[JV.IDX_TOP]);
|
|
|
let rst = {
|
|
|
Left: srcArea[JV.IDX_LEFT] + offsetX, Top: srcArea[JV.IDX_TOP] + offsetY, width, height,
|
|
|
PtCenterX: +((srcArea[JV.IDX_LEFT] + offsetX + width / 2) * PDF_SCALE).toFixed(2),
|
|
|
- PtCenterY: +((A4_PIXEL_HEIGHT - (srcArea[JV.IDX_TOP] + offsetX + height / 2)) * PDF_SCALE).toFixed(2),
|
|
|
+ PtCenterY: +((ptChkHeight - (srcArea[JV.IDX_TOP] + offsetX + height / 2)) * PDF_SCALE).toFixed(2),
|
|
|
PtWidth: +(width * PDF_SCALE).toFixed(2), PtHeight: +(height * PDF_SCALE).toFixed(2),
|
|
|
pages: []
|
|
|
};
|
|
@@ -550,6 +551,15 @@ let rptArchiveObj = {
|
|
|
};
|
|
|
for(let i = 0; i < pageData.items.length; i++) {
|
|
|
let page = pageData.items[i];
|
|
|
+ if (i === 0) {
|
|
|
+ let maxX = 0;
|
|
|
+ let maxY = 0;
|
|
|
+ page.cells.forEach(cell => {
|
|
|
+ if (cell.area.Right > maxX) maxX = cell.area.Right;
|
|
|
+ if (cell.area.Bottom > maxY) maxY = cell.area.Bottom;
|
|
|
+ });
|
|
|
+ if (maxX > maxY) ptChkHeight = A4_PIXEL_WIDTH;
|
|
|
+ }
|
|
|
for (let sCell of page.signature_cells) {
|
|
|
// sCell.signature_name 草图不用加密
|
|
|
if (sCell.signature_name.indexOf('dummy_pic') < 0) {
|