zet-lib 1.0.18 → 1.0.20

package/lib/index.js

@@ -5,15 +5,13 @@ module.exports = {
     Util: require('./Util'),
     myCache: require('./cache'),
     connection: require('./connection'),
-    zdataTable: require('./zdataTable'),
+    zDataTable: require('./zdataTable'),
     zDebug: require('./debug'),
     zForm: require('./Form'),
     io: require('./io'),
     zMail: require('./Mail'),
-    zModal: require('./Modal'),
     moduleLib: require('./moduleLib'),
-    tableForm: require('./tableForm'),
-    zapp: require('./zapp'),
+    zApp: require('./zapp'),
     zComponent: require('./zComponent'),
     zFn: require('./zFn'),
     zFunction: require('./zFunction'),
@@ -24,6 +22,5 @@ module.exports = {
     zRoleRouter : require('./zRoleRouter'),
     zPage: require('./zPage'),
     zTester: require('./zTester'),
-    zCache : require('./zCache'),
-    UI : require('./UI')
+    zCache : require('./zCache')
 };

package/lib/zdataTable.js

@@ -33,11 +33,20 @@ class dataTable {
             return this.setColumns;
         let html = '';
         for (var key in this.visibles) {
-            html += `<th id="data_${key}">${this.visibles[key]}</th>`;
+            html += `<th id="data_${key}_label">${this.visibles[key]}</th>`;
         }
         return html;
     }
 
+    get columnsFilter() {
+        let html = '<tr class="filters">';
+        for (var key in this.visibles) {
+            html += `<th id="data_${key}">${this.searchColumns[key]}</th>`;
+        }
+        html += '</tr>';
+        return html;
+    }
+
     /*
      Create table html header
      */
@@ -45,7 +54,7 @@ class dataTable {
         if (this.setTable)
             return this.setTable;
         return `<table id="dataTable" class="display table table-hover table-responsive" style="width:100%">
-            <thead>${this.columns}</thead>
+            <thead>${this.columns} ${this.columnsFilter}</thead>
         </table>`;
     }
 
@@ -113,13 +122,11 @@ class dataTable {
     get scripts() {
         let script = '<script type="text/javascript" src="https://cdn.datatables.net/v/bs5/dt-1.11.3/date-1.1.1/fc-4.0.1/fh-3.2.1/r-2.2.9/rg-1.1.4/sc-2.0.5/sl-1.3.4/datatables.min.js"></script>';
         script += `<script>${Util.newLine}`;
-        script += `var dataTableFilters = ${JSON.stringify(this.searchColumns)};${Util.newLine}`;
         script += `var dataTableFields = ${JSON.stringify(Object.keys(this.visibles,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}`;
-        script += `<script type="text/javascript" src="/js/datatableaddon.min.js"></script>${Util.newLine}`;
-
+        script += `<script type="text/javascript" src="/js/datatable.js"></script>${Util.newLine}`;
         if (this.searchColumns.FILTERKEY) {
             script += `<script>$(function () {  setTimeout(function () {  ${this.searchColumns.FILTERKEY} },500) });</script>${Util.newLine}`;
         }

package/package.json

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