zet-lib 1.0.85 → 1.0.87

package/lib/zRoute.js

@@ -304,15 +304,33 @@ zRoute.attributeData = async (res, MYMODEL, obj) => {
     filter = null
   }
   attributeData.labels = MYMODEL.labels
+  invisibles = invisibles.filter(Util.arrayUnique)
+  visibles = visibles.filter(Util.arrayUnique)
+  //check custom code
+  let customs = []
+  for (var key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name == 'custom') {
+      customs.push(key)
+    }
+  }
+  if (customs.length) {
+    visibles = visibles.filter((item) => !customs.includes(item))
+    invisibles = invisibles.filter((item) => !customs.includes(item))
+  }
 
   res.locals.routeName = routeName
   res.locals.attributeData = attributeData
   res.locals.visibles = visibles
   res.locals.invisibles = invisibles
   res.locals.gridFilter = filter
-  res.locals.visiblesObj = visibles.reduce((result, item) => {
-    return { ...result, [item]: MYMODEL.labels[item] }
-  }, {})
+  let visiblesObj = []
+  visibles.map((item) => {
+    visiblesObj.push({
+      key: item,
+      name: MYMODEL.labels[item],
+    })
+  })
+  res.locals.visiblesObj = visiblesObj
 }
 
 /*
@@ -641,6 +659,7 @@ 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] : ''
@@ -1586,7 +1605,6 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   if (objData.hasOwnProperty('whereArray')) {
     whereArray.push(objData['whereArray'])
   }
-
   whereArray.push({
     field: 'company_id',
     option: '=',

package/lib/zdataTable.js

@@ -18,6 +18,7 @@ class dataTable {
     this.routeName
     this.types = {}
     this.levels = {}
+    this.visiblesKey = visibles.map((item) => item.key)
   }
 
   // for filter html
@@ -31,20 +32,40 @@ class dataTable {
     delete obj.TYPES
     this.searchColumns = obj
   }
+  set buttons(html) {
+    return html
+  }
+
+  set buttons2(html) {
+    return html
+  }
 
   get columns() {
     if (this.setColumns) return this.setColumns
     let html = ''
-    for (const key in this.visibles) {
-      html += `<th id="data_${key}_label">${this.visibles[key]}</th>`
+    if (Array.isArray(this.visibles)) {
+      this.visibles.map((item) => {
+        html += `<th id="data_${item.key}_label">${item.name || ''}</th>`
+      })
+    } else {
+      for (const key in this.visibles) {
+        html += `<th id="data_${key}_label">${this.visibles[key]}</th>`
+      }
     }
+
     return html
   }
 
   get columnsFilter() {
     let html = '<tr class="filters">'
-    for (const key in this.visibles) {
-      html += `<th id="data_${key}">${this.searchColumns[key]}</th>`
+    if (Array.isArray(this.visibles)) {
+      this.visibles.map((item) => {
+        html += `<th id="data_${item.key}_label">${this.searchColumns[item.key]}</th>`
+      })
+    } else {
+      for (const key in this.visibles) {
+        html += `<th id="data_${key}">${this.searchColumns[key]}</th>`
+      }
     }
     html += '</tr>'
     return html
@@ -123,7 +144,7 @@ class dataTable {
   get scripts() {
     let script = `<script type="text/javascript" src="${this.srcScript}"></script>`
     script += `<script>${Util.newLine}`
-    script += `var dataTableFields = ${JSON.stringify(Object.keys(this.visibles, null, 2))};${Util.newLine}`
+    script += `var dataTableFields = ${JSON.stringify(this.visiblesKey, null, 2)};${Util.newLine}`
     script += `var dataTableTypes = ${JSON.stringify(this.types, null, 2)};${Util.newLine}`
     script += `var dataTableRoute = "${this.routeName}";${Util.newLine}`
     script += `</script>${Util.newLine}`

package/package.json

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