zet-lib 1.2.28 → 1.2.30

package/lib/index.js

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

package/lib/zRoute.js

@@ -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')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.28",
+  "version": "1.2.30",
   "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",