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

* Refactor: only process a chart object.

Browse Source
This commit is contained in:
liugang
2023-04-07 02:31:28 +00:00
parent ffd815ff16
commit d3dbbfe3e7
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/model.php
+9 -15
View File
@@ -63,28 +63,22 @@ class chartModel extends model
/**
* Process sql and correct type.
*
* @param object|array $charts
* @param bool $isObject
* @param object $chart
* @access public
* @return object|array
* @return object
*/
public function processChart($charts, $isObject = true)
public function processChart($chart)
{
if($isObject) $charts = array($charts);
if(!empty($chart->sql)) $chart->sql = trim(str_replace(';', '', $chart->sql));
if(!empty($chart->settings)) $chart->settings = json_decode($chart->settings, true);
foreach($charts as $id => $chart)
if(!empty($chart->settings) and is_array($chart->settings))
{
if(!empty($chart->sql)) $charts[$id]->sql = trim(str_replace(';', '', $chart->sql));
if(!empty($chart->settings)) $charts[$id]->settings = json_decode($chart->settings, true);
if(!empty($chart->settings) and is_array($chart->settings))
{
$firstSetting = current($chart->settings);
if(isset($firstSetting['type'])) $charts[$id]->type = $firstSetting['type'];
}
$firstSetting = current($chart->settings);
if(isset($firstSetting['type'])) $chart->type = $firstSetting['type'];
}
return $isObject ? reset($charts) : $charts;
return $chart;
}
/**