zet-lib 1.3.32 → 1.3.34

package/lib/Form.js

@@ -232,42 +232,52 @@ Form.field = (obj) => {
       break
 
     case 'select':
+      var please_select = obj.please_select
+      if (please_select != undefined) {
+        if (please_select != '') {
+          selects += `<option value="">${please_select}</option>`
+        }
+      }
       if (obj.hasOwnProperty('array')) {
         var items = obj.array || []
-        var please_select = obj.please_select
-        if (please_select != undefined) {
-          if (please_select != '') {
-            selects += `<option value="">${please_select}</option>`
-          }
-        }
         if (items.length) {
           items.forEach(function (item) {
-            const selected = item.value == value ? ' selected ' : ''
-            selects += `<option value="${item.value}" ${selected}>${item.label}</option>`
+            if (item.label) {
+              const selected = item.value == value ? ' selected ' : ''
+              selects += `<option value="${item.value}" ${selected}>${item.label}</option>`
+            }
           })
         } else {
           if (Array.isArray(data)) {
             data.map((item) => {
-              var selected = item.id == value ? ' selected ' : ''
-              selects += `<option value="${item.id}" ${selected}>${item.zname}</option>`
+              if (item.zname) {
+                var selected = item.id == value ? ' selected ' : ''
+                selects += `<option value="${item.id}" ${selected}>${item.zname}</option>`
+              }
             })
           } else {
             for (var keys in data) {
-              var selected = keys == value ? ' selected ' : ''
-              selects += `<option value="${keys}" ${selected}>${data[keys]}</option>`
+              if (data[keys]) {
+                var selected = keys == value ? ' selected ' : ''
+                selects += `<option value="${keys}" ${selected}>${data[keys]}</option>`
+              }
             }
           }
         }
       } else {
         if (Array.isArray(data)) {
           data.map((item) => {
-            const selected = item.id == value ? ' selected ' : ''
-            selects += `<option value="${item.id}" ${selected}>${item.zname}</option>`
+            if (item.zname) {
+              const selected = item.id == value ? ' selected ' : ''
+              selects += `<option value="${item.id}" ${selected}>${item.zname}</option>`
+            }
           })
         } else {
           for (let keys in data) {
-            let selected = keys == value ? ' selected ' : ''
-            selects += `<option value="${keys}" ${selected}>${data[keys]}</option>`
+            if (data[keys]) {
+              let selected = keys == value ? ' selected ' : ''
+              selects += `<option value="${keys}" ${selected}>${data[keys]}</option>`
+            }
           }
         }
       }
@@ -494,7 +504,12 @@ Form.field = (obj) => {
       break
 
     case 'dropzoneview':
-      displayForm = `<div class="boxy-tiny">`
+      let countFiles = obj.value && obj.value.length ? obj.value.length + ' Files' : ''
+      let bodydropzoneview =
+        countFiles == '' ? '' : `<div class="card-header">${countFiles} <div class="float-end"><span class="icon-small icons-light" title="Download"><img onclick="location.href= '/zdownloads-dropzone/${obj.routeName}/${obj.key}/${obj.dataId}'" class="icons-bg-black gridview icon-image" src="/assets/icons/download.svg"></span></div> </div>`
+      displayForm = `<div class="card">
+          ${bodydropzoneview}
+        <div class="card-body">`
       if (obj.value && obj.value.length > 0) {
         obj.value.map((item) => {
           let extFile = Util.fileExtension(item)
@@ -506,7 +521,7 @@ Form.field = (obj) => {
           }
         })
       }
-      displayForm += `</div>`
+      displayForm += `</div></div>`
 
       break
     default:

package/lib/zAppRouter.js

@@ -20,6 +20,7 @@ const zCache = require('./zCache')
 const pm2 = require('pm2')
 const zFunction = require('./zFunction')
 const qs = require('qs')
+const zip = require('express-zip')
 
 /*
  ajax Post
@@ -1569,4 +1570,33 @@ router.post('/zhistory-data', async (req, res) => {
   }
 })
 
+router.get('/zdownloads-dropzone/:table/:field/:id', async (req, res) => {
+  try {
+    let table = req.params.table
+    let field = req.params.field
+    let id = req.params.id
+    const room = res.locals.token
+    let result = await connection.result({
+      table: table,
+      where: {
+        id: id,
+      },
+    })
+    let dir = `${dirRoot}/public/uploads/${table}/${field}/`
+    let arr = []
+    let files = result[field]
+    for (const file of files) {
+      if (Util.fileExist(dir + file)) {
+        let filename = file.substring(13)
+        arr.push({ path: dir + file, name: filename })
+        io.to(room).emit('info', `Zip file ${filename}`)
+      }
+    }
+    io.to(room).emit('info', `Zip file completed...`)
+    res.zip(arr, `${field}_${table}_${id}.zip`)
+  } catch (e) {
+    console.log(e)
+    res.json(e + '')
+  }
+})
 module.exports = router

package/lib/zRoute.js

@@ -3035,6 +3035,7 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}, ke
           obj[key].value = data[key] || []
           obj[key].table = MYMODEL.table
           obj[key].key = key
+          obj[key].dataId = data.id || ''
           break
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.3.32",
+  "version": "1.3.34",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -34,6 +34,7 @@
     "dotenv": "^16.3.1",
     "ejs": "^3.1.9",
     "exceljs": "^4.4.0",
+    "express-zip": "^3.0.0",
     "fs-extra": "^11.1.1",
     "html-minifier-terser": "^7.2.0",
     "js-sha256": "^0.9.0",