zet-lib 1.2.68 → 1.2.70

package/lib/zRoute.js

@@ -544,7 +544,12 @@ zRoute.relations = async (req, res, table) => {
         let nots = Util.nots
         let obj = {}
         let visibles = MODEL_TABLE.grids.visibles
+        //exclude lock,approval_status, approval_history
+        let notIncludes = ['lock', 'approval_status', 'approval_history', 'created_at']
+        visibles = visibles.filter((item) => !notIncludes.includes(item))
         let invisibles = MODEL_TABLE.grids.invisibles
+        invisibles = invisibles.filter((item) => !notIncludes.includes(item))
+
         let properties = {}
         visibles.forEach(function (item) {
           if (!Util.in_array(item, nots)) {
@@ -558,6 +563,9 @@ zRoute.relations = async (req, res, table) => {
             properties[item] = MODEL_TABLE.widgets[item]
           }
         })
+        delete properties.lock
+        delete properties.approval_status
+        delete properties.approval_history
         relations[key] = obj
         relations[`properties_${key}`] = properties
         relations[keyRow] = await zRoute.relations(req, res, widget.table)
@@ -2510,7 +2518,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>`
@@ -2551,7 +2559,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
@@ -2578,16 +2587,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'

package/package.json

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