@websy/websy-designs 1.11.12 → 1.11.13
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 +4 -8
- package/dist/server/websy-designs-server.js +3 -1
- package/dist/websy-designs-es6.debug.js +1 -1
- package/dist/websy-designs-es6.js +2 -1
- package/dist/websy-designs-es6.min.js +1 -1
- package/dist/websy-designs.debug.js +1 -1
- package/dist/websy-designs.js +2 -1
- package/dist/websy-designs.min.js +1 -1
- package/package.json +1 -1
|
@@ -294,7 +294,6 @@ class PGHelper {
|
|
|
294
294
|
return sql
|
|
295
295
|
}
|
|
296
296
|
buildWhere (input, entity) {
|
|
297
|
-
console.log('input is', input)
|
|
298
297
|
if (typeof input === 'undefined' || input.trim() === '') {
|
|
299
298
|
return '1=1'
|
|
300
299
|
}
|
|
@@ -308,7 +307,7 @@ class PGHelper {
|
|
|
308
307
|
// console.log('where input', input)
|
|
309
308
|
// console.log('splitter is', this.options.fieldValueSeparator)
|
|
310
309
|
let list = input.split(';').map(d => {
|
|
311
|
-
let parts = d.split(this.options.fieldValueSeparator)
|
|
310
|
+
let parts = d.split(this.options.fieldValueSeparator)
|
|
312
311
|
if (parts.length === 2) {
|
|
313
312
|
let partValues = parts[1]
|
|
314
313
|
partValues = partValues.split('|')
|
|
@@ -322,12 +321,11 @@ class PGHelper {
|
|
|
322
321
|
else if (parts[1].indexOf('%') !== -1) {
|
|
323
322
|
return `LOWER(${entity ? entity + '.' : ''}${parts[0]}) LIKE '${parts[1]}'`
|
|
324
323
|
}
|
|
325
|
-
else {
|
|
324
|
+
else {
|
|
326
325
|
return `${entity ? entity + '.' : ''}${parts[0]} = '${parts[1]}'`
|
|
327
326
|
}
|
|
328
327
|
}
|
|
329
|
-
else {
|
|
330
|
-
console.log(`${entity ? entity + '.' : ''}${parts[0]} IN ('${partValues.join('\',\'')}')`)
|
|
328
|
+
else {
|
|
331
329
|
return `${entity ? entity + '.' : ''}${parts[0]} IN ('${partValues.join('\',\'')}')`
|
|
332
330
|
}
|
|
333
331
|
}
|
|
@@ -337,9 +335,7 @@ class PGHelper {
|
|
|
337
335
|
return `${entity ? entity + '.' : ''}${parts[0]} <> '${parts[1]}'`
|
|
338
336
|
}
|
|
339
337
|
}
|
|
340
|
-
})
|
|
341
|
-
console.log('list is')
|
|
342
|
-
console.log(list)
|
|
338
|
+
})
|
|
343
339
|
return `
|
|
344
340
|
${list.length > 0 ? list.join(' AND ') : ''}
|
|
345
341
|
`
|
|
@@ -67,7 +67,9 @@ module.exports = function (options) {
|
|
|
67
67
|
app.use('/pdf', require(`./routes/${version}/pdf`))
|
|
68
68
|
if (options.useDB === true) {
|
|
69
69
|
const dbHelper = require(`./helpers/${version}/${options.dbEngine}Helper`)
|
|
70
|
-
|
|
70
|
+
let dbOptions = options.dbEngine === 'pg' ? options.dbOptions : options.dbOnError || {}
|
|
71
|
+
|
|
72
|
+
dbHelper.init(dbOptions).then(() => {
|
|
71
73
|
app.set('trust proxy', 1)
|
|
72
74
|
app.use(cookieParser(process.env.SESSION_SECRET))
|
|
73
75
|
let cookieConfig = {
|
|
@@ -4198,7 +4198,7 @@ class WebsyResultList {
|
|
|
4198
4198
|
const el = document.getElementById(this.elementId)
|
|
4199
4199
|
el.innerHTML += html.replace(/\n/g, '')
|
|
4200
4200
|
}
|
|
4201
|
-
buildHTML (d, startIndex = 0, inputTemplate, locator = []) {
|
|
4201
|
+
buildHTML (d = [], startIndex = 0, inputTemplate, locator = []) {
|
|
4202
4202
|
let html = ``
|
|
4203
4203
|
if (this.options.template) {
|
|
4204
4204
|
if (d.length > 0) {
|
|
@@ -3965,8 +3965,9 @@ var WebsyResultList = /*#__PURE__*/function () {
|
|
|
3965
3965
|
}
|
|
3966
3966
|
}, {
|
|
3967
3967
|
key: "buildHTML",
|
|
3968
|
-
value: function buildHTML(
|
|
3968
|
+
value: function buildHTML() {
|
|
3969
3969
|
var _this28 = this;
|
|
3970
|
+
var d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
3970
3971
|
var startIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
3971
3972
|
var inputTemplate = arguments.length > 2 ? arguments[2] : undefined;
|
|
3972
3973
|
var locator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
|