zet-lib 1.0.49 → 1.0.52

package/lib/Util.js

@@ -723,7 +723,6 @@ Util.fileView = function (dir, file, attributes={}) {
 };
 /// end files
 
-
 Util.arrayDelete = function (arr, value) {
     return arr.filter((item)=> item != value);
 };
@@ -1125,6 +1124,28 @@ Util.userAvatar = (img) => {
 /*
  MYSQL HELPER
  */
+Util.selectParser = (fields, MYMODEL) => {
+    fields = fields.filter(e => e !== "actionColumn");
+    let virtuals = [];
+    for(var key in MYMODEL.widgets) {
+        if(MYMODEL.widgets[key].name === "virtual") {
+            virtuals.push(key);
+        }
+    }
+    let arr = []
+    fields.forEach((item) => {
+        if(virtuals.includes(item)) {
+            arr.push(MYMODEL.widgets[item].fields);
+        } else if(item === "no") {
+            arr.push('id');
+        } else {
+            arr.push(item)
+        }
+    })
+
+    let select = `"${arr.join('","')}"`;
+    return select;
+}
 
 Util.selectMysql = (fields,relations={}) => {
     let obj = {}

package/lib/zRoute.js

@@ -1050,6 +1050,12 @@ zRoute.handleSession = async (req, user) => {
 }
 
 zRoute.excelQuery = async (req, res, MYMODEL) => {
+  let virtuals = []
+  for (var key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name === 'virtual') {
+      virtuals.push(key)
+    }
+  }
   //check directory for import not export
   const dir = `${dirRoot}/public/excel/tmp`
   if (!fs.existsSync(dir)) {
@@ -1078,10 +1084,11 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     let result = results[0]
     body = result.filter
     fields = body.fields.filter((item) => item != 'no' && item != 'actionColumn')
-    select = Util.selectMysql(fields)
+    select = Util.selectParser(fields, MYMODEL)
+    console.log(virtuals)
     if (zall) {
       let difference = allfields.filter((x) => !fields.includes(x))
-      arr = [...fields, ...difference]
+      arr = [...fields, ...difference].filter((x) => !virtuals.includes(x))
       select = `"${arr.join('","')}"`
     }
     let whereArray = []
@@ -1115,7 +1122,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     rows = await connection.results(obj)
   } else {
     rows = await connection.results({
-      select: Util.selectMysql(fields),
+      select: Util.selectParser(fields, MYMODEL),
       table: MYMODEL.table,
       limit: reqQuery.pageSize,
       offset: parseInt(reqQuery.pageSize) - 1,
@@ -1125,6 +1132,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
   if (zall) {
     fields = arr
   }
+  console.log(select)
 
   const ztype = reqQuery.ztype == 1 ? true : false
   if (ztype) {
@@ -1524,7 +1532,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   const MYMODEL = objData.MYMODEL || {}
   const fields = Object.prototype.hasOwnProperty.call(objData, 'fields') ? objData.fields : req.body.fields
   const relations = await zRoute.relations(req, res, MYMODEL.table)
-  const select = Object.prototype.hasOwnProperty.call(objData, 'select') ? objData.select : Util.selectMysql(fields, relations)
+  const select = Object.prototype.hasOwnProperty.call(objData, 'select') ? objData.select : Util.selectParser(fields, MYMODEL)
   const columns = Object.prototype.hasOwnProperty.call(objData, 'columns') ? objData.columns : body.columns
   let whereArray = []
   if (objData.hasOwnProperty('whereArray')) {
@@ -1604,7 +1612,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   const relations = await zRoute.relations(req, res, MYMODEL.table)
   const body = req.body
   const fields = body.fields
-  const select = Util.selectMysql(fields, relations)
+  const select = Util.selectParser(fields, MYMODEL)
   let whereArray = []
   const columns = body.columns
   whereArray.push({
@@ -3036,8 +3044,8 @@ zRoute.import = async (req, res, MYMODEL) => {
   }
   //convert to table header
   let hd = '<tr>'
+  let i = 0
   for (let prop in result[1]) {
-    let i = 0
     keys[prop] = result[1][prop]
     hd += `<th>${result[0][prop]}</th>`
     headers.push({ i: i, prop: prop, value: result[0][prop] })
@@ -3045,20 +3053,44 @@ zRoute.import = async (req, res, MYMODEL) => {
   }
   hd += `<th>${LANGUAGE['noted']}</th>`
   hd += `</tr>`
+
+  let isCut = false
+  if (i > 20 && result.length > 2000) {
+    io.to(room).emit('message', 'short display data!')
+    isCut = true
+  }
   //convert to table header
   io.to(room).emit('import', hd)
   let isInsert = true
-  hd += `<tr>`
+
   for (let i = 3; i < result.length; i++) {
+    hd = ''
+    hd += `<tr>`
     const data = {}
     hd += `${i - 2}`
+    //column cut tidak penting hanya jika kebanyakan dipotong
+    let columnCut = 0
     for (var prop in keys) {
       let value = result[i][prop]
       if (value) {
-        data[keys[prop]] = value
+        if (MYMODEL.widgets[keys[prop]].name === 'integer') {
+          data[keys[prop]] = parseInt(value) || null
+        } else if (MYMODEL.widgets[keys[prop]].name === 'virtual') {
+          //empty
+        } else {
+          data[keys[prop]] = value
+        }
+      }
+      if (isCut) {
+        console.log('cut and column cut')
+        if (columnCut < 10) {
+          hd += `<td>${value || ''}</td>`
+        }
+      } else {
+        hd += `<td>${value || ''}</td>`
       }
-      hd += `<td>${value}</td>`
       if (keys[prop] == 'id') isInsert = false
+      columnCut++
     }
     try {
       if (isInsert) {
@@ -3081,13 +3113,13 @@ zRoute.import = async (req, res, MYMODEL) => {
       }
       hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
     } catch (err) {
-      hd += `<td class='text text-danger'>${err.toString()}</td>`
+      hd += `<td class='text text-danger'>${err + ''}</td>`
+      io.to(room).emit('error', err + '' + ' ')
     }
     hd += '</tr>'
     io.to(room).emit('import', hd)
   }
-  hd += ''
-  io.to(room).emit('import', hd)
+
   fs.removeSync(filename)
   //cache for uploading excel
   zRoute.modelsCacheRenew(MYMODEL.table, res.locals.companyId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.0.49",
+  "version": "1.0.52",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -49,4 +49,4 @@
     "uuid": "^9.0.0",
     "xlsx": "^0.18.5"
   }
-}
+}