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

* Fix filter with metric table.

Browse Source
This commit is contained in:
qixinzhi
2024-02-21 13:05:20 +08:00
committed by caoyanyi
parent fe003e3c18
commit fa08feb6c4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/control.php
+4 -4
View File
@@ -135,8 +135,9 @@ class screen extends control
return print(json_encode($filterComponent));
}
$queryType = isset($_POST['queryType']) ? $this->post->queryType : 'filter';
$component = isset($_POST['component']) ? json_decode($this->post->component) : null;
$queryType = isset($_POST['queryType']) ? $this->post->queryType : 'filter';
$component = isset($_POST['component']) ? json_decode($this->post->component) : null;
$filterParams = isset($_POST['filters']) ? json_decode($this->post->filters, true) : null;
$type = $this->screen->getChartType($type);
@@ -146,7 +147,6 @@ class screen extends control
$filterFormat = '';
if($queryType == 'filter')
{
$filterParams = json_decode($this->post->filters, true);
$filters = json_decode($chart->filters, true);
$mergeFilters = array();
@@ -202,7 +202,7 @@ class screen extends control
if($type == 'metric')
{
$metric = $this->loadModel('metric')->getByID($chartID);
$chartData = $this->screen->genMetricComponent($metric, $component);
$chartData = $this->screen->genMetricComponent($metric, $component, $filterParams);
}
else
{