* [bug] fix drill in design.

This commit is contained in:
qixinzhi
2024-08-14 14:02:15 +08:00
committed by 代婷婷
parent 03b115cc02
commit 862ccb01c8
2 changed files with 6 additions and 9 deletions
+4 -2
View File
@@ -94,8 +94,10 @@ class pivot extends control
$mergeConditions[] = $condition;
}
$cols = $this->pivot->getDrillCols($drill->object);
$datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotID, $drill, $status, $mergeConditions, $filterValues);
$pivot = $this->pivot->getByID($pivotID);
$pivotState = $this->pivotZen->initPivotState($pivot);
$cols = $this->pivot->getDrillCols($drill->object);
$datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotState, $drill, $status, $mergeConditions, $filterValues);
if(strpos(',story,task,bug,', ",{$drill->object},") !== false) $datas = $this->pivot->processKanbanDatas($drill->object, $datas);
+2 -7
View File
@@ -2594,7 +2594,7 @@ class pivotModel extends model
/**
* Get drill datas.
*
* @param int $pivotID
* @param object $pivotState
* @param object $drill
* @param array $conditions
* @param array $filterValues
@@ -2602,13 +2602,8 @@ class pivotModel extends model
* @access public
* @return array
*/
public function getDrillDatas(int $pivotID, object $drill, string $status, array $conditions, array $filterValues = array()): array
public function getDrillDatas(object $pivotState, object $drill, string $status, array $conditions, array $filterValues = array()): array
{
$pivot = $this->getById($pivotID, false, false, $status);
$this->app->loadClass('pivotstate', true);
$pivotState = new pivotState($pivot, array(), $this->app->getClientLang());
$filters = $pivotState->setFiltersDefaultValue($filterValues);
foreach($conditions as $index => $condition)
{