@datarailsshared/dr_renderer 1.2.259 → 1.2.261
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 +1 -1
- package/src/dr_pivottable.js +1 -1
- package/src/highcharts_renderer.js +23 -22
package/package.json
CHANGED
package/src/dr_pivottable.js
CHANGED
|
@@ -865,7 +865,7 @@ let initDRPivotTable = function($, window, document) {
|
|
|
865
865
|
if(!string_val || typeof(string_val) != 'string' ){
|
|
866
866
|
return string_val;
|
|
867
867
|
}
|
|
868
|
-
var entityMap = {"'":"'","<":"<",">":">","
|
|
868
|
+
var entityMap = {"'":"'","<":"<",">":">","¡":"¡","¢":"¢","£":"£","¤":"¤","¥":"¥","¦":"¦","§":"§","¨":"¨","©":"©","ª":"ª","«":"«","¬":"¬","®":"®","¯":"¯","°":"°","±":"±","²":"²","³":"³","´":"´","µ":"µ","¶":"¶","·":"·","¸":"¸","¹":"¹","º":"º","»":"»","¼":"¼","½":"½","¾":"¾","¿":"¿","À":"À","Á":"Á","Â":"Â","Ã":"Ã","Ä":"Ä","Å":"Å","Æ":"Æ","Ç":"Ç","È":"È","É":"É","Ê":"Ê","Ë":"Ë","Ì":"Ì","Í":"Í","Î":"Î","Ï":"Ï","Ð":"Ð","Ñ":"Ñ","Ò":"Ò","Ó":"Ó","Ô":"Ô","Õ":"Õ","Ö":"Ö","×":"×","Ø":"Ø","Ù":"Ù","Ú":"Ú","Û":"Û","Ü":"Ü","Ý":"Ý","Þ":"Þ","ß":"ß","à":"à","á":"á","â":"â","ã":"ã","ä":"ä","å":"å","æ":"æ","ç":"ç","è":"è","é":"é","ê":"ê","ë":"ë","ì":"ì","í":"í","î":"î","ï":"ï","ð":"ð","ñ":"ñ","ò":"ò","ó":"ó","ô":"ô","õ":"õ","ö":"ö","÷":"÷","ø":"ø","ù":"ù","ú":"ú","û":"û","ü":"ü","ý":"ý","þ":"þ","ÿ":"ÿ","Œ":"Œ","œ":"œ","Š":"Š","š":"š","Ÿ":"Ÿ","ƒ":"ƒ","ˆ":"ˆ","˜":"˜","Α":"Α","Β":"Β","Γ":"Γ","Δ":"Δ","Ε":"Ε","Ζ":"Ζ","Η":"Η","Θ":"Θ","Ι":"Ι","Κ":"Κ","Λ":"Λ","Μ":"Μ","Ν":"Ν","Ξ":"Ξ","Ο":"Ο","Π":"Π","Ρ":"Ρ","Σ":"Σ","Τ":"Τ","Υ":"Υ","Φ":"Φ","Χ":"Χ","Ψ":"Ψ","Ω":"Ω","α":"α","β":"β","γ":"γ","δ":"δ","ε":"ε","ζ":"ζ","η":"η","θ":"θ","ι":"ι","κ":"κ","λ":"λ","μ":"μ","ν":"ν","ξ":"ξ","ο":"ο","π":"π","ρ":"ρ","ς":"ς","σ":"σ","τ":"τ","υ":"υ","φ":"φ","χ":"χ","ψ":"ψ","ω":"ω","ϑ":"ϑ","ϒ":"&Upsih;","ϖ":"ϖ","–":"–","—":"—","‘":"‘","’":"’","‚":"‚","“":"“","”":"”","„":"„","†":"†","‡":"‡","•":"•","…":"…","‰":"‰","′":"′","″":"″","‹":"‹","›":"›","‾":"‾","⁄":"⁄","€":"€","ℑ":"ℑ","℘":"℘","ℜ":"ℜ","™":"™","ℵ":"ℵ","←":"←","↑":"↑","→":"→","↓":"↓","↔":"↔","↵":"↵","⇐":"⇐","⇑":"&UArr;","⇒":"⇒","⇓":"⇓","⇔":"⇔","∀":"∀","∂":"∂","∃":"∃","∅":"∅","∇":"∇","∈":"∈","∉":"∉","∋":"∋","∏":"∏","∑":"∑","−":"−","∗":"∗","√":"√","∝":"∝","∞":"∞","∠":"∠","∧":"∧","∨":"∨","∩":"∩","∪":"∪","∫":"∫","∴":"∴","∼":"∼","≅":"≅","≈":"≈","≠":"≠","≡":"≡","≤":"≤","≥":"≥","⊂":"⊂","⊃":"⊃","⊄":"⊄","⊆":"⊆","⊇":"⊇","⊕":"⊕","⊗":"⊗","⊥":"⊥","⋅":"⋅","⌈":"⌈","⌉":"⌉","⌊":"⌊","⌋":"⌋","⟨":"⟨","⟩":"⟩","◊":"◊","♠":"♠","♣":"♣","♥":"♥","♦":"♦"};
|
|
869
869
|
string_val = string_val.replace(/&/g, '&');
|
|
870
870
|
string_val = string_val.replace(/"/g, '"');
|
|
871
871
|
for (var key in entityMap) {
|
|
@@ -8423,7 +8423,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8423
8423
|
const labels = [];
|
|
8424
8424
|
colFilter.values = [];
|
|
8425
8425
|
lodash.forEach(col_key, function (col_value) {
|
|
8426
|
-
if (widget.cols[0].type === 'Date') {
|
|
8426
|
+
if (widget.cols[0].type === 'Date' && col_value !== NULL_VALUE) {
|
|
8427
8427
|
let date = highchartsRenderer.createDateFromString(
|
|
8428
8428
|
col_value,
|
|
8429
8429
|
highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
|
|
@@ -8449,7 +8449,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8449
8449
|
lodash.forEach(col_key, function (col_value, index) {
|
|
8450
8450
|
if (widget && widget.cols[index]) {
|
|
8451
8451
|
let temp = highchartsRenderer.createFilterObject(widget.cols[index]);
|
|
8452
|
-
if (widget.cols[index].type === 'Date') {
|
|
8452
|
+
if (widget.cols[index].type === 'Date' && col_value !== NULL_VALUE) {
|
|
8453
8453
|
let datetrange = highchartsRenderer.createDateTypeFromValue(
|
|
8454
8454
|
col_value,
|
|
8455
8455
|
highchartsRenderer.getDateFieldFormat(widget, widget.cols[index])
|
|
@@ -8472,7 +8472,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8472
8472
|
if (widget && widget.rows[index]) {
|
|
8473
8473
|
let temp = highchartsRenderer.createFilterObject(widget.rows[index]);
|
|
8474
8474
|
|
|
8475
|
-
if (widget.rows[index].type === 'Date') {
|
|
8475
|
+
if (widget.rows[index].type === 'Date' && row_value !== NULL_VALUE) {
|
|
8476
8476
|
let datetrange = highchartsRenderer.createDateTypeFromValue(
|
|
8477
8477
|
row_value,
|
|
8478
8478
|
highchartsRenderer.getDateFieldFormat(widget, widget.rows[index])
|
|
@@ -8545,7 +8545,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8545
8545
|
let filter = lodash.find(filters, {name: widget.rows[i].name});
|
|
8546
8546
|
if (filter) {
|
|
8547
8547
|
filter.is_excluded = false;
|
|
8548
|
-
filter.values = widget.rows[i].type === 'Date' ?
|
|
8548
|
+
filter.values = widget.rows[i].type === 'Date' && rowKey[i] !== NULL_VALUE ?
|
|
8549
8549
|
highchartsRenderer.createDateTypeFromValue(rowKey[i], highchartsRenderer.getDateFieldFormat(widget, widget.rows[i])) :
|
|
8550
8550
|
[rowKey[i]];
|
|
8551
8551
|
} else {
|
|
@@ -8564,7 +8564,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8564
8564
|
filter.values = [];
|
|
8565
8565
|
for (let i = 0; i < colKey.length; i++) {
|
|
8566
8566
|
filter.values.push(
|
|
8567
|
-
widget.cols[0].type === 'Date'
|
|
8567
|
+
widget.cols[0].type === 'Date' && colKey[i] !== NULL_VALUE
|
|
8568
8568
|
? highchartsRenderer.createDateFromString(
|
|
8569
8569
|
colKey[i],
|
|
8570
8570
|
highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
|
|
@@ -8592,7 +8592,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8592
8592
|
let filter = lodash.find(filters, {name: widget.cols[i].name});
|
|
8593
8593
|
if (filter) {
|
|
8594
8594
|
filter.is_excluded = false;
|
|
8595
|
-
filter.values = widget.cols[i].type === 'Date' ?
|
|
8595
|
+
filter.values = widget.cols[i].type === 'Date' && colKey[i] !== NULL_VALUE ?
|
|
8596
8596
|
highchartsRenderer.createDateTypeFromValue(colKey[i], highchartsRenderer.getDateFieldFormat(widget, widget.cols[i])) :
|
|
8597
8597
|
[colKey[i]];
|
|
8598
8598
|
} else {
|
|
@@ -8613,7 +8613,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8613
8613
|
filtOb.override_global_filter = false;
|
|
8614
8614
|
filtOb.field = field.id;
|
|
8615
8615
|
filtOb.name = highchartsRenderer.decodeFunc(field.name);
|
|
8616
|
-
if (field.type === 'Date') {
|
|
8616
|
+
if (field.type === 'Date' && value !== NULL_VALUE) {
|
|
8617
8617
|
filtOb.values = highchartsRenderer.createDateTypeFromValue(value, highchartsRenderer.getDateFieldFormat(widget, field));
|
|
8618
8618
|
}
|
|
8619
8619
|
|
|
@@ -8766,23 +8766,24 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8766
8766
|
var rowsAndCols = [];
|
|
8767
8767
|
rowsAndCols = widget.rows.concat(widget.cols);
|
|
8768
8768
|
|
|
8769
|
-
if (
|
|
8769
|
+
if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN) {
|
|
8770
|
+
|
|
8771
|
+
// if it is breakdown widget - redefine sorting according to breakdown_options
|
|
8772
|
+
// TODO: remove this when BE sort will be implemented
|
|
8773
|
+
lodash.forEach(rowsAndCols, function (field) {
|
|
8774
|
+
const waterfallFieldType = field.id === widget.cols[0].id ? 'totals' : 'breakdown';
|
|
8775
|
+
field.sorting = {
|
|
8776
|
+
type: 'CustomOrder',
|
|
8777
|
+
values: lodash.map(
|
|
8778
|
+
widget.options.breakdown_options.values[waterfallFieldType],
|
|
8779
|
+
value => value.key
|
|
8780
|
+
),
|
|
8781
|
+
};
|
|
8782
|
+
});
|
|
8783
|
+
} else if (isCustomSorting) {
|
|
8770
8784
|
lodash.forEach(rowsAndCols, function (field) {
|
|
8771
8785
|
const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
|
|
8772
8786
|
field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
|
|
8773
|
-
|
|
8774
|
-
// if it is breakdown widget - redefine sorting according to breakdown_options
|
|
8775
|
-
// TODO: remove this when BE sort will be implemented
|
|
8776
|
-
if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN) {
|
|
8777
|
-
const waterfallFieldType = field.id === widget.cols[0].id ? 'totals' : 'breakdown';
|
|
8778
|
-
field.sorting = {
|
|
8779
|
-
type: "CustomOrder",
|
|
8780
|
-
values: lodash.map(
|
|
8781
|
-
widget.options.breakdown_options.values[waterfallFieldType],
|
|
8782
|
-
value => value.key
|
|
8783
|
-
),
|
|
8784
|
-
};
|
|
8785
|
-
}
|
|
8786
8787
|
});
|
|
8787
8788
|
}
|
|
8788
8789
|
|
|
@@ -9263,7 +9264,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
9263
9264
|
filter.values.push(colValue);
|
|
9264
9265
|
});
|
|
9265
9266
|
} else {
|
|
9266
|
-
filter.values = field.type === 'Date'
|
|
9267
|
+
filter.values = field.type === 'Date' && colKey !== NULL_VALUE
|
|
9267
9268
|
? highchartsRenderer.createDateTypeFromValue(colKey, highchartsRenderer.getDateFieldFormat(widget, field))
|
|
9268
9269
|
: [colKey];
|
|
9269
9270
|
filter.value_to_show = colKey;
|