add axisFormat option to ganttConfig

dist/index.html

@@ -33,6 +33,7 @@
   <div class="mermaid">
 gantt
 dateFormat  YYYY-MM-DD
+axisFormat  %m/%d(%Y)
 title Adding GANTT diagram to mermaid
 
 section A section

src/diagrams/gantt/ganttDb.js

@@ -2,6 +2,7 @@ import moment from 'moment'
 import { logger } from '../../logger'
 
 let dateFormat = ''
+let axisFormat = ''
 let title = ''
 let sections = []
 let tasks = []
@@ -25,6 +26,15 @@ export const setDateFormat = function (txt) {
 export const getDateFormat = function () {
   return dateFormat
 }
+
+export const setAxisFormat = function (txt) {
+  axisFormat = txt
+}
+
+export const getAxisFormat = function () {
+  return axisFormat
+}
+
 export const setTitle = function (txt) {
   title = txt
 }
@@ -349,6 +359,8 @@ export default {
   clear,
   setDateFormat,
   getDateFormat,
+  setAxisFormat,
+  getAxisFormat,
   setTitle,
   getTitle,
   addSection,

src/diagrams/gantt/ganttRenderer.js

@@ -289,22 +289,28 @@ export const draw = function (text, id) {
       }]
     ]
     let formatter
-    if (typeof conf.axisFormatter !== 'undefined') {
-      mid = []
-      conf.axisFormatter.forEach(function (item) {
-        const n = []
-        n[0] = item[0]
-        n[1] = item[1]
-        mid.push(n)
-      })
-    }
-    formatter = pre.concat(mid).concat(post)
-
     let xAxis = d3.svg.axis()
       .scale(timeScale)
       .orient('bottom')
       .tickSize(-h + theTopPad + conf.gridLineStartPadding, 0, 0)
-      .tickFormat(d3.time.format.multi(formatter))
+    if (parser.yy.getAxisFormat() !== '') {
+      xAxis = xAxis.tickFormat(d3.time.format(parser.yy.getAxisFormat()))
+    } else if (typeof conf.axisFormatter === 'string') {
+      xAxis = xAxis.tickFormat(d3.time.format(conf.axisFormatter))
+    } else {
+      if (typeof conf.axisFormatter !== 'undefined') {
+        mid = []
+        conf.axisFormatter.forEach(function (item) {
+          const n = []
+          n[0] = item[0]
+          n[1] = item[1]
+          mid.push(n)
+        })
+      }
+      formatter = pre.concat(mid).concat(post)
+
+      xAxis = xAxis.tickFormat(d3.time.format.multi(formatter))
+    }
 
     if (daysInChart > 7 && daysInChart < 230) {
       xAxis = xAxis.ticks(d3.time.monday.range)

src/diagrams/gantt/parser/gantt.jison

@@ -19,6 +19,7 @@
 \%%[^\n]*               /* skip comments */
 "gantt"     	        return 'gantt';
 "dateFormat"\s[^#\n;]+  return 'dateFormat';
+"axisFormat"\s[^#\n;]+  return 'axisFormat';
 \d\d\d\d"-"\d\d"-"\d\d  return 'date';
 "title"\s[^#\n;]+       return 'title';
 "section"\s[^#:\n;]+    return 'section';
@@ -54,6 +55,7 @@ line
 
 statement
 	: 'dateFormat' {yy.setDateFormat($1.substr(11));$$=$1.substr(11);}
+	| 'axisFormat' {yy.setAxisFormat($1.substr(11));$$=$1.substr(11);}
 	| title {yy.setTitle($1.substr(6));$$=$1.substr(6);}
 	| section {yy.addSection($1.substr(8));$$=$1.substr(8);}
 	| taskTxt taskData {yy.addTask($1,$2);$$='task';}