zet-lib 1.3.29 → 1.3.30
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 +12 -7
- package/package.json +1 -1
package/lib/zRoute.js
CHANGED
|
@@ -880,6 +880,15 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
|
|
|
880
880
|
types[key] = 'select'
|
|
881
881
|
break
|
|
882
882
|
|
|
883
|
+
case 'dropdown_checkbox':
|
|
884
|
+
options = MYMODEL.widgets[key].fields.reduce((result, item) => {
|
|
885
|
+
var selected = value == item ? ' selected ' : ''
|
|
886
|
+
return result + `<option value="${item}" ${selected} >${item}</option>`
|
|
887
|
+
}, '')
|
|
888
|
+
dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search"><option value=""></option>${options}</select>`
|
|
889
|
+
types[key] = 'select'
|
|
890
|
+
break
|
|
891
|
+
|
|
883
892
|
case 'dropdown_multi':
|
|
884
893
|
options = relations[key].reduce((result, item) => {
|
|
885
894
|
var selected = value == item.id ? ' selected ' : ''
|
|
@@ -2023,13 +2032,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
|
|
|
2023
2032
|
if (MYMODEL.widgets[key].name == 'datepicker') {
|
|
2024
2033
|
asDate.push(key)
|
|
2025
2034
|
}
|
|
2026
|
-
if (MYMODEL.widgets[key].name == 'dropdown_multi') {
|
|
2027
|
-
asJSONb.push(key)
|
|
2028
|
-
}
|
|
2029
|
-
if (MYMODEL.widgets[key].name == 'dragdrop') {
|
|
2030
|
-
asJSONb.push(key)
|
|
2031
|
-
}
|
|
2032
|
-
if (MYMODEL.widgets[key].name == 'dropdown_checkbox') {
|
|
2035
|
+
if (MYMODEL.widgets[key].name == 'dropdown_multi' || MYMODEL.widgets[key].name == 'dragdrop' || MYMODEL.widgets[key].name == 'dropdown_checkbox') {
|
|
2033
2036
|
asJSONb.push(key)
|
|
2034
2037
|
}
|
|
2035
2038
|
if (MYMODEL.widgets[key].name == 'json_array' || MYMODEL.widgets[key].name == 'array' || MYMODEL.widgets[key].name == 'dropzone') {
|
|
@@ -2102,6 +2105,8 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
|
|
|
2102
2105
|
gridData.joins = joins
|
|
2103
2106
|
}
|
|
2104
2107
|
const rows = await connection.results(gridData)
|
|
2108
|
+
//let sql = await connection.sql(gridData)
|
|
2109
|
+
//console.log(sql)
|
|
2105
2110
|
let gridCount = {
|
|
2106
2111
|
select: `count(${table}.id) as count`,
|
|
2107
2112
|
table: MYMODEL.table,
|