|
|
@ -2361,6 +2361,7 @@ class BaseModelSqlv2 { |
|
|
|
SelectOption[] & { options } |
|
|
|
SelectOption[] & { options } |
|
|
|
>(); |
|
|
|
>(); |
|
|
|
groupingValues = new Set(colOptions.options.map((opt) => opt.title)); |
|
|
|
groupingValues = new Set(colOptions.options.map((opt) => opt.title)); |
|
|
|
|
|
|
|
groupingValues.add(null); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
groupingValues = new Set( |
|
|
|
groupingValues = new Set( |
|
|
|
( |
|
|
|
( |
|
|
@ -2369,8 +2370,8 @@ class BaseModelSqlv2 { |
|
|
|
.distinct() |
|
|
|
.distinct() |
|
|
|
).map((row) => row[column.column_name]) |
|
|
|
).map((row) => row[column.column_name]) |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
groupingValues.add(null); |
|
|
|
} |
|
|
|
} |
|
|
|
groupingValues.add(null); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const qb = this.dbDriver(this.model.table_name); |
|
|
|
const qb = this.dbDriver(this.model.table_name); |
|
|
|
qb.limit(+rest?.limit || 25); |
|
|
|
qb.limit(+rest?.limit || 25); |
|
|
|