zet-lib 1.3.27 → 1.3.28

package/lib/zRoute.js

@@ -4749,34 +4749,55 @@ module.exports = (req, res, next) => {`
 }
 
 zRoute.typeahead = async (req, res) => {
-  let table = req.params.table
-  let keys = req.params.field
-  const MYMODELS = myCache.get('MYMODELS')
-  let MYMODEL = MYMODELS[table]
-  let WIDGET = MYMODEL.widgets
-  let query = {}
-  //employee_payroll_salary___employee_id_1
-  let name = `${MYMODEL.widgets[keys].table}_${MYMODEL.table}___${keys}_${res.locals.companyId}`
-  let json = myCache.get(name)
-  res.json(json)
+  try {
+    let table = req.params.table
+    let keys = req.params.field
+    const MYMODELS = myCache.get('MYMODELS')
+    if (keys.includes('___')) {
+      let split = keys.split('___')
+      table = split[0]
+      keys = split[1]
+    }
+    let MYMODEL = MYMODELS[table]
+    let WIDGET = MYMODEL.widgets
+    let query = {}
+    //employee_payroll_salary___employee_id_1
+    let name = `${MYMODEL.widgets[keys].table}_${MYMODEL.table}___${keys}_${res.locals.companyId}`
+    let json = myCache.get(name)
+    res.json(json)
+  } catch (e) {
+    console.log(e)
+    res.json(e + '')
+  }
 }
 
 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)
+  try {
+    let table = req.params.table
+    let keys = req.params.field
+    let id = req.body.id
+    const MYMODELS = myCache.get('MYMODELS')
+    if (keys.includes('___')) {
+      let split = keys.split('___')
+      table = split[0]
+      keys = split[1]
+    }
+    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)
+  } catch (e) {
+    console.log(e)
+    res.json(e + '')
+  }
 }
 
 zRoute.history = async (req, res, relations, id, MYMODEL, users, results = []) => {

package/package.json

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