flexmonster 2.9.23 → 2.9.24

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 (41) hide show
  1. package/flexmonster.css +1 -1
  2. package/flexmonster.es5.full.js +2700 -2698
  3. package/flexmonster.es5.js +2689 -2687
  4. package/flexmonster.full.js +2355 -2352
  5. package/flexmonster.js +2347 -2344
  6. package/flexmonster.min.css +1 -1
  7. package/package.json +1 -1
  8. package/theme/accessible/flexmonster.css +1 -1
  9. package/theme/accessible/flexmonster.min.css +1 -1
  10. package/theme/blackorange/flexmonster.css +1 -1
  11. package/theme/blackorange/flexmonster.min.css +1 -1
  12. package/theme/brightorange/flexmonster.css +1 -1
  13. package/theme/brightorange/flexmonster.min.css +1 -1
  14. package/theme/dark/flexmonster.css +1 -1
  15. package/theme/dark/flexmonster.min.css +1 -1
  16. package/theme/flexmonster-base.less +1 -1
  17. package/theme/green/flexmonster.css +1 -1
  18. package/theme/green/flexmonster.min.css +1 -1
  19. package/theme/lightblue/flexmonster.css +1 -1
  20. package/theme/lightblue/flexmonster.min.css +1 -1
  21. package/theme/macos/flexmonster.css +1 -1
  22. package/theme/macos/flexmonster.min.css +1 -1
  23. package/theme/midnight/flexmonster.css +1 -1
  24. package/theme/midnight/flexmonster.min.css +1 -1
  25. package/theme/old/flexmonster.css +1 -1
  26. package/theme/old/flexmonster.min.css +1 -1
  27. package/theme/orange/flexmonster.css +1 -1
  28. package/theme/orange/flexmonster.min.css +1 -1
  29. package/theme/purple/flexmonster.css +1 -1
  30. package/theme/purple/flexmonster.min.css +1 -1
  31. package/theme/softdefault/flexmonster.css +1 -1
  32. package/theme/softdefault/flexmonster.min.css +1 -1
  33. package/theme/stripedblue/flexmonster.css +1 -1
  34. package/theme/stripedblue/flexmonster.min.css +1 -1
  35. package/theme/stripedteal/flexmonster.css +1 -1
  36. package/theme/stripedteal/flexmonster.min.css +1 -1
  37. package/theme/teal/flexmonster.css +1 -1
  38. package/theme/teal/flexmonster.min.css +1 -1
  39. package/theme/yellow/flexmonster.css +1 -1
  40. package/theme/yellow/flexmonster.min.css +1 -1
  41. package/toolbar/flexmonster.toolbar.js +7 -4
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * Flexmonster Pivot Table & Charts [https://www.flexmonster.com/]
3
- * April 2022 (v. 2.9.23)
3
+ * May 2022 (v. 2.9.24)
4
4
  * Copyright (c) 2022 Flexmonster. All rights reserved.
5
5
  *
6
6
  * Flexmonster Pivot Table & Charts commercial licenses may be obtained at
@@ -14,6 +14,7 @@ var FlexmonsterToolbar = function (pivotContainer, pivot, _, width, labels, data
14
14
  this.Labels = labels;
15
15
  this.dataSourceType = dataSourceType || 5;
16
16
  this.showShareReportTab = false;
17
+ this.singleAggregationFormatting = false;
17
18
  }
18
19
  FlexmonsterToolbar.prototype.getTabs = function () {
19
20
  var tabs = [];
@@ -1574,7 +1575,9 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
1574
1575
  var measure = null;
1575
1576
  for (var i = 0; i < measuresList.length; i++) {
1576
1577
  measure = getMeasureFromUniqueName(measuresList[i]);
1577
- self.pivot.setFormat(formatVO, (measure[0] == "" ? null : measure[0]), measure[1]);
1578
+ self.pivot.setFormat(formatVO,
1579
+ (measure[0] == "" ? null : measure[0]),
1580
+ (self.singleAggregationFormatting ? undefined : measure[1]));
1578
1581
  }
1579
1582
  // if (valuesDropDown.getValue() === "" && currentReport.hasOwnProperty("formats")) {
1580
1583
  // var reportMeasures = currentReport.slice.measures;
@@ -1603,7 +1606,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
1603
1606
  var aggregation = aggregationLabelIndex === -1 || measure.aggregation === "none" || measure.calculated ?
1604
1607
  null :
1605
1608
  measure.availableAggregationsCaptions[aggregationLabelIndex];
1606
- return aggregation === null ?
1609
+ return aggregation === null || self.singleAggregationFormatting ?
1607
1610
  measure.name :
1608
1611
  measure.name + " (" + aggregation + ")";
1609
1612
  }
@@ -1638,7 +1641,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
1638
1641
  var _measures = self.pivot.getMeasures();
1639
1642
  for (var i = 0; i < _measures.length; i++) {
1640
1643
  if (!_uniqueNames[_measures[i].uniqueName] ||
1641
- (_uniqueNames[_measures[i].uniqueName] && !_uniqueNames[_measures[i].uniqueName][_measures[i].aggregation])) {
1644
+ (_uniqueNames[_measures[i].uniqueName] && !_uniqueNames[_measures[i].uniqueName][_measures[i].aggregation] && !this.singleAggregationFormatting)) {
1642
1645
  if (!_uniqueNames[_measures[i].uniqueName]) _uniqueNames[_measures[i].uniqueName] = {};
1643
1646
  _uniqueNames[_measures[i].uniqueName][_measures[i].aggregation] = true;
1644
1647
  measuresDataProvider.push({