Merge remote-tracking branch 'origin/master'

gulpfile.js

@@ -186,7 +186,7 @@ function css(options) {
     if(options.csspaths){
         return gulp.src(options.csspaths)
             .pipe($.plumber())
-            .pipe($.cssnano())
+            .pipe($.cssnano({reduceIdents: false}))
             .pipe($.concat(options.concatName+"."+version+".css"))
             .pipe(gulp.dest(cssDest));
     }

web/building_saas/report/js/rpt_jspdf.js

@@ -32,8 +32,8 @@ let JpcJsPDFHelper = {
     },
     outputAsPdf: function (pageData, paperSize, pdfName) {
         let me = this;
-        let offsetX= 10;
-        let offsetY=10;
+        let offsetX= 0;
+        let offsetY= 0;
         let newName = pdfName;
         let pageObj = pageData;
         let paperSizeIdx = JV.PAGES_SIZE_STR.indexOf(paperSize);

web/building_saas/report/js/rpt_print.js

@@ -89,6 +89,9 @@ 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) {
+        rst[JV.PROP_LINE_WEIGHT] = 0.5;
+    }
     if (mergeBorderStyle) {
         if (parseFloat(cell[JV.PROP_AREA][borderStr]) === parseFloat(pageBorderArea[borderStr])) {
             if (borderStr === JV.PROP_LEFT || borderStr === JV.PROP_RIGHT) {