doomiwork 4.0.6 → 4.0.8

package/core/controller.js

@@ -219,7 +219,7 @@ class controller {
     */
     async getDataById(req, dataKey, sqlCommand) {
         if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s 详细数据",dataKey)
-        const detailinfo = getDetailInfo(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);
         ////如果返回Null,则表示不加载数据了
@@ -255,7 +255,7 @@ class controller {
         let detailinfo, resultItem = { successed: true, data: req.body };
         ///是否需要将data中的key-value值到配置文件中进行转换
         if (mapping == true) {
-            detailinfo = getDetailInfo(dataKey);
+            detailinfo = getDetailInfo(req, dataKey);
             if (!detailinfo) return { successed: false, errcode: -10, errmsg: `缺失${dataKey}对应的详情配置` };
             resultItem = View2Data(req, detailinfo.fields, "create");
             ///如果转换的验证过程中出现错误，则返回
@@ -307,7 +307,7 @@ class controller {
         let detailinfo, resultItem = { successed: true, data: req.body };
         ///是否需要将data中的key-value值到配置文件中进行转换
         if (mapping == true) {
-            detailinfo = getDetailInfo(dataKey);
+            detailinfo = getDetailInfo(req, dataKey);
             if (!detailinfo) return { successed: false, errcode: -10, errmsg: `缺失${dataKey}对应的详情配置` };
             ///从Request中获取到用户提交的数据
             resultItem = View2Data(req, detailinfo.fields, "update");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "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: workSheetName, data: data }]);
+        return new Promise(reslove => {
+            return fs.writeFile(fileName, buffer, (err) => {
+                return reslove({ successed: !err, errmessage: err, fileName:randomFile })
+            })
+        })
     }
     ///导出记录集到Excel，写入
     ///dataRow :记录集
@@ -69,7 +63,7 @@ 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;
             ////第一行导出标题行
@@ -116,8 +110,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) {

package/utilities/requestparser.js

@@ -149,10 +149,11 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
 * 详细页面请求上下文中获取需要的信息
 * 如Page ,PageSize , Sort 等等
 */
-module.exports.getDetailInfo = (dataKey) => {
+module.exports.getDetailInfo = (req,dataKey) => {
     if (dataKey) {
         const dataConfig = dataconfig.getConfig(dataKey);
         if (dataConfig && dataConfig.detail) {
+            req.dataConfig = dataConfig;
             const { primary, field: fields, primaryIsAutoIncrease } = dataConfig.detail;
             return { primary, fields, autoincrease: primaryIsAutoIncrease }
         }