zet-lib 1.0.31 → 1.0.33

package/lib/Util.js

@@ -1,4 +1,4 @@
-const moment = require('moment-timezone');
+const moment = require('moment');
 const path = require('path');
 const randomstring = require("randomstring");
 const fs = require('fs-extra');
@@ -78,10 +78,10 @@ Util.dateSql = function (date, format) {
         return '';
 };
 
-Util.dateFormat = function (date, format, tz='Asia/Jakarta') {
+Util.dateFormat = function (date, format) {
     format = format || "YYYY-MM-DD";
     if (date && date != "0000-00-00")
-        return moment(date).tz(tz).format(format);
+        return moment(date).format(format);
     else
         return '';
 };

package/lib/moduleLib.js

@@ -147,7 +147,7 @@ m.lexical = function(req,res,elem) {
     let end = ``;
     elem = elem || ".editor";
     head += `<link rel="stylesheet" href="/assets/main.143ecbc6.css">`;
-    head += `<script type="module" crossorigin src="/assets/main.3be493b7.js"></script>`;
+    end += `<script type="module" crossorigin src="/assets/main.3be493b7.js"></script>`;
 
     return {
         head : head,

package/lib/zRoute.js

@@ -1576,20 +1576,26 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   let datas = [];
   const zRole = objData.zRole || {};
   const levels = objData.hasOwnProperty('levels') ? objData.levels : zRole.myLevel(req, res, MYMODEL.table);
-  rows.forEach(function (row, index) {
-    let arr = [];
-    fields.forEach(function (item) {
-      if (item == "no") {
-        arr.push((index + 1 + parseInt(body.start)));
-      } else if (item == "actionColumn") {
-        let buttons = objData.hasOwnProperty('actionButtons') ? objData.actionButtons(levels, row, MYMODEL.table) : zRoute.actionButtons(levels, row, MYMODEL.table);
-        arr.push(buttons);
-      } else {
-        arr.push(zRoute.dataTableData(item, row[item], MYMODEL, relations));
-      }
+  if(objData.hasOwnProperty('datas')) {
+    datas = objData.datas(body, rows, fields, relations, levels);
+  } else {
+    rows.forEach(function (row, index) {
+      let arr = [];
+      fields.forEach(function (item) {
+        if (item == "no") {
+          arr.push((index + 1 + parseInt(body.start)));
+        } else if (item == "actionColumn") {
+          let buttons = objData.hasOwnProperty('actionButtons') ? objData.actionButtons(levels, row, MYMODEL.table) : zRoute.actionButtons(levels, row, MYMODEL.table);
+          arr.push(buttons);
+        } else {
+          let data = objData.hasOwnProperty('datas') ? objData.data(item, row[item],MYMODEL,relations) : zRoute.dataTableData(item, row[item], MYMODEL, relations);
+          arr.push(data);
+        }
+      });
+      datas.push(arr)
     });
-    datas.push(arr)
-  });
+  }
+
   const data = {
     draw: body.draw,
     recordsTotal: count.count || 0,
@@ -2545,7 +2551,10 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     } else if (widgets[key].name == "tags") {
       hasTags = true;
     } else if (widgets[key].name == "lexical") {
+      let lexicalObj = moduleLib.lexical(req, res, `#${key}`);
       hasLexical = true;
+      headObj.lexical = lexicalObj.head;
+      endObj.lexical = lexicalObj.end;
       lexicals.push(key);
     } else if (widgets[key].name == "tinymce") {
       hasTinymce = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -37,7 +37,6 @@
     "html-minifier-terser": "^7.2.0",
     "js-sha256": "^0.9.0",
     "moment": "^2.29.4",
-    "moment-timezone": "^0.5.43",
     "node-cache": "^5.1.2",
     "nodemailer": "^6.9.4",
     "pg": "^8.11.2",