@datarailsshared/dr_renderer 1.2.87 → 1.2.90
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/package.json
CHANGED
package/src/dr_pivottable.js
CHANGED
|
@@ -259,8 +259,9 @@ let initDRPivotTable = function($, window, document) {
|
|
|
259
259
|
|
|
260
260
|
DRPivotData.prototype.getAggregator = function(rowKey, colKey) {
|
|
261
261
|
var agg, flatColKey, flatRowKey;
|
|
262
|
-
|
|
263
|
-
|
|
262
|
+
let hebrewMarkRegex = new RegExp(String.fromCharCode(8206), 'g');
|
|
263
|
+
flatRowKey = rowKey.join(delim).replace(hebrewMarkRegex, '');
|
|
264
|
+
flatColKey = colKey.join(delim).replace(hebrewMarkRegex, '');
|
|
264
265
|
if (rowKey.length === 0 && colKey.length === 0) {
|
|
265
266
|
agg = this.allTotal;
|
|
266
267
|
} else if (rowKey.length === 0) {
|
|
@@ -701,9 +702,7 @@ let initDRPivotTable = function($, window, document) {
|
|
|
701
702
|
if(color_to_set){
|
|
702
703
|
element.style.setProperty("background-color", color_to_set, "important");
|
|
703
704
|
element.style.setProperty("border-color", color_to_set, "important");
|
|
704
|
-
element.style.color =
|
|
705
|
-
? invertColors(color_to_set)
|
|
706
|
-
: '#3a3b39';
|
|
705
|
+
element.style.color = invertColors(color_to_set);
|
|
707
706
|
element.style.fontWeight = "bold";
|
|
708
707
|
if (opts.chartOptions.table_options.freeze_panes && element.firstChild) {
|
|
709
708
|
for (const child of element.children) {
|
|
@@ -733,9 +732,7 @@ let initDRPivotTable = function($, window, document) {
|
|
|
733
732
|
element.style.setProperty("background-color", color_to_set, "important");
|
|
734
733
|
element.style.setProperty("border-color", color_to_set, "important");
|
|
735
734
|
element.style.setProperty("vertical-align", "baseline");
|
|
736
|
-
element.style.color =
|
|
737
|
-
? invertColors(color_to_set)
|
|
738
|
-
: '#3a3b39';
|
|
735
|
+
element.style.color = invertColors(color_to_set);
|
|
739
736
|
element.style.fontWeight = "bold";
|
|
740
737
|
if (opts.chartOptions.table_options.freeze_panes && element.firstChild) {
|
|
741
738
|
for (const child of element.children) {
|
|
@@ -7643,7 +7643,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7643
7643
|
verticalAlign: 'top',
|
|
7644
7644
|
borderWidth: 0,
|
|
7645
7645
|
itemMarginTop: 10,
|
|
7646
|
-
y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle.subtitle ? 30 : 13)
|
|
7646
|
+
y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle && additionOptions.subtitle.subtitle ? 30 : 13)
|
|
7647
7647
|
} : {
|
|
7648
7648
|
layout: 'vertical',
|
|
7649
7649
|
align: 'right',
|
|
@@ -7659,7 +7659,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7659
7659
|
verticalAlign: 'top',
|
|
7660
7660
|
borderWidth: 0,
|
|
7661
7661
|
itemMarginTop: 10,
|
|
7662
|
-
y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle.subtitle ? 30 : 13)
|
|
7662
|
+
y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle && additionOptions.subtitle.subtitle ? 30 : 13)
|
|
7663
7663
|
} : {
|
|
7664
7664
|
enabled: rowAttrsLength > 0,
|
|
7665
7665
|
layout: 'vertical',
|