zet-lib 1.5.7 → 1.5.9
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.
- package/lib/zRoute.js +19 -11
- package/package.json +1 -1
package/lib/zRoute.js
CHANGED
|
@@ -540,7 +540,7 @@ zRoute.selectData = (MYMODEL) => {
|
|
|
540
540
|
return data;
|
|
541
541
|
};
|
|
542
542
|
|
|
543
|
-
zRoute.relationTable = async (req, res, table) => {
|
|
543
|
+
zRoute.relationTable = async (req, res, table, visiblesColumns = []) => {
|
|
544
544
|
try {
|
|
545
545
|
const MYMODELS = myCache.get("MYMODELS");
|
|
546
546
|
const MYMODEL = MYMODELS[table];
|
|
@@ -551,8 +551,17 @@ zRoute.relationTable = async (req, res, table) => {
|
|
|
551
551
|
let hasAttributes = false;
|
|
552
552
|
let zattributes = {};
|
|
553
553
|
let company_id = res.locals.companyId;
|
|
554
|
+
let widgets = {}
|
|
555
|
+
if(visiblesColumns.length == 0){
|
|
556
|
+
widgets = MYMODEL.widgets
|
|
557
|
+
} else {
|
|
558
|
+
visiblesColumns.map((item) => {
|
|
559
|
+
widgets[item] = MYMODEL.widgets[item]
|
|
560
|
+
})
|
|
561
|
+
}
|
|
562
|
+
|
|
554
563
|
//widgets
|
|
555
|
-
for (let key in
|
|
564
|
+
for (let key in widgets) {
|
|
556
565
|
const keyRow = key + "Row";
|
|
557
566
|
const keyFields = key + "Fields";
|
|
558
567
|
const keyObject = key + "Object";
|
|
@@ -801,11 +810,11 @@ zRoute.relationTable = async (req, res, table) => {
|
|
|
801
810
|
}
|
|
802
811
|
};
|
|
803
812
|
|
|
804
|
-
zRoute.relations = async (req, res, table) => {
|
|
813
|
+
zRoute.relations = async (req, res, table, visiblesColumns = []) => {
|
|
805
814
|
try {
|
|
806
815
|
const MYMODELS = myCache.get("MYMODELS");
|
|
807
816
|
const MYMODEL = MYMODELS[table];
|
|
808
|
-
let relation = await zRoute.relationTable(req, res, table);
|
|
817
|
+
let relation = await zRoute.relationTable(req, res, table, visiblesColumns);
|
|
809
818
|
let relations = {};
|
|
810
819
|
if (MYMODEL.joins && MYMODEL.joins.list) {
|
|
811
820
|
let joinOfTables = MYMODEL.joins.tables;
|
|
@@ -2378,7 +2387,7 @@ zRoute.dataTableSave = async (routeName, userId, body) => {
|
|
|
2378
2387
|
/*
|
|
2379
2388
|
dynamic list Data Table
|
|
2380
2389
|
*/
|
|
2381
|
-
zRoute.listDataTable = async (req, res, objData = {}) => {
|
|
2390
|
+
zRoute.listDataTable = async (req, res, objData = {}, visibleColumns = []) => {
|
|
2382
2391
|
const room = res.locals.token || "aa";
|
|
2383
2392
|
try {
|
|
2384
2393
|
const body = req.body;
|
|
@@ -2387,9 +2396,8 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
|
|
|
2387
2396
|
const fields = Object.prototype.hasOwnProperty.call(objData, "fields")
|
|
2388
2397
|
? objData.fields
|
|
2389
2398
|
: req.body.fields;
|
|
2390
|
-
let relations = await zRoute.relations(req, res, MYMODEL.table);
|
|
2399
|
+
let relations = await zRoute.relations(req, res, MYMODEL.table, visibleColumns);
|
|
2391
2400
|
//find relation with joins
|
|
2392
|
-
|
|
2393
2401
|
const select = Object.prototype.hasOwnProperty.call(objData, "select")
|
|
2394
2402
|
? objData.select
|
|
2395
2403
|
: Util.selectParser(fields, MYMODEL);
|
|
@@ -5878,11 +5886,11 @@ zRoute.typeahead = async (req, res) => {
|
|
|
5878
5886
|
}
|
|
5879
5887
|
let MYMODEL = MYMODELS[table];
|
|
5880
5888
|
let WIDGET = MYMODEL.widgets;
|
|
5881
|
-
let query =
|
|
5882
|
-
//employee_payroll_salary___employee_id_1
|
|
5889
|
+
let query = req.query.query;
|
|
5883
5890
|
let name = `${MYMODEL.widgets[keys].table}_${MYMODEL.table}___${keys}_${res.locals.companyId}`;
|
|
5884
|
-
let
|
|
5885
|
-
|
|
5891
|
+
let sql = `select id,${MYMODEL.widgets[keys].fields[1]} as zname from ${MYMODEL.widgets[keys].table} where ${MYMODEL.widgets[keys].fields[1]} ILIKE '%${query}%' limit 50`
|
|
5892
|
+
let results = await connection.query(sql);
|
|
5893
|
+
res.json(results);
|
|
5886
5894
|
} catch (e) {
|
|
5887
5895
|
console.log(e);
|
|
5888
5896
|
res.json(e + "");
|