From 0cfa2f164decbc819e6473fca953a54f0feff470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Thu, 28 Mar 2024 15:23:29 +0800 Subject: [PATCH] * Fix waterpolo echart show bug.; --- module/chart/model.php | 1 + module/chart/ui/charts.html.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/module/chart/model.php b/module/chart/model.php index 796d58be79..50977aa582 100644 --- a/module/chart/model.php +++ b/module/chart/model.php @@ -208,6 +208,7 @@ class chartModel extends model if($type == 'line') return $this->genLineChart($chart->fieldSettings, $settings, $chart->sql, $filterFormat, $chart->langs); if($type == 'cluBarX' || $type == 'cluBarY') return $this->genCluBar($chart->fieldSettings, $settings, $chart->sql, $filterFormat, '', $chart->langs); if($type == 'stackedBar' || $type == 'stackedBarY') return $this->genCluBar($chart->fieldSettings, $settings, $chart->sql, $filterFormat, 'total', $chart->langs); + if($type == 'waterpolo') return $this->bi->genWaterpolo($chart->fieldSettings, $settings, $chart->sql, $filterFormat); return array(); } diff --git a/module/chart/ui/charts.html.php b/module/chart/ui/charts.html.php index 2dec24a522..f39e2f1f64 100644 --- a/module/chart/ui/charts.html.php +++ b/module/chart/ui/charts.html.php @@ -62,7 +62,11 @@ $generateCharts = function() use($charts, $lang) div ( setID('chart_' . $chartID), - echarts(set($chartOptions))->size('100%', 400) + echarts + ( + set($chartOptions), + $chart->type == 'waterpolo' ? set::exts('liquidfill') : null, + )->size('100%', 400) ) ); }