zet-lib 1.2.35 → 1.2.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/zRoute.js +8 -3
- package/package.json +1 -1
package/lib/zRoute.js
CHANGED
|
@@ -1382,9 +1382,9 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
|
|
|
1382
1382
|
let t
|
|
1383
1383
|
if (field == 'company_id') {
|
|
1384
1384
|
t = !callback(result, field) ? result.company_id : callback(result, field)
|
|
1385
|
-
} else if (field == 'created_at' || field == '
|
|
1386
|
-
|
|
1387
|
-
|
|
1385
|
+
} else if (field == 'created_at' || field == 'updated_at') {
|
|
1386
|
+
worksheet.getCell(sequence[i] + start).numFmt = '@'
|
|
1387
|
+
result[field] = Util.dateOriginal(result[field])
|
|
1388
1388
|
t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
|
|
1389
1389
|
} else if (Util.in_array(field, ['created_by', 'updated_by'])) {
|
|
1390
1390
|
if (isRaws) {
|
|
@@ -1420,12 +1420,16 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
|
|
|
1420
1420
|
t = !callback(result, field) ? (Object.hasOwn(tableObj[field], result[field]) ? tableObj[field][result[field]] : result[field]) : callback(result, field)
|
|
1421
1421
|
}
|
|
1422
1422
|
} else if (widgets.hasOwnProperty(field) && widgets[field].name == 'datetime') {
|
|
1423
|
+
result[field] = Util.dateOriginal(result[field])
|
|
1424
|
+
worksheet.getCell(sequence[i] + start).numFmt = '@'
|
|
1425
|
+
//console.log(result[field])
|
|
1423
1426
|
if (isRaws) {
|
|
1424
1427
|
t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
|
|
1425
1428
|
} else {
|
|
1426
1429
|
t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
|
|
1427
1430
|
}
|
|
1428
1431
|
} else if (widgets.hasOwnProperty(field) && widgets[field].name == 'datepicker') {
|
|
1432
|
+
worksheet.getCell(sequence[i] + start).numFmt = '@'
|
|
1429
1433
|
if (isRaws) {
|
|
1430
1434
|
t = !callback(result, field) ? Util.dateFormat(result[field]) : callback(result, field)
|
|
1431
1435
|
} else {
|
|
@@ -1449,6 +1453,7 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
|
|
|
1449
1453
|
t = !callback(result, field) ? result[field] : callback(result, field)
|
|
1450
1454
|
}
|
|
1451
1455
|
}
|
|
1456
|
+
|
|
1452
1457
|
worksheet.getCell(sequence[i] + start).value = t
|
|
1453
1458
|
})
|
|
1454
1459
|
start++
|