From 4d7477f15e3e07910b8e64f84a54c67d3a732ef8 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Fri, 9 Aug 2024 06:13:12 +0000 Subject: [PATCH] * [bug#53076,0.5h] fix empty column name. --- module/pivot/lang/de.php | 1 + module/pivot/lang/en.php | 1 + module/pivot/lang/fr.php | 1 + module/pivot/lang/zh-cn.php | 1 + module/pivot/model.php | 1 + 5 files changed, 5 insertions(+) diff --git a/module/pivot/lang/de.php b/module/pivot/lang/de.php index 8495e876a2..b1ffb9e2e9 100644 --- a/module/pivot/lang/de.php +++ b/module/pivot/lang/de.php @@ -84,6 +84,7 @@ $lang->pivot->project = $lang->projectCommon; $lang->pivot->PO = 'PO'; $lang->pivot->showPivot = 'Show Pivot table'; $lang->pivot->showOrigin = 'Show Origin Data'; +$lang->pivot->empty = 'Empty'; $lang->pivot->showOriginItem = 'Show origin item'; $lang->pivot->recTotalTip = ' %s items in total'; diff --git a/module/pivot/lang/en.php b/module/pivot/lang/en.php index 4172d57d11..652469e54e 100644 --- a/module/pivot/lang/en.php +++ b/module/pivot/lang/en.php @@ -84,6 +84,7 @@ $lang->pivot->project = $lang->projectCommon; $lang->pivot->PO = 'PO'; $lang->pivot->showPivot = 'Show Pivot table'; $lang->pivot->showOrigin = 'Show Origin Data'; +$lang->pivot->empty = 'Empty'; $lang->pivot->showOriginItem = 'Show origin item'; $lang->pivot->recTotalTip = ' %s items in total'; diff --git a/module/pivot/lang/fr.php b/module/pivot/lang/fr.php index 668f8ac075..4c27216edd 100644 --- a/module/pivot/lang/fr.php +++ b/module/pivot/lang/fr.php @@ -84,6 +84,7 @@ $lang->pivot->project = $lang->projectCommon; $lang->pivot->PO = 'PO'; $lang->pivot->showPivot = 'Show Pivot table'; $lang->pivot->showOrigin = 'Show Origin Data'; +$lang->pivot->empty = 'Empty'; $lang->pivot->showOriginItem = 'Show origin item'; $lang->pivot->recTotalTip = ' %s items in total'; diff --git a/module/pivot/lang/zh-cn.php b/module/pivot/lang/zh-cn.php index 1148642ccf..f85ab65413 100644 --- a/module/pivot/lang/zh-cn.php +++ b/module/pivot/lang/zh-cn.php @@ -84,6 +84,7 @@ $lang->pivot->project = $lang->projectCommon; $lang->pivot->PO = '产品负责人'; $lang->pivot->showPivot = '查看透视表'; $lang->pivot->showOrigin = '查看原始数据'; +$lang->pivot->empty = '空'; $lang->pivot->showOriginItem = '展示原始条目'; $lang->pivot->recTotalTip = '共 %s 项'; diff --git a/module/pivot/model.php b/module/pivot/model.php index 1cbabb03b6..e9d67009a3 100644 --- a/module/pivot/model.php +++ b/module/pivot/model.php @@ -1706,6 +1706,7 @@ class pivotModel extends model $childCol->name = $field; $childCol->isGroup = false; $childCol->label = isset($optionList[$field]) ? $optionList[$field] : $field; + $childCol->label = empty($childCol->label) ? $this->lang->pivot->empty : $childCol->label; $childCol->colspan = $monopolize ? 2 : 1; $childCol->isDrilling = $isDrilling; $childCol->drillField = $drillField;