marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-26 02:39:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support global config of gantt axisFormat

Browse Source
This commit is contained in:
Tyler Long
2018-03-12 21:33:02 +08:00
parent acf11bdc6c
commit 37076d3d1f
4 changed files with 5 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/diagrams/gantt/ganttRenderer.js
View File

@@ -1,13 +1,10 @@
import moment from 'moment'
import * as d3 from 'd3'
import { parser } from './parser/gantt'
import ganttDb from './ganttDb'
import { logger } from '../../logger'
parser.yy = ganttDb
let daysInChart
const conf = {
titleTopMargin: 25,
barHeight: 20,
@@ -52,13 +49,6 @@ export const draw = function (text, id) {
elem.setAttribute('viewBox', '0 0 ' + w + ' ' + h)
const svg = d3.select('#' + id)
const startDate = d3.min(taskArray, function (d) {
return d.startTime
})
const endDate = d3.max(taskArray, function (d) {
return d.endTime
})
// Set timescale
const timeScale = d3.scaleTime()
.domain([d3.min(taskArray, function (d) {
@@ -71,8 +61,6 @@ export const draw = function (text, id) {
let categories = []
daysInChart = moment.duration(endDate - startDate).asDays()
for (let i = 0; i < taskArray.length; i++) {
categories.push(taskArray[i].type)
}
@@ -254,32 +242,9 @@ export const draw = function (text, id) {
}
function makeGrid (theSidePad, theTopPad, w, h) {
const formatMillisecond = d3.timeFormat('.%L')
const formatSecond = d3.timeFormat(':%S')
const formatMinute = d3.timeFormat('%I:%M')
const formatHour = d3.timeFormat('%I %p')
const formatDay = d3.timeFormat('%Y-%m-%d')
const formatWeek = d3.timeFormat('%Y-%m-%d')
const formatMonth = d3.timeFormat('%b-%Y')
const formatYear = d3.timeFormat('%Y')
const multiFormat = date => {
return (d3.timeSecond(date) < date ? formatMillisecond
: d3.timeMinute(date) < date ? formatSecond
: d3.timeHour(date) < date ? formatMinute
: d3.timeDay(date) < date ? formatHour
: d3.timeMonth(date) < date ? (d3.timeWeek(date) < date ? formatDay : formatWeek)
: d3.timeYear(date) < date ? formatMonth
: formatYear)(date)
}
// todo: if (typeof conf.axisFormatter !== 'undefined')
let xAxis = d3.axisBottom(timeScale)
.tickSize(-h + theTopPad + conf.gridLineStartPadding)
.tickFormat(multiFormat)
logger.debug(daysInChart) // just to pass lint
.tickFormat(d3.timeFormat(conf.axisFormat || '%Y-%m-%d'))
svg.append('g')
.attr('class', 'grid')