@websy/websy-designs 1.2.32 → 1.3.0
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/dist/server/helpers/v1/pgHelper.js +13 -5
- package/dist/server/routes/v1/api.js +11 -1
- package/dist/websy-designs-es6.debug.js +972 -44
- package/dist/websy-designs-es6.js +1224 -161
- package/dist/websy-designs-es6.min.js +1 -1
- package/dist/websy-designs.debug.js +1024 -45
- package/dist/websy-designs.js +1289 -169
- package/dist/websy-designs.min.css +1 -1
- package/dist/websy-designs.min.js +1 -1
- package/index.js +1 -0
- package/package.json +1 -1
|
@@ -213,12 +213,20 @@ class PGHelper {
|
|
|
213
213
|
let list = input.split(';').map(d => {
|
|
214
214
|
let parts = d.split(':')
|
|
215
215
|
if (parts.length === 2) {
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
216
|
+
let partValues = parts[1]
|
|
217
|
+
partValues = partValues.split('|')
|
|
218
|
+
if (partValues.length === 1) {
|
|
219
|
+
if (parts[1].indexOf('%') !== -1) {
|
|
220
|
+
return `${entity ? entity + '.' : ''}${parts[0]} LIKE '${parts[1]}'`
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
return `${entity ? entity + '.' : ''}${parts[0]} = '${parts[1]}'`
|
|
224
|
+
}
|
|
225
|
+
}
|
|
219
226
|
else {
|
|
220
|
-
|
|
221
|
-
|
|
227
|
+
console.log(`${entity ? entity + '.' : ''}${parts[0]} IN ('${partValues.join('\',\'')}')`)
|
|
228
|
+
return `${entity ? entity + '.' : ''}${parts[0]} IN ('${partValues.join('\',\'')}')`
|
|
229
|
+
}
|
|
222
230
|
}
|
|
223
231
|
else {
|
|
224
232
|
parts = d.split('!')
|
|
@@ -31,7 +31,17 @@ function APIRoutes (dbHelper) {
|
|
|
31
31
|
// console.log(`lang is ${lang}`)
|
|
32
32
|
const sql = dbHelper.buildSelect(req.params.entity, req.query, req.query.columns, lang)
|
|
33
33
|
dbHelper.execute(sql).then(response => {
|
|
34
|
-
|
|
34
|
+
if (process.env.RETURN_COUNTS === true || process.env.RETURN_COUNTS === 'true') {
|
|
35
|
+
let countWhere = ''
|
|
36
|
+
const countSql = `SELECT COUNT(*) as total FROM ${req.params.entity} WHERE ${dbHelper.buildWhere(req.query.where, req.params.entity)}`
|
|
37
|
+
dbHelper.execute(countSql).then(countResponse => {
|
|
38
|
+
response.totalCount = countResponse.rows[0].total
|
|
39
|
+
res.json(translate(response))
|
|
40
|
+
})
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
res.json(translate(response))
|
|
44
|
+
}
|
|
35
45
|
}, err => res.json(err))
|
|
36
46
|
})
|
|
37
47
|
router.post('/:entity', (req, res) => {
|