@syncfusion/ej2-pivotview 19.4.38 → 19.4.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/CHANGELOG.md +37 -0
  2. package/README.md +1 -1
  3. package/dist/ej2-pivotview.umd.min.js +2 -2
  4. package/dist/ej2-pivotview.umd.min.js.map +1 -1
  5. package/dist/es6/ej2-pivotview.es2015.js +127 -49
  6. package/dist/es6/ej2-pivotview.es2015.js.map +1 -1
  7. package/dist/es6/ej2-pivotview.es5.js +127 -49
  8. package/dist/es6/ej2-pivotview.es5.js.map +1 -1
  9. package/dist/global/ej2-pivotview.min.js +2 -2
  10. package/dist/global/ej2-pivotview.min.js.map +1 -1
  11. package/dist/global/index.d.ts +1 -1
  12. package/package.json +18 -18
  13. package/src/base/engine.js +8 -0
  14. package/src/common/actions/pivot-button.js +1 -0
  15. package/src/common/popups/toolbar.js +12 -12
  16. package/src/pivotview/actions/excel-export.js +54 -25
  17. package/src/pivotview/actions/pdf-export.js +45 -9
  18. package/src/pivotview/actions/virtualscroll.d.ts +1 -0
  19. package/src/pivotview/actions/virtualscroll.js +7 -3
  20. package/src/pivotview/model/chartsettings-model.d.ts +1 -1
  21. package/src/pivotview/model/chartsettings.d.ts +1 -1
  22. package/src/pivotview/model/chartsettings.js +1 -1
  23. package/styles/bootstrap-dark.css +30 -14
  24. package/styles/bootstrap.css +30 -14
  25. package/styles/bootstrap4.css +30 -14
  26. package/styles/bootstrap5-dark.css +30 -14
  27. package/styles/bootstrap5.css +30 -14
  28. package/styles/fabric-dark.css +30 -14
  29. package/styles/fabric.css +30 -14
  30. package/styles/highcontrast-light.css +30 -14
  31. package/styles/highcontrast.css +30 -14
  32. package/styles/material-dark.css +30 -14
  33. package/styles/material.css +30 -14
  34. package/styles/pivotfieldlist/_theme.scss +28 -12
  35. package/styles/pivotfieldlist/bootstrap-dark.css +30 -14
  36. package/styles/pivotfieldlist/bootstrap.css +30 -14
  37. package/styles/pivotfieldlist/bootstrap4.css +30 -14
  38. package/styles/pivotfieldlist/bootstrap5-dark.css +30 -14
  39. package/styles/pivotfieldlist/bootstrap5.css +30 -14
  40. package/styles/pivotfieldlist/fabric-dark.css +30 -14
  41. package/styles/pivotfieldlist/fabric.css +30 -14
  42. package/styles/pivotfieldlist/highcontrast-light.css +30 -14
  43. package/styles/pivotfieldlist/highcontrast.css +30 -14
  44. package/styles/pivotfieldlist/material-dark.css +30 -14
  45. package/styles/pivotfieldlist/material.css +30 -14
  46. package/styles/pivotfieldlist/tailwind-dark.css +30 -14
  47. package/styles/pivotfieldlist/tailwind.css +30 -14
  48. package/styles/tailwind-dark.css +30 -14
  49. package/styles/tailwind.css +30 -14
@@ -3084,6 +3084,14 @@ class PivotEngine {
3084
3084
  }
3085
3085
  /* eslint-enable */
3086
3086
  rawHeaders = this.getSortedHeaders(rawHeaders.concat(excessHeaders), this.fieldList[headersInfo.fields[0].name].sort).concat(grandHeader);
