Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [misc] fix query filter value with query.

Browse Source
This commit is contained in:
qixinzhi
2024-07-08 19:53:09 +08:00
committed by 宋辰轩
parent a7975014c9
commit 029da630ee
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pivotstate/pivotstate.class.php
+10 -4
View File
@@ -1040,14 +1040,20 @@ class pivotState
{
if(!$this->isQueryFilter()) return;
$keepFilters = array();
foreach($this->filters as $filter)
$keepFilters = array();
$keepPivotFilters = array();
foreach($this->filters as $index => $filter)
{
$field = $filter['field'];
if(strpos($this->sql, "\$$field") !== false) $keepFilters[] = $filter;
if(strpos($this->sql, "\$$field") !== false)
{
$keepFilters[] = $filter;
$keepPivotFilters[] = $this->pivotFilters[0][$index];
}
}
$this->filters = $keepFilters;
$this->filters = $keepFilters;
$this->pivotFilters[0] = $keepPivotFilters;
}
/**
module/bi/config.php
+1 -1
View File
@@ -23,7 +23,7 @@ $config->bi->duckdbExt['dm'] = array('win' => 'sync2parquet.exe',
$config->bi->duckdbExt['mysql'] = array('win' => 'mysql_scanner.duckdb_extension', 'linux' => 'mysql_scanner.duckdb_extension');
$config->bi->duckdbExtUrl = array();
$config->bi->duckdbExtUrl['dm'] = array('win' => 'win/sync2parquet.exe', 'linux' => 'linux/amd64/sync2parquet');
$config->bi->duckdbExtUrl['dm'] = array('win' => 'win/sync2parquet.exe', 'linux' => 'linux/amd64/sync2parquet');
$config->bi->duckdbExtUrl['mysql'] = array('win' => 'win/mysql_scanner.duckdb_extension.zip', 'linux' => 'linux/amd64/mysql_scanner.duckdb_extension.zip');
$charts = array();