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

* Fix get latest data of metric.

Browse Source
This commit is contained in:
qixinzhi
2023-12-14 15:01:24 +08:00
parent f537d81569
commit e18cbadd74
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+38 -16
View File
@@ -181,7 +181,7 @@ class screenModel extends model
}
else if($component)
{
$component = $this->getLatestChart($component);
$this->getLatestChart($component);
}
else
{
@@ -210,7 +210,7 @@ class screenModel extends model
$table = $this->config->objectTables[$type];
$chart = $this->dao->select('*')->from($table)->where('id')->eq($chartID)->fetch();
if($type == 'metric') return $this->genMetricComponent($chart);
if($type == 'metric') return $this->genMetricComponent($chart, $component);
return $this->genComponentData($chart, $type, $component);
}
@@ -325,14 +325,9 @@ class screenModel extends model
* @access public
* @return object
*/
public function genMetricComponent($metric)
public function genMetricComponent($metric, $component = null)
{
$component = new stdclass();
$component->id = $metric->id;
$component->sourceID = $metric->id;
$component->title = $metric->name;
$component->type = 'metric';
$component->chartConfig = json_decode($this->config->screen->chartConfig['metric']);
$this->initMetricComponent($metric, $component);
$component->chartConfig->title = $metric->name;
$component->chartConfig->sourceID = $metric->id;
@@ -341,6 +336,10 @@ class screenModel extends model
$component->chartConfig->card = $this->getMetricCardOption($metric);
$component->chartConfig->filters = $this->buildMetricFilters($metric);
$component->option->chartOption = $component->chartConfig->chartOption;
$component->option->tableOption = $component->chartConfig->tableOption;
$component->option->card = $component->chartConfig->card;
return $component;
}
@@ -1927,19 +1926,42 @@ class screenModel extends model
* @return void
*/
public function initComponent($chart, $type, $component = null)
{
if($type == 'metric') return $this->initMetricComponent($chart, $component);
if($type == 'chart' || $type == 'pivot') return $this->initChartAndPivotComponent($chart, $type, $component);
return array($component, false);
}
public function initMetricComponent($metric, $component = null)
{
if(!$component) $component = new stdclass();
if(!isset($component->id)) $component->id = $metric->id;
if(!isset($component->sourceID)) $component->sourceID = $metric->id;
if(!isset($component->title)) $component->title = $metric->name;
if(!isset($component->type)) $component->type = 'metric';
if(!isset($component->chartConfig)) $component->chartConfig = json_decode($this->config->screen->chartConfig['metric']);
if(!isset($component->option)) $component->option = json_decode($this->config->screen->chartOption['metric']);
return array($component, false);
}
public function initChartAndPivotComponent($chart, $type, $component = null)
{
if(!$component) $component = new stdclass();
if(!$chart) return $component;
$settings = is_string($chart->settings) ? json_decode($chart->settings) : $chart->settings;
$chartID = $chart->id;
$chartName = $chart->name;
$settings = is_string($chart->settings) ? json_decode($chart->settings) : $chart->settings;
$builtin = $chart->builtin;
$isBuiltin = ($builtin and !in_array($chartID, $this->config->screen->builtinChart));
if(!isset($component->id)) $component->id = $chart->id;
if(!isset($component->sourceID)) $component->sourceID = $chart->id;
if(!isset($component->title)) $component->title = $chart->name;
if(!isset($component->id)) $component->id = $chartID;
if(!isset($component->sourceID)) $component->sourceID = $chartID;
if(!isset($component->title)) $component->title = $chartName;
if($type == 'chart') $chartType = ($chart->builtin and !in_array($chart->id, $this->config->screen->builtinChart)) ? $chart->type : $settings[0]->type;
if($type == 'pivot') $chartType = 'table';
if($type == 'metric') $chartType = 'metric';
$chartType = $type == 'pivot' ? 'table' : ($isBuiltin ? $chart->type : $settings[0]->type);
$component->type = $chartType;
$typeChanged = false;