no message

src/excelCmd.js

@@ -11,6 +11,13 @@ let typeEnum = {
     "双轴多柱状数据":1,
 }
 
+function changeDataName(str) {
+    let result = str.replace(/[()""“”（）]/, "_");
+    for (let i =0; i < 10; i++) {
+        result = result.replace(/[()""“”（）]/, "_");
+    }
+    return result;
+}
 
 let createBizAndDataConfigMap = {
     // "page1": {
@@ -49,7 +56,7 @@ function createConfig() {
             let pageName = valueList[0];
             let sheetName = valueList[1];
             let type = valueList[2];
-            let dataName = valueList[3];
+            let dataName = changeDataName(valueList[3]);
             let title = valueList[4];
             let unit = valueList[5];
             let total = valueList[6];
@@ -156,23 +163,24 @@ function getBizStr(apiList, sheetName) {
         let ${dataName}DataAndUnit = objKeyReplace(excelData.${dataName});`;
             if (unit == 'inData') {
                 subStr += `
-        ret["${apiName}"] =  getKeyValue("${dataName}", ${dataName}DataAndUnit.dataMap, ${dataName}DataAndUnit.unitMap, ${total}, ${percent} )`;
+        ret["${apiName}"] =  getKeyValue("${dataName}", ${dataName}DataAndUnit.dataMap, ${dataName}DataAndUnit.unitMap, ${total}, ${percent} );`;
             } else {
                 subStr += `
-        ret["${apiName}"] =  getKeyValue("${dataName}", ${dataName}DataAndUnit.dataMap, ${typeof unit == 'boolean' ? unit : `'${unit}'`}, ${total}, ${percent} )`;
+        ret["${apiName}"] =  getKeyValue("${dataName}", ${dataName}DataAndUnit.dataMap, ${typeof unit == 'boolean' ? unit : `'${unit}'`}, ${total}, ${percent} );`;
             }
             break;
             case "柱状数据": 
+                let chartUnit = typeof unit == 'boolean' ? unit : `'${unit}'`;
                 subStr = `
-        ret["${apiName}"] = getChartData("${dataName}", excelData.${dataName}, '${unit}', ${percent} )`; 
+        ret["${apiName}"] = getChartData("${dataName}", excelData.${dataName}, ${chartUnit}, ${percent} );`; 
             break;
             case "列表数据": 
                 subStr = `
-        ret["${apiName}"] = getListData("${dataName}",excelData.${dataName},${titleList},${titleValueObj})`; 
+        ret["${apiName}"] = getListData("${dataName}",excelData.${dataName},${titleList},${titleValueObj});`; 
             break;
             case "单轴多柱状数据": 
             subStr = `
-        ret["${apiName}"] = getSingleYAndMoreData("${dataName}", excelData.${dataName}, ${percent}, '${unit}')`; 
+        ret["${apiName}"] = getSingleYAndMoreData("${dataName}", excelData.${dataName}, ${percent}, '${unit}');`; 
             break; 
             case "双轴多柱状数据": 
             subStr = `
@@ -202,24 +210,21 @@ function createRouter() {
 
     for (let pageName in createBizAndDataConfigMap) {
         importName+=`
-    import * as ${pageName}Biz from '../biz/${pageName}';
-        `;
+import * as ${pageName}Biz from '../biz/${pageName}';`;
         routergetName+=`
-    httpServer.get('/${pageName}', asyncHandler(${pageName}Biz.getData));
-        `;
+    httpServer.get('/${pageName}', asyncHandler(${pageName}Biz.getData));`;
         routerpostName+=`
-    httpServer.post('/${pageName}', asyncHandler(${pageName}Biz.getData));
-        `;
+    httpServer.post('/${pageName}', asyncHandler(${pageName}Biz.getData));`;
     }
 
     let str=`
-    import * as asyncHandler from 'express-async-handler'
-    ${importName}
+import * as asyncHandler from 'express-async-handler'
+${importName}
 
-    export function setRouter(httpServer){
+export function setRouter(httpServer){
         ${routergetName}
         ${routerpostName}
-    }`;
+}`;
 
     let path = `./routers/router.ts`;
     fs.access(path, (err) => {

src/util/tools.ts

@@ -87,7 +87,18 @@ function separateDataAndUint(str) {
 }
 
 //object key替换 带单位
-export function objKeyReplace(object, keyInfo = {}) {
+export function objKeyReplace(object, keyInfo = {}, isString = true) {
+    if (isString) {
+        //校验字符
+        for (let key in object) {
+            if (!object[key]) object[key] = '';
+        }
+    } else {
+         //校验数字
+         for (let key in object) {
+            if (!object[key]) object[key] = '0';
+        }
+    }
     let unitMap = {};
     let dataMap = {};
     for(let key in object) {
@@ -288,3 +299,9 @@ export function getAgeByBirthday(birthday:string) {
     else if (age > 50) return "50岁以上";
     else return '其他';
 }
+
+export function analysisAddOrRMData(str) {
+    let checkStr = str.replace(/增加/, "+");
+    let result = checkStr.replace(/减少/, "-");
+    return result;
+}
\ No newline at end of file