3087
+ if (headersInfo.axis === 'row') {
3088
+ this.cMembers = this.getIndexedHeaders(this.columns, this.data, 0, this.filterMembers, 'column', '');
3089
+ this.insertAllMember(this.cMembers, this.filterMembers, '', 'column');
3090
+ }
3091
+ else {
3092
+ this.rMembers = this.getIndexedHeaders(this.rows, this.data, 0, this.filterMembers, 'row', '');
3093
+ this.insertAllMember(this.rMembers, this.filterMembers, '', 'row');
3094
+ }
3087
3095
  }
3088
3096
  if (headersInfo.axis === 'row') {
3089
3097
  this.rowCount = 0;
@@ -12824,6 +12832,7 @@ class VirtualScroll$1 {
12824
12832
  this.previousValues = { top: 0, left: 0 };
12825
12833
  this.frozenPreviousValues = { top: 0, left: 0 };
12826
12834
  this.eventType = '';
12835
+ this.isFireFox = Browser.userAgent.toLowerCase().indexOf('firefox') > -1;
12827
12836
  this.parent = parent;
12828
12837
  this.engineModule = this.parent.dataType === 'pivot' ? this.parent.engineModule : this.parent.olapEngineModule;
12829
12838
  this.addInternalEvents();
@@ -12847,11 +12856,14 @@ class VirtualScroll$1 {
12847
12856
  let mScrollBar = mCont.parentElement.parentElement.querySelector('.' + MOVABLESCROLL_DIV);
12848
12857
  EventHandler.clearEvents(mCont);
12849
12858
  EventHandler.clearEvents(fCont);
12859
+ if (this.isFireFox) {
12860
+ EventHandler.clearEvents(mHdr);
12861
+ }
12850
12862
  if (this.engineModule) {
12851
12863
  let ele = this.parent.isAdaptive ? mCont : mCont.parentElement.parentElement.querySelector('.' + MOVABLESCROLL_DIV);
12852
12864
  EventHandler.add(ele, 'scroll touchmove pointermove', this.onHorizondalScroll(mHdr, mCont, fCont), this);
12853
12865
  EventHandler.add(mCont.parentElement, 'scroll wheel touchmove pointermove keyup keydown', this.onVerticalScroll(fCont, mCont), this);
12854
- EventHandler.add(mCont.parentElement.parentElement, 'mouseup touchend', this.common(mHdr, mCont, fCont), this);
12866
+ EventHandler.add(mCont, 'mouseup touchend scroll', this.common(mHdr, mCont, fCont), this);
12855
12867
  EventHandler.add(mScrollBar, 'scroll', this.onCustomScrollbarScroll(mCont, mHdr), this);
12856
12868
  EventHandler.add(mCont, 'scroll', this.onCustomScrollbarScroll(mScrollBar, mHdr), this);
12857
12869
  EventHandler.add(mHdr, 'scroll', this.onCustomScrollbarScroll(mScrollBar, mCont), this);
@@ -12906,7 +12918,7 @@ class VirtualScroll$1 {
12906
12918
  }
12907
12919
  let target = e.target;
12908
12920
  let left = target.scrollLeft;
12909
- if (this.previousValues.left === left) {
12921
+ if (this.previousValues.left === left || (this.isFireFox && target.classList.contains(MOVABLEHEADER_DIV))) {
12910
12922
  return;
12911
12923
  }
12912
12924
  content.scrollLeft = left;
@@ -16997,7 +17009,7 @@ __decorate$3([
16997
17009
  Property('')
16998
17010
  ], PivotAxis.prototype, "title", void 0);
16999
17011
  __decorate$3([
17000
- Property(null)
17012
+ Property(1)
17001
17013
  ], PivotAxis.prototype, "zoomFactor", void 0);
17002
17014
  __decorate$3([
17003
17015
  Complex({}, CrosshairTooltip)
@@ -26272,9 +26284,6 @@ class ExcelExport$1 {
26272
26284
  let clonedValues;
26273
26285
  let currentPivotValues = PivotExportUtil.getClonedPivotValues(this.engine.pivotValues);
26274
26286
  let customFileName = isFileNameSet ? exportProperties.fileName : 'default.xlsx';
26275
- if (isHeaderSet) {
26276
- this.addHeaderAndFooter(exportProperties.header, '', 'header', exportProperties.header.headerRows);
26277
- }
26278
26287
  if (this.parent.exportAllPages && this.parent.enableVirtualization && this.parent.dataType !== 'olap') {
26279
26288
  let pageSettings = this.engine.pageSettings;
26280
26289
  this.engine.pageSettings = null;
@@ -26288,7 +26297,7 @@ class ExcelExport$1 {
26288
26297
  clonedValues = currentPivotValues;
26289
26298
  }
26290
26299
  let args = {
26291
- fileName: customFileName, header: '', footer: '', dataCollections: [clonedValues]
26300
+ fileName: customFileName, header: '', footer: '', dataCollections: [clonedValues], excelExportProperties: exportProperties
26292
26301
  };
26293
26302
  let fileName;
26294
26303
  let header;
@@ -26322,6 +26331,14 @@ class ExcelExport$1 {
26322
26331
  for (let cCnt = 0; cCnt < colLen; cCnt++) {
26323
26332
  if (pivotValues[rCnt][cCnt]) {
26324
26333
  let pivotCell = pivotValues[rCnt][cCnt];
26334
+ let field = (this.parent.dataSourceSettings.valueAxis === 'row' &&
26335
+ this.parent.dataType === 'olap' && pivotCell.rowOrdinal &&
26336
+ this.engine.tupRowInfo[pivotCell.rowOrdinal]) ?
26337
+ this.engine.tupRowInfo[pivotCell.rowOrdinal].measureName :
26338
+ pivotCell.actualText;
26339
+ let styles = (pivotCell.axis == 'row') ? { hAlign: 'Left', bold: true, wrapText: true } : { numberFormat: formatList[field], bold: false, wrapText: true };
26340
+ let pivotCells = currentPivotValues[rCnt][cCnt];
26341
+ let headerStyle = { bold: true, vAlign: 'Center', wrapText: true, indent: cCnt === 0 ? pivotCell.level * 10 : 0 };
26325
26342
  if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
26326
26343
  let cellValue = pivotCell.axis === 'value' ? pivotCell.value : pivotCell.formattedText;
26327
26344
  let isgetValuesHeader = ((this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row')
@@ -26341,33 +26358,21 @@ class ExcelExport$1 {
26341
26358
  index: cCnt + 1, value: cellValue,
26342
26359
  colSpan: pivotCell.colSpan, rowSpan: (pivotCell.rowSpan === -1 ? 1 : pivotCell.rowSpan),
26343
26360
  });
26361
+ let lastCell = cells[cells.length - 1];
26344
26362
  if (pivotCell.axis === 'value') {
26345
26363
  if (isNaN(pivotCell.value) || pivotCell.formattedText === '' ||
26346
26364
  pivotCell.formattedText === undefined || isNullOrUndefined(pivotCell.value)) {
26347
- cells[cells.length - 1].value = type === 'Excel' ? null : '';
26348
- }
26349
- let field = (this.parent.dataSourceSettings.valueAxis === 'row' &&
26350
- this.parent.dataType === 'olap' && pivotCell.rowOrdinal &&
26351
- this.engine.tupRowInfo[pivotCell.rowOrdinal]) ?
26352
- this.engine.tupRowInfo[pivotCell.rowOrdinal].measureName :
26353
- pivotCell.actualText;
26354
- cells[cells.length - 1].style = !isNullOrUndefined(cells[cells.length - 1].value) ? { numberFormat: formatList[field], bold: false, wrapText: true } : { bold: false, wrapText: true };
26355
- if (pivotCell.style) {
26356
- cells[cells.length - 1].style.backColor = pivotCell.style.backgroundColor;
26357
- cells[cells.length - 1].style.fontColor = pivotCell.style.color;
26358
- cells[cells.length - 1].style.fontName = pivotCell.style.fontFamily;
26359
- cells[cells.length - 1].style.fontSize = Number(pivotCell.style.fontSize.split('px')[0]);
26365
+ lastCell.value = type === 'Excel' ? null : '';
26360
26366
  }
26367
+ lastCell.style = !isNullOrUndefined(lastCell.value) ? styles : { bold: false, wrapText: true };
26361
26368
  }
26362
26369
  else {
26363
- cells[cells.length - 1].style = {
26364
- bold: true, vAlign: 'Center', wrapText: true, indent: cCnt === 0 ? pivotCell.level * 10 : 0
26365
- };
26370
+ lastCell.style = headerStyle;
26366
26371
  if (pivotCell.axis === 'row' && cCnt === 0) {
26367
- cells[cells.length - 1].style.hAlign = 'Left';
26372
+ lastCell.style = styles;
26368
26373
  if (this.parent.dataType === 'olap') {
26369
26374
  let indent = this.parent.renderModule.indentCollection[rCnt];
26370
- cells[cells.length - 1].style.indent = indent * 2;
26375
+ lastCell.style.indent = indent * 2;
26371
26376
  maxLevel = maxLevel > indent ? maxLevel : indent;
26372
26377
  }
26373
26378
  else {
@@ -26377,19 +26382,55 @@ class ExcelExport$1 {
26377
26382
  let levelPosition = levelName.split(this.parent.dataSourceSettings.valueSortSettings.headerDelimiter).length -
26378
26383
  (memberPos ? memberPos - 1 : memberPos);
26379
26384
  let level = levelPosition ? (levelPosition - 1) : 0;
26380
- cells[cells.length - 1].style.indent = level * 2;
26385
+ lastCell.style.indent = level * 2;
26381
26386
  maxLevel = level > maxLevel ? level : maxLevel;
26382
26387
  }
26383
26388
  }
26384
26389
  }
26385
- cells[cells.length - 1].style.borders = { color: '#000000', lineStyle: 'Thin' };
26390
+ if (pivotCell.style || lastCell.style.backgroundColor || lastCell.style.fontColor || lastCell.style.fontName || lastCell.style.fontSize) {
26391
+ lastCell.style.backgroundColor = lastCell.style.backgroundColor ? lastCell.style.backgroundColor : pivotCell.style.backgroundColor;
26392
+ lastCell.style.fontColor = lastCell.style.fontColor ? lastCell.style.fontColor : pivotCell.style.color;
26393
+ lastCell.style.fontName = lastCell.style.fontName ? lastCell.style.fontName : pivotCell.style.fontFamily;
26394
+ lastCell.style.fontSize = lastCell.style.fontSize ? Number(lastCell.style.fontSize) : Number(pivotCell.style.fontSize.split('px')[0]);
26395
+ }
26396
+ lastCell.style.borders = { color: '#000000', lineStyle: 'Thin' };
26397
+ let excelHeaderQueryCellInfoArgs;
26398
+ let excelQueryCellInfoArgs;
26399
+ if (pivotCell.axis === 'column') {
26400
+ excelHeaderQueryCellInfoArgs = {
26401
+ style: headerStyle,
26402
+ cell: pivotCells,
26403
+ };
26404
+ this.parent.trigger(excelHeaderQueryCellInfo, excelHeaderQueryCellInfoArgs);
26405
+ }
26406
+ else {
26407
+ excelQueryCellInfoArgs = {
26408
+ style: styles,
26409
+ cell: pivotCells,
26410
+ column: undefined,
26411
+ data: pivotValues,
26412
+ value: cellValue
26413
+ };
26414
+ this.parent.trigger(excelQueryCellInfo, excelQueryCellInfoArgs);
26415
+ }
26416
+ lastCell.value = (pivotCell.axis == 'column') ? excelHeaderQueryCellInfoArgs.cell.formattedText : excelQueryCellInfoArgs.value;
26417
+ lastCell.style = (pivotCell.axis == 'column') ? excelHeaderQueryCellInfoArgs.style : excelQueryCellInfoArgs.style;
26386
26418
  }
26387
26419
  }
26388
26420
  cCnt = cCnt + (pivotCell.colSpan ? (pivotCell.colSpan - 1) : 0);
26389
26421
  }
26390
26422
  else {
26423
+ let pivotCell = { formattedText: "" };
26424
+ let excelHeaderQueryCellInfoArgs;
26425
+ if (pivotCell) {
26426
+ excelHeaderQueryCellInfoArgs = {
26427
+ style: undefined,
26428
+ cell: pivotCell,
26429
+ };
26430
+ this.parent.trigger(excelHeaderQueryCellInfo, excelHeaderQueryCellInfoArgs);
26431
+ }
26391
26432
  cells.push({
26392
- index: cCnt + 1, value: '', colSpan: 1, rowSpan: 1,
26433
+ index: cCnt + 1, colSpan: 1, rowSpan: 1, value: pivotCell.formattedText, style: excelHeaderQueryCellInfoArgs.style
26393
26434
  });
26394
26435
  }
26395
26436
  }
@@ -26460,14 +26501,21 @@ class PDFExport {
26460
26501
  let footer = (!isNullOrUndefined(pdfExportProperties) && !isNullOrUndefined(pdfExportProperties.footer) && !isNullOrUndefined(pdfExportProperties.footer.contents) && !isNullOrUndefined(pdfExportProperties.footer.contents[0].value)) ?
26461
26502
  pdfExportProperties.footer.contents[0].value : eventParams.args.footer;
26462
26503
  let font = new PdfStandardFont(PdfFontFamily.TimesRoman, 15, PdfFontStyle.Regular);
26463
- let brush = new PdfSolidBrush(new PdfColor(0, 0, 0));
26504
+ let headerCondition = (!isNullOrUndefined(pdfExportProperties) && !isNullOrUndefined(pdfExportProperties.header)
26505
+ && !isNullOrUndefined(pdfExportProperties.header.contents) && !isNullOrUndefined(pdfExportProperties.header.contents[0].style));
26506
+ let footerCondition = (!isNullOrUndefined(pdfExportProperties) && !isNullOrUndefined(pdfExportProperties.footer)
26507
+ && !isNullOrUndefined(pdfExportProperties.footer.contents) && !isNullOrUndefined(pdfExportProperties.footer.contents[0].style));
26508
+ let headerColor = (headerCondition) ? this.hexDecToRgb(pdfExportProperties.header.contents[0].style.textBrushColor) : (new PdfColor(0, 0, 0));
26509
+ let brushHeader = (headerCondition) ? new PdfSolidBrush(new PdfColor(headerColor.r, headerColor.g, headerColor.b)) : new PdfSolidBrush(new PdfColor(0, 0, 0));
26510
+ let footerColor = (footerCondition) ? this.hexDecToRgb(pdfExportProperties.footer.contents[0].style.textBrushColor) : (new PdfColor(0, 0, 0));
26511
+ let brushFooter = (footerCondition) ? new PdfSolidBrush(new PdfColor(footerColor.r, footerColor.g, footerColor.b)) : new PdfSolidBrush(new PdfColor(0, 0, 0));
26464
26512
  let pen = new PdfPen(new PdfColor(0, 0, 0), .5);
26465
26513
  /** Header and Footer to be set */
26466
26514
  let headerTemplate = new PdfPageTemplateElement(new RectangleF(0, 0, page.graphics.clientSize.width, 20));
26467
- headerTemplate.graphics.drawString(header, font, pen, brush, 0, 0, new PdfStringFormat(PdfTextAlignment.Center));
26515
+ headerTemplate.graphics.drawString(header, font, pen, brushHeader, 0, 0, new PdfStringFormat(PdfTextAlignment.Center));
26468
26516
  eventParams.document.template.top = headerTemplate;
26469
26517
  let footerTemplate = new PdfPageTemplateElement(new RectangleF(0, 0, page.graphics.clientSize.width, 20));
26470
- footerTemplate.graphics.drawString(footer, font, pen, brush, 0, 0, new PdfStringFormat(PdfTextAlignment.Center));
26518
+ footerTemplate.graphics.drawString(footer, font, pen, brushFooter, 0, 0, new PdfStringFormat(PdfTextAlignment.Center));
26471
26519
  eventParams.document.template.bottom = footerTemplate;
26472
26520
  return page;
26473
26521
  }
@@ -26649,12 +26697,12 @@ class PDFExport {
26649
26697
  let isValueCell = false;
26650
26698
  if (pivotValues[rCnt][cCnt]) {
26651
26699
  let pivotCell = pivotValues[rCnt][cCnt];
26700
+ let cellValue = pivotCell.formattedText;
26701
+ cellValue = (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'value') : cellValue;
26702
+ cellValue = pivotCell.type === 'grand sum' ? (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'grandTotal') :
26703
+ this.parent.localeObj.getConstant('grandTotal') : (pivotCell.type === 'sum' ?
26704
+ cellValue.toString().replace('Total', this.parent.localeObj.getConstant('total')) : cellValue);
26652
26705
  if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
26653
- let cellValue = pivotCell.formattedText;
26654
- cellValue = (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'value') : cellValue;
26655
- cellValue = pivotCell.type === 'grand sum' ? (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'grandTotal') :
26656
- this.parent.localeObj.getConstant('grandTotal') : (pivotCell.type === 'sum' ?
26657
- cellValue.toString().replace('Total', this.parent.localeObj.getConstant('total')) : cellValue);
26658
26706
  if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
26659
26707
  pdfGridRow.cells.getCell(localCnt).columnSpan = pivotCell.colSpan ?
26660
26708
  (pageSize - localCnt < pivotCell.colSpan ? pageSize - localCnt : pivotCell.colSpan) : 1;
@@ -26677,11 +26725,31 @@ class PDFExport {
26677
26725
  pdfGridRow = this.applyStyle(pdfGridRow, pivotCell, localCnt);
26678
26726
  }
26679
26727
  let args = {
26680
- style: (pivotCell && pivotCell.isSum) ? { bold: true } : undefined,
26728
+ style: (pivotCell.axis == "column") ? { bold: false } : ((pivotCell && pivotCell.isSum) || (pivotCell.axis == "row")) ? { bold: true } : undefined,
26681
26729
  pivotCell: pivotCell,
26682
26730
  cell: pdfGridRow.cells.getCell(localCnt)
26683
26731
  };
26684
26732
  this.parent.trigger(onPdfCellRender, args);
26733
+ if (pivotCell.axis == "column") {
26734
+ args = {
26735
+ style: args.style,
26736
+ cell: args.cell,
26737
+ gridCell: args.pivotCell
26738
+ };
26739
+ this.parent.trigger(pdfHeaderQueryCellInfo, args);
26740
+ pdfGridRow.cells.getCell(localCnt).value = args.gridCell.formattedText ? args.gridCell.formattedText : cellValue;
26741
+ }
26742
+ else {
26743
+ args = {
26744
+ style: args.style,
26745
+ cell: args.cell,
26746
+ column: undefined,
26747
+ data: args.pivotCell,
26748
+ value: cellValue,
26749
+ };
26750
+ this.parent.trigger(pdfQueryCellInfo, args);
26751
+ pdfGridRow.cells.getCell(localCnt).value = args.value ? args.value : cellValue;
26752
+ }
26685
26753
  if (args.style) {
26686
26754
  this.processCellStyle(pdfGridRow.cells.getCell(localCnt), args);
26687
26755
  }
@@ -26693,6 +26761,15 @@ class PDFExport {
26693
26761
  cell: pdfGridRow.cells.getCell(localCnt)
26694
26762
  };
26695
26763
  this.parent.trigger(onPdfCellRender, args);
26764
+ let pivotCell = { formattedText: "" };
26765
+ if (pivotCell.axis == "column") {
26766
+ args = {
26767
+ style: args.style,
26768
+ cell: args.cell,
26769
+ gridCell: args.pivotCell
26770
+ };
26771
+ this.parent.trigger(pdfHeaderQueryCellInfo, args);
26772
+ }
26696
26773
  if (args.style) {
26697
26774
  this.processCellStyle(pdfGridRow.cells.getCell(localCnt), args);
26698
26775
  }
@@ -29892,6 +29969,7 @@ class PivotButton {
29892
29969
  this.refreshPivotButtonState(fieldName, isNodeUnChecked);
29893
29970
  if (!isNodeUnChecked) {
29894
29971
  this.removeDataSourceSettings(fieldName);
29972
+ filterItem = {};
29895
29973
  }
29896
29974
  this.parent.lastFilterInfo = filterItem;
29897
29975
  let actionInfo = {
@@ -35259,10 +35337,10 @@ class Toolbar$2 {
35259
35337
  }
35260
35338
  }
35261
35339
  actionClick(args) {
35262
- let actionName = (args.item.id == "PivotViewnew") ? addNewReport : (args.item.id == "PivotViewsave") ? saveCurrentReport : (args.item.id == "PivotViewsaveas") ? saveAsCurrentReport
35263
- : (args.item.id == "PivotViewrename") ? renameCurrentReport : (args.item.id == "PivotViewremove") ? removeCurrentReport : (args.item.id == "PivotViewload") ? loadReports
35264
- : (args.item.id == "PivotViewformatting") ? openConditionalFormatting : (args.item.id == "PivotViewnumberFormatting") ? openNumberFormatting
35265
- : (args.item.id == "PivotViewmdxQuery") ? MdxQuery : (args.item.id == "PivotViewfieldlist") ? showFieldList : '';
35340
+ let actionName = (args.item.id == this.parent.element.id + 'new') ? addNewReport : (args.item.id == this.parent.element.id + 'save') ? saveCurrentReport : (args.item.id == this.parent.element.id + 'saveas') ? saveAsCurrentReport
35341
+ : (args.item.id == this.parent.element.id + 'rename') ? renameCurrentReport : (args.item.id == this.parent.element.id + 'remove') ? removeCurrentReport : (args.item.id == this.parent.element.id + 'load') ? loadReports
35342
+ : (args.item.id == this.parent.element.id + 'formatting') ? openConditionalFormatting : (args.item.id == this.parent.element.id + 'numberFormatting') ? openNumberFormatting
35343
+ : (args.item.id == this.parent.element.id + 'mdxQuery') ? MdxQuery : (args.item.id == this.parent.element.id + 'fieldlist') ? showFieldList : '';
35266
35344
  this.parent.actionObj.actionName = actionName;
35267
35345
  if (this.parent.actionBeginMethod()) {
35268
35346
  return;
@@ -36098,14 +36176,14 @@ class Toolbar$2 {
36098
36176
  menuItemClick(args) {
36099
36177
  let exportArgs = {};
36100
36178
  let type;
36101
- let actionName = (args.item.id == "PivotViewgrid") ? tableView : (args.item.id == "PivotView_Column") ? chartView : (args.item.id == "PivotView_Bar") ? chartView : (args.item.id == "PivotView_Line") ? chartView
36102
- : (args.item.id == "PivotView_Area") ? chartView : (args.item.id == "PivotView_Scatter") ? chartView : (args.item.id == "PivotView_Polar") ? chartView : (args.item.id == "PivotView_ChartMoreOption") ? chartView
36103
- : (args.item.id == "PivotView_multipleAxes") ? multipleAxis : (args.item.id == "PivotView_showLegend") ? showLegend : (args.item.id == "PivotViewpdf") ? pdfExport : (args.item.id == "PivotViewpng") ? pngExport
36104
- : (args.item.id == "PivotViewexcel") ? excelExport : (args.item.id == "PivotViewcsv") ? csvExport : (args.item.id == "PivotViewjpeg") ? jpegExport : (args.item.id == "PivotViewsvg") ? svgExport
36105
- : (args.item.id == "PivotViewnotsubtotal") ? hideSubTotals : (args.item.id == "PivotViewsubtotalrow") ? subTotalsRow : (args.item.id == "PivotViewsubtotalcolumn") ? subTotalsColumn
36106
- : (args.item.id == "PivotViewsubtotal") ? showSubTotals : (args.item.id == "PivotViewnotgrandtotal") ? hideGrandTotals : (args.item.id == "PivotViewgrandtotalrow") ? grandTotalsRow
36107
- : (args.item.id == "PivotViewgrandtotalcolumn") ? grandTotalsColumn : (args.item.id == "PivotViewgrandtotal") ? showGrandTotals
36108
- : (args.item.id == "PivotViewnumberFormattingMenu") ? numberFormattingMenu : (args.item.id == "PivotViewconditionalFormattingMenu") ? conditionalFormattingMenu : '';
36179
+ let actionName = (args.item.id == this.parent.element.id + 'grid') ? tableView : (args.item.id == this.parent.element.id + '_' + "Column") ? chartView : (args.item.id == this.parent.element.id + '_' + "Bar") ? chartView : (args.item.id == this.parent.element.id + '_' + "Line") ? chartView
36180
+ : (args.item.id == this.parent.element.id + '_' + "Area") ? chartView : (args.item.id == this.parent.element.id + '_' + "Scatter") ? chartView : (args.item.id == this.parent.element.id + '_' + "Polar") ? chartView : (args.item.id == this.parent.element.id + '_' + "ChartMoreOption") ? chartView
36181
+ : (args.item.id == this.parent.element.id + '_' + "multipleAxes") ? multipleAxis : (args.item.id == this.parent.element.id + '_' + "showLegend") ? showLegend : (args.item.id == this.parent.element.id + "pdf") ? pdfExport : (args.item.id == this.parent.element.id + "png") ? pngExport
36182
+ : (args.item.id == this.parent.element.id + "excel") ? excelExport : (args.item.id == this.parent.element.id + "csv") ? csvExport : (args.item.id == this.parent.element.id + "jpeg") ? jpegExport : (args.item.id == this.parent.element.id + "svg") ? svgExport
36183
+ : (args.item.id == this.parent.element.id + "notsubtotal") ? hideSubTotals : (args.item.id == this.parent.element.id + "subtotalrow") ? subTotalsRow : (args.item.id == this.parent.element.id + "subtotalcolumn") ? subTotalsColumn
36184
+ : (args.item.id == this.parent.element.id + "subtotal") ? showSubTotals : (args.item.id == this.parent.element.id + "notgrandtotal") ? hideGrandTotals : (args.item.id == this.parent.element.id + "grandtotalrow") ? grandTotalsRow
36185
+ : (args.item.id == this.parent.element.id + "grandtotalcolumn") ? grandTotalsColumn : (args.item.id == this.parent.element.id + "grandtotal") ? showGrandTotals
36186
+ : (args.item.id == this.parent.element.id + "numberFormattingMenu") ? numberFormattingMenu : (args.item.id == this.parent.element.id + "conditionalFormattingMenu") ? conditionalFormattingMenu : '';
36109
36187
  this.parent.actionObj.actionName = actionName;
36110
36188
  if (this.parent.actionBeginMethod()) {
36111
36189
  return;