zet-lib 1.0.57 → 1.0.59

package/lib/zRoleRouter.js

@@ -300,6 +300,7 @@ const body = `<div class="">
                             <% for(var i = 0;i < actions.length;i++) { %>
                                 <th><%= actions[i] %> <input onclick='checkthis("<%= actions[i] %>")' type="checkbox" id="all<%= actions[i] %>"></th>
                             <% } %>
+                            <th>Tabs</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -307,14 +308,16 @@ const body = `<div class="">
                             <tr>
                                 <td>
                                     <% var ename = routes[i]; 
-                                    var titleName =  tabs.includes(routes[i]) ? '<a class="handle-access" data-bs-toggle="modal" data-bs-target="#tabaccess" href="#">'+routes[i]+'</a>' : routes[i] %>
-                                    <%- titleName %>
+                                    var handleTag = "handleAccess('"+routes[i]+"')";
+                                    var spanRole =  tabs.includes(routes[i]) ? '<span class="handle-access icon-small icons-light" onclick="'+handleTag+'" data-bs-toggle="modal" data-bs-target="#tabaccess" ><img class="icons-bg-blue gridview icon-image" src="/assets/icons/lock-access.svg"></span>' : '' %>
+                                    <a href="/<%- ename %>" target="_blank"><%- ename %></a>
                                     </td>
                                 <% for(var x = 0;x < actions.length;x++) { %>
                                     <td><input name="params[<%= ename %>][<%= actions[x] %>]" class="<%= actions[x] %>"
                                         <% if(json && json.hasOwnProperty(ename) && json[ename].indexOf(actions[x]) >= 0) { %> <%= 'checked="checked"' %> <% } %> title="Role for <%= routes[i] %> <%= actions[x] %>" type="checkbox">
                                     </td>
                                 <% } %>
+                                <td><%- spanRole %></td>
                             </tr>
                         <% } %>
                         </tbody>
@@ -456,7 +459,6 @@ const js = `<script>
             $(".body-access").html(data);
         }))
     }
-    $(".handle-access").on("click", (e)=> handleAccess(e.target.text));
     $(".btn-save-tab").on("click",(e) => {
         let queryform = $("#tabform").serializeArray();
         ajaxPost('/zrole/post-access', {

package/lib/zRoute.js

@@ -1049,6 +1049,34 @@ zRoute.handleSession = async (req, user) => {
   }
 }
 
+zRoute.selectAllowedField = (req, res, MYMODEL, arr = []) => {
+  let newArr = []
+  let viewRole = []
+  if (MYMODEL.hasOwnProperty('hasTabs') && MYMODEL.hasTabs) {
+    let roles = myCache.get('ROLES') || {}
+    let myrole = roles[res.locals.roleId]
+    let tabsRole = myrole.tabs || {}
+    if (tabsRole.hasOwnProperty(MYMODEL.table) && tabsRole[MYMODEL.table]) {
+      viewRole = tabsRole[MYMODEL.table].view
+    }
+    if (viewRole.length > 0) {
+      viewRole.map((item, index) => {
+        if (!item) {
+          newArr = [...newArr, ...MYMODEL.tabsDetail[`arr${index}`]]
+        }
+      })
+    } else {
+      MYMODEL.tabs.map((_, index) => {
+        newArr = [...newArr, ...MYMODEL.tabsDetail[`arr${index}`]]
+      })
+    }
+    let fixedArr = arr.filter((item) => !newArr.includes(item))
+    arr = fixedArr
+  }
+
+  return arr
+}
+
 zRoute.excelQuery = async (req, res, MYMODEL) => {
   let virtuals = []
   for (var key in MYMODEL.widgets) {
@@ -1132,7 +1160,9 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
   if (zall) {
     fields = arr
   }
-  console.log(select)
+
+  fields = zRoute.selectAllowedField(req, res, MYMODEL, fields)
+  //console.log('fields::',fields)
 
   const ztype = reqQuery.ztype == 1 ? true : false
   if (ztype) {
@@ -2092,7 +2122,41 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
   const MYMODELS = myCache.get('MYMODELS')
   const relations = await zRoute.relations(req, res, MYMODEL.table)
   let forms = zRoute.viewForm(req, res, MYMODEL, relations, data)
-  //zRoute.moduleLib(req, res, MYMODEL, relations, forms);
+  //add tabs role
+  if (MYMODEL.hasOwnProperty('hasTabs') && MYMODEL.hasTabs) {
+    let script = ''
+    //MYMODEL.tabs.map((table))
+    script += `$(()=> {
+        ajaxPost('/ztab-access',{table:"${MYMODEL.table}"},(data)=> {
+            let dataTabs = ${MYMODEL.hasOwnProperty('tabs') ? JSON.stringify(MYMODEL.tabs) : []};
+            let viewAccess = data.view || [];
+            let createAccess = data.create || [];
+            let editAccess = data.edit || [];
+            let deleteAccess = data.delete || [];
+            dataTabs.map((_, index)=> {
+                if(!deleteAccess[index]) {
+                  setTimeout(function () {$("#arr"+index).find(".icons-danger").remove();},1000)
+                }
+                if(!editAccess[index]) {
+                    $("#arr"+index).find("input").attr("disabled",true);
+                    $("#arr"+index).find("select").attr("disabled",true);
+                }
+                if(!createAccess[index]) {
+                    $("#arr"+index).find(".btn-plus").remove();
+                    $("#arr"+index).find("input").attr("disabled",true);
+                    $("#arr"+index).find("select").attr("disabled",true);
+                }
+                if(!viewAccess[index]) {
+                    $("#arr"+index).remove();
+                    $(".arr"+index).remove();
+                }
+            })
+        });
+      });
+      `
+    moduleLib.addScript(req, res, script)
+  }
+
   let tables = []
   for (let key in forms.obj) {
     if (forms.obj[key].type == 'table') {

package/package.json

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