zet-lib 1.3.29 → 1.3.31
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 +17 -14
- 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 ' : ''
|
|
@@ -1129,6 +1138,10 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
|
|
|
1129
1138
|
myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
|
|
1130
1139
|
break
|
|
1131
1140
|
|
|
1141
|
+
case 'dropdown_checkbox':
|
|
1142
|
+
myvalue = value ? value.reduce((acc,item)=> `${acc} <u>${item}</u> `, '') : ''
|
|
1143
|
+
break
|
|
1144
|
+
|
|
1132
1145
|
case 'array':
|
|
1133
1146
|
myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
|
|
1134
1147
|
break
|
|
@@ -2023,13 +2036,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
|
|
|
2023
2036
|
if (MYMODEL.widgets[key].name == 'datepicker') {
|
|
2024
2037
|
asDate.push(key)
|
|
2025
2038
|
}
|
|
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') {
|
|
2039
|
+
if (MYMODEL.widgets[key].name == 'dropdown_multi' || MYMODEL.widgets[key].name == 'dragdrop' || MYMODEL.widgets[key].name == 'dropdown_checkbox') {
|
|
2033
2040
|
asJSONb.push(key)
|
|
2034
2041
|
}
|
|
2035
2042
|
if (MYMODEL.widgets[key].name == 'json_array' || MYMODEL.widgets[key].name == 'array' || MYMODEL.widgets[key].name == 'dropzone') {
|
|
@@ -2102,6 +2109,8 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
|
|
|
2102
2109
|
gridData.joins = joins
|
|
2103
2110
|
}
|
|
2104
2111
|
const rows = await connection.results(gridData)
|
|
2112
|
+
//let sql = await connection.sql(gridData)
|
|
2113
|
+
//console.log(sql)
|
|
2105
2114
|
let gridCount = {
|
|
2106
2115
|
select: `count(${table}.id) as count`,
|
|
2107
2116
|
table: MYMODEL.table,
|
|
@@ -2169,13 +2178,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
|
|
|
2169
2178
|
if (MYMODEL.widgets[key].name == 'datepicker') {
|
|
2170
2179
|
asDate.push(key)
|
|
2171
2180
|
}
|
|
2172
|
-
if (MYMODEL.widgets[key].name == 'dropdown_multi') {
|
|
2173
|
-
asJSONb.push(key)
|
|
2174
|
-
}
|
|
2175
|
-
if (MYMODEL.widgets[key].name == 'dragdrop') {
|
|
2176
|
-
asJSONb.push(key)
|
|
2177
|
-
}
|
|
2178
|
-
if (MYMODEL.widgets[key].name == 'dropdown_checkbox') {
|
|
2181
|
+
if (MYMODEL.widgets[key].name == 'dropdown_multi' || MYMODEL.widgets[key].name == 'dragdrop' || MYMODEL.widgets[key].name == 'dropdown_checkbox') {
|
|
2179
2182
|
asJSONb.push(key)
|
|
2180
2183
|
}
|
|
2181
2184
|
if (MYMODEL.widgets[key].name == 'json_array' || MYMODEL.widgets[key].name == 'array' || MYMODEL.widgets[key].name == 'dropzone') {
|