Revert "* Refactor method of gen waterpolo."

This reverts commit 7166651759.
2023-12-22 10:45:12 +08:00
parent a8df595b47
commit f277e8463b
2 changed files with 2 additions and 12 deletions
@@ -1553,7 +1553,7 @@ class screenModel extends model
        else
        {
            $setting = json_decode($chart->settings, true)[0];
-            $options = $this->loadModel('chart')->genWaterPolo($setting, $chart->sql, $filters);
+            $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);