浏览代码

预览时坐标旋转基准坐标判断补漏(+签名cells)

TonyKang 5 年之前
父节点
当前提交
126220336f
共有 1 个文件被更改,包括 15 次插入5 次删除
  1. 15 5
      app/public/report/js/rpt_preview_common.js

+ 15 - 5
app/public/report/js/rpt_preview_common.js

@@ -82,11 +82,9 @@ function showPreviewData(svgArr, actAreaArr, scaleFactor, pageSize, orientation,
     }
 }
 
-function getActualArea(pageData) {
-    let rst = [];
-    for (let item of pageData.items) {
-        let area = {Left: 10000, Right: 0, Top: 10000, Bottom: 0};
-        for (let cell of item.cells) {
+function _chkActArea(area, cells) {
+    if (cells && cells.length > 0) {
+        for (let cell of cells) {
             if (cell.area.Left < area.Left) {
                 area.Left = cell.area.Left;
             }
@@ -100,6 +98,18 @@ function getActualArea(pageData) {
                 area.Bottom = cell.area.Bottom;
             }
         }
+    }
+}
+
+function getActualArea(pageData) {
+    let rst = [];
+
+    for (let item of pageData.items) {
+        let area = {Left: 10000, Right: 0, Top: 10000, Bottom: 0};
+        _chkActArea(area, item.cells);
+        _chkActArea(area, item.signature_cells);
+        _chkActArea(area, item.signature_date_cells);
+        _chkActArea(area, item.signature_audit_cells);
         rst.push(area);
     }
     return rst;