zet-lib 1.2.29 → 1.2.31

package/lib/index.js

@@ -30,4 +30,5 @@ module.exports = {
   axios: require('axios'),
   Excel: require('exceljs'),
   pm2: require('pm2'),
+  nodemailer: require('nodemailer'),
 }

package/lib/zRoute.js

@@ -803,7 +803,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
           case 'typeahead':
             dataTable[key] = `<div class="input-group">
                 <input type="text" class="form-control"  id="${key}Typeahead"  autocomplete="off" data-provide="typeahead" id="${key}Typeahead"   placeholder="Please type a word"  >
-<input type="hidden" id="${key}" class="search" required="" value="">
+<input type="hidden" id="${key}" class="search" required="" value="${value}">
 <span id="${key}Clear" class="input-group-addon input-group-text dropdownadd" title="Clear"  style="cursor: pointer;" title=" Add Data "><img src="/assets/icons/ban.svg" class="icons-bg-black" ></span>
 </div>`
             types[key] = 'input'
@@ -3704,7 +3704,7 @@ zRoute.modelsCache = async () => {
               obj[table] = {}
             }
             if (!Util.in_array(key, nots)) {
-              obj[table][`${keys}___${key}`] = `${widgets[key].fields[1]} as ${key}`
+              obj[table][`${keys}___${key}`] = `${widgets[key].fields[1]} as ${key}_${models[keys].table}`
               if (Object.prototype.hasOwnProperty.call(models[keys].widgets, key)) {
                 if (Object.prototype.hasOwnProperty.call(models[keys].widgets[key], 'order_by')) {
                   if (models[keys].widgets[key].order_by) {
@@ -3757,12 +3757,17 @@ zRoute.modelsCache = async () => {
                 let item = splits.length > 1 ? splits[1] : key
                 let arr = []
                 for (const result of results) {
-                  arr.push({ id: result.id, zname: result[item] })
+                  if (result[`${item}_${splits[0]}`]) {
+                    arr.push({ id: result.id, zname: result[`${item}_${splits[0]}`] })
+                  } else {
+                    arr.push({ id: result.id, zname: result[item] })
+                  }
                 }
                 if (orderBy[keys]) {
                   myCache.set(`${keys}_${key}_${company.id}`, arr)
                 } else {
                   const myarray = Util.sortArray(arr, 'zname')
+                  //console.log(`${keys}_${key}_${company.id}`)
                   myCache.set(`${keys}_${key}_${company.id}`, myarray)
                 }
               }
@@ -3808,7 +3813,11 @@ zRoute.modelsCacheRenew = (table, companyId) => {
               let item = splits.length > 1 ? splits[1] : key
               let arr = []
               for (const result of results) {
-                arr.push({ id: result.id, zname: result[item] })
+                if (result[`${item}_${splits[0]}`]) {
+                  arr.push({ id: result.id, zname: result[`${item}_${splits[0]}`] })
+                } else {
+                  arr.push({ id: result.id, zname: result[item] })
+                }
               }
               if (orderBy[table]) {
                 myCache.set(`${table}_${key}_${companyId}`, arr)
@@ -3825,7 +3834,6 @@ zRoute.modelsCacheRenew = (table, companyId) => {
     console.log(err)
   }
 }
-
 zRoute.makeFunctionsSystem = () => {
   try {
     let obj = myCache.get('ZFUNCTIONS')
@@ -3873,5 +3881,22 @@ zRoute.typeahead = async (req, res) => {
   let json = myCache.get(name)
   res.json(json)
 }
+zRoute.typeaheadpost = async (req, res) => {
+  let table = req.params.table
+  let keys = req.params.field
+  let id = req.body.id
+  const MYMODELS = myCache.get('MYMODELS')
+  let MYMODEL = MYMODELS[table]
+  let WIDGET = MYMODEL.widgets
+  let mytable = WIDGET[keys].table
+  let result = await connection.result({
+    select: `${WIDGET[keys].fields[1]} as zname`,
+    table: mytable,
+    where: {
+      id: id,
+    },
+  })
+  res.json(result.zname)
+}
 
 module.exports = zRoute

package/lib/zdataTable.js

@@ -158,9 +158,22 @@ class dataTable {
     let typeaheadScript = ''
     for (let key in this.MYMODEL.widgets) {
       if (this.MYMODEL.widgets[key].name == 'typeahead') {
-        typeaheadScript += `if($("#${key}").val()){setTimeout(()=>{$("#${key}").change();},1000)};`
+        typeaheadScript += `if($("#${key}").val()){
+        setTimeout(()=>{
+          ajaxPost('/ztypeaheadpost/${this.MYMODEL.table}/${key}', {
+            id: $("#${key}").val()
+          }, function(data) {
+            $("#${key}Typeahead").val(data);$("#${key}Typeahead").change();
+            $("#${key}").change();
+            $("#data_table_${key}").change();
+           
+            })
+          },1500)
+          };
+          `
       }
     }
+
     if (typeaheadScript) {
       script += `<script type="text/javascript">$(function () {${typeaheadScript}})</script>${Util.newLine}`
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.29",
+  "version": "1.2.31",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -40,7 +40,7 @@
     "node-cache": "^5.1.2",
     "nodemailer": "^6.9.4",
     "pg": "^8.11.2",
-    "pm2": "^5.3.0",
+    "pm2": "^5.3.1",
     "postgres-pool": "^8.1.4",
     "puppeteer": "^21.0.1",
     "qs": "^6.11.2",