From b4a3e3d3c3d571af02c320c669197edf8fe1e388 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Mon, 18 Dec 2023 10:11:00 +0800 Subject: [PATCH] Revert "* Fix bug for screen metric cardB fontSize can not use latest." This reverts commit 9f5bfc51be8272ae6f14feb32b42c916a4cfc6eb. --- module/screen/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/screen/model.php b/module/screen/model.php index b71adacec4..7dbf696686 100644 --- a/module/screen/model.php +++ b/module/screen/model.php @@ -1747,6 +1747,7 @@ class screenModel extends model $option = new stdclass(); $option->displayType = 'normal'; $option->cardType = 'A'; + $option->fontSize = '56'; $option->bgColor = '#26292EFF'; $option->border = array('color' => '#515458FF', 'width' => 1, 'radius' => 2); $option->scope = $metric->scope; @@ -1911,7 +1912,7 @@ class screenModel extends model $component->events = json_decode('{"baseEvent":{},"advancedEvents":{}}'); $component->key = "Funnel"; $component->chartConfig = json_decode('{"key":"Funnel","chartKey":"VFunnel","conKey":"VCFunnel","title":"漏斗图","category":"Mores","categoryName":"更多","package":"Charts","chartFrame":"echarts","image":"/static/png/funnel-d032fdf6.png"}'); - $component->option = json_decode('{"dataset":{"dimensions":["product","dataOne"],"source":[{"product":"data1","dataOne":20},{"product":"data2","dataOne":40},{"product":"data3","dataOne":60},{"product":"data4","dataOne":80},{"product":"data5","dataOne":100}]},"series":[{"name":"Funnel","type":"funnel","gap":5,"label":{"show":true,"position":"inside"}}],"backgroundColor":"rgba(0,0,0,0)"}'); + $component->option = json_decode('{"dataset":{"dimensions":["product","dataOne"],"source":[{"product":"data1","dataOne":20},{"product":"data2","dataOne":40},{"product":"data3","dataOne":60},{"product":"data4","dataOne":80},{"product":"data5","dataOne":100}]},"series":[{"name":"Funnel","type":"funnel","gap":5,"label":{"show":true,"position":"inside","fontSize":12}}],"backgroundColor":"rgba(0,0,0,0)"}'); return $this->setComponentDefaults($component); }