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

Revert "Revert "* Filter metric's data for screen designer.""

Browse Source 
This reverts commit fa7a08b9b1.
This commit is contained in:
qixinzhi
2024-01-02 09:39:04 +08:00
parent 17dd50cabc
commit 717f7242ef
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/control.php
+10 -7
View File
@@ -168,14 +168,17 @@ class screen extends control
$mergeFilters[] = $filter;
}
if($table == TABLE_PIVOT)
if($type != 'metric')
{
list($sql, $filterFormat) = $this->loadModel($type)->getFilterFormat($chart->sql, $mergeFilters);
$chart->sql = $sql;
}
else
{
$filterFormat = $this->loadModel($type)->getFilterFormat($mergeFilters);
if($table == TABLE_PIVOT)
{
list($sql, $filterFormat) = $this->loadModel($type)->getFilterFormat($chart->sql, $mergeFilters);
$chart->sql = $sql;
}
else
{
$filterFormat = $this->loadModel($type)->getFilterFormat($mergeFilters);
}
}
}