doomiwork 4.0.7 → 4.1.0

package/core/controller.js

@@ -54,6 +54,16 @@ class controller {
         let excelResult = await exportUtility.recordset2ExcelFile(data,excelkey, this.beforeExportExcel)
         return excelResult;
     }
+    /**
+    * 导出数据到Excel的多个workseet中
+    * @param {*} data 
+    * @param {*} excelkey 
+    */
+    async export2MutlisheetExcel(datainfo) {
+        if (!Array.isArray(datainfo) || datainfo.length == 0) return {successed:false};
+        let excelResult = await exportUtility.recordset2MutlisheetExcelFile(datainfo, this.beforeExportExcel)
+        return excelResult;
+    }
     /**
      * 写入Excel数据
      * @param {*} data 

package/index.js

@@ -4,6 +4,7 @@ exports = module.exports = {
   model: require('./core/database/daoBase'),
   appsetting:require('./configuration/appsetting'),
   actionresult:require('./core/actionresult'),
+  excelutility:require('./utilities/excelutility'),
   tokenHelper:require('./utilities/tokenutility'),
   constants:require('./core/enumconst'),
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "4.0.7",
+  "version": "4.1.0",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {

package/utilities/excelutility.js

@@ -35,7 +35,7 @@ class ExcelUtility {
         });
         fReadStream = fs.createReadStream(buffer);
         fReadStream.on("data", (chunk) => res.write(chunk, "binary"));
-        fReadStream.on("end", function () {
+        fReadStream.on("end", () => {
             res.end();
         });
     }
@@ -43,23 +43,17 @@ class ExcelUtility {
     async writeExcel(data, workSheetName) {
         let sheetName = 'sheet1';
         if (workSheetName == null) sheetName = workSheetName;
-        try {
-            let randomFile = uuid.v4() + '.xlsx';
-            let fileName = path.resolve(this.exportFolder, randomFile);
-            let _saveDir = path.dirname(fileName);
-            ///创建本地文件夹
-            if (!fs.existsSync(_saveDir)) {
-                if (!this.mkdirsSync(_saveDir)) {
-                    return { success: false, errorcode: 1, errmessage: 'create folder failed!' };
-                }
-            };
-            const buffer = xlsx.build([{ name: workSheetName, data: data }]);
-            fs.writeFileSync(fileName, buffer, { 'flag': 'w' });
-            return { successed: true, fileName: randomFile };
-        }
-        catch (err) {
-            return { successed: false, errorcode: 1, errmessage: err };
-        }
+        let randomFile = uuid.v4() + '.xlsx';
+        let fileName = path.resolve(this.exportFolder, randomFile);
+        let _saveDir = path.dirname(fileName);
+        ///创建本地文件夹
+        if (!this.mkdirsSync(_saveDir)) return { success: false, errorcode: 1, errmessage: 'create folder failed!' };
+        const buffer = xlsx.build([{ name: sheetName, data: data }]);
+        return new Promise(reslove => {
+            return fs.writeFile(fileName, buffer, (err) => {
+                return reslove({ successed: !err, errmessage: err, fileName:randomFile })
+            })
+        })
     }
     ///导出记录集到Excel，写入
     ///dataRow :记录集
@@ -69,9 +63,9 @@ class ExcelUtility {
         let _instance = this;
         //var setting = exportConfig ? excelConfig[exportConfig] : null;
         let setting = exportConfig ? _instance.excelConfig[exportConfig] : null;
-        let dataBuffer = [],worksheetName = "sheet1", fieldKey = [], titleRow = [];
+        let dataBuffer = [], worksheetName = "sheet1", fieldKey = [], titleRow = [];
         if (setting != null) {
-            worksheetName = setting.worksheet == null ? "sheet1" : setting.worksheet;
+            worksheetName = setting.worksheet ?? "sheet1"; //== null ? "sheet1" : setting.worksheet;
             ////第一行导出标题行
             setting.columns.forEach((field) => {
                 var dataOption = { type: 'title', config: exportConfig, title: field.title, field: field.name };
@@ -108,6 +102,75 @@ class ExcelUtility {
         return result;
     }
 
+    ///写Excel文件
+    async writeMutlisheetExcel(sheetinfo) {
+        //let sheetName = 'sheet1';
+        //if (workSheetName == null) sheetName = workSheetName;
+        let randomFile = uuid.v4() + '.xlsx';
+        let fileName = path.resolve(this.exportFolder, randomFile);
+        let _saveDir = path.dirname(fileName);
+        ///创建本地文件夹
+        if (!this.mkdirsSync(_saveDir)) return { success: false, errorcode: 1, errmessage: 'create folder failed!' };
+        const buffer = xlsx.build(sheetinfo);// ([{ name: sheetName, data: data }]);
+        return new Promise(reslove => {
+            return fs.writeFile(fileName, buffer, (err) => {
+                return reslove({ successed: !err, errmessage: err, fileName: randomFile })
+            })
+        })
+    }
+    /**
+     * 导出记录集到Excel的多个worksheet中
+     * @param {*} dataRow 
+     * @param {*} exportConfig 
+     * @param {*} readyDataFunc 
+     * @returns 
+     */
+    async recordset2MutlisheetExcelFile(sheetsInfo, readyDataFunc) {
+        let _instance = this;
+        let sheetinfo = [];
+        for (const { data: dataRow, mapping: exportConfig } of sheetsInfo){
+            let setting = exportConfig ? _instance.excelConfig[exportConfig] : null;
+            let dataBuffer = [], worksheetName = "sheet1", fieldKey = [], titleRow = [];
+            if (setting != null) {
+                worksheetName = setting.worksheet == null ? "sheet1" : setting.worksheet;
+                ////第一行导出标题行
+                setting.columns.forEach((field) => {
+                    var dataOption = { type: 'title', config: exportConfig, title: field.title, field: field.name };
+                    if (readyDataFunc != null && typeof (readyDataFunc) == "function")
+                        dataOption = readyDataFunc(dataOption)
+                    titleRow.push(dataOption.title);
+                    fieldKey.push(dataOption.field);
+                });
+            }
+            else if (dataRow.length > 0) {
+                var firstRow = dataRow[0];
+                Object.keys(firstRow).forEach(key => {
+                    var dataOption = { type: 'title', config: null, title: key, field: key };
+                    if (readyDataFunc != null && typeof (readyDataFunc) == "function")
+                        dataOption = readyDataFunc(dataOption)
+                    titleRow.push(dataOption.title);
+                    fieldKey.push(dataOption.field);
+                });
+            }
+            if (titleRow.length > 0) {
+                dataBuffer.push(titleRow);
+                dataRow.forEach((rowItem) => {
+                    var dataRow = [];
+                    fieldKey.forEach((field) => {
+                        var dataOption = { type: 'data', config: exportConfig, field: field, data: rowItem, value: rowItem[field] };
+                        if (readyDataFunc != null && typeof (readyDataFunc) == "function")
+                            dataOption = readyDataFunc(dataOption)
+                        dataRow.push(dataOption.value);
+                    });
+                    dataBuffer.push(dataRow);
+                })
+            }
+            sheetinfo.push({ name: worksheetName, data: dataBuffer });
+        }
+        const result = await _instance.writeMutlisheetExcel(sheetinfo);
+        return result;
+    }
+
     /**
      * 递归创建多级目录
      * @param {*} dirpath 
@@ -116,8 +179,8 @@ class ExcelUtility {
      */
     mkdirsSync(dirpath, mode) {
         if (!fs.existsSync(dirpath)) {
-            var pathtmp;
-            var splitPath = dirpath.split(path.sep);
+            let pathtmp;
+            const splitPath = dirpath.split(path.sep);
             for (var nLoop = 0; nLoop < splitPath.length; nLoop++) {
                 var dirname = splitPath[nLoop];
                 if (dirname.length == 0) {