Преглед на файлове

打印时autoheight的style有隐藏bug

TonyKang преди 5 години
родител
ревизия
b4e582d4fa
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      test/unit/reports/test_rpt_test_template.js
  2. 1 1
      web/building_saas/report/js/rpt_print.js

+ 2 - 2
test/unit/reports/test_rpt_test_template.js

@@ -72,7 +72,7 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 22032; //
+demoPrjId = 11355; //
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;
@@ -117,7 +117,7 @@ test('测试 - 测试模板啦: ', function (t) {
                     let dt = new Date();
                     fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_" + dt.getTime() + "_测试模板.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
-                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
+                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_" + dt.getTime() + "测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_测试模板.jsp");
                     //it's time to build the report!!!
                     let printCom = JpcEx.createNew();

+ 1 - 1
web/building_saas/report/js/rpt_print.js

@@ -88,7 +88,7 @@ let rptPrintHelper = {
 
 function getActualBorderStyle(cell, styles, mergeBorderStyle, pageBorderArea, borderStr) {
     let rst = styles[cell[JV.PROP_STYLE]][borderStr];
-    if (parseFloat(rst[JV.PROP_LINE_WEIGHT]) === 1) {
+    if (rst && parseFloat(rst[JV.PROP_LINE_WEIGHT]) === 1) {
         rst[JV.PROP_LINE_WEIGHT] = 0.5;
     }
     if (mergeBorderStyle) {