Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

Dockerfile

@@ -0,0 +1,11 @@
+FROM node:12
+
+WORKDIR /home
+
+COPY . .
+
+RUN npm install --registery=https://registery.npm.taobao.org
+
+EXPOSE 7005
+
+CMD ["npm", "run", "dev-docker"]

app/public/report/js/rpt_preview_common.js

@@ -82,7 +82,7 @@ function showPreviewData(svgArr, actAreaArr, scaleFactor, pageSize, orientation,
         }
         // let div = $('<div class="pageBreak"></div>');
         let div = $(`<div class="pageBreak" style="${paddingStr}"></div>`);
-        div.append($(svgArr[i].join("")));
+        div.append($(svgArr[i].join(" ")));
         $(div).find("svg").each(function(cIdx,elementSvg){
             elementSvg.setAttribute('height', pageHeight - offsetHeight);
             elementSvg.setAttribute('width', pageWidth - offsetWidth);

app/public/report/js/rpt_print.js

@@ -352,6 +352,11 @@ function getProperSignatureArea(cell, control, offsetX, offsetY) {
     return rst;
 }
 
+function strReplaceAll(targetStr, FindText, RepText) {
+    let regExp = new RegExp(FindText, "gm");
+    return targetStr.replace(regExp, RepText);
+}
+
 function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY, canvas, isHtoV, HtoVStr) {
     let orgFontHeight = parseInt(font[JV.FONT_PROPS[JV.FONT_PROP_IDX_HEIGHT]]);
     let fontWeight = (font[JV.FONT_PROPS[JV.FONT_PROP_IDX_BOLD]] === 'T')?"bold":"normal";
@@ -367,6 +372,9 @@ function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY, canv
     let value = cell[JV.PROP_VALUE];
     if (value === undefined || value === null) {
         value = "";
+    } else if (typeof value === 'string') {
+        //注意：要把 < 符号转义 -> &lt; 否则svg会有错乱
+        value = strReplaceAll(value, '<', '&lt;');
     }
     let values = null;
     if (typeof value === "string") {

package.json

@@ -78,7 +78,7 @@
         "test-local": "set EGG_SERVER_ENV=local&& egg-bin test",
         "test-qa": "set EGG_SERVER_ENV=qa&&egg-bin test",
         "test-auto": "set EGG_SERVER_ENV=autotest&&egg-bin test",
-        "dev-docker": "egg-scripts start --port 7005",
+        "dev-docker": "egg-scripts start --env=local --port 7005",
         "cov": "egg-bin cov",
         "lint": "eslint .",
         "ci": "npm run lint && npm run cov",