zet-lib 1.0.21 → 1.0.23

package/lib/Form.js

@@ -371,7 +371,7 @@ Form.field = (obj) => {
             }
             let btnAdd = '';
             if (!obj.isAddButton && !obj.viewOnly) {
-                btnAdd = `<th><button type="button" class="btn" title="Add" id="add${obj.id}"><img src="/assets/icons/plus.svg" class="icons-bg-black" ></button></th>`;
+                btnAdd = `<th><img  id="add${obj.id}" src="/assets/icons/plus.svg" class="icons-bg-black boxy-small" ></th>`;
             }
             obj.btnAdd = btnAdd;
             obj.html = html;
@@ -557,12 +557,12 @@ Form.breadcrumbImport = (routeName) => {
 
 Form.breadcrumbApproval = (routeName, id) => {
     return Form.breadcrumbs( [
-            {text: LANGUAGE['home'], href: "/dashboard"},
-            {text: LANGUAGE['grid_list'],href: "/" + routeName},
-            {text: LANGUAGE['update'], href: '/' + routeName + '/update/' + id},
-            {text: LANGUAGE['create'],href: '/' + routeName + '/create'},
-            {text: "Approval", active: true}
-        ]);
+        {text: LANGUAGE['home'], href: "/dashboard"},
+        {text: LANGUAGE['grid_list'],href: "/" + routeName},
+        {text: LANGUAGE['update'], href: '/' + routeName + '/update/' + id},
+        {text: LANGUAGE['create'],href: '/' + routeName + '/create'},
+        {text: "Approval", active: true}
+    ]);
 }
 
 Form.grid = (type, obj) => {

package/lib/zPage.js

@@ -54,7 +54,7 @@ const csrfProtection = csrf({cookie: true});
 const fs = require('fs-extra');
 const qs = require('qs');
 const axios = require('axios');
-const {zRoute, zRole, connection, Util, io, zCache, myCache, debug, moduleLib, zFunction, zFn, Mail } = require('zet-lib');
+const { connection, Util, io, zCache, myCache, zDebug, zDataTable, moduleLib, zFunction, zFn, zMail, zRoute, zRole} = require('zet-lib');
 
 `;
 };
@@ -159,6 +159,7 @@ zpage.buildLayout = async (obj) => {
             minifyCSS:true,
             collapseWhitespace: true
         });
+        console.log(dirRoot + "/views/layouts/" + name + ".ejs");
         fs.writeFileSync(dirRoot + "/views/layouts/" + name + ".ejs", html, 'utf-8');
         if (process.env.NODE_ENV  === "production") {
             setTimeout(function () {

package/lib/zRoute.js

@@ -51,6 +51,34 @@ zRoute.ROUTES = () => {
   return arr;
 };
 
+//translate render and optimize so javascript can direct inject
+zRoute.renderHTML = (datas)=> {
+  let renderBody=renderEnd=bodyHTML=endHTML='';
+  if(datas.hasOwnProperty('renderBody')) {
+    renderBody = datas.renderBody.replaceAll('/','_').replaceAll('.','_');
+    if(myCache.has(renderBody)){
+      bodyHTML = myCache.get(renderBody);
+    } else {
+      bodyHTML = Util.readFile(`${dirRoot}/views/${datas.renderBody}`);
+      myCache.set(renderBody, bodyHTML);
+    }
+    delete datas.renderBody;
+  }
+  if(datas.hasOwnProperty('renderEnd')) {
+    renderEnd = datas.renderEnd.replaceAll('/','_').replaceAll('.','_');
+    if(myCache.has(renderEnd)){
+      endHTML = myCache.get(renderEnd);
+    } else {
+      endHTML = Util.readFile(`${dirRoot}/views/${datas.renderEnd}`);
+      myCache.set(renderEnd, endHTML);
+    }
+    delete datas.renderEnd;
+  }
+
+  datas.bodyHTML =  ejs.render(bodyHTML,datas);
+  datas.endHTML =  ejs.render(endHTML,datas);
+  return datas;
+}
 /*
 Auto updated_at,created_at,company_id,created_by,updated_by
  */
@@ -2722,7 +2750,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
           trtd += `<td  class="td_${key}_${MYMODEL.widgets[keys].table}">${cForm.field(obj)}</td>`;
         }
 
-        trtd += `<td style="vertical-align:top"><span class="fas fa-trash-alt ${trash}" ></span></td></tr>`;
+        trtd += `<td style="vertical-align:top"><span class="icon-small icons-danger ${trash}" title="Delete"><img class="icons-bg-white griddelete icon-image" src="/assets/icons/trash-filled.svg"></span></td></tr>`;
         let subname = MYMODEL.table + "_" + keys;
         scriptForm += `$("table").on("click", ".${trash}", function () {$(this).closest('tr').remove();});`;
         scriptForm += Util.newLine;
@@ -3312,7 +3340,7 @@ zRoute.makeFunctionsSystem = () => {
       content += Util.newLine;
     }
   }
-  let templateSystem = `const {zRole, zCache, myCache, Util, io, moment, Mail} = require('zet-lib');
+  let templateSystem = `const { connection, Util, io, zCache, myCache, zDebug, zDataTable, moduleLib, zFunction, zFn, zMail, zRoute, zRole} = require('zet-lib');
 module.exports = (req, res, next) => {`;
   let fileSystem = `${dirRoot}/components/zFunctionsSystem.js`;
   templateSystem += content;

package/package.json

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