From 71dfbb2fd47e623dd4990953af20e1b26ce9ae32 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Fri, 19 Jul 2024 11:26:23 +0000 Subject: [PATCH] * [bug#52916,1h] fix get url name too long. --- module/pivot/control.php | 9 ++++++++- module/pivot/js/preview.ui.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/pivot/control.php b/module/pivot/control.php index 1299ff1303..81c46d897d 100644 --- a/module/pivot/control.php +++ b/module/pivot/control.php @@ -85,8 +85,15 @@ class pivot extends control $conditions = json_decode(base64_decode($conditions), true); $filterValues = json_decode(base64_decode($filterValues), true); + $mergeConditions = array(); + foreach($drill->condition as $index => $condition) + { + $condition['value'] = $conditions[$index]; + $mergeConditions[] = $condition; + } + $cols = $this->pivot->getDrillCols($drill->object); - $datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotID, $drill, $conditions, $filterValues); + $datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotID, $drill, $mergeConditions, $filterValues); if($drill->object == 'task') $datas = $this->pivot->processTaskDatas($datas); diff --git a/module/pivot/js/preview.ui.js b/module/pivot/js/preview.ui.js index e839b2c2e8..ed226284cd 100644 --- a/module/pivot/js/preview.ui.js +++ b/module/pivot/js/preview.ui.js @@ -245,6 +245,7 @@ window.clickCell = function(col, {colName, rowInfo}) let [originField, conditions] = drillConditions; let filterValues = getFilterValues(); + conditions = conditions.map(condition => condition.value); conditions = latin1ToBase64(JSON.stringify(conditions)) filterValues = latin1ToBase64(JSON.stringify(filterValues))