QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-20 00:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hotfix] xAxis broken on time series viz

Browse Source
This commit is contained in:
Maxime Beauchemin
2017-06-21 16:35:50 -07:00
parent bd706ebbd1
commit 6eba6cac0b
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
superset/assets/visualizations/nvd3_vis.js
View File

@@ -7,14 +7,10 @@ import nv from 'nvd3';
import { category21 } from '../javascripts/modules/colors';
import { customizeToolTip, d3TimeFormatPreset, d3FormatPreset, tryNumify } from '../javascripts/modules/utils';
import { D3_TIME_FORMAT_OPTIONS } from '../javascripts/explore/stores/controls';
// CSS
import '../node_modules/nvd3/build/nv.d3.min.css';
import './nvd3_vis.css';
const timeStampFormats = D3_TIME_FORMAT_OPTIONS.map(opt => opt[0]);
const minBarWidth = 15;
const animationTime = 1000;
@@ -316,15 +312,15 @@ function nvd3Vis(slice, payload) {
if (fd.x_log_scale) {
chart.xScale(d3.scale.log());
}
const isTimeSeries = timeStampFormats.indexOf(fd.x_axis_format) > -1;
const isTimeSeries = [
'line', 'dual_line', 'area', 'compare', 'bar'].indexOf(vizType) >= 0;
// if x axis format is a date format, rotate label 90 degrees
if (isTimeSeries) {
chart.xAxis.rotateLabels(45);
}
let xAxisFormatter = d3FormatPreset(fd.x_axis_format);
if (isTimeSeries && fd.x_axis_format) {
if (isTimeSeries) {
xAxisFormatter = d3TimeFormatPreset(fd.x_axis_format);
}
if (chart.x2Axis && chart.x2Axis.tickFormat) {