Merge branch 'daitingting_adaptation_parameters' into 'master'

* Add parameters. See merge request easycorp/zentaopms!7418
2023-04-14 05:26:38 +00:00
parent 700c80534a a47cb05c8e
commit e4801f1e73
1 changed files with 1 additions and 1 deletions
@@ -8435,7 +8435,7 @@ class upgradeModel extends model
                $component->chartConfig = $chartConfig;
                $component->option      = json_decode(zget($this->config->screen->chartOption, $chartType));
                if(isset($component->option->title->text)) $component->option->title->text = $chart->name;
-                $component = $this->screen->getChartOption($component);
+                $component = $this->screen->getChartOption($chart, $component, json_decode($chart->filters, true));
            }

            $componentList[] = $component;