zet-lib 1.2.97 → 1.2.98

package/lib/Form.js

@@ -466,7 +466,7 @@ Form.field = (obj) => {
           if (extFile.type == 'image') {
             displayForm += `<img src="${filename}" class="boxy zoom mx-2 my-2" width="200px">`
           } else {
-            displayForm += Util.fileView(`/uploads/${obj.table}/${obj.key}/`, item, { withIcon: true })
+            displayForm += '<br>' + Util.fileView(`/uploads/${obj.table}/${obj.key}/`, item, { withIcon: true }) + '<br>'
           }
         })
       }

package/lib/Util.js

@@ -1254,4 +1254,8 @@ Util.sortArray = (arr, key) => {
   return arr.sort(compare)
 }
 
+Util.cleanString = (str = '') => {
+  return str.replaceAll('(', '').replaceAll(')', '').replaceAll('%', '').replaceAll('-', '')
+}
+
 module.exports = Util

package/lib/zAppRouter.js

@@ -1479,6 +1479,7 @@ router.post('/zdropzone', async (req, res) => {
 router.post('/zdropzone-remove', async (req, res) => {
   try {
     let userId = res.locals.userId
+    let cacheName = req.body.cname.replace('ZUSER___ID', userId)
     let dir = `${dirRoot}/public/zdropzone/${userId}`
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true })
@@ -1486,6 +1487,11 @@ router.post('/zdropzone-remove', async (req, res) => {
     let filename = `${dirRoot}/public/zdropzone/${userId}/${req.body.file}`
     if (Util.fileExist(filename)) {
       await fs.unlink(filename)
+      if (myCache.has(cacheName)) {
+        arr = myCache.get(name)
+      }
+      arr = Util.arrayDelete(arr, body.file)
+      myCache.set(name, arr)
     }
     res.json('ok')
   } catch (e) {
@@ -1503,6 +1509,7 @@ router.post('/zdropzone-attributes', async (req, res) => {
     let body = req.body
     let category = body.category
     let name = `dropzone__${userId}__${body.table}__${body.field}__${body.type}`
+    //dropzone__${res.locals.userId}__${table}__${key}__create
     let arr = []
     if (category === 'add') {
       if (myCache.has(name)) {

package/lib/zRoute.js

@@ -968,6 +968,9 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
 
         case 'dropzone':
           if (myvalue && myvalue.length > 0) {
+            if (typeof myvalue === 'string') {
+              value = [myvalue]
+            }
             myvalue = value.map((item) => `<a class="text-success" target="_blank" href="/uploads/${MYMODEL.routeName}/${key}/${item}"> ${item.substring(13)}</a>  `)
           }
           break
@@ -2318,7 +2321,11 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}) => {
         case 'dropzone':
           let dropzone_data_arr = []
           if (obj.value.length > 0) {
-            obj.value.map((item) => {
+            let dropfiles = obj.value || []
+            if (typeof obj.value == 'string') {
+              dropfiles = [obj.value]
+            }
+            dropfiles.map((item) => {
               let filename = `${dirRoot}/public/uploads/${MYMODEL.table}/${key}/${item}`
               var fileSizeInBytes = 12345
               if (Util.fileExist(filename)) {
@@ -2502,7 +2509,6 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
   //add tabs role
   if (MYMODEL.hasOwnProperty('hasTabs') && MYMODEL.hasTabs) {
     let script = ''
-    //MYMODEL.tabs.map((table))
     script += `$(()=> {
         ajaxPost('/ztab-access',{table:"${MYMODEL.table}"},(data)=> {
             let dataTabs = ${MYMODEL.hasOwnProperty('tabs') ? JSON.stringify(MYMODEL.tabs) : []};
@@ -3242,7 +3248,8 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
     maxFilesize: 30,
     headers: {"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content")},
     removedfile: function(file) {
-        ajaxPost("/zdropzone-remove",{file:file.name},(data) => {
+        const type = window.location.href.split("/").pop();
+        ajaxPost("/zdropzone-remove",{file:file.name, cname:"dropzone__ZUSER___ID__${MYMODEL.table}__${item}__"+type},(data) => {
             file.previewElement.remove();
         })
     },
@@ -3615,14 +3622,18 @@ zRoute.insertSQL = async (req, res, table, data) => {
           if (arr.length > 0) {
             let time = new Date().getTime()
             arr.map((item) => {
-              let newItem = time + item
-              newArr.push(newItem)
-              fs.rename(path_src + item, path_dest + newItem)
+              if (Util.fileExist(path_src + item)) {
+                let newItem = Util.cleanString(time + item)
+                newArr.push(newItem)
+                fs.rename(path_src + item, path_dest + newItem)
+              }
             })
-
             data[key] = Util.array_to_jsonb(newArr)
           }
         }
+
+        //delete cache
+        myCache.del(name)
       }
     }
     const result = await connection.insert({ table: table, data: data })
@@ -3670,21 +3681,19 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
         }
         let name = `dropzone__${userId}__${MYMODEL.table}__${key}__${whereData.id}`
         if (myCache.has(name)) {
-          let arr = myCache.get(name)
+          let arr = myCache.get(name) || []
           let newArr = []
-          if (arr.length > 0) {
-            let time = new Date().getTime()
-            arr.map((item) => {
-              if (!Util.fileExist(path_dest + item)) {
-                let newItem = time + item
-                newArr.push(newItem)
-                fs.rename(path_src + item, path_dest + newItem)
-              } else {
-                newArr.push(item)
-              }
-            })
-            data[key] = Util.array_to_jsonb(newArr)
-          }
+          let time = new Date().getTime()
+          arr.map((item) => {
+            if (!Util.fileExist(path_dest + item)) {
+              let newItem = time + item
+              newArr.push(newItem)
+              fs.rename(path_src + item, path_dest + newItem)
+            } else {
+              newArr.push(item)
+            }
+          })
+          data[key] = Util.array_to_jsonb(newArr)
         }
       }
     }

package/package.json

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