zet-lib 1.2.69 → 1.2.71

package/lib/zRoute.js

@@ -1228,6 +1228,12 @@ zRoute.selectAllowedField = (req, res, MYMODEL, arr = []) => {
 }
 
 zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
+  const levels = zRole.myLevel(req, res, MYMODEL.table);
+  if(!levels.export) {
+    res.json("no access")
+    return false;
+  }
+
   let virtuals = []
   let customs = []
   let asDate = []
@@ -1348,6 +1354,11 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
 
 // for excels
 zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
+  const levels = zRole.myLevel(req, res, MYMODEL.table);
+  if(!levels.export) {
+    res.json("no access")
+    return false;
+  }
   //if any other custom value then callback needed
   callback = callback || function () {}
   const workbook = new Excel.Workbook()
@@ -2518,7 +2529,7 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
       let val = obj.value || []
       if (val.length) {
         val.forEach(function (item) {
-          let myforms = zRoute.viewForm(req, res, MODEL, relationsTable, item)
+          let myforms = zRoute.viewForm(req, res, MODEL, relationsTable, item, MYMODEL)
           html += `<tr>`
           for (let k in obj.data) {
             html += `<td>${cForm.field(myforms.obj[k])}</td>`
@@ -2559,7 +2570,8 @@ zRoute.viewFormSync = (req, res, MYMODEL, relations, data = {}) => {
   return forms
 }
 
-zRoute.viewForm = (req, res, MYMODEL, relations, data = {}) => {
+zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}) => {
+  let isTableType = Object.keys(MODEL_TABLE).length > 0 ? true : false
   let forms = zRoute.forms(req, res, MYMODEL, relations, data)
   const widgets = MYMODEL.widgets
   let obj = forms.obj
@@ -2586,16 +2598,27 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}) => {
         case 'image':
           obj[key].type = 'plaintext'
           let width = widgets[key].width || '300'
-          obj[key].value =
-            '<br><br>' +
-            Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], {
+          if (isTableType) {
+            obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${MYMODEL.routeName}/`, data[key], {
               width: width,
               class: 'boxy',
             })
+          } else {
+            obj[key].value =
+              '<br><br>' +
+              Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], {
+                width: width,
+                class: 'boxy',
+              })
+          }
           break
         case 'file':
           obj[key].type = 'plaintext'
-          obj[key].value = '<br><br>' + Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], { withIcon: true })
+          if (isTableType) {
+            obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${MYMODEL.routeName}/`, data[key], { withIcon: true })
+          } else {
+            obj[key].value = '<br><br>' + Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], { withIcon: true })
+          }
           break
         case 'switch':
           obj[key].type = 'plaintext'
@@ -3534,6 +3557,11 @@ zRoute.deleteSQL = async (table, id, company_id) => {
 
 //for import
 zRoute.import = async (req, res, MYMODEL) => {
+  const levels = zRole.myLevel(req, res, MYMODEL.table);
+  if(!levels.import) {
+    res.json("no access")
+    return false;
+  }
   const userId = res.locals.userId
   const room = res.locals.token
   let progress = 0

package/package.json

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