@datarailsshared/dr_renderer 1.2.260 → 1.2.262-dragons
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 +16 -2
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) {
|
|
@@ -494,8 +494,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
494
494
|
cols = this.point.name;
|
|
495
495
|
}
|
|
496
496
|
|
|
497
|
-
highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
|
|
498
|
-
|
|
499
497
|
if (!lodash.isArray(cols)) {
|
|
500
498
|
cols = [cols];
|
|
501
499
|
}
|
|
@@ -537,6 +535,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
537
535
|
cols = modifiedRowsAndCols.cols;
|
|
538
536
|
}
|
|
539
537
|
|
|
538
|
+
highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
|
|
539
|
+
|
|
540
540
|
var aggr = pivotData.getAggregator(rows, cols);
|
|
541
541
|
|
|
542
542
|
const formattedValue = is_drill_down_pie || labelOptions.show_value ? $.pivotUtilities.getFormattedNumber(value, aggr, opts, true) : '';
|
|
@@ -1035,6 +1035,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1035
1035
|
ob.name = row_n_value.join(highchartsRenderer.delimer)
|
|
1036
1036
|
.replace(highchartsRenderer.DR_OTHERS_KEY, othersName);
|
|
1037
1037
|
}
|
|
1038
|
+
|
|
1038
1039
|
lodash.forEach(col_n_keys, function (col_n_value, index) {
|
|
1039
1040
|
var agg = pivotData.getAggregator(row_n_value, col_n_value);
|
|
1040
1041
|
var val = agg.value();
|
|
@@ -1134,6 +1135,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1134
1135
|
newSeries.className = 'totalSeries';
|
|
1135
1136
|
newSeries.name = 'Total';
|
|
1136
1137
|
newSeries.data = [];
|
|
1138
|
+
|
|
1139
|
+
if (colors && colors[i]) {
|
|
1140
|
+
newSeries.color = colors[i];
|
|
1141
|
+
}
|
|
1142
|
+
|
|
1137
1143
|
col_n_keys.forEach(columnKey => {
|
|
1138
1144
|
let totalKey = columnKey;
|
|
1139
1145
|
if (lodash.isArray(columnKey)) {
|
|
@@ -1252,6 +1258,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1252
1258
|
if (opts.trendLine) {
|
|
1253
1259
|
const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
|
|
1254
1260
|
const b = ((n * xySum) - (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
|
|
1261
|
+
|
|
1255
1262
|
const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
|
|
1256
1263
|
trendSeries.className = 'trendSeries';
|
|
1257
1264
|
trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
|
|
@@ -1262,6 +1269,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1262
1269
|
if (colors && colors[i]) {
|
|
1263
1270
|
trendSeries.color = colors[i];
|
|
1264
1271
|
}
|
|
1272
|
+
|
|
1265
1273
|
trendSerieses.push(trendSeries);
|
|
1266
1274
|
}
|
|
1267
1275
|
i++;
|
|
@@ -1278,6 +1286,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1278
1286
|
}
|
|
1279
1287
|
|
|
1280
1288
|
let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
|
|
1289
|
+
|
|
1281
1290
|
if (opts.comboOptions && lodash.includes(chartType,'combo') && !lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
|
|
1282
1291
|
chart_series.forEach((series, seriesIndex) => {
|
|
1283
1292
|
const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
|
|
@@ -1316,6 +1325,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1316
1325
|
totalSeries.className = 'totalSeries';
|
|
1317
1326
|
totalSeries.name = 'Total';
|
|
1318
1327
|
totalSeries.data = [];
|
|
1328
|
+
|
|
1329
|
+
if (colors && colors[i]) {
|
|
1330
|
+
totalSeries.color = colors[i];
|
|
1331
|
+
}
|
|
1332
|
+
|
|
1319
1333
|
col_n_keys.forEach(columnKey => {
|
|
1320
1334
|
let key = columnKey;
|
|
1321
1335
|
let totalKey = columnKey;
|