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.
- package/flexmonster.css +1 -1
- package/flexmonster.es5.full.js +2700 -2698
- package/flexmonster.es5.js +2689 -2687
- package/flexmonster.full.js +2355 -2352
- package/flexmonster.js +2347 -2344
- package/flexmonster.min.css +1 -1
- package/package.json +1 -1
- package/theme/accessible/flexmonster.css +1 -1
- package/theme/accessible/flexmonster.min.css +1 -1
- package/theme/blackorange/flexmonster.css +1 -1
- package/theme/blackorange/flexmonster.min.css +1 -1
- package/theme/brightorange/flexmonster.css +1 -1
- package/theme/brightorange/flexmonster.min.css +1 -1
- package/theme/dark/flexmonster.css +1 -1
- package/theme/dark/flexmonster.min.css +1 -1
- package/theme/flexmonster-base.less +1 -1
- package/theme/green/flexmonster.css +1 -1
- package/theme/green/flexmonster.min.css +1 -1
- package/theme/lightblue/flexmonster.css +1 -1
- package/theme/lightblue/flexmonster.min.css +1 -1
- package/theme/macos/flexmonster.css +1 -1
- package/theme/macos/flexmonster.min.css +1 -1
- package/theme/midnight/flexmonster.css +1 -1
- package/theme/midnight/flexmonster.min.css +1 -1
- package/theme/old/flexmonster.css +1 -1
- package/theme/old/flexmonster.min.css +1 -1
- package/theme/orange/flexmonster.css +1 -1
- package/theme/orange/flexmonster.min.css +1 -1
- package/theme/purple/flexmonster.css +1 -1
- package/theme/purple/flexmonster.min.css +1 -1
- package/theme/softdefault/flexmonster.css +1 -1
- package/theme/softdefault/flexmonster.min.css +1 -1
- package/theme/stripedblue/flexmonster.css +1 -1
- package/theme/stripedblue/flexmonster.min.css +1 -1
- package/theme/stripedteal/flexmonster.css +1 -1
- package/theme/stripedteal/flexmonster.min.css +1 -1
- package/theme/teal/flexmonster.css +1 -1
- package/theme/teal/flexmonster.min.css +1 -1
- package/theme/yellow/flexmonster.css +1 -1
- package/theme/yellow/flexmonster.min.css +1 -1
- package/toolbar/flexmonster.toolbar.js +7 -4
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Flexmonster Pivot Table & Charts [https://www.flexmonster.com/]
|
|
3
|
-
*
|
|
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,
|
|
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({
|