Skip to content

Commit 357fa18

Browse files
sara-resara-gnucoop
authored andcommitted
fix(core/chart): disable mainDataNumberThreshold using zero value if required by xls-report
1 parent 6ca8dcc commit 357fa18

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

projects/core/chart/src/chart.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ export class AjfChartComponent implements AfterViewInit, OnChanges {
6060
*/
6161
@Input()
6262
set mainDataNumberThreshold(mainDataNumberThreshold: number | undefined) {
63-
this._mainDataNumberThreshold = mainDataNumberThreshold || 10;
63+
this._mainDataNumberThreshold =
64+
mainDataNumberThreshold || mainDataNumberThreshold === 0 ? mainDataNumberThreshold : 10;
6465
}
6566
private _mainDataNumberThreshold: number = 10;
6667

projects/core/reports/src/xls-report/xls-report.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,10 @@ function _buildChart(name: string, sheet: {[key: string]: string}[]): AjfWidget
246246
const beginAtZeroY = boolOption(options['beginAtZeroY']);
247247
const removeZeroValues =
248248
options['removeZeroValues'] != null ? Boolean(options['removeZeroValues']) : true;
249-
const mainDataNumberThreshold = +options['mainDataNumberThreshold'] || 10;
249+
const mainDataNumberThreshold =
250+
+options['mainDataNumberThreshold'] || +options['mainDataNumberThreshold'] === 0
251+
? +options['mainDataNumberThreshold']
252+
: 10;
250253

251254
const dataset: AjfChartDataset[] = [];
252255
Object.keys(data).forEach((key, index) => {

0 commit comments

Comments
 (0)