@datarailsshared/dr_renderer 1.2.182-dragons → 1.2.184
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/highcharts_renderer.js +31 -27
package/package.json
CHANGED
|
@@ -5192,33 +5192,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
5192
5192
|
|
|
5193
5193
|
lodash.forEach(widgetOptions.filters, function (filterObj) {
|
|
5194
5194
|
fieldOb = lodash.find(fields, {id: filterObj.field});
|
|
5195
|
-
|
|
5196
|
-
filterObj.values = filterObj.values.val
|
|
5197
|
-
} else if (fieldOb && filterObj.values && filterObj.values.datetype && filterObj.values.datetype != 'list') {
|
|
5198
|
-
fieldOb.values = filterObj.values;
|
|
5199
|
-
} else if (fieldOb && filterObj.values && filterObj.values.type === 'advanced') {
|
|
5200
|
-
fieldOb.values = filterObj.values;
|
|
5201
|
-
}
|
|
5202
|
-
|
|
5203
|
-
if (fieldOb && filterObj.values && filterObj.values instanceof Array) {
|
|
5204
|
-
if (filterObj.is_excluded == true) {
|
|
5205
|
-
fieldOb.excludes = filterObj.values;
|
|
5206
|
-
} else {
|
|
5207
|
-
fieldOb.includes = filterObj.values;
|
|
5208
|
-
}
|
|
5209
|
-
includes[fieldOb.name] = highchartsRenderer.getOnlyIncludedOfField(fieldOb);
|
|
5210
|
-
}
|
|
5211
|
-
if (filterObj.show_in_graph && fieldOb) {
|
|
5212
|
-
fieldOb.show_in_graph = filterObj.show_in_graph
|
|
5213
|
-
}
|
|
5214
|
-
|
|
5215
|
-
if (filterObj.override_global_filter && fieldOb) {
|
|
5216
|
-
fieldOb.override_global_filter = filterObj.override_global_filter;
|
|
5217
|
-
}
|
|
5218
|
-
|
|
5219
|
-
if (filterObj.allow_nulls && fieldOb) {
|
|
5220
|
-
fieldOb.allow_nulls = filterObj.allow_nulls;
|
|
5221
|
-
}
|
|
5195
|
+
highchartsRenderer.addFilterDataToField(filterObj, fieldOb, includes)
|
|
5222
5196
|
});
|
|
5223
5197
|
|
|
5224
5198
|
// // fill calculated values
|
|
@@ -5317,6 +5291,36 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
5317
5291
|
|
|
5318
5292
|
};
|
|
5319
5293
|
|
|
5294
|
+
highchartsRenderer.addFilterDataToField = function (filterObj, fieldOb, includes) {
|
|
5295
|
+
if (fieldOb && filterObj.values && filterObj.values.datetype && filterObj.values.datetype === 'list') {
|
|
5296
|
+
filterObj.values = filterObj.values.val
|
|
5297
|
+
} else if (fieldOb && filterObj.values && filterObj.values.datetype && filterObj.values.datetype !== 'list') {
|
|
5298
|
+
fieldOb.values = filterObj.values;
|
|
5299
|
+
} else if (fieldOb && filterObj.values && filterObj.values.type === 'advanced') {
|
|
5300
|
+
fieldOb.values = filterObj.values;
|
|
5301
|
+
}
|
|
5302
|
+
|
|
5303
|
+
if (fieldOb && filterObj.values && filterObj.values instanceof Array) {
|
|
5304
|
+
if (filterObj.is_excluded == true) {
|
|
5305
|
+
fieldOb.excludes = filterObj.values;
|
|
5306
|
+
} else {
|
|
5307
|
+
fieldOb.includes = filterObj.values;
|
|
5308
|
+
}
|
|
5309
|
+
includes[fieldOb.name] = highchartsRenderer.getOnlyIncludedOfField(fieldOb);
|
|
5310
|
+
}
|
|
5311
|
+
if (filterObj.show_in_graph && fieldOb) {
|
|
5312
|
+
fieldOb.show_in_graph = filterObj.show_in_graph
|
|
5313
|
+
}
|
|
5314
|
+
|
|
5315
|
+
if (filterObj.override_global_filter && fieldOb) {
|
|
5316
|
+
fieldOb.override_global_filter = filterObj.override_global_filter;
|
|
5317
|
+
}
|
|
5318
|
+
|
|
5319
|
+
if (filterObj.allow_nulls && fieldOb) {
|
|
5320
|
+
fieldOb.allow_nulls = filterObj.allow_nulls;
|
|
5321
|
+
}
|
|
5322
|
+
}
|
|
5323
|
+
|
|
5320
5324
|
highchartsRenderer.getChartOptionsBySubType = function (subTypeChart) {
|
|
5321
5325
|
if (subTypeChart == highchartsRenderer.richTextSubType.type) {
|
|
5322
5326
|
return highchartsRenderer.richTextSubType;
|