|
|
@@ -24,15 +24,17 @@ function getTrueFilters(item, filters) {
|
|
|
if(f.operator === 'betweent' ? ( !!f.value1 && (f.value1.length ? f.value1.length > 0 : true) && !!f.value2 && (f.value2.length ? f.value2.length > 0 : true)) : (!!f.value1 && (f.value1.length ? f.value1.length > 0 : true))) {
|
|
|
if(f.combined) {
|
|
|
f.dataSource && f.dataSource.forEach(d => {
|
|
|
- trueFilters.push({
|
|
|
- dataSourceCode: d.dataSource.code,
|
|
|
- name: d.column.name,
|
|
|
- operator: f.operator,
|
|
|
- type: f.type,
|
|
|
- value1: f.value1,
|
|
|
- value2: f.value2,
|
|
|
- using: f.using
|
|
|
- });
|
|
|
+ if(d.dataSource.code === item.dataSourceCode) {
|
|
|
+ trueFilters.push({
|
|
|
+ dataSourceCode: d.dataSource.code,
|
|
|
+ name: d.column.name,
|
|
|
+ operator: f.operator,
|
|
|
+ type: f.type,
|
|
|
+ value1: f.value1,
|
|
|
+ value2: f.value2,
|
|
|
+ using: f.using
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
}else {
|
|
|
if(f.dataSource.code === item.dataSourceCode) {
|