doomiwork 4.0.8 → 4.1.1

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 
@@ -217,11 +227,11 @@ class controller {
     /*
     * 获取详细记录的方法
     */
-    async getDataById(req, dataKey, sqlCommand) {
+    async getDataById(req, dataKey, sqlCommand,idValue) {
         if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s 详细数据",dataKey)
         const detailinfo = getDetailInfo(req, dataKey);
         if (!detailinfo) return { successed: false, errcode: -10, errmsg: `缺失${dataKey}对应的详情配置` };
-        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.getByIdSql(), req.params.id, "detail", this);
+        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.getByIdSql(), idValue ||req.params.id, "detail", this);
         ////如果返回Null,则表示不加载数据了
         if (beforeData.canceled===true) return { successed: false, errorcode: 1, errormessage: "操作已取消" };
         /////处理SQL中的一些定义符

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.8",
+  "version": "4.1.1",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {

package/utilities/excelutility.js

@@ -48,7 +48,7 @@ class ExcelUtility {
         let _saveDir = path.dirname(fileName);
         ///创建本地文件夹
         if (!this.mkdirsSync(_saveDir)) return { success: false, errorcode: 1, errmessage: 'create folder failed!' };
-        const buffer = xlsx.build([{ name: workSheetName, data: data }]);
+        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 })
@@ -65,7 +65,7 @@ class ExcelUtility {
         let setting = exportConfig ? _instance.excelConfig[exportConfig] : null;
         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 };
@@ -102,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 

package/utilities/requestparser.js

@@ -108,7 +108,7 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
     // 防止页面数据传入非数字
     if (!page || isNaN(page)) page = 1
     ///最大允许获取100条数据
-    pageSize = Math.min(pageSize, 100);
+    pageSize = Math.min(pageSize, 10000);
     ///拼接排序的语句
     if (order && sort && ORDER_STRING.includes(order.toLowerCase())) sort = sort + ' ' + order
     //req.order =req.sort? utility.ifNull((req.body.order || req.query.order), ""):'';