zet-lib 1.0.63 → 1.0.64
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 -2
- package/package.json +1 -1
package/lib/zRoute.js
CHANGED
|
@@ -1077,7 +1077,7 @@ zRoute.selectAllowedField = (req, res, MYMODEL, arr = []) => {
|
|
|
1077
1077
|
return arr
|
|
1078
1078
|
}
|
|
1079
1079
|
|
|
1080
|
-
zRoute.excelQuery = async (req, res, MYMODEL) => {
|
|
1080
|
+
zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
|
|
1081
1081
|
let virtuals = []
|
|
1082
1082
|
for (var key in MYMODEL.widgets) {
|
|
1083
1083
|
if (MYMODEL.widgets[key].name === 'virtual') {
|
|
@@ -1113,13 +1113,19 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
|
|
|
1113
1113
|
body = result.filter
|
|
1114
1114
|
fields = body.fields.filter((item) => item != 'no' && item != 'actionColumn')
|
|
1115
1115
|
select = Util.selectParser(fields, MYMODEL)
|
|
1116
|
-
console.log(virtuals)
|
|
1117
1116
|
if (zall) {
|
|
1118
1117
|
let difference = allfields.filter((x) => !fields.includes(x))
|
|
1119
1118
|
arr = [...fields, ...difference].filter((x) => !virtuals.includes(x))
|
|
1120
1119
|
select = `"${arr.join('","')}"`
|
|
1121
1120
|
}
|
|
1122
1121
|
let whereArray = []
|
|
1122
|
+
if (paramsObject.hasOwnProperty('whereArray')) {
|
|
1123
|
+
if (Array.isArray(paramsObject.whereArray)) {
|
|
1124
|
+
whereArray = paramsObject.whereArray
|
|
1125
|
+
} else {
|
|
1126
|
+
whereArray.push(paramsObject.whereArray)
|
|
1127
|
+
}
|
|
1128
|
+
}
|
|
1123
1129
|
let columns = body.columns
|
|
1124
1130
|
columns.forEach(function (item) {
|
|
1125
1131
|
if (item.search.value) {
|