zet-lib 1.3.36 → 1.3.38

package/lib/zAppRouter.js

@@ -1294,12 +1294,16 @@ router.post('/zdeleted-selected/:table', async (req, res) => {
     if (datas.length > 0) {
       for (const data of datas) {
         let id = data.name.replace('ck[', '').replace(']', '')
-        await connection.delete({
-          table: table,
-          where: {
-            id: id,
-          },
-        })
+        try {
+          await connection.delete({
+            table: table,
+            where: {
+              id: id,
+            },
+          })
+        } catch (e) {
+          io.emit('error', e + '')
+        }
       }
     } else {
       json = Util.flashError('No Data')

package/lib/zRoute.js

@@ -1637,7 +1637,7 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
   let aliasResults = {}
   for (let key in MYMODEL.widgets) {
     if (!notJoins.includes(key)) {
-      if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
+      if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead' || MYMODEL.widgets[key].name == 'dropdown_multi') {
         if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
           aliasResults[key] = Util.arrayToObject(
             await connection.results({
@@ -1671,7 +1671,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' || widget.name == 'typeahead') {
+      } else if (widget.name == 'relation' || widget.name == 'typeahead' || widget.name == 'dropdown_multi') {
         var rowsarr = await connection.results({
           table: widget.table,
           select: widget.fields[0] + ',' + widget.fields[1] + ' as zname ',
@@ -1747,20 +1747,31 @@ 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') || (widgets.hasOwnProperty(field) && widgets[field].name == 'typeahead')) {
+        } else if ((widgets.hasOwnProperty(field) && widgets[field].name == 'relation') || (widgets.hasOwnProperty(field) && widgets[field].name == 'typeahead') || (widgets.hasOwnProperty(field) && widgets[field].name == 'dropdown_multi')) {
           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]
+            if (widgets[field].name == 'dropdown_multi') {
+              if (Array.isArray(result[field])) {
+                let dropdownmultivalue = []
+                result[field].map((item) => {
+                  dropdownmultivalue.push(relations[field][item].zname)
+                })
+                result[field] = result[field] ? JSON.stringify(dropdownmultivalue) : ''
+              }
             } else {
-              myvalue = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
-              result[field] = result[field] ? aliasResults[field][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] = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
+              }
             }
           } else {
-            myvalue = result[field] ? relations[field][result[field]].zname : ''
+            if (widgets[field].name == 'dropdown_multi') {
+              myvalue = result[field] ? result[field] : ''
+            } else {
+              myvalue = result[field] ? relations[field][result[field]].zname : ''
+            }
           }
           if (isRaws) {
             t = !callback(result, field) ? result[field] : callback(result, field)
@@ -4180,6 +4191,8 @@ zRoute.import = async (req, res, MYMODEL) => {
   let json = Util.jsonSuccess(LANGUAGE['import_success'])
   let aliasRelations = []
   let selectRelations = ''
+  let isDropdownWidgets = []
+  let dropdownWidgetRelations = {}
   for (let key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key]) {
       if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
@@ -4188,6 +4201,19 @@ zRoute.import = async (req, res, MYMODEL) => {
           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} `
         }
       }
+
+      if (MYMODEL.widgets[key].name == 'dropdown_multi') {
+        if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
+          isDropdownWidgets.push(key)
+          let cacheName = `${MYMODEL.widgets[key].table}_${MYMODEL.table}___${key}_${companyId}`
+          let datasName = myCache.get(cacheName) || []
+          let objDatas = {}
+          datasName.map((item) => {
+            objDatas[item.zname] = item.id
+          })
+          dropdownWidgetRelations[key] = objDatas
+        }
+      }
     }
   }
   try {
@@ -4253,12 +4279,26 @@ zRoute.import = async (req, res, MYMODEL) => {
             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 },
+              //{ field: MYMODEL.widgets[keys[prop]].import_field, option: 'ILIKE', value: value },
+              { field: MYMODEL.widgets[keys[prop]].import_field, option: '=', value: value },
             ],
           })
           if (result_alias.id) {
             data[keys[prop]] = result_alias.id
           }
+        } else if (isDropdownWidgets.includes(keys[prop])) {
+          value = value + ''.trim()
+          let letter = value.charAt(0)
+          if (letter == '[') {
+            let dArray = []
+            let dropdownMultiArrays = JSON.parse(value)
+            dropdownMultiArrays.map((dropdownMultiArray) => {
+              if (dropdownWidgetRelations[keys[prop]][dropdownMultiArray]) {
+                dArray.push(dropdownWidgetRelations[keys[prop]][dropdownMultiArray])
+              }
+            })
+            data[keys[prop]] = JSON.stringify(dArray)
+          }
         } else {
           let name = MYMODEL.widgets[keys[prop]] && MYMODEL.widgets[keys[prop]].name ? MYMODEL.widgets[keys[prop]].name : ''
           if (name != 'virtual') {

package/lib/zdataTable.js

@@ -159,7 +159,7 @@ class dataTable {
       html += `<button title="Lock/Unlock" style="background-color: #E4A11B; color:white" class="btn btn-danger buttons-lock buttons-html5 copy gridlock boxy-small dimens2x image-button"  data-bs-toggle="modal" data-bs-target="#grid-lock" type="button"><img src="/assets/icons/lock-check.svg" class="icons-bg-white"> </span></span></button>`
     }
     if (this.levels.delete_all) {
-      html += `<button title="Lock/Unlock" style="background-color: #DC4C64; color:white" class="btn btn-danger buttons-lock buttons-html5 copy griddeleteall boxy-small dimens2x image-button"  data-bs-toggle="modal" data-bs-target="#grid-delete-all" type="button"><img src="/assets/icons/http-delete.svg" class="icons-bg-white"> </span></span></button>`
+      html += `<button title="Delete selected data" style="background-color: #DC4C64; color:white" class="btn btn-danger buttons-lock buttons-html5 copy griddeleteall boxy-small dimens2x image-button"  data-bs-toggle="modal" data-bs-target="#grid-delete-all" type="button"><img src="/assets/icons/http-delete.svg" class="icons-bg-white"> </span></span></button>`
     }
     if (this.hasLevels) {
       html += `<button title="Approval" style="background-color: #E4A11B; color:white" class="btn buttons-html5 boxy-small dimens2x image-button"  data-bs-toggle="modal" data-bs-target="#grid-approval" type="button"><img src="/assets/icons/rubber-stamp.svg" class="icons-bg-white"> </span></span></button>`

package/package.json

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