@datarailsshared/dr_renderer 1.2.375 → 1.2.377

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/highcharts_renderer.js +12 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datarailsshared/dr_renderer",
3
- "version": "1.2.375",
3
+ "version": "1.2.377",
4
4
  "description": "DataRails charts and tables renderer",
5
5
  "keywords": [
6
6
  "datarails",
package/src/highcharts_renderer.js CHANGED
@@ -24,8 +24,8 @@ const CHART_COLORS = {
24
24
  LABEL_SECOND: '#85889c',
25
25
  DRILL_UP_FILL: '#eef3f6',
26
26
  DRILL_BUTTON_COLOR_FILL: 'white',
27
- DRILL_BUTTON_COLOR: '#333333',
28
- DRILL_BUTTON_COLOR_HOVER: '#6D6E6F',
27
+ DRILL_BUTTON_COLOR: '#6D6E6F',
28
+ DRILL_BUTTON_COLOR_HOVER: '#333333',
29
29
  PLOT_BORDER: '#606063',
30
30
  MINOR_GRID_LINE: '#505053',
31
31
  TICK_COLOR: '#666',
@@ -66,7 +66,7 @@ const CHART_TYPES = {
66
66
 
67
67
  const HIGHCHARTS_CONSTANTS = {
68
68
  delimer: ' , ',
69
- DRILL_BUTTON_FONT_SIZE: '14px',
69
+ DRILL_BUTTON_FONT_SIZE: '16px',
70
70
  MAX_ROWS_FOR_AUTO_REFRESH: 100000,
71
71
  MAX_ROWS_FOR_SHOW_RESULTS: 10000,
72
72
  DR_OTHERS_KEY: 'DR_Others',
@@ -340,7 +340,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
340
340
  maskColor: CHART_COLORS.MASK,
341
341
  lang: {
342
342
  decimalPoint: '.',
343
- drillUpText: '< Back'
343
+ drillUpText: '<&nbsp;Back'
344
344
  },
345
345
  navigation: {
346
346
  buttonOptions: {
@@ -1042,13 +1042,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1042
1042
  };
1043
1043
  if (isNewAngular) {
1044
1044
  const isPieChart = chartOptions.chart && chartOptions.chart.type === 'pie';
1045
- const x = isPieChart ? 0 :
1046
- chartOptions.yAxis && chartOptions.yAxis.title && (chartOptions.yAxis.title.text || chartOptions.yAxis.title.autoylabel) ? -60 : -40;
1047
- const y = isPieChart ? 27 :
1048
- chartOptions.xAxis && chartOptions.xAxis.title && (chartOptions.xAxis.title.text || chartOptions.xAxis.title.autoxlabel) ? 65 : 43;
1045
+ const x = isPieChart ? 13 : 12
1046
+ const y = isPieChart ? -9 : 6
1049
1047
  chartOptions.chart.spacingBottom = lodash.get(chartOptions, 'xAxis.title') ? 34 : 30;
1050
1048
  chartOptions.drilldown.breadcrumbs = {
1051
- formatter: () => 'Back',
1049
+ formatter: () => '< &nbsp;Back',
1052
1050
  showFullPath: false,
1053
1051
  position: {
1054
1052
  align: 'left',
@@ -1057,7 +1055,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1057
1055
  y: y,
1058
1056
  },
1059
1057
  floating: true,
1060
- position: { align: 'left', x: 12, y: 6, verticalAlign: 'bottom' },
1061
1058
  relativeTo: 'spacingBox',
1062
1059
  buttonTheme: {
1063
1060
  fill: CHART_COLORS.DRILL_BUTTON_COLOR_FILL,
@@ -1666,6 +1663,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1666
1663
  }
1667
1664
 
1668
1665
  const agg = pivotData.getAggregator([], keys);
1666
+
1667
+ if (keys[0] === 'Total') {
1668
+ agg.uniq = pivotData.allTotal.uniq;
1669
+ }
1670
+
1669
1671
  let val = agg.value();
1670
1672
 
1671
1673
  if (val != null && $.isNumeric(val)) {