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

* Fix bug for filter.

Browse Source
This commit is contained in:
songchenxuan
2024-01-30 11:25:03 +08:00
parent 89cf39c75b
commit de0040213f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/screen/model.php
View File

@@ -285,6 +285,7 @@ class screenModel extends model
// 如果传过来的component->chartConfig中有filters，判断filters是否发生了改变，改变则重置filters，其中单个filter的linkedGlobalFilter属性就不存在了
$latestFilters = $this->getChartFilters($chart);
$filterChanged = false;
if(!isset($component->chartConfig->filters))
{
$component->chartConfig->filters = $latestFilters;
@@ -293,12 +294,11 @@ class screenModel extends model
else
{
$oldFilters = $component->chartConfig->filters;
$filterChanged = false;
if(count($oldFilters) != count($latestFilters)) $filterChanged = true;
foreach($oldFilters as $index => $oldFilter)
{
if($oldFilter->field != $latestFilters[$index]->field || $oldFilter->name != $latestFilters[$index]->name || $oldFilter->type != $latestFilters[$index]->type) $filterChanged = true;
if($oldFilter->field != $latestFilters[$index]['field'] || $oldFilter->name != $latestFilters[$index]['name'] || $oldFilter->type != $latestFilters[$index]['type']) $filterChanged = true;
}
if($filterChanged)
@@ -307,6 +307,8 @@ class screenModel extends model
$component->chartConfig->noSetupGlobalFilterList = array();
}
}
$component->chartConfig->filterChange = $filterChanged;
if($type == 'chart' && (!$chart->builtin or in_array($chart->id, $this->config->screen->builtinChart)))
{
if(!empty($component->option->series))