zet-lib 1.0.87 → 1.0.89

package/lib/zRoute.js

@@ -659,7 +659,6 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
   let types = {}
   let dataTable = {}
   let options
-  console.log('fields', fields)
   for (let key in fields) {
     let html = ''
     const value = filterObject.hasOwnProperty(key) ? filterObject[key] : ''
@@ -1105,15 +1104,28 @@ zRoute.selectAllowedField = (req, res, MYMODEL, arr = []) => {
     arr = fixedArr
   }
 
+  let customs = []
+  for (var key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name == 'custom') {
+      customs.push(key)
+    }
+  }
+  if (customs.length > 0) {
+    arr = arr.filter((item) => !customs.includes(item))
+  }
   return arr
 }
 
 zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
   let virtuals = []
+  let customs = []
   for (var key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key].name === 'virtual') {
       virtuals.push(key)
     }
+    if (MYMODEL.widgets[key].name === 'custom') {
+      customs.push(key)
+    }
   }
   //check directory for import not export
   const dir = `${dirRoot}/public/excel/tmp`
@@ -1147,6 +1159,7 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
     if (zall) {
       let difference = allfields.filter((x) => !fields.includes(x))
       arr = [...fields, ...difference].filter((x) => !virtuals.includes(x))
+      arr = arr.filter((item) => !customs.includes(item))
       select = `"${arr.join('","')}"`
     }
     let whereArray = []

package/package.json

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