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

* Fix syntax error.

Browse Source
This commit is contained in:
qixinzhi
2024-02-20 17:31:08 +08:00
committed by caoyanyi
parent d294f1bec7
commit b4bb2045d9
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/screen/control.php
View File

@@ -202,7 +202,7 @@ class screen extends control
if($type == 'metric')
{
$metric = $this->loadModel('metric')->getByID($chartID);
$chartData = $this->screen->genMetricComponent($metric, $component, (array)$filterParams);
$chartData = $this->screen->genMetricComponent($metric, $component);
}
else
{
@@ -258,7 +258,7 @@ class screen extends control
{
$sourceId = $params->sourceID;
$field = $params->field;
$saveAs = $params->saveAs;
$saveAs = isset($params->saveAs) ? $params->saveAs : '';
$table = $this->config->objectTables[$type];
$chart = $this->dao->select('*')->from($table)->where('id')->eq($sourceId)->fetch();

9
module/screen/model.php
View File

@@ -348,8 +348,9 @@ class screenModel extends model
{
foreach($oldFilters as $index => $filter)
{
$oldDefault = $filter->default;
$newDefault = $latestFilters[$index]->default;
$newFilter = $latestFilters[$index];
$oldDefault = isset($filter->default) ? $filter->default : '';
$newDefault = isset($newFilter->default) ? $newFilter->default : '';
if($oldDefault !== $newDefault) $component->chartConfig->filters[$index]->default = $newDefault;
}
}
@@ -359,7 +360,7 @@ class screenModel extends model
$oldSaveAs = zget($filter, 'saveAs', '');
$newSaveAs = zget($latestFilters[$index], 'saveAs', '');
if($oldDefault !== $newDefault) $component->chartConfig->filters[$index]->default = $newDefault;
if($oldSaveAs !== $newSaveAs) $component->chartConfig->filters[$index]->default = $newSaveAs;
if($isSelect and $oldSaveAs !== $newSaveAs) $component->chartConfig->filters[$index]->saveAs = $newSaveAs;
}
}
@@ -700,7 +701,7 @@ class screenModel extends model
foreach($yStats as $index => $dataList)
{
$field = zget($fields, $metrics[$index]);
$fieldName = $field->name;
$fieldName = $field['name'];
if(isset($langs[$field['field']]) and !empty($langs[$field['field']][$clientLang])) $fieldName = $langs[$field['field']][$clientLang];
$field = $fieldName . '(' . zget($this->lang->chart->aggList, $aggs[$index]) . ')';
$dimensions[] = $field;