zet-lib 1.2.36 → 1.2.38

package/lib/zRoute.js

@@ -1348,6 +1348,25 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
   worksheet.getCell('A3').font = bold
   worksheet.getCell('A3').alignment = center
 
+  let aliasRelations = []
+  let selectRelations = ''
+  let aliasResults = {}
+  for (let key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
+      if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
+        aliasResults[key] = Util.arrayToObject(
+          await connection.results({
+            select: `id,  ${MYMODEL.widgets[key].import_field}`,
+            table: MYMODEL.widgets[key].table,
+          }),
+          'id'
+        )
+        //console.log(aliasResults[key])
+        aliasRelations.push(key)
+        selectRelations += `, (select ${MYMODEL.widgets[key].import_field} from "${MYMODEL.widgets[key].table}" where  ${MYMODEL.widgets[key].table}.id = ${MYMODEL.table}.${key} limit 1) as ${key} `
+      }
+    }
+  }
   //check relations
   let isRelations = false
   let relations = [],
@@ -1365,7 +1384,7 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
         tableObj[key] = widget.fields
       } else if (widget.name == 'switch') {
         tableObj[key] = widget.fields
-      } else if (widget.name == 'relation') {
+      } else if (widget.name == 'relation' || widget.name == 'typeahead') {
         var rowsarr = await connection.results({
           table: widget.table,
           select: widget.fields[0] + ',' + widget.fields[1] + ' as zname ',
@@ -1422,7 +1441,6 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
         } else if (widgets.hasOwnProperty(field) && widgets[field].name == 'datetime') {
           result[field] = Util.dateOriginal(result[field])
           worksheet.getCell(sequence[i] + start).numFmt = '@'
-          //console.log(result[field])
           if (isRaws) {
             t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
           } else {
@@ -1441,13 +1459,25 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
           } else {
             t = !callback(result, field) ? tableObj[field][result[field]] || '' : callback(result, field)
           }
-        } else if (widgets.hasOwnProperty(field) && widgets[field].name == 'relation') {
+        } else if ((widgets.hasOwnProperty(field) && widgets[field].name == 'relation') || (widgets.hasOwnProperty(field) && widgets[field].name == 'typeahead')) {
+          let myvalue = ''
+          if (widgets[field].import_field && widgets[field].import_field != 'id') {
+            /*console.log(result[field])
+            console.log(widgets[field].import_field)
+            console.log([result[field]][widgets[field].import_field])*/
+            if (isNaN(result[field])) {
+              myvalue = result[field]
+            } else {
+              myvalue = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
+              result[field] = aliasResults[field][result[field]][widgets[field].import_field]
+            }
+          } else {
+            myvalue = result[field] ? relations[field][result[field]].zname : ''
+          }
           if (isRaws) {
             t = !callback(result, field) ? result[field] : callback(result, field)
           } else {
-            if (relations[field][result[field]]) {
-              t = !callback(result, field) ? relations[field][result[field]].zname || '' : callback(result, field)
-            }
+            t = !callback(result, field) ? myvalue : callback(result, field)
           }
         } else {
           t = !callback(result, field) ? result[field] : callback(result, field)
@@ -3399,6 +3429,18 @@ zRoute.import = async (req, res, MYMODEL) => {
     datas: datas,
   }
   let json = Util.jsonSuccess(LANGUAGE['import_success'])
+  let aliasRelations = []
+  let selectRelations = ''
+  for (let key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key]) {
+      if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
+        if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
+          aliasRelations.push(key)
+          selectRelations += `, (select ${MYMODEL.widgets[key].import_field} from "${MYMODEL.widgets[key].table}" where  ${MYMODEL.widgets[key].table}.id = ${MYMODEL.table}.${key} limit 1) as ${key} `
+        }
+      }
+    }
+  }
   try {
     if (Object.keys(req.files).length == 0) {
       return res.json(Util.flashError(LANGUAGE['import_no_file']))
@@ -3459,7 +3501,19 @@ zRoute.import = async (req, res, MYMODEL) => {
     for (var prop in keys) {
       let value = result[i][prop]
       if (value) {
-        if (MYMODEL.widgets[keys[prop]].name === 'integer') {
+        if (aliasRelations.includes(keys[prop])) {
+          let result_alias = await connection.result({
+            select: `id, ${MYMODEL.widgets[keys[prop]].import_field} `,
+            table: MYMODEL.widgets[keys[prop]].table,
+            whereArray: [
+              //{field:"your_field",option:"=>",value:"12",operator:"AND",type:"text,json,date"}
+              { field: MYMODEL.widgets[keys[prop]].import_field, option: 'ILIKE', value: value },
+            ],
+          })
+          if (result_alias.id) {
+            data[keys[prop]] = result_alias.id
+          }
+        } else if (MYMODEL.widgets[keys[prop]].name === 'integer') {
           data[keys[prop]] = parseInt(value) || null
         } else if (MYMODEL.widgets[keys[prop]].name === 'virtual') {
           //empty

package/package.json

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