Browse Source

报表图表刷新时携带不属于图表数据源的过滤条件问题修复

zhuth 6 years ago
parent
commit
566b76be21
1 changed files with 11 additions and 9 deletions
  1. 11 9
      src/models/dashboardDesigner.js

+ 11 - 9
src/models/dashboardDesigner.js

@@ -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) {