zet-lib 1.2.69 → 1.2.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/zRoute.js +18 -6
  2. package/package.json +1 -1
package/lib/zRoute.js CHANGED
@@ -2518,7 +2518,7 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
2518
2518
  let val = obj.value || []
2519
2519
  if (val.length) {
2520
2520
  val.forEach(function (item) {
2521
- let myforms = zRoute.viewForm(req, res, MODEL, relationsTable, item)
2521
+ let myforms = zRoute.viewForm(req, res, MODEL, relationsTable, item, MYMODEL)
2522
2522
  html += `<tr>`
2523
2523
  for (let k in obj.data) {
2524
2524
  html += `<td>${cForm.field(myforms.obj[k])}</td>`
@@ -2559,7 +2559,8 @@ zRoute.viewFormSync = (req, res, MYMODEL, relations, data = {}) => {
2559
2559
  return forms
2560
2560
  }
2561
2561
 
2562
- zRoute.viewForm = (req, res, MYMODEL, relations, data = {}) => {
2562
+ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}) => {
2563
+ let isTableType = Object.keys(MODEL_TABLE).length > 0 ? true : false
2563
2564
  let forms = zRoute.forms(req, res, MYMODEL, relations, data)
2564
2565
  const widgets = MYMODEL.widgets
2565
2566
  let obj = forms.obj
@@ -2586,16 +2587,27 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}) => {
2586
2587
  case 'image':
2587
2588
  obj[key].type = 'plaintext'
2588
2589
  let width = widgets[key].width || '300'
2589
- obj[key].value =
2590
- '<br><br>' +
2591
- Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], {
2590
+ if (isTableType) {
2591
+ obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${MYMODEL.routeName}/`, data[key], {
2592
2592
  width: width,
2593
2593
  class: 'boxy',
2594
2594
  })
2595
+ } else {
2596
+ obj[key].value =
2597
+ '<br><br>' +
2598
+ Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], {
2599
+ width: width,
2600
+ class: 'boxy',
2601
+ })
2602
+ }
2595
2603
  break
2596
2604
  case 'file':
2597
2605
  obj[key].type = 'plaintext'
2598
- obj[key].value = '<br><br>' + Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], { withIcon: true })
2606
+ if (isTableType) {
2607
+ obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${MYMODEL.routeName}/`, data[key], { withIcon: true })
2608
+ } else {
2609
+ obj[key].value = '<br><br>' + Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], { withIcon: true })
2610
+ }
2599
2611
  break
2600
2612
  case 'switch':
2601
2613
  obj[key].type = 'plaintext'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zet-lib",
3
- "version": "1.2.69",
3
+ "version": "1.2.70",
4
4
  "description": "zet is a library that part of zet generator.",
5
5
  "engines": {
6
6
  "node": ">=18"