zet-lib 1.2.34 → 1.2.36

package/lib/zAppRouter.js

@@ -18,6 +18,7 @@ const io = require('./io')
 const Mail = require('./Mail')
 const zCache = require('./zCache')
 const pm2 = require('pm2')
+const zFunction = require('./zFunction')
 
 /*
  ajax Post

package/lib/zRoute.js

@@ -1382,9 +1382,9 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
       let t
       if (field == 'company_id') {
         t = !callback(result, field) ? result.company_id : callback(result, field)
-      } else if (field == 'created_at' || field == 'created_at') {
-        t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
-      } else if (field == 'updated_at' || field == 'updated_at') {
+      } else if (field == 'created_at' || field == 'updated_at') {
+        worksheet.getCell(sequence[i] + start).numFmt = '@'
+        result[field] = Util.dateOriginal(result[field])
         t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
       } else if (Util.in_array(field, ['created_by', 'updated_by'])) {
         if (isRaws) {
@@ -1420,12 +1420,16 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
             t = !callback(result, field) ? (Object.hasOwn(tableObj[field], result[field]) ? tableObj[field][result[field]] : result[field]) : callback(result, field)
           }
         } else if (widgets.hasOwnProperty(field) && widgets[field].name == 'datetime') {
+          result[field] = Util.dateOriginal(result[field])
+          worksheet.getCell(sequence[i] + start).numFmt = '@'
+          //console.log(result[field])
           if (isRaws) {
             t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
           } else {
             t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
           }
         } else if (widgets.hasOwnProperty(field) && widgets[field].name == 'datepicker') {
+          worksheet.getCell(sequence[i] + start).numFmt = '@'
           if (isRaws) {
             t = !callback(result, field) ? Util.dateFormat(result[field]) : callback(result, field)
           } else {
@@ -1449,6 +1453,7 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
           t = !callback(result, field) ? result[field] : callback(result, field)
         }
       }
+
       worksheet.getCell(sequence[i] + start).value = t
     })
     start++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.34",
+  "version": "1.2.36",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"