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

* Fix bug #41993.

Browse Source
This commit is contained in:
zhouxin
2023-12-20 14:22:07 +08:00
parent 826b9ebf98
commit 694df821c7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+2 -2
View File
@@ -1538,7 +1538,7 @@ class screenModel extends model
* @access public
* @return object
*/
public function getWaterPoloOption($component, $chart)
public function getWaterPoloOption($component, $chart, $filters)
{
if(!$chart->settings)
{
@@ -1553,7 +1553,7 @@ class screenModel extends model
else
{
$setting = json_decode($chart->settings, true)[0];
$options = $this->loadModel('chart')->genWaterPolo(json_decode($chart->fieldSettings, true), $setting, $chart->sql, json_decode($chart->filters, true));
$options = $this->loadModel('chart')->genWaterPolo(json_decode($chart->fieldSettings, true), $setting, $chart->sql, $filters);
$component->option->dataset = $options['series'][0]['data'][0];
return $this->setComponentDefaults($component);