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

Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17

Browse Source
This commit is contained in:
宋辰轩
2023-03-29 17:26:40 +08:00
parent cc1c1c0838 000179d422
commit d0ce8a9f7b
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+35
View File
@@ -8595,6 +8595,36 @@ class upgradeModel extends model
$filters = $settings->filter;
unset($settings->filter);
}
if(isset($settings->yaxis))
{
$yaxisFields = $settings->yaxis;
foreach($yaxisFields as $yaxisIndex => $yaxisField)
{
if($yaxisField->valOrAgg == 'value') $yaxisField->valOrAgg = 'sum';
if($yaxisField->valOrAgg == 'count_distinct') $yaxisField->valOrAgg = 'distinct';
if($yaxisField->valOrAgg == 'value_all') $yaxisField->valOrAgg = 'count';
if($yaxisField->valOrAgg == 'value_distinct') $yaxisField->valOrAgg = 'distinct';
$yaxisFields[$yaxisIndex] = $yaxisField;
}
$settings->yaxis = $yaxisFields;
}
if(isset($settings->metric))
{
$metricFields = $settings->metric;
foreach($metricFields as $metricIndex => $metricField)
{
if($metricField->valOrAgg == 'value') $metricField->valOrAgg = 'sum';
if($metricField->valOrAgg == 'count_distinct') $metricField->valOrAgg = 'distinct';
if($metricField->valOrAgg == 'value_all') $metricField->valOrAgg = 'count';
if($metricField->valOrAgg == 'value_distinct') $metricField->valOrAgg = 'distinct';
$metricFields[$metricIndex] = $metricField;
}
$settings->metric = $metricFields;
}
}
$data->settings = json_encode(array($settings));
@@ -8688,6 +8718,11 @@ class upgradeModel extends model
$column->field = $tableColumn->field;
$column->stat = $tableColumn->valOrAgg;
if($column->stat == 'value') $column->stat = 'sum';
if($column->stat == 'count_distinct') $column->stat = 'distinct';
if($column->stat == 'value_all') $column->stat = 'count';
if($column->stat == 'value_distinct') $column->stat = 'distinct';
$columns[] = $column;
}
$pivotSettings->columns = $columns;