zet-lib 1.2.37 → 1.2.39
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 +2 -9
- package/package.json +1 -1
package/lib/zRoute.js
CHANGED
|
@@ -1469,22 +1469,15 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
|
|
|
1469
1469
|
myvalue = result[field]
|
|
1470
1470
|
} else {
|
|
1471
1471
|
myvalue = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
|
|
1472
|
-
result[field] = aliasResults[field][result[field]][widgets[field].import_field]
|
|
1472
|
+
result[field] = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
|
|
1473
1473
|
}
|
|
1474
1474
|
} else {
|
|
1475
|
-
myvalue = relations[field][result[field]].zname
|
|
1475
|
+
myvalue = result[field] ? relations[field][result[field]].zname : ''
|
|
1476
1476
|
}
|
|
1477
1477
|
if (isRaws) {
|
|
1478
1478
|
t = !callback(result, field) ? result[field] : callback(result, field)
|
|
1479
1479
|
} else {
|
|
1480
1480
|
t = !callback(result, field) ? myvalue : callback(result, field)
|
|
1481
|
-
/*
|
|
1482
|
-
if (relations[field][result[field]]) {
|
|
1483
|
-
console.log('relation fieldssssss')
|
|
1484
|
-
t = !callback(result, field) ? myvalue : callback(result, field)
|
|
1485
|
-
} else {
|
|
1486
|
-
t = myvalue;
|
|
1487
|
-
}*/
|
|
1488
1481
|
}
|
|
1489
1482
|
} else {
|
|
1490
1483
|
t = !callback(result, field) ? result[field] : callback(result, field)
|