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

* Fix empty chart object.

Browse Source
This commit is contained in:
qixinzhi
2023-12-18 10:53:09 +08:00
parent de7a6054e4
commit 122859f900
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+21 -21
View File
@@ -223,26 +223,6 @@ class screenModel extends model
*/
public function genComponentData($chart, $type = 'chart', $component = null, $filters = '')
{
$chart = clone($chart);
if($type == 'pivot' and $chart)
{
$chart = $this->loadModel('pivot')->processPivot($chart);
$chart->settings = json_encode($chart->settings);
}
if(empty($filters) and !empty($chart->filters))
{
if($type == 'pivot')
{
list($sql, $filters) = $this->loadModel($type)->getFilterFormat($chart->sql, json_decode($chart->filters, true));
$chart->sql = $sql;
}
else
{
$filters = $this->loadModel($type)->getFilterFormat(json_decode($chart->filters, true));
}
}
list($component, $typeChanged) = $this->initComponent($chart, $type, $component);
if(empty($chart) || ($chart->stage == 'draft' || $chart->deleted == '1'))
@@ -277,6 +257,26 @@ class screenModel extends model
return $component;
}
$chart = clone($chart);
if($type == 'pivot' and $chart)
{
$chart = $this->loadModel('pivot')->processPivot($chart);
$chart->settings = json_encode($chart->settings);
}
if(empty($filters) and !empty($chart->filters))
{
if($type == 'pivot')
{
list($sql, $filters) = $this->loadModel($type)->getFilterFormat($chart->sql, json_decode($chart->filters, true));
$chart->sql = $sql;
}
else
{
$filters = $this->loadModel($type)->getFilterFormat(json_decode($chart->filters, true));
}
}
$component = $this->getChartOption($chart, $component, $filters);
if($type == 'chart') $component = $this->getAxisRotateOption($chart, $component);
@@ -1723,7 +1723,7 @@ class screenModel extends model
public function initComponent($chart, $type, $component = null)
{
if(!$component) $component = new stdclass();
if(!$chart) return $component;
if(!$chart) return array($component, false);
$settings = is_string($chart->settings) ? json_decode($chart->settings) : $chart->settings;