diff --git a/package-lock.json b/package-lock.json index ba44081..646bcba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vue-ganttastic", - "version": "0.9.24", + "version": "0.9.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b0b781d..aec2de5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-ganttastic", - "version": "0.9.25", + "version": "0.9.3", "description": "A simple and customizable Gantt chart component for Vue.js", "repository": { "type": "git", diff --git a/src/GGanttBar.vue b/src/GGanttBar.vue index be23b77..5cac4ff 100644 --- a/src/GGanttBar.vue +++ b/src/GGanttBar.vue @@ -303,13 +303,13 @@ export default { switch(overlapType){ case "left": minuteDiff = overlapEndMoment.diff(currentStartMoment, "minutes", true) + this.getMinGapBetweenBars() - overlapBar[this.barEnd] = moment(currentBar[this.barStart]).subtract(this.getMinGapBetweenBars(), "minutes", true) - overlapBar[this.barStart] = overlapStartMoment.subtract(minuteDiff, "minutes", true) + overlapBar[this.barEnd] = currentStartMoment.subtract(this.getMinGapBetweenBars(), "minutes", true).format("YYYY-MM-DD HH:mm:ss") + overlapBar[this.barStart] = overlapStartMoment.subtract(minuteDiff, "minutes", true).format("YYYY-MM-DD HH:mm:ss") break case "right": minuteDiff = currentEndMoment.diff(overlapStartMoment, "minutes", true) + this.getMinGapBetweenBars() - overlapBar[this.barStart] = moment(currentBar[this.barEnd]).add(this.getMinGapBetweenBars(), "minutes", true) - overlapBar[this.barEnd] = overlapEndMoment.add(minuteDiff, "minutes", true) + overlapBar[this.barStart] = currentEndMoment.add(this.getMinGapBetweenBars(), "minutes", true).format("YYYY-MM-DD HH:mm:ss") + overlapBar[this.barEnd] = overlapEndMoment.add(minuteDiff, "minutes", true).format("YYYY-MM-DD HH:mm:ss") break default: // eslint-disable-next-line diff --git a/src/GGanttChart.vue b/src/GGanttChart.vue index 306a11a..f52c548 100644 --- a/src/GGanttChart.vue +++ b/src/GGanttChart.vue @@ -52,8 +52,8 @@ export default { rowLabelWidth: {type: String, default: "10%"}, rowHeight: {type: Number, default: 40}, locale: {type: String, default: "en"}, - theme: String, - grid: Boolean, + theme: {type: String}, + grid: {type: Boolean}, highlightedHours: {type: Array, default: () => []}, width: {type: String, default: "100%"}, // the total width of the entire ganttastic component in % pushOnOverlap: {type: Boolean},