mirrors/vue-ganttastic
2
0
Fork 0
mirror of https://github.com/tenrok/vue-ganttastic.git synced 2026-06-24 15:21:38 +03:00
Code Activity

Added prop for specifying minimum gap between bars in minutes

Browse Source 
Bumped version

Merge branch 'master' of https://github.com/InfectoOne/vue-ganttastic
This commit is contained in:
zunicma
2021-01-11 16:23:22 +01:00
parent 0fefc6eba8 60d18dab5c
commit 26f3d403bf
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "vue-ganttastic", "name": "vue-ganttastic",
"version": "0.9.24", "version": "0.9.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "vue-ganttastic", "name": "vue-ganttastic",
"version": "0.9.25", "version": "0.9.3",
"description": "A simple and customizable Gantt chart component for Vue.js", "description": "A simple and customizable Gantt chart component for Vue.js",
"repository": { "repository": {
"type": "git", "type": "git",
src/GGanttBar.vue
+4 -4
View File
@@ -303,13 +303,13 @@ export default {
switch(overlapType){ switch(overlapType){
case "left": case "left":
minuteDiff = overlapEndMoment.diff(currentStartMoment, "minutes", true) + this.getMinGapBetweenBars() minuteDiff = overlapEndMoment.diff(currentStartMoment, "minutes", true) + this.getMinGapBetweenBars()
overlapBar[this.barEnd] = moment(currentBar[this.barStart]).subtract(this.getMinGapBetweenBars(), "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) overlapBar[this.barStart] = overlapStartMoment.subtract(minuteDiff, "minutes", true).format("YYYY-MM-DD HH:mm:ss")
break break
case "right": case "right":
minuteDiff = currentEndMoment.diff(overlapStartMoment, "minutes", true) + this.getMinGapBetweenBars() minuteDiff = currentEndMoment.diff(overlapStartMoment, "minutes", true) + this.getMinGapBetweenBars()
overlapBar[this.barStart] = moment(currentBar[this.barEnd]).add(this.getMinGapBetweenBars(), "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) overlapBar[this.barEnd] = overlapEndMoment.add(minuteDiff, "minutes", true).format("YYYY-MM-DD HH:mm:ss")
break break
default: default:
// eslint-disable-next-line // eslint-disable-next-line
src/GGanttChart.vue
+2 -2
View File
@@ -52,8 +52,8 @@ export default {
rowLabelWidth: {type: String, default: "10%"}, rowLabelWidth: {type: String, default: "10%"},
rowHeight: {type: Number, default: 40}, rowHeight: {type: Number, default: 40},
locale: {type: String, default: "en"}, locale: {type: String, default: "en"},
theme: String, theme: {type: String},
grid: Boolean, grid: {type: Boolean},
highlightedHours: {type: Array, default: () => []}, highlightedHours: {type: Array, default: () => []},
width: {type: String, default: "100%"}, // the total width of the entire ganttastic component in % width: {type: String, default: "100%"}, // the total width of the entire ganttastic component in %
pushOnOverlap: {type: Boolean}, pushOnOverlap: {type: Boolean},