zet-lib 1.2.79 → 1.2.81

package/lib/Form.js

@@ -457,6 +457,22 @@ Form.field = (obj) => {
                     </label></div>${information}${append}`
       break
 
+    case 'dropzoneview':
+      displayForm = `<div class="boxy-tiny">`
+      if (obj.value && obj.value.length > 0) {
+        obj.value.map((item) => {
+          let extFile = Util.fileExtension(item)
+          let filename = `/uploads/${obj.table}/${obj.key}/${item}`
+          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}/`, filename, { withIcon: true })
+          }
+        })
+      }
+      displayForm += `</div>`
+
+      break
     default:
       displayForm = `${prepend}${inputGroupLeft}<input ${disabled} autocomplete="nope" autofocus=""  ${readonly}  ${tabindex}  type="${type}" ${classview}  ${id} ${name} ${placeholder}   ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
       break

package/lib/moduleLib.js

@@ -71,7 +71,6 @@ m.dropzone = function (req, res, elem) {
   elem = elem || '.dropzone'
   head += '<link href="/modules/dropzone/dropzone.css" rel="stylesheet">'
   end += '<script src="/modules/dropzone/dropzone.min.js"></script>'
-  script = `$("div${elem}").dropzone({ url: "/zdropzone" });`
 
   return {
     head: head,

package/lib/zAppRouter.js

@@ -8,7 +8,7 @@ const access = require('./access')
 const myCache = require('./cache')
 const Util = require('./Util')
 const moment = require('moment')
-const fs = require('fs')
+const fs = require('fs-extra')
 const moduleLib = require('./moduleLib')
 var env = process.env.NODE_ENV || 'development'
 var ecosystem = require(`${dirRoot}/ecosystem.config.js`)
@@ -19,6 +19,7 @@ const Mail = require('./Mail')
 const zCache = require('./zCache')
 const pm2 = require('pm2')
 const zFunction = require('./zFunction')
+const qs = require('qs')
 
 /*
  ajax Post
@@ -1369,14 +1370,6 @@ router.post('/zapproval-update/:table', async (req, res) => {
             canUpdate = false
           }
         }
-        /*if (approval_history.length > 0) {
-          let lastStatus = +approval_history[approval_history.length - 1].status
-          canUpdate = lastStatus > +value ? false : true
-          let history = approval_history.filter((item) => item.status == value && item.user_id == res.locals.userId)
-          if (history.length > 0) {
-            canUpdate = false
-          }
-        }*/
         if (canUpdate) {
           approval_history.push({
             status: value,
@@ -1388,11 +1381,11 @@ router.post('/zapproval-update/:table', async (req, res) => {
             approval_status: value,
             approval_history: Util.array_to_jsonb(approval_history),
           }
-          if(+value >1 && +value <22) {
-            mydata.lock=1
+          if (+value > 1 && +value < 22) {
+            mydata.lock = 1
           }
-          if((+value === 22)) {
-            mydata.lock=0
+          if (+value === 22) {
+            mydata.lock = 0
           }
           await connection.update({
             table: table,
@@ -1511,4 +1504,66 @@ router.get('/addapproval-models', async (req, res) => {
   res.send(text)
 })
 
+//post dropzone widget
+router.post('/zdropzone', async (req, res) => {
+  try {
+    let userId = res.locals.userId
+    if (userId) {
+      let dir = `${dirRoot}/public/zdropzone/${userId}`
+      if (!fs.existsSync(dir)){
+        fs.mkdirSync(dir,{ recursive: true });
+      }
+      let filename = req.files.file.name
+      req.files.file.mv(dir + '/' + filename, function (err) {
+        if (err) {
+          //console.log('fileempty move',err); // => null
+          return res.status(500).send(err+'')
+        }
+      })
+    }
+    res.json('ok')
+  } catch (e) {
+    console.log(e)
+    res.status(500)
+    res.send(e+'')
+  }
+})
+
+router.post('/zdropzone-remove', async (req, res) => {
+  try {
+    let userId = res.locals.userId
+    //console.log(req.body)
+    let filename = `${dirRoot}/public/zdropzone/${userId}/${req.body.file}`
+    if(Util.fileExist(filename)) {
+      await fs.unlink(filename)
+    }
+    res.json('ok')
+  } catch (e) {
+    console.log(e)
+    res.status(500).send(e+'')
+  }
+})
+router.post('/zdropzone-attributes', async (req, res) => {
+  try {
+    let userId = res.locals.userId
+    let body = req.body
+    let category = body.category
+    let name = `dropzone__${userId}__${body.table}__${body.field}__${body.type}`
+    let arr = []
+    if (myCache.has(name)) {
+      arr = myCache.get(name)
+    }
+    if (category === 'add') {
+      arr.push(body.file)
+    } else {
+      Util.arrayDelete(arr, body.file)
+    }
+    myCache.set(name, arr)
+    res.json('ok')
+  } catch (e) {
+    console.log(e)
+    res.status(500).send(e+'')
+  }
+})
+
 module.exports = router

package/lib/zRoute.js

@@ -122,6 +122,7 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
   fs.ensureDir(path_tmp, (err) => {
     //console.log('ensureDir',err); // => null
   })
+
   if (!isEmptyFiles) {
     files = qs.parse(req.files)
     let fileRoute = files[routeName]
@@ -2309,6 +2310,11 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}) => {
           obj.type = 'email'
           break
         case 'dropzone':
+          if(obj.value.length > 0){
+            myCache.set(`dropzone__${res.locals.userId}__${MYMODEL.table}__${key}__${data.id}`, obj.value)
+          }
+          let dropzoneValue = obj.value.length > 0 ? JSON.stringify(obj.value) : '[]'
+          script += `let dropzone_${key}_data = ${dropzoneValue};`
           obj.type = 'dropzone'
           obj.class = 'dropzone boxy-tiny d-block'
           break
@@ -2670,6 +2676,13 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}, ke
           obj[key].type = 'text'
           obj[key].value = relations[key + 'Object'][data[key]] || ''
           break
+
+        case 'dropzone':
+          obj[key].type = 'dropzoneview'
+          obj[key].value = data[key] || []
+          obj[key].table = MYMODEL.table
+          obj[key].key = key
+          break
       }
     }
     //forms.build[key] = cForm.build(obj[key]);
@@ -2990,6 +3003,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
   let hasEditor = false
   let hasDateTimePicker = false
   let hasDropzone = false
+  let dropzones = []
   let hasTable = false
   let chainsObj = {}
   let chainsArr = []
@@ -3041,6 +3055,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
       hasTinymce = true
     } else if (widgets[key].name == 'dropzone') {
       hasDropzone = true
+      dropzones.push(key)
     }
     // has chains
     if (widgets[key].name == 'relation') {
@@ -3076,9 +3091,9 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
   }
   if (hasDropzone) {
     let dropzoneObj = moduleLib.dropzone(req, res)
-    scriptForm += dropzoneObj.script
     headObj.dropzone = dropzoneObj.head
     endObj.dropzone = dropzoneObj.end
+    scriptForm += `Dropzone.autoDiscover = false;`
   }
   if (hasEditor) {
     let editorObj = moduleLib.editor(req, res)
@@ -3169,11 +3184,49 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
                 }
             })
         });
-      })
-      
+      });
+     
       `
   }
 
