zet-lib 1.2.108 → 1.2.110

package/lib/Form.js

@@ -886,7 +886,8 @@ Form.modal = (obj, LANGUAGE = {}) => {
                         <input type="hidden" id="serialize_right" name="serialize_right" value=''/>
                     </form>
                 </div> <!-- .dynagrid-config-form -->`,
-    footer: `<button type="reset" class="btn btn-default refresh gridreload image-button" title="Abort any changes and reset settings">
+    footer: `<select id="zgrid_default_type" class="form-control select-sm" style="width:100px"><option value="1">Data Table</option><option value="2">Table</option> </select>
+<button type="reset" class="btn btn-default refresh gridreload image-button" title="Abort any changes and reset settings">
                     <img src="/assets/icons/refresh.svg" class="icons-bg-black"> ${LANGUAGE.reset || 'Reset'}
                 </button>
                 <button type="button" class="btn btn-primary grid-submit boxy image-button" title="Save grid settings">

package/lib/zRoute.js

@@ -341,6 +341,7 @@ zRoute.attributeData = async (res, MYMODEL, obj) => {
   obj = obj || null
   const userId = res.locals.userId || 0
   const routeName = MYMODEL.routeName
+  let type = 1
   let attributeData, labels, visibles, invisibles, filter
   attributeData = MYMODEL
   const zgrid = await connection.results({
@@ -351,6 +352,7 @@ zRoute.attributeData = async (res, MYMODEL, obj) => {
     visibles = zgrid[0].visibles ? zgrid[0].visibles : MYMODEL.grids.visibles
     invisibles = zgrid[0].invisibles ? zgrid[0].invisibles : MYMODEL.grids.invisibles
     filter = zgrid[0].filter ? zgrid[0].filter : null
+    type = zgrid[0].type
   } else {
     visibles = MYMODEL.grids.visibles
     invisibles = MYMODEL.grids.invisibles
@@ -370,12 +372,12 @@ zRoute.attributeData = async (res, MYMODEL, obj) => {
     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.gridType = type
   let visiblesObj = []
   visibles.map((item) => {
     visiblesObj.push({
@@ -1916,7 +1918,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
             let buttons = objData.hasOwnProperty('actionButtons') ? objData.actionButtons(levels, row, MYMODEL.table) : zRoute.actionButtons(levels, row, MYMODEL.table)
             arr.push(buttons)
           } else {
-            let data = objData.hasOwnProperty('datas') ? objData.data(item, row[item], MYMODEL, relations) : zRoute.dataTableData(item, row[item], MYMODEL, relations, row.id)
+            let data = objData.hasOwnProperty('dataTableData') ? objData.dataTableData(item, row[item], MYMODEL, relations) : zRoute.dataTableData(item, row[item], MYMODEL, relations, row.id)
             arr.push(data)
           }
         })
@@ -2147,6 +2149,9 @@ zRoute.postGrid = async (req, res) => {
       company_id: 1,
       updated_at: Util.now(),
     }
+    if (query.serialize_type) {
+      post.type = query.serialize_type
+    }
     let results = await connection.results({
       table: gridTable,
       where: { user_id: res.locals.userId, route_name: res.locals.routeName },

package/lib/zdataTable.js

@@ -6,12 +6,13 @@ const myCache = require('./cache')
 
 class dataTable {
   constructor(datas) {
+    //console.log(datas)
     this.visibles = datas.visiblesObj //array object
     this.setColumns = ''
     this.setTable = ''
     this.srcScript = '/modules/datatables.min.js'
     this.dataTableScript = '/js/datatable-grids.js'
-    this.dataTableButtons = '/js/datatable-buttons.min.js'
+    this.dataTableButtons = '/js/datatable-buttons.js'
     this.customButtons = ''
     this.MYMODEL = null
     this.searchColumns = {}
@@ -22,6 +23,7 @@ class dataTable {
     this.level_approval = this.roles.approvals && this.roles.approvals[datas.routeName] ? this.roles.approvals[datas.routeName] : {}
     this.hasLevels = Object.keys(this.level_approval).length == 0 ? false : true
     this.visiblesKey = this.visibles.map((item) => item.key)
+    this.gridType = datas.gridType || 1
   }
 
   // for filter html
@@ -240,6 +242,14 @@ class dataTable {
 })</script>${Util.newLine}`
     }
 
+    /*
+    Slug script change data table responsive or not
+     */
+    let slugScript = ''
+    if (this.gridType == 2) {
+      slugScript += `$("#dataTable").removeClass("dataTable");`
+    }
+
     script += `<script type="text/javascript">
 $(function () {
     $("#ck_all").on('click', function () {
@@ -274,6 +284,9 @@ $(".btn-save-unlock").on("click", function () {
     })
 })
 
+$("#zgrid_default_type").val(${this.gridType});
+    ${slugScript}
+
 })</script>${Util.newLine}`
 
     return script

package/package.json

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