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

* Refactor pivotModel::processPivot.

Browse Source
This commit is contained in:
wangxuepeng
2023-11-28 15:52:14 +08:00
parent 4192d32155
commit 8b9ebfbff2
4 changed files with 95 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+73 -44
View File
@@ -46,11 +46,7 @@ class pivotModel extends model
if(!empty($pivot->filters))
{
$filters = json_decode($pivot->filters, true);
foreach($filters as $key => $filter)
{
if(empty($filter['default'])) continue;
$filters[$key]['default'] = $this->processDateVar($filter['default']);
}
$this->pivotTao->setFilterDefault($filters);
$pivot->filters = $filters;
}
@@ -82,6 +78,7 @@ class pivotModel extends model
}
/**
* 构建透视表的信息。
* Process sql and correct type.
*
* @param object|array $pivots
@@ -89,47 +86,85 @@ class pivotModel extends model
* @access public
* @return object|array
*/
public function processPivot($pivots, $isObject = true)
public function processPivot(object|array $pivots, bool $isObject = true): object|array
{
if($isObject) $pivots = array($pivots);
$this->loadModel('screen');
$screenList = $this->dao->select('scheme')->from(TABLE_SCREEN)->where('deleted')->eq(0)->andWhere('status')->eq('published')->fetchAll();
foreach($pivots as $index => $pivot)
foreach($pivots as $pivot) $this->completePivot($pivot, $screenList);
if($isObject && $pivot->stage == 'published') $this->processFieldSettings($pivot);
return $isObject ? $pivot : $pivots;
}
/**
* 补充透视表的信息。
* Complete pivot.
*
* @param object $pivot
* @param array $screenList
* @access public
* @return void
*/
public function completePivot(object $pivot, array $screenList): void
{
if(!empty($pivot->sql)) $pivot->sql = trim(str_replace(';', '', $pivot->sql));
if(!empty($pivot->settings)) $pivot->settings = json_decode($pivot->settings, true);
if(empty($pivot->type))
{
if(!empty($pivot->sql)) $pivots[$index]->sql = trim(str_replace(';', '', $pivot->sql));
if(!empty($pivot->settings)) $pivots[$index]->settings = json_decode($pivot->settings, true);
if(empty($pivot->type))
$pivot->names = array();
$pivot->descs = array();
if(!empty($pivot->name))
{
$pivot->names = '';
$pivot->descs = '';
if(!empty($pivot->name))
{
$pivotNames = json_decode($pivot->name, true);
$pivot->name = zget($pivotNames, $this->app->getClientLang(), '');
$pivot->names = $pivotNames;
if(!$pivot->name)
{
$pivotNames = array_filter($pivotNames);
$pivot->name = reset($pivotNames);
}
}
if(!empty($pivot->desc))
{
$pivotDescs = json_decode($pivot->desc, true);
$pivot->desc = zget($pivotDescs, $this->app->getClientLang(), '');
$pivot->descs = $pivotDescs;
}
$pivots[$index]->used = $this->screen->checkIFChartInUse($pivot->id, 'pivot', $screenList);
$pivotNames = json_decode($pivot->name, true);
$pivot->name = zget($pivotNames, $this->app->getClientLang(), '') ? : reset($pivotNames);
$pivot->names = $pivotNames;
}
if($isObject and $pivots[$index]->stage == 'published') $pivots[$index] = $this->processFieldSettings($pivots[$index]);
}
if(!empty($pivot->desc))
{
$pivotDescs = json_decode($pivot->desc, true);
$pivot->desc = zget($pivotDescs, $this->app->getClientLang(), '');
$pivot->descs = $pivotDescs;
}
return $isObject ? reset($pivots) : $pivots;
$pivot->used = $this->checkIFChartInUse($pivot->id, 'pivot', $screenList);
}
}
/**
* 检测图表是否在使用。
* Check if the Chart is in use.
*
* @param int $chartID
* @param string $type
* @access public
* @return bool
*/
public function checkIFChartInUse(int $chartID, string $type = 'chart', array $screenList): bool
{
foreach($screenList as $screen)
{
$scheme = json_decode($screen->scheme);
if(empty($scheme->componentList)) continue;
foreach($scheme->componentList as $component)
{
$list = !empty($component->isGroup) ? $component->groupList : array($component);
foreach($list as $groupComponent)
{
if(!isset($groupComponent->chartConfig)) continue;
$sourceID = zget($groupComponent->chartConfig, 'sourceID', '');
$sourceType = zget($groupComponent->chartConfig, 'package', '') == 'Tables' ? 'pivot' : 'chart';
if($chartID == $sourceID && $type == $sourceType) return true;
}
}
}
return false;
}
/**
@@ -161,12 +196,7 @@ class pivotModel extends model
if(!empty($filters))
{
foreach($filters as $index => $filter)
{
if(empty($filter['default'])) continue;
$filters[$index]['default'] = $this->processDateVar($filter['default']);
}
$this->pivotTao->setFilterDefault($filters);
}
$querySQL = $this->chart->parseSqlVars($sql, $filters);
@@ -2298,7 +2328,6 @@ class pivotModel extends model
$sql = preg_replace("/= *'\!/U", "!='", $sql);
return $sql;
}
}
/**
module/pivot/tao.php
+21
View File
@@ -0,0 +1,21 @@
<?php
declare(strict_types=1);
class pivotTao extends pivotModel
{
/**
* 设置默认的过滤器
* Set default filter.
*
* @param array $filters
* @access public
* @return void
*/
protected function setFilterDefault(array &$filters): void
{
foreach($filters as &$filter)
{
if(empty($filter['default'])) continue;
if(is_string($filter['default'])) $filter['default']= $this->processDateVar($filter['default']);
}
}
}
module/screen/model.php
-35
View File
@@ -1551,39 +1551,4 @@ class screenModel extends model
$component->chartConfig->title = $chart->name;
$component->chartConfig->sourceID = $component->sourceID;
}
/**
* Check if the Chart is in use.
*
* @param int $chartID
* @param string $type
* @access public
* @return bool
*/
public function checkIFChartInUse(int $chartID, string $type = 'chart'): bool
{
static $screenList = array();
if(empty($screenList)) $screenList = $this->dao->select('scheme')->from(TABLE_SCREEN)->where('deleted')->eq(0)->andWhere('status')->eq('published')->fetchAll();
foreach($screenList as $screen)
{
$scheme = json_decode($screen->scheme);
if(empty($scheme->componentList)) continue;
foreach($scheme->componentList as $component)
{
$list = !empty($component->isGroup) ? $component->groupList : array($component);
foreach($list as $groupComponent)
{
if(!isset($groupComponent->chartConfig)) continue;
$sourceID = zget($groupComponent->chartConfig, 'sourceID', '');
$sourceType = zget($groupComponent->chartConfig, 'package', '') == 'Tables' ? 'pivot' : 'chart';
if($chartID == $sourceID && $type == $sourceType) return true;
}
}
}
return false;
}
}
module/screen/tao.php
+1 -1
View File
@@ -10,7 +10,7 @@ class screenTao extends screenModel
* @param object $component
* @return void
*/
public function setChartDefault(string $type, object $component): void
protected function setChartDefault(string $type, object $component): void
{
$chartConfig = $this->config->screen->chart->default->{$type};
foreach(get_object_vars($chartConfig) as $key => $value) $component->{$key} = $value;