+  if (hasDropzone) {
+    dropzones.map((item) => {
+      scriptForm += `$("div#${item}").dropzone({
+    url: "/zdropzone",
+    addRemoveLinks: !0,
+    maxFilesize: 30,
+    headers: {"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content")},
+    removedfile: function(file) {
+        ajaxPost("/zdropzone-remove",{file:file.name},(data) => {
+            file.previewElement.remove();
+        })
+    },
+    init: function() {
+        let dz = this;
+        const type = window.location.href.split("/").pop();
+        dz.on("addedfile", function(file) {
+            ajaxPost("/zdropzone-attributes",{file:file.name,'category':'add',field:"${item}",table:"${MYMODEL.table}", type:type},() => {})
+        });
+        dz.on("removedfile", function(file) {
+            ajaxPost("/zdropzone-attributes",{file:file.name,'category':'remove',field:"${item}",table:"${MYMODEL.table}", type:type},() => {})
+        });
+        if(dropzone_${item}_data.length > 0) {
+          dropzone_${item}_data.map((item) => {
+          const mockFile = {
+                    name: item,
+                    id: item,
+                    size: 12345,
+                    accepted:true
+                }; 
+            dz.options.addedfile.call(dz, mockFile);
+            dz.options.thumbnail.call(dz, mockFile, "${process.env.APP_URL}/uploads/${MYMODEL.table}/${item}/"+item);
+          })
+        };
+    }
+}); `
+    })
+  }
+
   defaultScript = `${Util.newLine} $(function () {
         $(".isfile").each(function (index, value) {
             let filename = $(this).attr("data-filename") || "";
@@ -3468,12 +3521,43 @@ zRoute.insertSQL = async (req, res, table, data) => {
   const MYMODELS = myCache.get('MYMODELS')
   let MYMODEL = MYMODELS[table]
   let fields = MYMODEL.keys
+  let userId = res.locals.userId || 1
   if (fields.includes('company_id')) data.company_id = res.locals.companyId || 1
   if (fields.includes('updated_at')) data.updated_at = Util.now()
   if (fields.includes('created_at')) data.created_at = Util.now()
-  if (fields.includes('updated_by')) data.updated_by = res.locals.userId || 1
-  if (fields.includes('created_by')) data.created_by = res.locals.userId || 1
+  if (fields.includes('updated_by')) data.updated_by = userId
+  if (fields.includes('created_by')) data.created_by = userId
   delete data.lock
+  delete data.approval_status
+  delete data.approval_history
+
+  //check dropzone
+  let hasDropzone = false
+  for (let key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name === 'dropzone') {
+      //console.log('has dropzone')
+      let path_src = dirRoot + '/public/zdropzone/' + userId + '/'
+      let path_dest = dirRoot + '/public/uploads/' + MYMODEL.routeName + '/' + key + '/'
+      fs.ensureDir(path_dest, (err) => {
+        //console.log('ensureDir',err); // => null
+      })
+      let name = `dropzone__${res.locals.userId}__${table}__${key}__create`
+      if (myCache.has(name)) {
+        let arr = myCache.get(name)
+        let newArr = []
+        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)
+          })
+
+          data[key] = Util.array_to_jsonb(newArr)
+        }
+      }
+    }
+  }
   const result = await connection.insert({ table: table, data: data })
   zRoute.modelsCacheRenew(table, res.locals.companyId)
   return result
@@ -3536,6 +3620,8 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
   delete data.created_at
   delete data.created_by
   delete data.lock
+  delete data.approval_status
+  delete data.approval_history
   if (result.lock != 1) {
     const myresult = await connection.update({ table: table, where: whereData, data: data })
     zRoute.modelsCacheRenew(table, res.locals.companyId)

package/package.json

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